Merge pull request #1660 from OWASP/desktop-improvements

.net container support

Dockerfile_webdesktop

@@ -18,18 +18,19 @@ RUN \
   rm -rf /tmp/*
 
 RUN \
+  export DOTNET_INSTALL_DIR="/etc/dotnet" && \
   echo "installing dotnet" && \
   wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
   chmod +x dotnet-install.sh && \
   ./dotnet-install.sh --version latest && \
-  export DOTNET_ROOT=$HOME/.dotnet && \
+  export DOTNET_ROOT=/etc/dotnet && \
   export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools && \
-  dotnet tool install --global ilspycmd && \
-  dotnet tool install -g sfextract
+  export PATH="$PATH:/config/.dotnet/tools" &&\
+  dotnet tool install ilspycmd --version 9.0.0.7660-preview2 --tool-path /etc/dotnet/tools
 
 WORKDIR /config/Desktop
 
-COPY src/main/resources/executables/*linux* /var/tmp/wrongsecrets/
+COPY src/main/resources/executables/*linux-mus* /var/tmp/wrongsecrets/
 COPY src/main/resources/executables/decrypt/ /var/tmp/wrongsecrets/decrypt/
 COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /var/tmp/wrongsecrets/
 COPY src/main/resources/executables/secrchallenge.md /var/tmp/wrongsecrets/

Dockerfile_webdesktopk8s

@@ -23,18 +23,19 @@ RUN echo "**** clone wrongsecrets.git for webtop in k8s ****" && \
     git clone https://github.com/OWASP/wrongsecrets.git
 
 RUN \
-  echo "installing dotnet" && \
-  wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
-  chmod +x dotnet-install.sh && \
-  ./dotnet-install.sh --version latest && \
-  export DOTNET_ROOT=$HOME/.dotnet && \
-  export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools && \
-  dotnet tool install --global ilspycmd && \
-  dotnet tool install -g sfextract
+    export DOTNET_INSTALL_DIR="/etc/dotnet" && \
+    echo "installing dotnet" && \
+    wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
+    chmod +x dotnet-install.sh && \
+    ./dotnet-install.sh --version latest && \
+    export DOTNET_ROOT=/etc/dotnet && \
+    export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools && \
+    export PATH="$PATH:/config/.dotnet/tools" &&\
+    dotnet tool install ilspycmd --version 9.0.0.7660-preview2 --tool-path /etc/dotnet/tools
 
 WORKDIR /config/Desktop
 
-COPY src/main/resources/executables/*linux* /var/tmp/wrongsecrets/
+COPY src/main/resources/executables/*linux-mus* /var/tmp/wrongsecrets/
 COPY src/main/resources/executables/decrypt/ /var/tmp/wrongsecrets/decrypt/
 COPY src/main/resources/executables/wrongsecrets-advanced-c-windows.exe /var/tmp/wrongsecrets/
 COPY src/main/resources/executables/secrchallenge.md /var/tmp/wrongsecrets/

src/main/resources/explanations/challenge50_hint.adoc

@@ -8,7 +8,7 @@ You can solve this challenge using the following alternative solutions:
 - download it from the https://github.com/OWASP/wrongsecrets-binaries/releases[Wrongsecrets Binaries]
 - Install .NET8 and .NET8 SDK
 - Install https://github.com/icsharpcode/ILSpy/tree/master/ICSharpCode.ILSpyCmd[ilspycmd]
-- Install `sfextract`: `dotnet tool install -g sfextract`
-- Unpack the self-contained binary: `sfextract wrongsecrets-dotnet -o \./tmp`.
+- optionally: Install `sfextract`: `dotnet tool install -g sfextract`
+- Unpack the self-contained binary: `sfextract wrongsecrets-dotnet -o \./tmp`. or use ilspy: `mkdir tmp && ilspycmd -d wrongsecrets-dotnet-linux -o ~/tmp`
 - Go to the tmp folder and do `ilspycmd dotnetproject.dll` to decompile the dll and find the secret.
 Don't want to install the tools? check the https://github.com/OWASP/wrongsecrets/tree/master?tab=readme-ov-file#want-to-play-but-are-not-allowed-to-install-the-tools[WrongSecrets Desktop container]!

wrongsecret-desktop-resources/startwm.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-export DOTNET_ROOT=$HOME/.dotnet
-export PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
+export DOTNET_ROOT=/etc/dotnet
+export DOTNET_INSTALL_DIR="/etc/dotnet"
+export PATH="$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools"
+export PATH="$PATH:/config/.dotnet/tools"
 /startpulse.sh &
 ln -s -r /var/tmp/wrongsecrets /config/Desktop/wrongsecrets
 ln -s /var/tmp/wrongsecrets/welcome.md /config/Desktop/welcome.md