From 58bc94d1f696aa015e04803edefb1094fdcc7fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Zubcevic?= <rene@zubcevic.com>
Date: Wed, 22 Apr 2020 09:54:30 +0200
Subject: [PATCH] fix green buttons

---
 .../org/owasp/webgoat/GeneralLessonTest.java  | 11 ++++
 .../main/resources/html/InsecureLogin.html    | 12 ++---
 .../main/resources/html/PasswordReset.html    | 51 ++++++++++---------
 .../resources/html/WebWolfIntroduction.html   | 41 +++++++--------
 4 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/GeneralLessonTest.java b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/GeneralLessonTest.java
index 1723ecc26..1e9fde7d0 100644
--- a/webgoat-integration-tests/src/test/java/org/owasp/webgoat/GeneralLessonTest.java
+++ b/webgoat-integration-tests/src/test/java/org/owasp/webgoat/GeneralLessonTest.java
@@ -77,6 +77,17 @@ public class GeneralLessonTest extends IntegrationTest {
         checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
         checkResults("/VulnerableComponents/");
     }
+    
+    @Test
+    public void insecureLogin() {
+    	startLesson("InsecureLogin");
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username", "CaptainJack");
+        params.put("password", "BlackPearl");
+        checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
+        checkResults("/InsecureLogin/");
+    }
 
     @Test
     public void securePasswords() {
diff --git a/webgoat-lessons/insecure-login/src/main/resources/html/InsecureLogin.html b/webgoat-lessons/insecure-login/src/main/resources/html/InsecureLogin.html
index 72f180de2..7415bf0f1 100755
--- a/webgoat-lessons/insecure-login/src/main/resources/html/InsecureLogin.html
+++ b/webgoat-lessons/insecure-login/src/main/resources/html/InsecureLogin.html
@@ -14,16 +14,12 @@
         <div class="adoc-content" th:replace="doc:InsecureLogin_Task.adoc"></div>
         <div class="attack-container">
             <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-            <script th:src="@{/lesson_js/credentials.js}"
-                    language="JavaScript"></script>
+            <script th:src="@{/lesson_js/credentials.js}"></script>
             <form class="attack-form" accept-charset="UNKNOWN" name="task"
                   method="POST"
-                  action="#attack/307/100">
-<!---
-                <input type="hidden" value="" name="username" id="SecretUsername"/>
-                <input type="hidden" value="" name="password" id="SecretPassword"/>
-                <input type="button" value="Log in" onpress="submit_secret_credentials()"/>-->
-                <button onclick="submit_secret_credentials()">Log in</button>
+                  action="/WebGoat/InsecureLogin/task">
+
+                <button onclick="javascript:submit_secret_credentials();return false;">Log in</button>
 
             </form>
             <br></br>
diff --git a/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html b/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html
index 4eada2545..5df435c24 100644
--- a/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html
+++ b/webgoat-lessons/password-reset/src/main/resources/html/PasswordReset.html
@@ -19,6 +19,32 @@
 
             <div class="row">
                 <div class="col-md-4">
+                    
+
+                    <form class="attack-form" accept-charset="UNKNOWN" novalidate="novalidate"
+                          method="POST"
+                          action="/WebGoat/PasswordReset/simple-mail/reset">
+                        <div style="display: none;" id="password-reset-2">
+                            <h4 class="">Forgot your password?</h4>
+
+                            <fieldset>
+                                <span class="help-block">Please type your e-mail address</span>
+                                <div class="form-group input-group">
+                                    <span class="input-group-addon">@</span>
+                                    <input class="form-control" placeholder="test1233@webgoat.org" name="emailReset"
+                                           type="email"/>
+                                </div>
+                                <button type="submit" class="btn btn-primary btn-block" id="btn-olvidado">Continue
+                                </button>
+                                <p class="help-block">
+                                    <a class="text-muted" href="#" id="acceso" onclick="showPassword()">
+                                        <small>Account Access</small>
+                                    </a>
+                                </p>
+                            </fieldset>
+
+                        </div>
+                    </form>
                     <form class="attack-form" accept-charset="UNKNOWN" novalidate="novalidate"
                           method="POST"
                           action="/WebGoat/PasswordReset/simple-mail">
@@ -52,31 +78,6 @@
 
                         </div>
                     </form>
-
-                    <form class="attack-form" accept-charset="UNKNOWN" novalidate="novalidate"
-                          method="POST"
-                          action="/WebGoat/PasswordReset/simple-mail/reset">
-                        <div style="display: none;" id="password-reset-2">
-                            <h4 class="">Forgot your password?</h4>
-
-                            <fieldset>
-                                <span class="help-block">Please type your e-mail address</span>
-                                <div class="form-group input-group">
-                                    <span class="input-group-addon">@</span>
-                                    <input class="form-control" placeholder="test1233@webgoat.org" name="emailReset"
-                                           type="email"/>
-                                </div>
-                                <button type="submit" class="btn btn-primary btn-block" id="btn-olvidado">Continue
-                                </button>
-                                <p class="help-block">
-                                    <a class="text-muted" href="#" id="acceso" onclick="showPassword()">
-                                        <small>Account Access</small>
-                                    </a>
-                                </p>
-                            </fieldset>
-
-                        </div>
-                    </form>
                 </div>
             </div>
         </div>
diff --git a/webgoat-lessons/webwolf-introduction/src/main/resources/html/WebWolfIntroduction.html b/webgoat-lessons/webwolf-introduction/src/main/resources/html/WebWolfIntroduction.html
index 0976b631b..baa87bea7 100644
--- a/webgoat-lessons/webwolf-introduction/src/main/resources/html/WebWolfIntroduction.html
+++ b/webgoat-lessons/webwolf-introduction/src/main/resources/html/WebWolfIntroduction.html
@@ -14,26 +14,7 @@
     <div class="attack-container">
         <img th:src="@{/images/wolf-enabled.png}" class="webwolf-enabled"/>
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-        <form class="attack-form" accept-charset="UNKNOWN"
-              method="POST" name="form"
-              action="/WebGoat/WebWolf/mail/">
-            <div class="container-fluid">
-                <div class="row">
-                    <div class="col-md-4">
-                        <div class="input-group">
-                            <input type="text" class="form-control"
-                                   placeholder="Type in your unique code"
-                                   name='uniqueCode'/>
-                            <div class="input-group-btn">
-                                <button class="btn btn-primary" type="submit">Go</button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </form>
-        <br/>
-        <br/>
+        
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
               method="POST" name="form"
@@ -57,6 +38,26 @@
         </form>
         <br/>
         <br/>
+        <form class="attack-form" accept-charset="UNKNOWN"
+              method="POST" name="form"
+              action="/WebGoat/WebWolf/mail/">
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="col-md-4">
+                        <div class="input-group">
+                            <input type="text" class="form-control"
+                                   placeholder="Type in your unique code"
+                                   name='uniqueCode'/>
+                            <div class="input-group-btn">
+                                <button class="btn btn-primary" type="submit">Go</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+        <br/>
+        <br/>
         
         <div class="attack-feedback"></div>
         <div class="attack-output"></div>