Update POM file with new version: 1.8.0

OWASP · Dec 13, 2023 · e0632f3 · e0632f3
1 parent 3af6f8f
commit e0632f3
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 15 deletions.
diff --git 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="j0F45AmfXRSTk8hkEiMe+BSAhqzZ8hiH1B23HcCmgck="
+export tempPassword="+Z/y6yT2roEAQix+X34x8hHzX+MA9cV0i8Me/Q3CuXc="
 mvn run tempPassword
 k6
 npx k6

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM amazoncorretto:21.0.1-alpine
 
 ARG argBasedPassword="default"
-ARG argBasedVersion="1.8.0RC11"
+ARG argBasedVersion="1.8.0"
 ARG spring_profile=""
 ENV SPRING_PROFILES_ACTIVE=$spring_profile
 ENV ARG_BASED_PASSWORD=$argBasedPassword

diff --git a/Dockerfile.web b/Dockerfile.web
@@ -1,5 +1,5 @@
-FROM jeroenwillemsen/wrongsecrets:1.8.0RC11-no-vault
-ARG argBasedVersion="1.8.0RC11-no-vault"
+FROM jeroenwillemsen/wrongsecrets:1.8.0-no-vault
+ARG argBasedVersion="1.8.0-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/README.md b/README.md
@@ -291,19 +291,21 @@ Contributors:
 - [Filip Chyla @fchyla](https://www.github.com/fchyla)
 - [Dmitry Litosh @Dlitosh](https://www.github.com/Dlitosh)
 - [Turjo Chowdhury @turjoc120](https://www.github.com/turjoc120)
+- [Norbert Wolniak @nwolniak](https://www.github.com/nwolniak)
 - [Josh Grossman @tghosth](https://www.github.com/tghosth)
 - [alphasec @alphasecio](https://www.github.com/alphasecio)
 - [CaduRoriz @CaduRoriz](https://www.github.com/CaduRoriz)
 - [Madhu Akula @madhuakula](https://www.github.com/madhuakula)
 - [Mike Woudenberg @mikewoudenberg](https://www.github.com/mikewoudenberg)
 - [Spyros @northdpole](https://www.github.com/northdpole)
-- [RubenAtBinx @RubenAtBinx](https://www.github.com/RubenAtBinx)
 - [Vineeth Jagadeesh @djvinnie](https://www.github.com/djvinnie)
+- [RubenAtBinx @RubenAtBinx](https://www.github.com/RubenAtBinx)
 - [za @za](https://www.github.com/za)
 - [Alex Bender @alex-bender](https://www.github.com/alex-bender)
 - [Nicolas Humblot @nhumblot](https://www.github.com/nhumblot)
 - [Rick M @kingthorin](https://www.github.com/kingthorin)
 - [Shlomo Zalman Heigh @szh](https://www.github.com/szh)
+- [Fern @f3rn0s](https://www.github.com/f3rn0s)
 
 Testers:
 

diff --git 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.0RC11-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0-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
@@ -41,7 +41,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "azure-wrongsecrets-vault"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.8.0RC11-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           securityContext:

diff --git a/fly.toml b/fly.toml
@@ -8,7 +8,7 @@ app = "wrongsecrets"
 primary_region = "ams"
 
 [build]
-  image = "docker.io/jeroenwillemsen/wrongsecrets:1.8.0RC11-no-vault"
+  image = "docker.io/jeroenwillemsen/wrongsecrets:1.8.0-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
@@ -39,7 +39,7 @@ spec:
             volumeAttributes:
               secretProviderClass: "wrongsecrets-gcp-secretsmanager"
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.8.0RC11-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0-k8s-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           ports:

diff --git 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.0RC11-no-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0-no-vault
           imagePullPolicy: IfNotPresent
           name: secret-challenge
           ports:

diff --git a/k8s/secret-challenge-vault-deployment.yml b/k8s/secret-challenge-vault-deployment.yml
@@ -30,7 +30,7 @@ spec:
         runAsNonRoot: true
       serviceAccountName: vault
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.8.0RC11-k8s-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0-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
@@ -28,7 +28,7 @@ spec:
         runAsGroup: 2000
         fsGroup: 2000
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.8.0RC11-no-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0-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
@@ -28,7 +28,7 @@ spec:
         runAsGroup: 2000
         fsGroup: 2000
       containers:
-        - image: jeroenwillemsen/wrongsecrets:1.7.2-no-vault
+        - image: jeroenwillemsen/wrongsecrets:1.8.0-no-vault
           name: secret-challenge
           imagePullPolicy: IfNotPresent
           securityContext:

diff --git a/scripts/sort_contibutors/main.py b/scripts/sort_contibutors/main.py
@@ -122,7 +122,7 @@ def fetch_repository(project: str, user_token: str) -> list:
                'Accept': 'application/vnd.github+json',
                'Authorization': 'Bearer ' + user_token}
     r = requests.get('https://api.github.com/repos/OWASP/' +
-                     project + '/contributors', headers=headers, timeout=20)
+                     project + '/contributors?per_page=100', headers=headers, timeout=20)
     if r.status_code == 401:
         print("Invalid token")
         os._exit(-1)
@@ -182,6 +182,11 @@ def get_contibutors_list(token: str) -> list:
 
 if token is not None:
 
+    contributors = [
+        {'username': 'f3rn0s', 'name': 'f3rn0s'},
+        {'username': 'szh', 'name': 'Shlomo Zalman Heigh'},
+    ]
+
     testers = [
         {'username': 'davevs', 'name': 'Dave van Stein'},
         {'username': 'drnow4u', 'name': 'Marcin Nowak'},

diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html
@@ -118,13 +118,16 @@
                         <li><a href='https://www.github.com/fchyla'>Filip Chyla @fchyla</a></li>
                         <li><a href='https://www.github.com/Dlitosh'>Dmitry Litosh @Dlitosh</a></li>
                         <li><a href='https://www.github.com/turjoc120'>Turjo Chowdhury @turjoc120</a></li>
+                        <li><a href='https://www.github.com/nwolniak'>Norbert Wolniak @nwolniak</a></li>
                         <li><a href='https://www.github.com/tghosth'>Josh Grossman @tghosth</a></li>
                         <li><a href='https://www.github.com/alphasecio'>alphasec @alphasecio</a></li>
+                        <li><a href='https://www.github.com/CaduRoriz'>CaduRoriz @CaduRoriz</a></li>
                         <li><a href='https://www.github.com/madhuakula'>Madhu Akula @madhuakula</a></li>
                         <li><a href='https://www.github.com/mikewoudenberg'>Mike Woudenberg @mikewoudenberg</a></li>
                         <li><a href='https://www.github.com/northdpole'>Spyros @northdpole</a></li>
-                        <li><a href='https://www.github.com/RubenAtBinx'>RubenAtBinx @RubenAtBinx</a></li>
                         <li><a href='https://www.github.com/djvinnie'>Vineeth Jagadeesh @djvinnie</a></li>
+                        <li><a href='https://www.github.com/RubenAtBinx'>RubenAtBinx @RubenAtBinx</a></li>
+                        <li><a href='https://www.github.com/za'>za @za</a></li>
                         <li><a href='https://www.github.com/alex-bender'>Alex Bender @alex-bender</a></li>
                         <li><a href='https://www.github.com/nhumblot'>Nicolas Humblot @nhumblot</a></li>
                         <li><a href='https://www.github.com/kingthorin'>Rick M @kingthorin</a></li>