fix: vault template injection challenge renamed to 46

Author: nwolniak

k8s/secret-challenge-vault-deployment.yml

@@ -25,8 +25,8 @@ spec:
         vault.hashicorp.com/agent-inject-status: "update"
         vault.hashicorp.com/namespace: "default"
         vault.hashicorp.com/log-level: debug
-        vault.hashicorp.com/agent-inject-secret-challenge44: "secret/data/secret-challenge"
-        vault.hashicorp.com/agent-inject-template-challenge44: |
+        vault.hashicorp.com/agent-inject-secret-challenge46: "secret/data/secret-challenge"
+        vault.hashicorp.com/agent-inject-template-challenge46: |
           {{ with secret "/secret/data/secret-challenge" }}
             {{ range $k, $v := .Data.data }}
               {{ printf "%s=%s" $k $v }}

src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge44.java renamed to src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge46.java

@@ -7,12 +7,12 @@
 
 /** This challenge is about having a secrets injected via Vault template. */
 @Component
-public class Challenge44 extends FixedAnswerChallenge {
+public class Challenge46 extends FixedAnswerChallenge {
 
   private final Vaultpassword vaultPassword;
   private final String mockedAnswer;
 
-  public Challenge44(Vaultpassword vaultPassword, @Value("${vaultpassword}") String mockedAnswer) {
+  public Challenge46(Vaultpassword vaultPassword, @Value("${vaultpassword}") String mockedAnswer) {
     this.vaultPassword = vaultPassword;
     this.mockedAnswer = mockedAnswer;
   }

src/main/resources/explanations/challenge44.adoc renamed to src/main/resources/explanations/challenge46.adoc

@@ -711,13 +711,13 @@ configurations:
       ctf:
         enabled: true
 
-    - name: Challenge 44
-      short-name: "challenge-44"
+    - name: Challenge 46
+      short-name: "challenge-46"
       sources:
-        - class-name: "org.owasp.wrongsecrets.challenges.kubernetes.Challenge44"
-          explanation: "explanations/challenge44.adoc"
-          hint: "explanations/challenge44_hint.adoc"
-          reason: "explanations/challenge44_reason.adoc"
+        - class-name: "org.owasp.wrongsecrets.challenges.kubernetes.Challenge46"
+          explanation: "explanations/challenge46.adoc"
+          hint: "explanations/challenge46_hint.adoc"
+          reason: "explanations/challenge46_reason.adoc"
           environments: [*k8s_vault]
       difficulty: *expert
       category: *vault

src/main/resources/explanations/challenge44_hint.adoc renamed to src/main/resources/explanations/challenge46_hint.adoc

@@ -53,7 +53,7 @@ void shouldSpoilExercises() throws Exception {
   void shouldNotShowDisabledChallengeAnywhere() throws Exception {
     for (var challenge : challenges.getChallengeDefinitions()) {
       var shortname = challenge.name().shortName();
-      if (shortname.contains("44")) {
+      if (shortname.contains("46")) {
         continue;
       }
       mvc.perform(get("/challenge/%s".formatted(challenge.name().shortName())))

src/main/resources/explanations/challenge44_reason.adoc renamed to src/main/resources/explanations/challenge46_reason.adoc

@@ -4,13 +4,13 @@
 
 import org.junit.jupiter.api.Test;
 
-public class Challenge44Test {
+public class Challenge46Test {
 
   @Test
   void spoilerShouldGiveAnswerWithVault() {
     var vaultPassword = new Vaultpassword();
     vaultPassword.setPassword("answer");
-    var challenge = new Challenge44(vaultPassword, "");
+    var challenge = new Challenge46(vaultPassword, "");
     assertThat(challenge.spoiler().solution()).isNotEmpty();
     assertThat(challenge.answerCorrect(challenge.spoiler().solution())).isTrue();
   }
@@ -19,7 +19,7 @@ void spoilerShouldGiveAnswerWithVault() {
   void spoilerShouldGiveAnswer() {
     var vaultPassword = new Vaultpassword();
     vaultPassword.setPassword("");
-    var challenge = new Challenge44(vaultPassword, "answer");
+    var challenge = new Challenge46(vaultPassword, "answer");
     assertThat(challenge.spoiler().solution()).isEqualTo("answer");
     assertThat(challenge.answerCorrect(challenge.spoiler().solution())).isTrue();
   }
@@ -28,7 +28,7 @@ void spoilerShouldGiveAnswer() {
   void incorrectAnswerShouldNotSolveChallenge() {
     var vaultPassword = new Vaultpassword();
     vaultPassword.setPassword("answer");
-    var challenge = new Challenge44(vaultPassword, "");
+    var challenge = new Challenge46(vaultPassword, "");
     assertThat(challenge.answerCorrect("wrong answer")).isFalse();
   }
 }

src/main/resources/wrong-secrets-configuration.yaml

@@ -54,7 +54,7 @@ void shouldNotShowDisabledChallengeAnywhere() throws Exception {
           || shortname.contains("9")
           || shortname.contains("10")
           || shortname.contains("11")
-          || shortname.contains("44")) {
+          || shortname.contains("46")) {
         continue;
       }
       mvc.perform(get("/challenge/%s".formatted(challenge.name().shortName())))
@@ -81,7 +81,7 @@ void shouldEnableK8sExercises() throws Exception {
         .andExpect(
             content().string(containsString("challenge-7_disabled-link"))) // vault is not visible
         .andExpect(content().string(not(containsString("challenge-33_disabled-link"))))
-        .andExpect(content().string(containsString("challenge-44_disabled-link")));
+        .andExpect(content().string(containsString("challenge-46_disabled-link")));
   }
 
   @Test