From f13632578dd15942fedc40ec29d58c94752415de Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Mon, 15 Nov 2021 21:40:48 +0100
Subject: [PATCH] Fix layout of assignment and remove duplicate feedback

Resolves: #1143
---
 .../SecurePasswordsAssignment.java            |  1 -
 .../main/resources/html/SecurePasswords.html  | 36 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/webgoat-lessons/secure-passwords/src/main/java/org/owasp/webgoat/secure_password/SecurePasswordsAssignment.java b/webgoat-lessons/secure-passwords/src/main/java/org/owasp/webgoat/secure_password/SecurePasswordsAssignment.java
index ed8d0d3a1..d484ce8e7 100644
--- a/webgoat-lessons/secure-passwords/src/main/java/org/owasp/webgoat/secure_password/SecurePasswordsAssignment.java
+++ b/webgoat-lessons/secure-passwords/src/main/java/org/owasp/webgoat/secure_password/SecurePasswordsAssignment.java
@@ -69,7 +69,6 @@ public class SecurePasswordsAssignment extends AssignmentEndpoint {
             output.append("</ul></br>");
         }
         output.append("<b>Score: </b>" + strength.getScore() + "/4 </br>");
-        output.append("<b>Estimated cracking time in seconds: </b>" + calculateTime((long) strength.getCrackTimeSeconds().getOnlineNoThrottling10perSecond()));
 
         if (strength.getScore() >= 4)
             return success(this).feedback("securepassword-success").output(output.toString()).build();
diff --git a/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html b/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html
index e718bf2c7..27c1e076b 100644
--- a/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html
+++ b/webgoat-lessons/secure-passwords/src/main/resources/html/SecurePasswords.html
@@ -22,16 +22,16 @@
               method="POST" name="form"
               action="/WebGoat/SecurePasswords/assignment"
               autocomplete="off">
-            <table>
-                <tr>
-                    <td><label>Password</label></td>
-                    <td><input id="myInput" name="password" value="" type="password" placeholder="Enter a secure password"/></td>
-                    <td><input type="checkbox" onclick="javascript:myFunction()"/>Show password</td>
-                </tr>
-                <tr>
-                    <td><button type="SUBMIT">Submit</button></td>
-                </tr>
-            </table>
+
+            <div class="input-group input-group">
+                <input id="myInput" name="password" value="" type="password" class="form-control"
+                       placeholder="Enter a secure password..."
+                       aria-describedby="password-label">
+                <span class="input-group-addon"><input type="checkbox" onclick="javascript:myFunction()"/> Show password</span>
+            </div>
+            <div class="input-group" style="margin-top: 10px">
+                <button type="submit" class="btn btn-primary">Submit</button>
+            </div>
         </form>
         <div class="attack-feedback"></div>
         <div class="attack-output"></div>
@@ -47,14 +47,14 @@
 </div>
 
 <script>
-function myFunction() {
-  var x = document.getElementById("myInput");
-  if (x.type === "password") {
-    x.type = "text";
-  } else {
-    x.type = "password";
-  }
-}
+    function myFunction() {
+        var x = document.getElementById("myInput");
+        if (x.type === "password") {
+            x.type = "text";
+        } else {
+            x.type = "password";
+        }
+    }
 </script>