diff --git a/src/main/java/org/owasp/webgoat/lessons/path_traversal/PathTraversal.java b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/PathTraversal.java similarity index 96% rename from src/main/java/org/owasp/webgoat/lessons/path_traversal/PathTraversal.java rename to src/main/java/org/owasp/webgoat/lessons/pathtraversal/PathTraversal.java index 703aa30ea..da689cf42 100644 --- a/src/main/java/org/owasp/webgoat/lessons/path_traversal/PathTraversal.java +++ b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/PathTraversal.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.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.owasp.webgoat.container.lessons.Category; import org.owasp.webgoat.container.lessons.Lesson; diff --git a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUpload.java b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUpload.java similarity index 97% rename from src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUpload.java rename to src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUpload.java index eaaff7963..754933530 100644 --- a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUpload.java +++ b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUpload.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.owasp.webgoat.container.assignments.AssignmentHints; import org.owasp.webgoat.container.assignments.AttackResult; diff --git a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadBase.java b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadBase.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadBase.java rename to src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadBase.java index 639e9eca7..4377650a1 100644 --- a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadBase.java +++ b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadBase.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadFix.java b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadFix.java similarity index 97% rename from src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadFix.java rename to src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadFix.java index da7214377..c1dd5ce58 100644 --- a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadFix.java +++ b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadFix.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.owasp.webgoat.container.assignments.AssignmentHints; import org.owasp.webgoat.container.assignments.AttackResult; diff --git a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRemoveUserInput.java b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRemoveUserInput.java similarity index 96% rename from src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRemoveUserInput.java rename to src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRemoveUserInput.java index ecfcc46fe..d62c8451d 100644 --- a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRemoveUserInput.java +++ b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRemoveUserInput.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.owasp.webgoat.container.assignments.AssignmentHints; import org.owasp.webgoat.container.assignments.AttackResult; diff --git a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRetrieval.java b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRetrieval.java similarity index 97% rename from src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRetrieval.java rename to src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRetrieval.java index 247b07425..b010532eb 100644 --- a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRetrieval.java +++ b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRetrieval.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.RandomUtils; @@ -51,7 +51,7 @@ public class ProfileUploadRetrieval extends AssignmentEndpoint { @PostConstruct public void initAssignment() { for (int i = 1; i <= 10; i++) { - try (InputStream is = new ClassPathResource("lessons/path_traversal/images/cats/" + i + ".jpg").getInputStream()) { + try (InputStream is = new ClassPathResource("lessons/pathtraversal/images/cats/" + i + ".jpg").getInputStream()) { FileCopyUtils.copy(is, new FileOutputStream(new File(catPicturesDirectory, i + ".jpg"))); } catch (Exception e) { log.error("Unable to copy pictures" + e.getMessage()); diff --git a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileZipSlip.java b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileZipSlip.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileZipSlip.java rename to src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileZipSlip.java index e1ea60fe8..7bcf317d9 100644 --- a/src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileZipSlip.java +++ b/src/main/java/org/owasp/webgoat/lessons/pathtraversal/ProfileZipSlip.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import lombok.SneakyThrows; import org.owasp.webgoat.container.assignments.AssignmentHints; diff --git a/src/main/resources/lessons/path_traversal/css/path_traversal.css b/src/main/resources/lessons/pathtraversal/css/path_traversal.css similarity index 100% rename from src/main/resources/lessons/path_traversal/css/path_traversal.css rename to src/main/resources/lessons/pathtraversal/css/path_traversal.css diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_intro.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_intro.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_intro.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_intro.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_retrieval.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_retrieval.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_retrieval.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_retrieval.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_fix.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_fix.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_fix.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_fix.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_fixed.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_fixed.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_fixed.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_fixed.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_mitigation.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_mitigation.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_mitigation.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_mitigation.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_remove_user_input.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_remove_user_input.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_upload_remove_user_input.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_upload_remove_user_input.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_zip_slip.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_zip_slip.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_zip_slip.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_zip_slip.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_zip_slip_assignment.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_zip_slip_assignment.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_zip_slip_assignment.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_zip_slip_assignment.adoc diff --git a/src/main/resources/lessons/path_traversal/documentation/PathTraversal_zip_slip_solution.adoc b/src/main/resources/lessons/pathtraversal/documentation/PathTraversal_zip_slip_solution.adoc similarity index 100% rename from src/main/resources/lessons/path_traversal/documentation/PathTraversal_zip_slip_solution.adoc rename to src/main/resources/lessons/pathtraversal/documentation/PathTraversal_zip_slip_solution.adoc diff --git a/src/main/resources/lessons/path_traversal/html/PathTraversal.html b/src/main/resources/lessons/pathtraversal/html/PathTraversal.html similarity index 92% rename from src/main/resources/lessons/path_traversal/html/PathTraversal.html rename to src/main/resources/lessons/pathtraversal/html/PathTraversal.html index d56f8e8f9..fd19a7495 100644 --- a/src/main/resources/lessons/path_traversal/html/PathTraversal.html +++ b/src/main/resources/lessons/pathtraversal/html/PathTraversal.html @@ -5,11 +5,11 @@
-
+
-
+
@@ -63,7 +63,7 @@
-
+
@@ -118,7 +118,7 @@
-
+
@@ -174,7 +174,7 @@
-
+
@@ -212,11 +212,11 @@
-
+
-
+
@@ -273,7 +273,7 @@
-
+
diff --git a/src/main/resources/lessons/path_traversal/i18n/WebGoatLabels.properties b/src/main/resources/lessons/pathtraversal/i18n/WebGoatLabels.properties similarity index 100% rename from src/main/resources/lessons/path_traversal/i18n/WebGoatLabels.properties rename to src/main/resources/lessons/pathtraversal/i18n/WebGoatLabels.properties diff --git a/src/main/resources/lessons/path_traversal/images/account.png b/src/main/resources/lessons/pathtraversal/images/account.png similarity index 100% rename from src/main/resources/lessons/path_traversal/images/account.png rename to src/main/resources/lessons/pathtraversal/images/account.png diff --git a/src/main/resources/lessons/path_traversal/images/cats/1.jpg b/src/main/resources/lessons/pathtraversal/images/cats/1.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/1.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/1.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/10.jpg b/src/main/resources/lessons/pathtraversal/images/cats/10.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/10.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/10.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/2.jpg b/src/main/resources/lessons/pathtraversal/images/cats/2.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/2.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/2.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/3.jpg b/src/main/resources/lessons/pathtraversal/images/cats/3.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/3.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/3.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/4.jpg b/src/main/resources/lessons/pathtraversal/images/cats/4.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/4.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/4.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/5.jpg b/src/main/resources/lessons/pathtraversal/images/cats/5.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/5.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/5.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/6.jpg b/src/main/resources/lessons/pathtraversal/images/cats/6.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/6.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/6.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/7.jpg b/src/main/resources/lessons/pathtraversal/images/cats/7.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/7.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/7.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/8.jpg b/src/main/resources/lessons/pathtraversal/images/cats/8.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/8.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/8.jpg diff --git a/src/main/resources/lessons/path_traversal/images/cats/9.jpg b/src/main/resources/lessons/pathtraversal/images/cats/9.jpg similarity index 100% rename from src/main/resources/lessons/path_traversal/images/cats/9.jpg rename to src/main/resources/lessons/pathtraversal/images/cats/9.jpg diff --git a/src/main/resources/lessons/path_traversal/js/path_traversal.js b/src/main/resources/lessons/pathtraversal/js/path_traversal.js similarity index 100% rename from src/main/resources/lessons/path_traversal/js/path_traversal.js rename to src/main/resources/lessons/pathtraversal/js/path_traversal.js diff --git a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadFixTest.java b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadFixTest.java similarity index 95% rename from src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadFixTest.java rename to src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadFixTest.java index b0c8c63d4..bce4228f0 100644 --- a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadFixTest.java +++ b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadFixTest.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.owasp.webgoat.container.plugins.LessonTest; -import org.owasp.webgoat.lessons.path_traversal.PathTraversal; +import org.owasp.webgoat.lessons.pathtraversal.PathTraversal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRemoveUserInputTest.java b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRemoveUserInputTest.java similarity index 95% rename from src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRemoveUserInputTest.java rename to src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRemoveUserInputTest.java index 3a4d50613..ae10174d4 100644 --- a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRemoveUserInputTest.java +++ b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRemoveUserInputTest.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.owasp.webgoat.container.plugins.LessonTest; -import org.owasp.webgoat.lessons.path_traversal.PathTraversal; +import org.owasp.webgoat.lessons.pathtraversal.PathTraversal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.junit.jupiter.SpringExtension; diff --git a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRetrievalTest.java b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRetrievalTest.java similarity index 97% rename from src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRetrievalTest.java rename to src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRetrievalTest.java index 77629dd5a..dba1586bc 100644 --- a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadRetrievalTest.java +++ b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadRetrievalTest.java @@ -1,11 +1,11 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.owasp.webgoat.container.plugins.LessonTest; -import org.owasp.webgoat.lessons.path_traversal.PathTraversal; +import org.owasp.webgoat.lessons.pathtraversal.PathTraversal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.security.core.token.Sha512DigestUtils; diff --git a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadTest.java b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadTest.java similarity index 97% rename from src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadTest.java rename to src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadTest.java index d88a675c6..a3932cc83 100644 --- a/src/test/java/org/owasp/webgoat/lessons/path_traversal/ProfileUploadTest.java +++ b/src/test/java/org/owasp/webgoat/lessons/pathtraversal/ProfileUploadTest.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.path_traversal; +package org.owasp.webgoat.lessons.pathtraversal; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.owasp.webgoat.container.plugins.LessonTest; -import org.owasp.webgoat.lessons.path_traversal.PathTraversal; +import org.owasp.webgoat.lessons.pathtraversal.PathTraversal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.junit.jupiter.SpringExtension;