diff --git a/.github/scripts/.bash_history b/.github/scripts/.bash_history index e6b484322..2fbc8c44d 100644 --- a/.github/scripts/.bash_history +++ b/.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="acGSExxt6C8bl8IYNnkyEV3bphYisP+qkpCHZGs/YBU=" +export tempPassword="t1XyoVxdiCYgSOsEgELE2yXCjtYoWhYsspHXERKkbXQ=" mvn run tempPassword k6 npx k6 diff --git a/Dockerfile b/Dockerfile index 6da49503a..8d5597857 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM bellsoft/liberica-openjre-debian:26-cds AS builder WORKDIR /builder -ARG argBasedVersion="1.14.0RC7" +ARG argBasedVersion="1.14.0RC8" COPY --chown=wrongsecrets target/wrongsecrets-${argBasedVersion}-SNAPSHOT.jar application.jar RUN java -Djarmode=tools -jar application.jar extract --layers --destination extracted diff --git a/Dockerfile.web b/Dockerfile.web index af4f4c10c..9c81ab989 100644 --- a/Dockerfile.web +++ b/Dockerfile.web @@ -1,5 +1,5 @@ -FROM jeroenwillemsen/wrongsecrets:1.14.0RC7-no-vault -ARG argBasedVersion="1.14.0RC7-no-vault" +FROM jeroenwillemsen/wrongsecrets:1.14.0RC8-no-vault +ARG argBasedVersion="1.14.0RC8-no-vault" ARG spring_profile="without-vault" ARG CANARY_URLS="http://canarytokens.com/terms/about/s7cfbdakys13246ewd8ivuvku/post.jsp,http://canarytokens.com/terms/about/y0all60b627gzp19ahqh7rl6j/post.jsp" ARG CTF_ENABLED=false diff --git a/aws/k8s/secret-challenge-vault-deployment.yml b/aws/k8s/secret-challenge-vault-deployment.yml index 1474c3f88..be859dcdc 100644 --- a/aws/k8s/secret-challenge-vault-deployment.yml +++ b/aws/k8s/secret-challenge-vault-deployment.yml @@ -58,7 +58,7 @@ spec: volumeAttributes: secretProviderClass: "wrongsecrets-aws-secretsmanager" containers: - - image: jeroenwillemsen/wrongsecrets:1.14.0RC7-k8s-vault + - image: jeroenwillemsen/wrongsecrets:1.14.0RC8-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge command: ["/bin/sh"] diff --git a/azure/k8s/secret-challenge-vault-deployment.yml.tpl b/azure/k8s/secret-challenge-vault-deployment.yml.tpl index 95aa2dc23..31702307f 100644 --- a/azure/k8s/secret-challenge-vault-deployment.yml.tpl +++ b/azure/k8s/secret-challenge-vault-deployment.yml.tpl @@ -61,7 +61,7 @@ spec: volumeAttributes: secretProviderClass: "azure-wrongsecrets-vault" containers: - - image: jeroenwillemsen/wrongsecrets:1.14.0RC7-k8s-vault + - image: jeroenwillemsen/wrongsecrets:1.14.0RC8-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge command: ["/bin/sh"] diff --git a/docs/VERSION_MANAGEMENT.md b/docs/VERSION_MANAGEMENT.md index 918861469..9ad4787c8 100644 --- a/docs/VERSION_MANAGEMENT.md +++ b/docs/VERSION_MANAGEMENT.md @@ -12,9 +12,9 @@ The project maintains version consistency between: ## Version Schema ``` -pom.xml version: 1.14.0RC7-SNAPSHOT -Dockerfile version: 1.14.0RC7 -Dockerfile.web version: 1.14.0RC7-no-vault +pom.xml version: 1.14.0RC8-SNAPSHOT +Dockerfile version: 1.14.0RC8 +Dockerfile.web version: 1.14.0RC8-no-vault ``` ## Automated Solutions diff --git a/fly.toml b/fly.toml index a92a1d237..253af35b6 100644 --- a/fly.toml +++ b/fly.toml @@ -8,7 +8,7 @@ app = "wrongsecrets" primary_region = "ams" [build] - image = "docker.io/jeroenwillemsen/wrongsecrets:1.14.0RC7-no-vault" + image = "docker.io/jeroenwillemsen/wrongsecrets:1.14.0RC8-no-vault" [env] K8S_ENV = "Fly(Docker)" diff --git a/gcp/k8s/secret-challenge-vault-deployment.yml.tpl b/gcp/k8s/secret-challenge-vault-deployment.yml.tpl index 69048964e..5d2af6823 100644 --- a/gcp/k8s/secret-challenge-vault-deployment.yml.tpl +++ b/gcp/k8s/secret-challenge-vault-deployment.yml.tpl @@ -58,7 +58,7 @@ spec: volumeAttributes: secretProviderClass: "wrongsecrets-gcp-secretsmanager" containers: - - image: jeroenwillemsen/wrongsecrets:1.14.0RC7-k8s-vault + - image: jeroenwillemsen/wrongsecrets:1.14.0RC8-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge command: ["/bin/sh"] diff --git a/js/index.js b/js/index.js index 58798686c..1fbd16e7d 100644 --- a/js/index.js +++ b/js/index.js @@ -1,5 +1,5 @@ - - function secret() { - var password = "5sCkSVs=" + 9 + "P3TC" + 6 + "Ceg=" + 2 + "I3P6" + 7; +// eslint-disable-next-line no-unused-vars + function secret() { + var password = "OoWE6mM=" + 9 + "srCE" + 6 + "Lqk=" + 2 + "MKnt" + 7; return password; } diff --git a/k8s/challenge53/secret-challenge53-sidecar.yml b/k8s/challenge53/secret-challenge53-sidecar.yml index dd40e898e..c948dfa7a 100644 --- a/k8s/challenge53/secret-challenge53-sidecar.yml +++ b/k8s/challenge53/secret-challenge53-sidecar.yml @@ -21,7 +21,7 @@ spec: runAsGroup: 2000 fsGroup: 2000 containers: - - image: jeroenwillemsen/wrongsecrets-challenge53:1.14.0RC7 + - image: jeroenwillemsen/wrongsecrets-challenge53:1.14.0RC8 name: secret-challenge-53 imagePullPolicy: IfNotPresent resources: @@ -45,7 +45,7 @@ spec: command: ["/bin/sh", "-c"] args: - cp /home/wrongsecrets/* /shared-data/ && exec /home/wrongsecrets/start-on-arch.sh - - image: jeroenwillemsen/wrongsecrets-challenge53-debug:1.14.0RC7 + - image: jeroenwillemsen/wrongsecrets-challenge53-debug:1.14.0RC8 name: sidecar imagePullPolicy: IfNotPresent command: ["/bin/sh", "-c", "while true; do ls /shared-data; sleep 10; done"] diff --git a/k8s/challenge53/secret-challenge53.yml b/k8s/challenge53/secret-challenge53.yml index 1ee75c10d..55e0d956b 100644 --- a/k8s/challenge53/secret-challenge53.yml +++ b/k8s/challenge53/secret-challenge53.yml @@ -21,7 +21,7 @@ spec: runAsGroup: 2000 fsGroup: 2000 containers: - - image: jeroenwillemsen/wrongsecrets-challenge53:1.14.0RC7 + - image: jeroenwillemsen/wrongsecrets-challenge53:1.14.0RC8 name: secret-challenge-53 imagePullPolicy: IfNotPresent resources: diff --git a/k8s/secret-challenge-deployment.yml b/k8s/secret-challenge-deployment.yml index 8addefac0..cdb33a01b 100644 --- a/k8s/secret-challenge-deployment.yml +++ b/k8s/secret-challenge-deployment.yml @@ -28,7 +28,7 @@ spec: runAsGroup: 2000 fsGroup: 2000 containers: - - image: jeroenwillemsen/wrongsecrets:1.14.0RC7-no-vault + - image: jeroenwillemsen/wrongsecrets:1.14.0RC8-no-vault imagePullPolicy: IfNotPresent name: secret-challenge ports: diff --git a/k8s/secret-challenge-vault-deployment.yml b/k8s/secret-challenge-vault-deployment.yml index 0606a41f9..7b81987cc 100644 --- a/k8s/secret-challenge-vault-deployment.yml +++ b/k8s/secret-challenge-vault-deployment.yml @@ -50,7 +50,7 @@ spec: type: RuntimeDefault serviceAccountName: vault containers: - - image: jeroenwillemsen/wrongsecrets:1.14.0RC7-k8s-vault + - image: jeroenwillemsen/wrongsecrets:1.14.0RC8-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge command: ["/bin/sh"] diff --git a/okteto/k8s/secret-challenge-ctf-deployment.yml b/okteto/k8s/secret-challenge-ctf-deployment.yml index 84b422ea0..ceb214443 100644 --- a/okteto/k8s/secret-challenge-ctf-deployment.yml +++ b/okteto/k8s/secret-challenge-ctf-deployment.yml @@ -28,7 +28,7 @@ spec: runAsGroup: 2000 fsGroup: 2000 containers: - - image: jeroenwillemsen/wrongsecrets:1.14.0RC7-no-vault + - image: jeroenwillemsen/wrongsecrets:1.14.0RC8-no-vault name: secret-challenge-ctf imagePullPolicy: IfNotPresent securityContext: diff --git a/okteto/k8s/secret-challenge-deployment.yml b/okteto/k8s/secret-challenge-deployment.yml index dde28f587..26f1e593b 100644 --- a/okteto/k8s/secret-challenge-deployment.yml +++ b/okteto/k8s/secret-challenge-deployment.yml @@ -28,7 +28,7 @@ spec: runAsGroup: 2000 fsGroup: 2000 containers: - - image: jeroenwillemsen/wrongsecrets:1.14.0RC7-no-vault + - image: jeroenwillemsen/wrongsecrets:1.14.0RC8-no-vault name: secret-challenge imagePullPolicy: IfNotPresent securityContext: diff --git a/pom.xml b/pom.xml index a924ab2e7..fdd6e70c5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.owasp wrongsecrets - 1.14.0RC7-SNAPSHOT + 1.14.0RC8-SNAPSHOT OWASP WrongSecrets Examples with how to not use secrets