From 37d684fdd3605e33c38d39a0584beb68a52e1431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80ngel=20Oll=C3=A9=20Bl=C3=A1zquez?= Date: Sat, 30 Jul 2022 20:16:54 +0200 Subject: [PATCH] Renamed to passwordreset --- .../PasswordReset.java | 2 +- .../PasswordResetEmail.java | 2 +- .../QuestionsAssignment.java | 2 +- .../ResetLinkAssignment.java | 6 +++--- .../ResetLinkAssignmentForgotPassword.java | 2 +- .../SecurityQuestionAssignment.java | 2 +- .../SimpleMailAssignment.java | 2 +- .../TriedQuestions.java | 2 +- .../resetlink/PasswordChangeForm.java | 2 +- .../css/password.css | 0 .../PasswordReset_SecurityQuestions.adoc | 0 .../documentation/PasswordReset_host_header.adoc | 0 .../PasswordReset_known_questions.adoc | 0 .../documentation/PasswordReset_mitigation.adoc | 0 .../documentation/PasswordReset_plan.adoc | 0 .../documentation/PasswordReset_simple.adoc | 0 .../PasswordReset_wrong_message.adoc | 0 .../html/PasswordReset.html | 14 +++++++------- .../i18n/WebGoatLabels.properties | 0 .../images/reset1.png | Bin .../images/reset2.png | Bin .../images/slack1.png | Bin .../images/slack2.png | Bin .../js/password-reset-simple.js | 0 .../templates/password_link_not_found.html | 0 .../templates/password_reset.html | 0 .../templates/success.html | 0 .../SecurityQuestionAssignmentTest.java | 3 ++- 28 files changed, 20 insertions(+), 19 deletions(-) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/PasswordReset.java (96%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/PasswordResetEmail.java (96%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/QuestionsAssignment.java (98%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/ResetLinkAssignment.java (96%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/ResetLinkAssignmentForgotPassword.java (98%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/SecurityQuestionAssignment.java (98%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/SimpleMailAssignment.java (98%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/TriedQuestions.java (96%) rename src/main/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/resetlink/PasswordChangeForm.java (84%) rename src/main/resources/lessons/{password_reset => passwordreset}/css/password.css (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/documentation/PasswordReset_SecurityQuestions.adoc (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/documentation/PasswordReset_host_header.adoc (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/documentation/PasswordReset_known_questions.adoc (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/documentation/PasswordReset_mitigation.adoc (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/documentation/PasswordReset_plan.adoc (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/documentation/PasswordReset_simple.adoc (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/documentation/PasswordReset_wrong_message.adoc (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/html/PasswordReset.html (93%) rename src/main/resources/lessons/{password_reset => passwordreset}/i18n/WebGoatLabels.properties (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/images/reset1.png (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/images/reset2.png (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/images/slack1.png (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/images/slack2.png (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/js/password-reset-simple.js (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/templates/password_link_not_found.html (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/templates/password_reset.html (100%) rename src/main/resources/lessons/{password_reset => passwordreset}/templates/success.html (100%) rename src/test/java/org/owasp/webgoat/lessons/{password_reset => passwordreset}/SecurityQuestionAssignmentTest.java (97%) diff --git a/src/main/java/org/owasp/webgoat/lessons/password_reset/PasswordReset.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/PasswordReset.java similarity index 96% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/PasswordReset.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/PasswordReset.java index a0024f033..eea060533 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/PasswordReset.java +++ b/src/main/java/org/owasp/webgoat/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/src/main/java/org/owasp/webgoat/lessons/password_reset/PasswordResetEmail.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/PasswordResetEmail.java similarity index 96% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/PasswordResetEmail.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/PasswordResetEmail.java index 848e70683..7f21050dc 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/PasswordResetEmail.java +++ b/src/main/java/org/owasp/webgoat/lessons/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/src/main/java/org/owasp/webgoat/lessons/password_reset/QuestionsAssignment.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/QuestionsAssignment.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/QuestionsAssignment.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/QuestionsAssignment.java index 1b698067e..88ac80fff 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/QuestionsAssignment.java +++ b/src/main/java/org/owasp/webgoat/lessons/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/src/main/java/org/owasp/webgoat/lessons/password_reset/ResetLinkAssignment.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java similarity index 96% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/ResetLinkAssignment.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java index 24078d78d..d8bfce33d 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/ResetLinkAssignment.java +++ b/src/main/java/org/owasp/webgoat/lessons/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 class ResetLinkAssignment extends AssignmentEndpoint { 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/src/main/java/org/owasp/webgoat/lessons/password_reset/ResetLinkAssignmentForgotPassword.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignmentForgotPassword.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/ResetLinkAssignmentForgotPassword.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignmentForgotPassword.java index 111753a09..c17529aea 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/ResetLinkAssignmentForgotPassword.java +++ b/src/main/java/org/owasp/webgoat/lessons/passwordreset/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/src/main/java/org/owasp/webgoat/lessons/password_reset/SecurityQuestionAssignment.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/SecurityQuestionAssignment.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/SecurityQuestionAssignment.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/SecurityQuestionAssignment.java index fd4b2d547..83af61934 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/SecurityQuestionAssignment.java +++ b/src/main/java/org/owasp/webgoat/lessons/passwordreset/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/src/main/java/org/owasp/webgoat/lessons/password_reset/SimpleMailAssignment.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/SimpleMailAssignment.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/SimpleMailAssignment.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/SimpleMailAssignment.java index 83e56bcba..42c4dce67 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/SimpleMailAssignment.java +++ b/src/main/java/org/owasp/webgoat/lessons/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/src/main/java/org/owasp/webgoat/lessons/password_reset/TriedQuestions.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/TriedQuestions.java similarity index 96% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/TriedQuestions.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/TriedQuestions.java index 69a8914dc..64d565b9f 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/TriedQuestions.java +++ b/src/main/java/org/owasp/webgoat/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/src/main/java/org/owasp/webgoat/lessons/password_reset/resetlink/PasswordChangeForm.java b/src/main/java/org/owasp/webgoat/lessons/passwordreset/resetlink/PasswordChangeForm.java similarity index 84% rename from src/main/java/org/owasp/webgoat/lessons/password_reset/resetlink/PasswordChangeForm.java rename to src/main/java/org/owasp/webgoat/lessons/passwordreset/resetlink/PasswordChangeForm.java index 6ece727e3..267b39447 100644 --- a/src/main/java/org/owasp/webgoat/lessons/password_reset/resetlink/PasswordChangeForm.java +++ b/src/main/java/org/owasp/webgoat/lessons/passwordreset/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/src/main/resources/lessons/password_reset/css/password.css b/src/main/resources/lessons/passwordreset/css/password.css similarity index 100% rename from src/main/resources/lessons/password_reset/css/password.css rename to src/main/resources/lessons/passwordreset/css/password.css diff --git a/src/main/resources/lessons/password_reset/documentation/PasswordReset_SecurityQuestions.adoc b/src/main/resources/lessons/passwordreset/documentation/PasswordReset_SecurityQuestions.adoc similarity index 100% rename from src/main/resources/lessons/password_reset/documentation/PasswordReset_SecurityQuestions.adoc rename to src/main/resources/lessons/passwordreset/documentation/PasswordReset_SecurityQuestions.adoc diff --git a/src/main/resources/lessons/password_reset/documentation/PasswordReset_host_header.adoc b/src/main/resources/lessons/passwordreset/documentation/PasswordReset_host_header.adoc similarity index 100% rename from src/main/resources/lessons/password_reset/documentation/PasswordReset_host_header.adoc rename to src/main/resources/lessons/passwordreset/documentation/PasswordReset_host_header.adoc diff --git a/src/main/resources/lessons/password_reset/documentation/PasswordReset_known_questions.adoc b/src/main/resources/lessons/passwordreset/documentation/PasswordReset_known_questions.adoc similarity index 100% rename from src/main/resources/lessons/password_reset/documentation/PasswordReset_known_questions.adoc rename to src/main/resources/lessons/passwordreset/documentation/PasswordReset_known_questions.adoc diff --git a/src/main/resources/lessons/password_reset/documentation/PasswordReset_mitigation.adoc b/src/main/resources/lessons/passwordreset/documentation/PasswordReset_mitigation.adoc similarity index 100% rename from src/main/resources/lessons/password_reset/documentation/PasswordReset_mitigation.adoc rename to src/main/resources/lessons/passwordreset/documentation/PasswordReset_mitigation.adoc diff --git a/src/main/resources/lessons/password_reset/documentation/PasswordReset_plan.adoc b/src/main/resources/lessons/passwordreset/documentation/PasswordReset_plan.adoc similarity index 100% rename from src/main/resources/lessons/password_reset/documentation/PasswordReset_plan.adoc rename to src/main/resources/lessons/passwordreset/documentation/PasswordReset_plan.adoc diff --git a/src/main/resources/lessons/password_reset/documentation/PasswordReset_simple.adoc b/src/main/resources/lessons/passwordreset/documentation/PasswordReset_simple.adoc similarity index 100% rename from src/main/resources/lessons/password_reset/documentation/PasswordReset_simple.adoc rename to src/main/resources/lessons/passwordreset/documentation/PasswordReset_simple.adoc diff --git a/src/main/resources/lessons/password_reset/documentation/PasswordReset_wrong_message.adoc b/src/main/resources/lessons/passwordreset/documentation/PasswordReset_wrong_message.adoc similarity index 100% rename from src/main/resources/lessons/password_reset/documentation/PasswordReset_wrong_message.adoc rename to src/main/resources/lessons/passwordreset/documentation/PasswordReset_wrong_message.adoc diff --git a/src/main/resources/lessons/password_reset/html/PasswordReset.html b/src/main/resources/lessons/passwordreset/html/PasswordReset.html similarity index 93% rename from src/main/resources/lessons/password_reset/html/PasswordReset.html rename to src/main/resources/lessons/passwordreset/html/PasswordReset.html index 4a292e009..2acb24098 100644 --- a/src/main/resources/lessons/password_reset/html/PasswordReset.html +++ b/src/main/resources/lessons/passwordreset/html/PasswordReset.html @@ -3,10 +3,10 @@
-
+
-
+
@@ -90,11 +90,11 @@
-
+
-
+
@@ -138,7 +138,7 @@
-
+
-
+
@@ -260,6 +260,6 @@
-
+
diff --git a/src/main/resources/lessons/password_reset/i18n/WebGoatLabels.properties b/src/main/resources/lessons/passwordreset/i18n/WebGoatLabels.properties similarity index 100% rename from src/main/resources/lessons/password_reset/i18n/WebGoatLabels.properties rename to src/main/resources/lessons/passwordreset/i18n/WebGoatLabels.properties diff --git a/src/main/resources/lessons/password_reset/images/reset1.png b/src/main/resources/lessons/passwordreset/images/reset1.png similarity index 100% rename from src/main/resources/lessons/password_reset/images/reset1.png rename to src/main/resources/lessons/passwordreset/images/reset1.png diff --git a/src/main/resources/lessons/password_reset/images/reset2.png b/src/main/resources/lessons/passwordreset/images/reset2.png similarity index 100% rename from src/main/resources/lessons/password_reset/images/reset2.png rename to src/main/resources/lessons/passwordreset/images/reset2.png diff --git a/src/main/resources/lessons/password_reset/images/slack1.png b/src/main/resources/lessons/passwordreset/images/slack1.png similarity index 100% rename from src/main/resources/lessons/password_reset/images/slack1.png rename to src/main/resources/lessons/passwordreset/images/slack1.png diff --git a/src/main/resources/lessons/password_reset/images/slack2.png b/src/main/resources/lessons/passwordreset/images/slack2.png similarity index 100% rename from src/main/resources/lessons/password_reset/images/slack2.png rename to src/main/resources/lessons/passwordreset/images/slack2.png diff --git a/src/main/resources/lessons/password_reset/js/password-reset-simple.js b/src/main/resources/lessons/passwordreset/js/password-reset-simple.js similarity index 100% rename from src/main/resources/lessons/password_reset/js/password-reset-simple.js rename to src/main/resources/lessons/passwordreset/js/password-reset-simple.js diff --git a/src/main/resources/lessons/password_reset/templates/password_link_not_found.html b/src/main/resources/lessons/passwordreset/templates/password_link_not_found.html similarity index 100% rename from src/main/resources/lessons/password_reset/templates/password_link_not_found.html rename to src/main/resources/lessons/passwordreset/templates/password_link_not_found.html diff --git a/src/main/resources/lessons/password_reset/templates/password_reset.html b/src/main/resources/lessons/passwordreset/templates/password_reset.html similarity index 100% rename from src/main/resources/lessons/password_reset/templates/password_reset.html rename to src/main/resources/lessons/passwordreset/templates/password_reset.html diff --git a/src/main/resources/lessons/password_reset/templates/success.html b/src/main/resources/lessons/passwordreset/templates/success.html similarity index 100% rename from src/main/resources/lessons/password_reset/templates/success.html rename to src/main/resources/lessons/passwordreset/templates/success.html diff --git a/src/test/java/org/owasp/webgoat/lessons/password_reset/SecurityQuestionAssignmentTest.java b/src/test/java/org/owasp/webgoat/lessons/passwordreset/SecurityQuestionAssignmentTest.java similarity index 97% rename from src/test/java/org/owasp/webgoat/lessons/password_reset/SecurityQuestionAssignmentTest.java rename to src/test/java/org/owasp/webgoat/lessons/passwordreset/SecurityQuestionAssignmentTest.java index 91bc19169..072acc6d7 100644 --- a/src/test/java/org/owasp/webgoat/lessons/password_reset/SecurityQuestionAssignmentTest.java +++ b/src/test/java/org/owasp/webgoat/lessons/passwordreset/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;