Renamed to passwordreset

pushprajhons · Jul 31, 2022 · 37d684f · 37d684f
1 parent 4f911c6
commit 37d684f
Show file tree

Hide file tree

Showing 28 changed files with 20 additions and 19 deletions.
diff --git a/...lessons/password_reset/PasswordReset.java → .../lessons/passwordreset/PasswordReset.java b/...lessons/password_reset/PasswordReset.java → .../lessons/passwordreset/PasswordReset.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;

diff --git a/...ns/password_reset/PasswordResetEmail.java → ...ons/passwordreset/PasswordResetEmail.java b/...ns/password_reset/PasswordResetEmail.java → ...ons/passwordreset/PasswordResetEmail.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import lombok.Builder;
 import lombok.Data;

diff --git a/...s/password_reset/QuestionsAssignment.java → ...ns/passwordreset/QuestionsAssignment.java b/...s/password_reset/QuestionsAssignment.java → ...ns/passwordreset/QuestionsAssignment.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;

diff --git a/...s/password_reset/ResetLinkAssignment.java → ...ns/passwordreset/ResetLinkAssignment.java b/...s/password_reset/ResetLinkAssignment.java → ...ns/passwordreset/ResetLinkAssignment.java
@@ -20,13 +20,13 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import com.google.common.collect.Maps;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.password_reset.resetlink.PasswordChangeForm;
+import org.owasp.webgoat.lessons.passwordreset.resetlink.PasswordChangeForm;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -120,7 +120,7 @@ public ModelAndView changePassword(@ModelAttribute("form") PasswordChangeForm fo
         if (checkIfLinkIsFromTom(form.getResetLink())) {
             usersToTomPassword.put(getWebSession().getUserName(), form.getPassword());
         }
-        modelAndView.setViewName("lessons/password_reset/templates/success.html");
+        modelAndView.setViewName("lessons/passwordreset/templates/success.html");
         return modelAndView;
     }
 

diff --git a/...et/ResetLinkAssignmentForgotPassword.java → ...et/ResetLinkAssignmentForgotPassword.java b/...et/ResetLinkAssignmentForgotPassword.java → ...et/ResetLinkAssignmentForgotPassword.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;

diff --git a/...ord_reset/SecurityQuestionAssignment.java → ...wordreset/SecurityQuestionAssignment.java b/...ord_reset/SecurityQuestionAssignment.java → ...wordreset/SecurityQuestionAssignment.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;

diff --git a/.../password_reset/SimpleMailAssignment.java → ...s/passwordreset/SimpleMailAssignment.java b/.../password_reset/SimpleMailAssignment.java → ...s/passwordreset/SimpleMailAssignment.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import org.apache.commons.lang3.StringUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;

diff --git a/...essons/password_reset/TriedQuestions.java → ...lessons/passwordreset/TriedQuestions.java b/...essons/password_reset/TriedQuestions.java → ...lessons/passwordreset/TriedQuestions.java
@@ -20,7 +20,7 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.SessionScope;

diff --git a/...d_reset/resetlink/PasswordChangeForm.java → ...rdreset/resetlink/PasswordChangeForm.java b/...d_reset/resetlink/PasswordChangeForm.java → ...rdreset/resetlink/PasswordChangeForm.java
@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons.password_reset.resetlink;
+package org.owasp.webgoat.lessons.passwordreset.resetlink;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...s/lessons/password_reset/css/password.css → ...es/lessons/passwordreset/css/password.css b/...s/lessons/password_reset/css/password.css → ...es/lessons/passwordreset/css/password.css
diff --git a/...tion/PasswordReset_SecurityQuestions.adoc → ...tion/PasswordReset_SecurityQuestions.adoc b/...tion/PasswordReset_SecurityQuestions.adoc → ...tion/PasswordReset_SecurityQuestions.adoc
diff --git a/...umentation/PasswordReset_host_header.adoc → ...umentation/PasswordReset_host_header.adoc b/...umentation/PasswordReset_host_header.adoc → ...umentation/PasswordReset_host_header.adoc
diff --git a/...tation/PasswordReset_known_questions.adoc → ...tation/PasswordReset_known_questions.adoc b/...tation/PasswordReset_known_questions.adoc → ...tation/PasswordReset_known_questions.adoc
diff --git a/...cumentation/PasswordReset_mitigation.adoc → ...cumentation/PasswordReset_mitigation.adoc b/...cumentation/PasswordReset_mitigation.adoc → ...cumentation/PasswordReset_mitigation.adoc
diff --git a/...set/documentation/PasswordReset_plan.adoc → ...set/documentation/PasswordReset_plan.adoc b/...set/documentation/PasswordReset_plan.adoc → ...set/documentation/PasswordReset_plan.adoc
diff --git a/...t/documentation/PasswordReset_simple.adoc → ...t/documentation/PasswordReset_simple.adoc b/...t/documentation/PasswordReset_simple.adoc → ...t/documentation/PasswordReset_simple.adoc
diff --git a/...entation/PasswordReset_wrong_message.adoc → ...entation/PasswordReset_wrong_message.adoc b/...entation/PasswordReset_wrong_message.adoc → ...entation/PasswordReset_wrong_message.adoc
diff --git a/...ns/password_reset/html/PasswordReset.html → ...ons/passwordreset/html/PasswordReset.html b/...ns/password_reset/html/PasswordReset.html → ...ons/passwordreset/html/PasswordReset.html
@@ -3,10 +3,10 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/password_reset/documentation/PasswordReset_plan.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/passwordreset/documentation/PasswordReset_plan.adoc"></div>
 </div>
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/password_reset/documentation/PasswordReset_simple.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/passwordreset/documentation/PasswordReset_simple.adoc"></div>
 
     <link rel="stylesheet" type="text/css" th:href="@{/lesson_css/password.css}"/>
     <script th:src="@{/lesson_js/bootstrap.min.js}" language="JavaScript"></script>
