From a5b63952ff7fddb1ade5819dcc714e514516067b Mon Sep 17 00:00:00 2001 From: Jeroen Willemsen Date: Tue, 5 Mar 2024 21:47:59 +0100 Subject: [PATCH] Release 1.8.4 --- .github/scripts/.bash_history | 2 +- Dockerfile | 2 +- Dockerfile.web | 4 ++-- aws/k8s/secret-challenge-vault-deployment.yml | 2 +- azure/k8s/secret-challenge-vault-deployment.yml.tpl | 2 +- fly.toml | 2 +- gcp/k8s/secret-challenge-vault-deployment.yml.tpl | 2 +- js/index.js | 2 +- k8s/secret-challenge-deployment.yml | 2 +- k8s/secret-challenge-vault-deployment.yml | 2 +- okteto/k8s/secret-challenge-ctf-deployment.yml | 2 +- okteto/k8s/secret-challenge-deployment.yml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/scripts/.bash_history b/.github/scripts/.bash_history index 50d852b18..778aaa751 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="Nd6JExdkvwPYNVAQsm/zmvjOZDmZ07A5mAoVr2sPP/U=" +export tempPassword="WSUKayftrYy/iemVnymAQ8KvZMlFd9z3OjDfmtrK/c8=" mvn run tempPassword k6 npx k6 diff --git a/Dockerfile b/Dockerfile index c9bf3d7a1..34675d15d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM amazoncorretto:21.0.2-alpine ARG argBasedPassword="default" -ARG argBasedVersion="1.8.3" +ARG argBasedVersion="1.8.4" ARG spring_profile="" ENV SPRING_PROFILES_ACTIVE=$spring_profile ENV ARG_BASED_PASSWORD=$argBasedPassword diff --git a/Dockerfile.web b/Dockerfile.web index 21de6d161..d42b7b2f7 100644 --- a/Dockerfile.web +++ b/Dockerfile.web @@ -1,5 +1,5 @@ -FROM jeroenwillemsen/wrongsecrets:1.8.4j-no-vault -ARG argBasedVersion="1.8.4j-no-vault" +FROM jeroenwillemsen/wrongsecrets:1.8.4-no-vault +ARG argBasedVersion="1.8.4-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 diff --git a/aws/k8s/secret-challenge-vault-deployment.yml b/aws/k8s/secret-challenge-vault-deployment.yml index bcb18f192..a69caeb97 100644 --- a/aws/k8s/secret-challenge-vault-deployment.yml +++ b/aws/k8s/secret-challenge-vault-deployment.yml @@ -41,7 +41,7 @@ spec: volumeAttributes: secretProviderClass: "wrongsecrets-aws-secretsmanager" containers: - - image: jeroenwillemsen/wrongsecrets:1.8.3-k8s-vault + - image: jeroenwillemsen/wrongsecrets:1.8.4-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge securityContext: diff --git a/azure/k8s/secret-challenge-vault-deployment.yml.tpl b/azure/k8s/secret-challenge-vault-deployment.yml.tpl index 0ec3d084e..8c1ea3169 100644 --- a/azure/k8s/secret-challenge-vault-deployment.yml.tpl +++ b/azure/k8s/secret-challenge-vault-deployment.yml.tpl @@ -41,7 +41,7 @@ spec: volumeAttributes: secretProviderClass: "azure-wrongsecrets-vault" containers: - - image: jeroenwillemsen/wrongsecrets:1.8.3-k8s-vault + - image: jeroenwillemsen/wrongsecrets:4-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge securityContext: diff --git a/fly.toml b/fly.toml index 1e97585f0..a4b902be7 100644 --- a/fly.toml +++ b/fly.toml @@ -8,7 +8,7 @@ app = "wrongsecrets" primary_region = "ams" [build] - image = "docker.io/jeroenwillemsen/wrongsecrets:1.8.3-no-vault" + image = "docker.io/jeroenwillemsen/wrongsecrets:1.8.4-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 06c665917..044a2f2ee 100644 --- a/gcp/k8s/secret-challenge-vault-deployment.yml.tpl +++ b/gcp/k8s/secret-challenge-vault-deployment.yml.tpl @@ -39,7 +39,7 @@ spec: volumeAttributes: secretProviderClass: "wrongsecrets-gcp-secretsmanager" containers: - - image: jeroenwillemsen/wrongsecrets:1.8.3-k8s-vault + - image: jeroenwillemsen/wrongsecrets:1.8.4-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge ports: diff --git a/js/index.js b/js/index.js index 864624efe..2f977dfb4 100644 --- a/js/index.js +++ b/js/index.js @@ -1,5 +1,5 @@ // eslint-disable-next-line no-unused-vars function secret () { - const password = '1P4S6Lk=' + 9 + 'N3pQ' + 6 + 'NDs=' + 2 + '+R7z' + 7 + const password = 'wprBVZE=' + 9 + 'Ft7i' + 6 + 'lY0=' + 2 + '6818' + 7 return password } diff --git a/k8s/secret-challenge-deployment.yml b/k8s/secret-challenge-deployment.yml index 89959f13e..df1d2c5e1 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.8.4i-no-vault + - image: jeroenwillemsen/wrongsecrets:1.8.4-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 b6ad6ed6a..e75157344 100644 --- a/k8s/secret-challenge-vault-deployment.yml +++ b/k8s/secret-challenge-vault-deployment.yml @@ -46,7 +46,7 @@ spec: type: RuntimeDefault serviceAccountName: vault containers: - - image: jeroenwillemsen/wrongsecrets:1.8.4k-k8s-vault + - image: jeroenwillemsen/wrongsecrets:1.8.4-k8s-vault imagePullPolicy: IfNotPresent name: secret-challenge securityContext: diff --git a/okteto/k8s/secret-challenge-ctf-deployment.yml b/okteto/k8s/secret-challenge-ctf-deployment.yml index cee8bf860..6e380f9e8 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.8.3-no-vault + - image: jeroenwillemsen/wrongsecrets:1.8.4-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 39c458122..e333b0ed3 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.8.3-no-vault + - image: jeroenwillemsen/wrongsecrets:1.8.4-no-vault name: secret-challenge imagePullPolicy: IfNotPresent securityContext: