update desktop container

Author: commjoen

.github/scripts/.bash_history

@@ -347,7 +347,7 @@ rm -rf jdk-18_linux-x64_bin.deb
 git rebase -i main
 git rebase -i master
 git stash
-export tempPassword="LtwkyiHy3lJAEE164GYKtwvp0c18w6AKMwlPmk5Kzn0="
+export tempPassword="AsN9cThr08bmwdnn28J399g7EwIqkKnHsEKeXtwllks="
 mvn run tempPassword
 k6
 npx k6

Dockerfile

@@ -1,7 +1,7 @@
 FROM bellsoft/liberica-openjre-debian:23.0.2-9-cds AS builder
 WORKDIR /builder
 
-ARG argBasedVersion="1.12.7"
+ARG argBasedVersion="1.12.8"
 
 COPY --chown=wrongsecrets target/wrongsecrets-${argBasedVersion}-SNAPSHOT.jar application.jar
 RUN java -Djarmode=tools -jar application.jar extract --layers --destination extracted

Dockerfile.web

@@ -1,5 +1,5 @@
-FROM jeroenwillemsen/wrongsecrets:1.12.7-no-vault
-ARG argBasedVersion="1.12.7-no-vault"
+FROM jeroenwillemsen/wrongsecrets:1.12.8-no-vault
+ARG argBasedVersion="1.12.8-no-vault"
 ARG CANARY_URLS="http://canarytokens.com/terms/about/s7cfbdakys13246ewd8ivuvku/post.jsp,http://canarytokens.com/terms/about/y0all60b627gzp19ahqh7rl6j/post.jsp"
 ARG CTF_ENABLED=false
 ARG HINTS_ENABLED=true

Dockerfile_webdesktop

@@ -1,32 +1,33 @@
-FROM lscr.io/linuxserver/webtop:4.16-r0-ls95
+FROM linuxserver/webtop:latest
 LABEL NAME="OWASP WrongSecrets Web Desktop" MAINTAINER="Jeroen Willemsen"
 
-RUN \
-   echo "*** install kubectl ***" && \
-    curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" &&\
-    sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl &&\
-    rm kubectl
+# RUN \
+#    echo "*** install kubectl ***" && \
+#     curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" &&\
+#     sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl &&\
+#     rm kubectl
 
 RUN \
   echo "**** install packages ****" && \
-  apk add --no-cache shadow keepassxc radare2 aws-cli geany git gdb build-base icu-libs icu-data-full ca-certificates libgcc libstdc++ zlib && \
+  apk add --no-cache shadow keepassxc kubectl radare2 dotnet9-sdk aws-cli geany git gdb build-base icu-libs icu-data-full ca-certificates libgcc libstdc++ zlib && \
   echo "**** adding abc user to root for Docker ****" && \
   usermod -aG root abc && \
   touch /var/run/docker.sock && \
   chown abc:abc /var/run/docker.sock && \
   echo "**** cleanup ****" && \
   rm -rf /tmp/*
 
-RUN \
-  echo "installing dotnet" && \
-  wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
-  chmod +x dotnet-install.sh && \
-  ./dotnet-install.sh --install-dir /etc/dotnet --version latest && \
-  export DOTNET_ROOT=/etc/dotnet && \
-  export PATH="/etc/dotnet:/etc/dotnet/tools:$PATH" && \
-  dotnet --info && \
-  dotnet tool install ilspycmd --version 9.0.0.7889 --tool-path /etc/dotnet/tools
-
+# RUN \
+#   echo "installing dotnet" && \
+#   wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
+#   chmod +x dotnet-install.sh && \
+#   ./dotnet-install.sh --install-dir /etc/dotnet --version latest && \
+#   export DOTNET_ROOT=/etc/dotnet && \
+#   export PATH="/etc/dotnet:/etc/dotnet/tools:$PATH" && \
+#   dotnet --info && \
+#   dotnet tool install ilspycmd --version 9.0.0.7889 --tool-path /etc/dotnet/tools
+
+RUN dotnet tool install ilspycmd --version 9.0.0.7889 --tool-path /etc/dotnet/tools
 # Add secret handling for Kubernetes-specific Docker builds
 # Create the /app directory to store the secret
 RUN mkdir -p /app

aws/k8s/secret-challenge-vault-deployment.yml

@@ -58,7 +58,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-aws-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.12.7-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.12.8-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           command: ["/bin/sh"]

azure/k8s/secret-challenge-vault-deployment.yml.tpl

@@ -61,7 +61,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "azure-wrongsecrets-vault"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.12.7-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.12.8-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           command: ["/bin/sh"]

docs/VERSION_MANAGEMENT.md

@@ -12,9 +12,9 @@ The project maintains version consistency between:
 ## Version Schema
 
 ```
-pom.xml version:        1.12.7-SNAPSHOT
-Dockerfile version:     1.12.7
-Dockerfile.web version: 1.12.7-no-vault
+pom.xml version:        1.12.8-SNAPSHOT
+Dockerfile version:     1.12.8
+Dockerfile.web version: 1.12.8-no-vault
 ```
 
 ## Automated Solutions

fly.toml

@@ -8,7 +8,7 @@ app = "wrongsecrets"
 primary_region = "ams"
 
 [build]
-  image = "docker.io/jeroenwillemsen/wrongsecrets:1.12.7-no-vault"
+  image = "docker.io/jeroenwillemsen/wrongsecrets:1.12.8-no-vault"
 
 [env]
   K8S_ENV = "Fly(Docker)"

gcp/k8s/secret-challenge-vault-deployment.yml.tpl

@@ -58,7 +58,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-gcp-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.12.7-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.12.8-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           command: ["/bin/sh"]

js/index.js

@@ -1,5 +1,5 @@
 
  function secret() {
- var password = "JaX7jBw=" + 9 + "Mwvs" + 6 + "WE4=" + 2 + "Appl" + 7;
+ var password = "ORqWt/g=" + 9 + "5kWb" + 6 + "dGE=" + 2 + "NLFC" + 7;
  return password;
  }