@@ -90,11 +90,11 @@ <h4 style="border-bottom: 1px solid #c5c5c5;"><i class="glyphicon glyphicon-user
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/password_reset/documentation/PasswordReset_wrong_message.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/passwordreset/documentation/PasswordReset_wrong_message.adoc"></div>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/password_reset/documentation/PasswordReset_known_questions.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/passwordreset/documentation/PasswordReset_known_questions.adoc"></div>
 
     <link rel="stylesheet" type="text/css" th:href="@{/lesson_css/password.css}"/>
     <script th:src="@{/lesson_js/bootstrap.min.js}" language="JavaScript"></script>
@@ -138,7 +138,7 @@ <h4 class="card-title mb-4 mt-1">WebGoat Password Recovery</h4>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/password_reset/documentation/PasswordReset_SecurityQuestions.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/passwordreset/documentation/PasswordReset_SecurityQuestions.adoc"></div>
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
@@ -168,7 +168,7 @@ <h4 class="card-title mb-4 mt-1">WebGoat Password Recovery</h4>
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/password_reset/documentation/PasswordReset_host_header.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/passwordreset/documentation/PasswordReset_host_header.adoc"></div>
     <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>
@@ -260,6 +260,6 @@ <h4 class="">
 </div>
 
 <div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/password_reset/documentation/PasswordReset_mitigation.adoc"></div>
+    <div class="adoc-content" th:replace="doc:lessons/passwordreset/documentation/PasswordReset_mitigation.adoc"></div>
 </div>
 </html>
diff --git a/...sword_reset/i18n/WebGoatLabels.properties → ...sswordreset/i18n/WebGoatLabels.properties b/...sword_reset/i18n/WebGoatLabels.properties → ...sswordreset/i18n/WebGoatLabels.properties
diff --git a/.../lessons/password_reset/images/reset1.png → ...s/lessons/passwordreset/images/reset1.png b/.../lessons/password_reset/images/reset1.png → ...s/lessons/passwordreset/images/reset1.png
diff --git a/.../lessons/password_reset/images/reset2.png → ...s/lessons/passwordreset/images/reset2.png b/.../lessons/password_reset/images/reset2.png → ...s/lessons/passwordreset/images/reset2.png
diff --git a/.../lessons/password_reset/images/slack1.png → ...s/lessons/passwordreset/images/slack1.png b/.../lessons/password_reset/images/slack1.png → ...s/lessons/passwordreset/images/slack1.png
diff --git a/.../lessons/password_reset/images/slack2.png → ...s/lessons/passwordreset/images/slack2.png b/.../lessons/password_reset/images/slack2.png → ...s/lessons/passwordreset/images/slack2.png
diff --git a/...assword_reset/js/password-reset-simple.js → ...passwordreset/js/password-reset-simple.js b/...assword_reset/js/password-reset-simple.js → ...passwordreset/js/password-reset-simple.js
diff --git a/...et/templates/password_link_not_found.html → ...et/templates/password_link_not_found.html b/...et/templates/password_link_not_found.html → ...et/templates/password_link_not_found.html
diff --git a/...sword_reset/templates/password_reset.html → ...sswordreset/templates/password_reset.html b/...sword_reset/templates/password_reset.html → ...sswordreset/templates/password_reset.html
diff --git a/...ons/password_reset/templates/success.html → ...sons/passwordreset/templates/success.html b/...ons/password_reset/templates/success.html → ...sons/passwordreset/templates/success.html
diff --git a/...reset/SecurityQuestionAssignmentTest.java → ...reset/SecurityQuestionAssignmentTest.java b/...reset/SecurityQuestionAssignmentTest.java → ...reset/SecurityQuestionAssignmentTest.java
@@ -1,10 +1,11 @@
-package org.owasp.webgoat.lessons.password_reset;
+package org.owasp.webgoat.lessons.passwordreset;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.owasp.webgoat.container.plugins.LessonTest;
+import org.owasp.webgoat.lessons.passwordreset.PasswordReset;
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;