From ab1d28f71e33d77f40a0fb6e34262d8326e1b4df Mon Sep 17 00:00:00 2001 From: ZarKyo Date: Wed, 28 Oct 2026 18:09:08 +0100 Subject: [PATCH] Fix Zimmerman tools: .NET 10 builds, and pass arguments intact download.ericzimmermanstools.com/net9/.zip now returns 404: the tools moved to .NET 10, published under /net/ (the root .zip is the Windows .exe build). The state still wrote the wrappers, so every evtxecmd, mftecmd, recmd... only printed "dotnet-/opt/zimmermantools/... .dll does not exist", and the salt run failed. - zimmerman.sls: download from /net/; every zip keeps the layout the wrappers expect (checked for all 15 tools, all target net10.0). - dotnet.sls: add dotnet-runtime-10.0 (Ubuntu noble-updates) next to dotnet-sdk-9.0, which mulder still uses; apt swaps dotnet-host-9.0 for dotnet-host-10.0 and keeps the 9.0 SDK and runtimes. - wrappers: `exec dotnet ... "$@"` instead of `dotnet ... ${*}`, which split any argument holding a space, so the tool printed its help instead of running. --- sift/packages/dotnet.sls | 7 +++++++ sift/scripts/zimmerman.sls | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sift/packages/dotnet.sls b/sift/packages/dotnet.sls index bb697d54..5350cde2 100644 --- a/sift/packages/dotnet.sls +++ b/sift/packages/dotnet.sls @@ -6,3 +6,10 @@ sift-package-dotnet9: - name: dotnet-sdk-9.0 - require: - sls: sift.repos.dotnet-backports + +# Eric Zimmerman's tools target net10.0 (sift.scripts.zimmerman). +sift-package-dotnet10-runtime: + pkg.installed: + - name: dotnet-runtime-10.0 + - require: + - sls: sift.repos.dotnet-backports diff --git a/sift/scripts/zimmerman.sls b/sift/scripts/zimmerman.sls index 05664277..d65edc80 100644 --- a/sift/scripts/zimmerman.sls +++ b/sift/scripts/zimmerman.sls @@ -15,7 +15,7 @@ include: download-{{ tool }}: file.managed: - name: /tmp/{{ tool }}.zip - - source: https://download.ericzimmermanstools.com/net9/{{ tool }}.zip + - source: https://download.ericzimmermanstools.com/net/{{ tool }}.zip - skip_verify: True - makedirs: True @@ -33,11 +33,11 @@ extract-{{ tool }}: - contents: | #!/bin/bash {% if tool|lower == "iisgeolocate" or tool|lower == "recmd" or tool|lower == "sqlecmd" %} - dotnet /opt/zimmermantools/{{ tool }}/{{ tool }}.dll ${*} + exec dotnet /opt/zimmermantools/{{ tool }}/{{ tool }}.dll "$@" {% elif tool|lower == "evtxecmd" %} - dotnet /opt/zimmermantools/EvtxeCmd/{{ tool }}.dll ${*} + exec dotnet /opt/zimmermantools/EvtxeCmd/{{ tool }}.dll "$@" {% else %} - dotnet /opt/zimmermantools/{{ tool }}.dll ${*} + exec dotnet /opt/zimmermantools/{{ tool }}.dll "$@" {% endif %} - mode: 755 - replace: True