From 1eff81718bba63b1cd8fa74982bf536c91b1b5e6 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:38:04 +0200 Subject: [PATCH] Renamed to httpproxies --- .../HttpBasicsInterceptRequest.java | 2 +- .../HttpProxies.java | 2 +- .../documentation/0overview.adoc | 0 .../documentation/10burp.adoc | 0 .../documentation/1proxysetupsteps.adoc | 0 .../documentation/3browsersetup.adoc | 0 .../5configurefilterandbreakpoints.adoc | 0 .../documentation/6assignment.adoc | 0 .../documentation/7resend.adoc | 0 .../documentation/8httpsproxy.adoc | 0 .../documentation/9manual.adoc | 0 .../html/HttpProxies.html | 18 +++++++++--------- .../i18n/WebGoatLabels.properties | 0 .../images/breakpoint.png | Bin .../images/breakpoint2.png | Bin .../images/burpfilter.png | Bin .../images/burpfilterclient.png | Bin .../images/burpintercept.png | Bin .../images/burpintercepted.png | Bin .../images/burpproxy.png | Bin .../images/burpwarn.png | Bin .../images/chrome-manual-proxy-win.png | Bin .../images/chrome-manual-proxy.png | Bin .../images/firefox-proxy-config.png | Bin .../images/firefoxsettingscerts.png | Bin .../images/importcerts.png | Bin .../images/loginscreen.png | Bin .../images/newlocalhost.png | Bin .../images/proxy-intercept-button.png | Bin .../images/proxy-intercept-details.png | Bin .../images/rootca.png | Bin .../images/savecerts.png | Bin .../images/zap-browser-button.png | Bin .../images/zap-exclude.png | Bin .../images/zap-history.png | Bin .../images/zap-start.png | Bin .../images/zap_edit_and_resend.png | Bin .../images/zap_edit_and_response.png | Bin .../images/zap_edit_and_send.png | Bin .../images/zap_exclude.png | Bin .../images/zap_exclude_url.png | Bin .../HttpBasicsInterceptRequestTest.java | 4 ++-- 42 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/org/owasp/webgoat/lessons/{http_proxies => httpproxies}/HttpBasicsInterceptRequest.java (98%) rename src/main/java/org/owasp/webgoat/lessons/{http_proxies => httpproxies}/HttpProxies.java (97%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/0overview.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/10burp.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/1proxysetupsteps.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/3browsersetup.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/5configurefilterandbreakpoints.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/6assignment.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/7resend.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/8httpsproxy.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/documentation/9manual.adoc (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/html/HttpProxies.html (52%) rename src/main/resources/lessons/{http_proxies => httpproxies}/i18n/WebGoatLabels.properties (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/breakpoint.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/breakpoint2.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/burpfilter.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/burpfilterclient.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/burpintercept.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/burpintercepted.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/burpproxy.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/burpwarn.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/chrome-manual-proxy-win.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/chrome-manual-proxy.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/firefox-proxy-config.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/firefoxsettingscerts.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/importcerts.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/loginscreen.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/newlocalhost.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/proxy-intercept-button.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/proxy-intercept-details.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/rootca.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/savecerts.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap-browser-button.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap-exclude.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap-history.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap-start.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap_edit_and_resend.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap_edit_and_response.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap_edit_and_send.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap_exclude.png (100%) rename src/main/resources/lessons/{http_proxies => httpproxies}/images/zap_exclude_url.png (100%) rename src/test/java/org/owasp/webgoat/lessons/{http_proxies => httpproxies}/HttpBasicsInterceptRequestTest.java (97%) diff --git a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequest.java b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.java similarity index 98% rename from src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequest.java rename to src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.java index aac759c27..0550018a7 100644 --- a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequest.java +++ b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.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.http_proxies; +package org.owasp.webgoat.lessons.httpproxies; import org.owasp.webgoat.container.assignments.AssignmentEndpoint; import org.owasp.webgoat.container.assignments.AttackResult; diff --git a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpProxies.java b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpProxies.java similarity index 97% rename from src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpProxies.java rename to src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpProxies.java index b0f9e31cb..a111e1223 100644 --- a/src/main/java/org/owasp/webgoat/lessons/http_proxies/HttpProxies.java +++ b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpProxies.java @@ -1,4 +1,4 @@ -package org.owasp.webgoat.lessons.http_proxies; +package org.owasp.webgoat.lessons.httpproxies; import org.owasp.webgoat.container.lessons.Category; import org.owasp.webgoat.container.lessons.Lesson; diff --git a/src/main/resources/lessons/http_proxies/documentation/0overview.adoc b/src/main/resources/lessons/httpproxies/documentation/0overview.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/0overview.adoc rename to src/main/resources/lessons/httpproxies/documentation/0overview.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/10burp.adoc b/src/main/resources/lessons/httpproxies/documentation/10burp.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/10burp.adoc rename to src/main/resources/lessons/httpproxies/documentation/10burp.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/1proxysetupsteps.adoc b/src/main/resources/lessons/httpproxies/documentation/1proxysetupsteps.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/1proxysetupsteps.adoc rename to src/main/resources/lessons/httpproxies/documentation/1proxysetupsteps.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/3browsersetup.adoc b/src/main/resources/lessons/httpproxies/documentation/3browsersetup.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/3browsersetup.adoc rename to src/main/resources/lessons/httpproxies/documentation/3browsersetup.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/5configurefilterandbreakpoints.adoc b/src/main/resources/lessons/httpproxies/documentation/5configurefilterandbreakpoints.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/5configurefilterandbreakpoints.adoc rename to src/main/resources/lessons/httpproxies/documentation/5configurefilterandbreakpoints.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/6assignment.adoc b/src/main/resources/lessons/httpproxies/documentation/6assignment.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/6assignment.adoc rename to src/main/resources/lessons/httpproxies/documentation/6assignment.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/7resend.adoc b/src/main/resources/lessons/httpproxies/documentation/7resend.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/7resend.adoc rename to src/main/resources/lessons/httpproxies/documentation/7resend.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/8httpsproxy.adoc b/src/main/resources/lessons/httpproxies/documentation/8httpsproxy.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/8httpsproxy.adoc rename to src/main/resources/lessons/httpproxies/documentation/8httpsproxy.adoc diff --git a/src/main/resources/lessons/http_proxies/documentation/9manual.adoc b/src/main/resources/lessons/httpproxies/documentation/9manual.adoc similarity index 100% rename from src/main/resources/lessons/http_proxies/documentation/9manual.adoc rename to src/main/resources/lessons/httpproxies/documentation/9manual.adoc diff --git a/src/main/resources/lessons/http_proxies/html/HttpProxies.html b/src/main/resources/lessons/httpproxies/html/HttpProxies.html similarity index 52% rename from src/main/resources/lessons/http_proxies/html/HttpProxies.html rename to src/main/resources/lessons/httpproxies/html/HttpProxies.html index f916785db..3b96be434 100644 --- a/src/main/resources/lessons/http_proxies/html/HttpProxies.html +++ b/src/main/resources/lessons/httpproxies/html/HttpProxies.html @@ -3,23 +3,23 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/main/resources/lessons/http_proxies/i18n/WebGoatLabels.properties b/src/main/resources/lessons/httpproxies/i18n/WebGoatLabels.properties similarity index 100% rename from src/main/resources/lessons/http_proxies/i18n/WebGoatLabels.properties rename to src/main/resources/lessons/httpproxies/i18n/WebGoatLabels.properties diff --git a/src/main/resources/lessons/http_proxies/images/breakpoint.png b/src/main/resources/lessons/httpproxies/images/breakpoint.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/breakpoint.png rename to src/main/resources/lessons/httpproxies/images/breakpoint.png diff --git a/src/main/resources/lessons/http_proxies/images/breakpoint2.png b/src/main/resources/lessons/httpproxies/images/breakpoint2.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/breakpoint2.png rename to src/main/resources/lessons/httpproxies/images/breakpoint2.png diff --git a/src/main/resources/lessons/http_proxies/images/burpfilter.png b/src/main/resources/lessons/httpproxies/images/burpfilter.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/burpfilter.png rename to src/main/resources/lessons/httpproxies/images/burpfilter.png diff --git a/src/main/resources/lessons/http_proxies/images/burpfilterclient.png b/src/main/resources/lessons/httpproxies/images/burpfilterclient.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/burpfilterclient.png rename to src/main/resources/lessons/httpproxies/images/burpfilterclient.png diff --git a/src/main/resources/lessons/http_proxies/images/burpintercept.png b/src/main/resources/lessons/httpproxies/images/burpintercept.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/burpintercept.png rename to src/main/resources/lessons/httpproxies/images/burpintercept.png diff --git a/src/main/resources/lessons/http_proxies/images/burpintercepted.png b/src/main/resources/lessons/httpproxies/images/burpintercepted.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/burpintercepted.png rename to src/main/resources/lessons/httpproxies/images/burpintercepted.png diff --git a/src/main/resources/lessons/http_proxies/images/burpproxy.png b/src/main/resources/lessons/httpproxies/images/burpproxy.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/burpproxy.png rename to src/main/resources/lessons/httpproxies/images/burpproxy.png diff --git a/src/main/resources/lessons/http_proxies/images/burpwarn.png b/src/main/resources/lessons/httpproxies/images/burpwarn.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/burpwarn.png rename to src/main/resources/lessons/httpproxies/images/burpwarn.png diff --git a/src/main/resources/lessons/http_proxies/images/chrome-manual-proxy-win.png b/src/main/resources/lessons/httpproxies/images/chrome-manual-proxy-win.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/chrome-manual-proxy-win.png rename to src/main/resources/lessons/httpproxies/images/chrome-manual-proxy-win.png diff --git a/src/main/resources/lessons/http_proxies/images/chrome-manual-proxy.png b/src/main/resources/lessons/httpproxies/images/chrome-manual-proxy.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/chrome-manual-proxy.png rename to src/main/resources/lessons/httpproxies/images/chrome-manual-proxy.png diff --git a/src/main/resources/lessons/http_proxies/images/firefox-proxy-config.png b/src/main/resources/lessons/httpproxies/images/firefox-proxy-config.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/firefox-proxy-config.png rename to src/main/resources/lessons/httpproxies/images/firefox-proxy-config.png diff --git a/src/main/resources/lessons/http_proxies/images/firefoxsettingscerts.png b/src/main/resources/lessons/httpproxies/images/firefoxsettingscerts.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/firefoxsettingscerts.png rename to src/main/resources/lessons/httpproxies/images/firefoxsettingscerts.png diff --git a/src/main/resources/lessons/http_proxies/images/importcerts.png b/src/main/resources/lessons/httpproxies/images/importcerts.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/importcerts.png rename to src/main/resources/lessons/httpproxies/images/importcerts.png diff --git a/src/main/resources/lessons/http_proxies/images/loginscreen.png b/src/main/resources/lessons/httpproxies/images/loginscreen.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/loginscreen.png rename to src/main/resources/lessons/httpproxies/images/loginscreen.png diff --git a/src/main/resources/lessons/http_proxies/images/newlocalhost.png b/src/main/resources/lessons/httpproxies/images/newlocalhost.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/newlocalhost.png rename to src/main/resources/lessons/httpproxies/images/newlocalhost.png diff --git a/src/main/resources/lessons/http_proxies/images/proxy-intercept-button.png b/src/main/resources/lessons/httpproxies/images/proxy-intercept-button.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/proxy-intercept-button.png rename to src/main/resources/lessons/httpproxies/images/proxy-intercept-button.png diff --git a/src/main/resources/lessons/http_proxies/images/proxy-intercept-details.png b/src/main/resources/lessons/httpproxies/images/proxy-intercept-details.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/proxy-intercept-details.png rename to src/main/resources/lessons/httpproxies/images/proxy-intercept-details.png diff --git a/src/main/resources/lessons/http_proxies/images/rootca.png b/src/main/resources/lessons/httpproxies/images/rootca.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/rootca.png rename to src/main/resources/lessons/httpproxies/images/rootca.png diff --git a/src/main/resources/lessons/http_proxies/images/savecerts.png b/src/main/resources/lessons/httpproxies/images/savecerts.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/savecerts.png rename to src/main/resources/lessons/httpproxies/images/savecerts.png diff --git a/src/main/resources/lessons/http_proxies/images/zap-browser-button.png b/src/main/resources/lessons/httpproxies/images/zap-browser-button.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap-browser-button.png rename to src/main/resources/lessons/httpproxies/images/zap-browser-button.png diff --git a/src/main/resources/lessons/http_proxies/images/zap-exclude.png b/src/main/resources/lessons/httpproxies/images/zap-exclude.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap-exclude.png rename to src/main/resources/lessons/httpproxies/images/zap-exclude.png diff --git a/src/main/resources/lessons/http_proxies/images/zap-history.png b/src/main/resources/lessons/httpproxies/images/zap-history.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap-history.png rename to src/main/resources/lessons/httpproxies/images/zap-history.png diff --git a/src/main/resources/lessons/http_proxies/images/zap-start.png b/src/main/resources/lessons/httpproxies/images/zap-start.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap-start.png rename to src/main/resources/lessons/httpproxies/images/zap-start.png diff --git a/src/main/resources/lessons/http_proxies/images/zap_edit_and_resend.png b/src/main/resources/lessons/httpproxies/images/zap_edit_and_resend.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap_edit_and_resend.png rename to src/main/resources/lessons/httpproxies/images/zap_edit_and_resend.png diff --git a/src/main/resources/lessons/http_proxies/images/zap_edit_and_response.png b/src/main/resources/lessons/httpproxies/images/zap_edit_and_response.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap_edit_and_response.png rename to src/main/resources/lessons/httpproxies/images/zap_edit_and_response.png diff --git a/src/main/resources/lessons/http_proxies/images/zap_edit_and_send.png b/src/main/resources/lessons/httpproxies/images/zap_edit_and_send.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap_edit_and_send.png rename to src/main/resources/lessons/httpproxies/images/zap_edit_and_send.png diff --git a/src/main/resources/lessons/http_proxies/images/zap_exclude.png b/src/main/resources/lessons/httpproxies/images/zap_exclude.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap_exclude.png rename to src/main/resources/lessons/httpproxies/images/zap_exclude.png diff --git a/src/main/resources/lessons/http_proxies/images/zap_exclude_url.png b/src/main/resources/lessons/httpproxies/images/zap_exclude_url.png similarity index 100% rename from src/main/resources/lessons/http_proxies/images/zap_exclude_url.png rename to src/main/resources/lessons/httpproxies/images/zap_exclude_url.png diff --git a/src/test/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequestTest.java b/src/test/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequestTest.java similarity index 97% rename from src/test/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequestTest.java rename to src/test/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequestTest.java index 5f12fac26..8cbc86bb7 100644 --- a/src/test/java/org/owasp/webgoat/lessons/http_proxies/HttpBasicsInterceptRequestTest.java +++ b/src/test/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequestTest.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.http_proxies; +package org.owasp.webgoat.lessons.httpproxies; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.BeforeEach; @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.owasp.webgoat.container.assignments.AssignmentEndpointTest; -import org.owasp.webgoat.lessons.http_proxies.HttpBasicsInterceptRequest; +import org.owasp.webgoat.lessons.httpproxies.HttpBasicsInterceptRequest; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;