From 4f911c64a15196f44aca602af1892202098af985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80ngel=20Oll=C3=A9=20Bl=C3=A1zquez?= Date: Sat, 30 Jul 2022 19:56:43 +0200 Subject: [PATCH] Renamed to missingac --- .../lessons/{missing_ac => missingac}/DisplayUser.java | 2 +- .../MissingAccessControlUserRepository.java | 2 +- .../{missing_ac => missingac}/MissingFunctionAC.java | 2 +- .../MissingFunctionACHiddenMenus.java | 2 +- .../MissingFunctionACUsers.java | 8 ++++---- .../MissingFunctionACYourHash.java | 7 ++++--- .../MissingFunctionACYourHashAdmin.java | 6 +++--- .../lessons/{missing_ac => missingac}/User.java | 2 +- .../lessons/{missing_ac => missingac}/css/ac.css | 0 .../db/migration/V2021_11_03_1__ac.sql | 0 .../documentation/missing-function-ac-01-intro.adoc | 0 .../missing-function-ac-02-client-controls.adoc | 0 .../documentation/missing-function-ac-03-users.adoc | 0 .../missing-function-ac-04-users-fixed.adoc | 0 .../html/MissingFunctionAC.html | 8 ++++---- .../i18n/WebGoatLabels.properties | 0 .../{missing_ac => missingac}/DisplayUserTest.java | 10 +++++----- .../MissingFunctionACHiddenMenusTest.java | 3 ++- .../MissingFunctionACUsersTest.java | 4 ++-- .../MissingFunctionACYourHashAdminTest.java | 10 +++++----- .../MissingFunctionYourHashTest.java | 4 ++-- 21 files changed, 36 insertions(+), 34 deletions(-) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/DisplayUser.java (98%) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingAccessControlUserRepository.java (97%) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionAC.java (97%) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionACHiddenMenus.java (98%) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionACUsers.java (94%) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionACYourHash.java (94%) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionACYourHashAdmin.java (95%) rename src/main/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/User.java (84%) rename src/main/resources/lessons/{missing_ac => missingac}/css/ac.css (100%) rename src/main/resources/lessons/{missing_ac => missingac}/db/migration/V2021_11_03_1__ac.sql (100%) rename src/main/resources/lessons/{missing_ac => missingac}/documentation/missing-function-ac-01-intro.adoc (100%) rename src/main/resources/lessons/{missing_ac => missingac}/documentation/missing-function-ac-02-client-controls.adoc (100%) rename src/main/resources/lessons/{missing_ac => missingac}/documentation/missing-function-ac-03-users.adoc (100%) rename src/main/resources/lessons/{missing_ac => missingac}/documentation/missing-function-ac-04-users-fixed.adoc (100%) rename src/main/resources/lessons/{missing_ac => missingac}/html/MissingFunctionAC.html (89%) rename src/main/resources/lessons/{missing_ac => missingac}/i18n/WebGoatLabels.properties (100%) rename src/test/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/DisplayUserTest.java (87%) rename src/test/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionACHiddenMenusTest.java (96%) rename src/test/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionACUsersTest.java (96%) rename src/test/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionACYourHashAdminTest.java (85%) rename src/test/java/org/owasp/webgoat/lessons/{missing_ac => missingac}/MissingFunctionYourHashTest.java (95%) diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/DisplayUser.java b/src/main/java/org/owasp/webgoat/lessons/missingac/DisplayUser.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/DisplayUser.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/DisplayUser.java index 2bb2fe0c9..f474dce5d 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/DisplayUser.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/DisplayUser.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.missing_ac; +package org.owasp.webgoat.lessons.missingac; import lombok.Getter; diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingAccessControlUserRepository.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingAccessControlUserRepository.java similarity index 97% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingAccessControlUserRepository.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingAccessControlUserRepository.java index f42eeddc0..7c0615e6e 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingAccessControlUserRepository.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingAccessControlUserRepository.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.missing_ac; +package org.owasp.webgoat.lessons.missingac; import org.owasp.webgoat.container.LessonDataSource; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionAC.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionAC.java similarity index 97% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionAC.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionAC.java index 609745ee2..80dd3a676 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionAC.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionAC.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.missing_ac; +package org.owasp.webgoat.lessons.missingac; import org.owasp.webgoat.container.lessons.Category; import org.owasp.webgoat.container.lessons.Lesson; diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenus.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenus.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenus.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenus.java index e07dbc961..1768e532c 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACHiddenMenus.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACHiddenMenus.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.missing_ac; +package org.owasp.webgoat.lessons.missingac; import org.owasp.webgoat.container.assignments.AssignmentEndpoint; import org.owasp.webgoat.container.assignments.AssignmentHints; diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsers.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsers.java similarity index 94% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsers.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsers.java index c8052cada..1e248c64e 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsers.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACUsers.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.missing_ac; +package org.owasp.webgoat.lessons.missingac; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,13 +34,13 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_ADMIN; +import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_SIMPLE; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_ADMIN; -import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_SIMPLE; - /** * Created by jason on 1/5/17. */ diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHash.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHash.java similarity index 94% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHash.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHash.java index 1c5a7a279..043fe905a 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHash.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHash.java @@ -20,9 +20,12 @@ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects. */ -package org.owasp.webgoat.lessons.missing_ac; +package org.owasp.webgoat.lessons.missingac; import lombok.RequiredArgsConstructor; + +import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_SIMPLE; + import org.owasp.webgoat.container.assignments.AssignmentEndpoint; import org.owasp.webgoat.container.assignments.AssignmentHints; import org.owasp.webgoat.container.assignments.AttackResult; @@ -30,8 +33,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_SIMPLE; - @RestController @AssignmentHints({"access-control.hash.hint1", "access-control.hash.hint2", "access-control.hash.hint3", "access-control.hash.hint4", "access-control.hash.hint5"}) @RequiredArgsConstructor diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdmin.java b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdmin.java similarity index 95% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdmin.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdmin.java index 8184a2f3e..80c8d185b 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdmin.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/MissingFunctionACYourHashAdmin.java @@ -20,7 +20,9 @@ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects. */ -package org.owasp.webgoat.lessons.missing_ac; +package org.owasp.webgoat.lessons.missingac; + +import static org.owasp.webgoat.lessons.missingac.MissingFunctionAC.PASSWORD_SALT_ADMIN; import org.owasp.webgoat.container.assignments.AssignmentEndpoint; import org.owasp.webgoat.container.assignments.AssignmentHints; @@ -29,8 +31,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_ADMIN; - @RestController @AssignmentHints({"access-control.hash.hint6", "access-control.hash.hint7", "access-control.hash.hint8", "access-control.hash.hint9", "access-control.hash.hint10", "access-control.hash.hint11", "access-control.hash.hint12"}) diff --git a/src/main/java/org/owasp/webgoat/lessons/missing_ac/User.java b/src/main/java/org/owasp/webgoat/lessons/missingac/User.java similarity index 84% rename from src/main/java/org/owasp/webgoat/lessons/missing_ac/User.java rename to src/main/java/org/owasp/webgoat/lessons/missingac/User.java index a3a9be85b..f5b8161f7 100644 --- a/src/main/java/org/owasp/webgoat/lessons/missing_ac/User.java +++ b/src/main/java/org/owasp/webgoat/lessons/missingac/User.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.missing_ac; +package org.owasp.webgoat.lessons.missingac; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/resources/lessons/missing_ac/css/ac.css b/src/main/resources/lessons/missingac/css/ac.css similarity index 100% rename from src/main/resources/lessons/missing_ac/css/ac.css rename to src/main/resources/lessons/missingac/css/ac.css diff --git a/src/main/resources/lessons/missing_ac/db/migration/V2021_11_03_1__ac.sql b/src/main/resources/lessons/missingac/db/migration/V2021_11_03_1__ac.sql similarity index 100% rename from src/main/resources/lessons/missing_ac/db/migration/V2021_11_03_1__ac.sql rename to src/main/resources/lessons/missingac/db/migration/V2021_11_03_1__ac.sql diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-01-intro.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-01-intro.adoc similarity index 100% rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-01-intro.adoc rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-01-intro.adoc diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-02-client-controls.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-02-client-controls.adoc similarity index 100% rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-02-client-controls.adoc rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-02-client-controls.adoc diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-03-users.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-03-users.adoc similarity index 100% rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-03-users.adoc rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-03-users.adoc diff --git a/src/main/resources/lessons/missing_ac/documentation/missing-function-ac-04-users-fixed.adoc b/src/main/resources/lessons/missingac/documentation/missing-function-ac-04-users-fixed.adoc similarity index 100% rename from src/main/resources/lessons/missing_ac/documentation/missing-function-ac-04-users-fixed.adoc rename to src/main/resources/lessons/missingac/documentation/missing-function-ac-04-users-fixed.adoc diff --git a/src/main/resources/lessons/missing_ac/html/MissingFunctionAC.html b/src/main/resources/lessons/missingac/html/MissingFunctionAC.html similarity index 89% rename from src/main/resources/lessons/missing_ac/html/MissingFunctionAC.html rename to src/main/resources/lessons/missingac/html/MissingFunctionAC.html index daf5b8fd6..bb0d1d248 100644 --- a/src/main/resources/lessons/missing_ac/html/MissingFunctionAC.html +++ b/src/main/resources/lessons/missingac/html/MissingFunctionAC.html @@ -1,12 +1,12 @@
-
+
-
+