From e0ac4a1083c91efa65219b692932dc4f39049580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Zubcevic?= Date: Thu, 10 Oct 2019 09:45:43 +0200 Subject: [PATCH] lessons in correct order and scoreboard visible again (#680) --- .../src/main/resources/templates/scoreboard.html | 2 +- .../org/owasp/webgoat/chrome_dev_tools/ChromeDevTools.java | 2 +- .../src/main/resources/i18n/WebGoatLabels.properties | 2 +- .../cia/src/main/java/org/owasp/webgoat/cia/CIA.java | 2 +- .../cia/src/main/resources/i18n/WebGoatLabels.properties | 2 +- .../java/org/owasp/webgoat/http_basics/HttpBasics.java | 2 +- .../src/main/resources/i18n/WebGoatLabels.properties | 2 +- .../src/main/resources/i18n/WebGoatLabels_nl.properties | 2 +- .../java/org/owasp/webgoat/http_proxies/HttpProxies.java | 2 +- .../src/main/resources/i18n/WebGoatLabels.properties | 2 +- .../resources/lessonPlans/en/PasswordReset_simple.adoc | 2 +- .../sql_injection/advanced/SqlInjectionAdvanced.java | 4 ++-- .../webgoat/sql_injection/introduction/SqlInjection.java | 2 +- .../sql_injection/mitigation/SqlInjectionMitigations.java | 2 +- .../src/main/resources/i18n/WebGoatLabels.properties | 7 ++++--- 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/webgoat-container/src/main/resources/templates/scoreboard.html b/webgoat-container/src/main/resources/templates/scoreboard.html index 1e9d0a674..b26f7d86a 100644 --- a/webgoat-container/src/main/resources/templates/scoreboard.html +++ b/webgoat-container/src/main/resources/templates/scoreboard.html @@ -19,7 +19,7 @@ - diff --git a/webgoat-lessons/chrome-dev-tools/src/main/java/org/owasp/webgoat/chrome_dev_tools/ChromeDevTools.java b/webgoat-lessons/chrome-dev-tools/src/main/java/org/owasp/webgoat/chrome_dev_tools/ChromeDevTools.java index 79fb9370d..64c96f36a 100644 --- a/webgoat-lessons/chrome-dev-tools/src/main/java/org/owasp/webgoat/chrome_dev_tools/ChromeDevTools.java +++ b/webgoat-lessons/chrome-dev-tools/src/main/java/org/owasp/webgoat/chrome_dev_tools/ChromeDevTools.java @@ -40,7 +40,7 @@ public class ChromeDevTools extends Lesson { @Override public String getTitle() { - return "chrome-dev-tools.title"; + return "3.chrome-dev-tools.title";//3rd lesson in General } @Override diff --git a/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties index 3741c9cf5..792ad7bbf 100644 --- a/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties +++ b/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties @@ -1,4 +1,4 @@ -chrome-dev-tools.title=Google Chrome Developer Tools +3.chrome-dev-tools.title=Developer Tools xss-dom-message-success=Correct! xss-dom-message-failure=Incorrect. diff --git a/webgoat-lessons/cia/src/main/java/org/owasp/webgoat/cia/CIA.java b/webgoat-lessons/cia/src/main/java/org/owasp/webgoat/cia/CIA.java index 74e9147f9..00d3ecd01 100644 --- a/webgoat-lessons/cia/src/main/java/org/owasp/webgoat/cia/CIA.java +++ b/webgoat-lessons/cia/src/main/java/org/owasp/webgoat/cia/CIA.java @@ -18,7 +18,7 @@ public class CIA extends Lesson { @Override public String getTitle() { - return "cia.title"; + return "4.cia.title";//4th lesson in general } @Override diff --git a/webgoat-lessons/cia/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/cia/src/main/resources/i18n/WebGoatLabels.properties index f028c3a78..8260cf034 100644 --- a/webgoat-lessons/cia/src/main/resources/i18n/WebGoatLabels.properties +++ b/webgoat-lessons/cia/src/main/resources/i18n/WebGoatLabels.properties @@ -1 +1 @@ -cia.title=CIA triad +4.cia.title=CIA Triad diff --git a/webgoat-lessons/http-basics/src/main/java/org/owasp/webgoat/http_basics/HttpBasics.java b/webgoat-lessons/http-basics/src/main/java/org/owasp/webgoat/http_basics/HttpBasics.java index 59c35eec4..4f54b0de9 100644 --- a/webgoat-lessons/http-basics/src/main/java/org/owasp/webgoat/http_basics/HttpBasics.java +++ b/webgoat-lessons/http-basics/src/main/java/org/owasp/webgoat/http_basics/HttpBasics.java @@ -35,7 +35,7 @@ public class HttpBasics extends Lesson { @Override public String getTitle() { - return "http-basics.title"; + return "1.http-basics.title";//first lesson in general } @Override diff --git a/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels.properties index a99bf8ab6..04ba9486a 100644 --- a/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels.properties +++ b/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels.properties @@ -1,6 +1,6 @@ http-basics.EnterYourName=Enter your Name http-basics.Go!=Go! -http-basics.title=HTTP Basics +1.http-basics.title=HTTP Basics http-basics.hints.http_basics_lesson.1=Type in your name and press 'go' diff --git a/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels_nl.properties b/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels_nl.properties index 509aaaf7e..afac8f96d 100644 --- a/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels_nl.properties +++ b/webgoat-lessons/http-basics/src/main/resources/i18n/WebGoatLabels_nl.properties @@ -1,6 +1,6 @@ http-basics.EnterYourName=Voer je naam in http-basics.Go!=Go! -http-basics.title=HTTP Basics +1.http-basics.title=HTTP Basics diff --git a/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpProxies.java b/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpProxies.java index 53c3c3ee8..28ad43520 100644 --- a/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpProxies.java +++ b/webgoat-lessons/http-proxies/src/main/java/org/owasp/webgoat/http_proxies/HttpProxies.java @@ -42,7 +42,7 @@ public class HttpProxies extends Lesson { @Override public String getTitle() { - return "http-proxies.title"; + return "2.http-proxies.title";//second lesson in GENERAL } @Override diff --git a/webgoat-lessons/http-proxies/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/http-proxies/src/main/resources/i18n/WebGoatLabels.properties index 2140e3ed4..d8e082f50 100644 --- a/webgoat-lessons/http-proxies/src/main/resources/i18n/WebGoatLabels.properties +++ b/webgoat-lessons/http-proxies/src/main/resources/i18n/WebGoatLabels.properties @@ -1,4 +1,4 @@ -http-proxies.title=HTTP Proxies +2.http-proxies.title=HTTP Proxies http-proxies.intercept.success=Well done, you tampered the request as expected http-proxies.intercept.failure=Please try again. Make sure to make all the changes. And case sensitivity may matter ... or not, you never know! \ No newline at end of file diff --git a/webgoat-lessons/password-reset/src/main/resources/lessonPlans/en/PasswordReset_simple.adoc b/webgoat-lessons/password-reset/src/main/resources/lessonPlans/en/PasswordReset_simple.adoc index c3e051b13..81b2e1e47 100644 --- a/webgoat-lessons/password-reset/src/main/resources/lessonPlans/en/PasswordReset_simple.adoc +++ b/webgoat-lessons/password-reset/src/main/resources/lessonPlans/en/PasswordReset_simple.adoc @@ -1,6 +1,6 @@ == Email functionality with WebWolf -Let's first do a simple assignment to make sure you are able to read e-mails with WebWolf, first start WebWolf (see http://) +Let's first do a simple assignment to make sure you are able to read e-mails with WebWolf, first start WebWolf (see webWolfLink:here[]) In the reset page below send an e-mail to `username@webgoat.org` (part behind the @ is not important) Open WebWolf and read the e-mail and login with your username and the password provided in the e-mail. diff --git a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/advanced/SqlInjectionAdvanced.java b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/advanced/SqlInjectionAdvanced.java index d9864fc38..5db93f742 100644 --- a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/advanced/SqlInjectionAdvanced.java +++ b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/advanced/SqlInjectionAdvanced.java @@ -30,12 +30,12 @@ import org.springframework.stereotype.Component; public class SqlInjectionAdvanced extends Lesson { @Override public Category getDefaultCategory() { - return Category.INJECTION; + return Category.INJECTION; } @Override public String getTitle() { - return "sql.advanced.title"; + return "2.sql.advanced.title"; } @Override diff --git a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjection.java b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjection.java index 7b2f4c842..11e2b7c2a 100644 --- a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjection.java +++ b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/introduction/SqlInjection.java @@ -35,7 +35,7 @@ public class SqlInjection extends Lesson { @Override public String getTitle() { - return "sql.injection.title"; + return "1.sql.injection.title"; } @Override diff --git a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/mitigation/SqlInjectionMitigations.java b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/mitigation/SqlInjectionMitigations.java index 7ea37924f..317c6492a 100644 --- a/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/mitigation/SqlInjectionMitigations.java +++ b/webgoat-lessons/sql-injection/src/main/java/org/owasp/webgoat/sql_injection/mitigation/SqlInjectionMitigations.java @@ -35,7 +35,7 @@ public class SqlInjectionMitigations extends Lesson { @Override public String getTitle() { - return "sql.mitigation.title"; + return "3.sql.mitigation.title"; } @Override diff --git a/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties index b6e9a02b7..b2544c042 100644 --- a/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties +++ b/webgoat-lessons/sql-injection/src/main/resources/i18n/WebGoatLabels.properties @@ -1,7 +1,8 @@ #StringSqlInjection.java -sql.injection.title=SQL Injection (introduction) -sql.mitigation.title=SQL Injection (mitigation) -sql.advanced.title=SQL Injection (advanced) +1.sql.injection.title=SQL Injection (intro) +2.sql.advanced.title=SQL Injection (advanced) +3.sql.mitigation.title=SQL Injection (mitigation) + SqlInjectionChallenge1=Look at the different response you receive from the server SqlInjectionChallenge2=The vulnerability is on the register form