Processed most of the feedback for #75

OWASP · Nov 28, 2021 · 538d7ff · 538d7ff
1 parent 88f3159
commit 538d7ff
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 54 deletions.
diff --git a/src/main/java/org/owasp/wrongsecrets/ChallengesController.java b/src/main/java/org/owasp/wrongsecrets/ChallengesController.java
@@ -58,12 +58,7 @@ public String challenge(Model model, @PathVariable String id) {
         model.addAttribute("answerIncorrect", null);
         model.addAttribute("solution", null);
         model.addAttribute("challengeNumber", challengeNumber(challenge));
-        if (challengeNumber(challenge) > 0) {
-            model.addAttribute("previouschallenge", challengeNumber(challenge) - 1);
-        }
-        if (challengeNumber(challenge) < challenges.size()) {
-            model.addAttribute("nextchallenge", challengeNumber(challenge) - 1);
-        }
+        addPreviousAndNextChallenge(model, challenge);
 
         model.addAttribute("explanationfile", challenge.getExplanationFileIdentifier());
         includeScoringStatus(model, challenge);
@@ -72,6 +67,15 @@ public String challenge(Model model, @PathVariable String id) {
         return "challenge";
     }
 
+    private void addPreviousAndNextChallenge(Model model, Challenge challenge) {
+        if (challengeNumber(challenge) > 1) {
+            model.addAttribute("previouschallenge", challengeNumber(challenge) - 1);
+        }
+        if (challengeNumber(challenge) < challenges.size()) {
+            model.addAttribute("nextchallenge", challengeNumber(challenge) + 1);
+        }
+    }
+
     @PostMapping("/challenge/{id}")
     public String postController(@ModelAttribute ChallengeForm challengeForm, Model model, @PathVariable String id) {
         var challenge = findChallenge(id);
@@ -85,6 +89,7 @@ public String postController(@ModelAttribute ChallengeForm challengeForm, Model
         }
         includeScoringStatus(model, challenge);
         addWarning(challenge, model);
+        addPreviousAndNextChallenge(model, challenge);
         return "challenge";
     }
 

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/Challenge.java b/src/main/java/org/owasp/wrongsecrets/challenges/Challenge.java
@@ -13,7 +13,9 @@ public abstract class Challenge {
 
     public abstract Spoiler spoiler();
 
-    public abstract String getExplanationFileIdentifier();
+    public String getExplanationFileIdentifier() {
+        return this.getClass().getAnnotation(ChallengeNumber.class).value();
+    }
 
     public boolean solved(String answer) {
         var correctAnswer = answerCorrect(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge1.java b/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge1.java
@@ -27,11 +27,6 @@ public Spoiler spoiler() {
         return new Spoiler(hardcodedPassword);
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "1";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return hardcodedPassword.equals(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge2.java b/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge2.java
@@ -25,11 +25,6 @@ public Spoiler spoiler() {
         return new Spoiler(argBasedPassword);
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "2";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return argBasedPassword.equals(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge3.java b/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge3.java
@@ -27,11 +27,6 @@ public Spoiler spoiler() {
         return new Spoiler(hardcodedEnvPassword);
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "3";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return hardcodedEnvPassword.equals(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge4.java b/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge4.java
@@ -21,11 +21,6 @@ public Spoiler spoiler() {
         return new Spoiler(Constants.password);
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "4";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return Constants.password.equals(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge8.java b/src/main/java/org/owasp/wrongsecrets/challenges/docker/Challenge8.java
@@ -21,11 +21,6 @@ public Spoiler spoiler() {
         return new Spoiler(Constants.newKey);
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "8";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return Constants.newKey.equals(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge5.java b/src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge5.java
@@ -25,11 +25,6 @@ public Spoiler spoiler() {
         return new Spoiler(configmapK8sSecret);
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "5";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return configmapK8sSecret.equals(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge6.java b/src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge6.java
@@ -25,11 +25,6 @@ public Spoiler spoiler() {
         return new Spoiler(secretK8sSecret);
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "6";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return secretK8sSecret.equals(answer);

diff --git a/src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge7.java b/src/main/java/org/owasp/wrongsecrets/challenges/kubernetes/Challenge7.java
@@ -32,11 +32,6 @@ public Spoiler spoiler() {
         return new Spoiler(getAnswer());
     }
 
-    @Override
-    public String getExplanationFileIdentifier() {
-        return "7";
-    }
-
     @Override
     public boolean answerCorrect(String answer) {
         return getAnswer().equals(answer);

diff --git a/src/main/resources/templates/challenge.html b/src/main/resources/templates/challenge.html
@@ -69,15 +69,15 @@ <h1 class="mt-3" th:text="'Challenge '+${challengeNumber}"/>
     </form>
 
     There are 11 challenges (/challenge/1-11), can you solve them all? <br/>
-    <div class="position-relative">
-        <div th:if="${previouschallenge}" class="position-absolute top-0 start-0">
-            <a href="'/challenge/'+${previouschallenge}">Previous</a>
+    <div class="row">
+        <div th:if="${previouschallenge!=null}" class="col-4">
+            <a th:href="'/challenge/'+${previouschallenge}">Previous</a>
         </div>
-        <div class="position-absolute top-50 start-50">
-            Go back to <a href="/">the main page</a>.
+        <div class="col-4">
+            <a href="/">Go the main page</a>
         </div>
-        <div th:if="${nextchallenge}" class="position-absolute top-0 end-0">
-            <a href="'/challenge/'+${nextchallenge}">Next</a>
+        <div th:if="${nextchallenge!=null}" class="col-4">
+            <a th:href="'/challenge/'+${nextchallenge}">Next</a>
         </div>
     </div>