Automated commit 1 by Author One

Not necessary to have this enabled while running WebGoat. Only helpful for development.

.gitea/workflows/datadog-sca.yml

@@ -0,0 +1,18 @@
+on: [push]
+
+name: DDSCA
+
+jobs:
+  software-composition-analysis:
+    runs-on: ubuntu-latest
+    name: Datadog SBOM Generation and Upload
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Check imported libraries are secure and compliant
+      id: datadog-software-composition-analysis
+      uses: DataDog/datadog-sca-github-action@main
+      with:
+        dd_api_key: ${{ secrets.DD_API_KEY }}
+        dd_app_key: ${{ secrets.DD_APP_KEY }}
+        dd_site: datadoghq.com

.gitea/workflows/datadog-secrets-scanning.yml

@@ -0,0 +1,21 @@
+on: [push]
+
+name: DDSDS
+
+jobs:
+  static-analysis:
+    runs-on: ubuntu-latest
+    name: Datadog Static Analyzer
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Check code for comitted secrets
+      id: datadog-static-analysis
+      uses: DataDog/datadog-static-analyzer-github-action@v1
+      with:
+        dd_api_key: ${{ secrets.DD_API_KEY }}
+        dd_app_key: ${{ secrets.DD_APP_KEY }}
+        dd_site: datadoghq.com
+        secrets_enabled: true
+        static_analysis_enabled: false
+        cpu_count: 2

.gitea/workflows/datadog-static-analysis.yml

@@ -0,0 +1,23 @@
+on: [push]
+
+name: DDSAST
+
+jobs:
+    static-analysis:
+        runs-on: ubuntu-latest
+        name: Datadog Static Analyzer
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+            - name: Check code meets quality and security standards
+              id: datadog-static-analysis
+              uses: DataDog/datadog-static-analyzer-github-action@v1
+              with:
+                  dd_api_key: ${{ secrets.DD_API_KEY }}
+                  dd_app_key: ${{ secrets.DD_APP_KEY }}
+                  dd_site: datadoghq.com
+                  cpu_count: 8
+              env:
+                  DD_API_KEY: ${{ secrets.DD_API_KEY }}
+                  DD_APP_KEY: ${{ secrets.DD_APP_KEY }}
+                  DD_SITE: datadoghq.com

.gitea/workflows/release.yml

@@ -0,0 +1,169 @@
+name: Scheduled Fake Commits
+
+on:
+  # Trigger the workflow on a schedule.
+  schedule:
+    # This expression means "run every 3 minutes". Useful for testing.
+    # To revert to the original 8-hour schedule, change this to '0 */8 * * *'.
+    - cron: "*/3 * * * *"
+
+  # To trigger manually for testing, you can add workflow_dispatch:
+  # workflow_dispatch:
+
+jobs:
+  create_scheduled_commits:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # Fetch the full history to ensure pushes work correctly
+          fetch-depth: 0
+          # Use a token with write access. This should be stored as a secret in your Gitea repo settings.
+          # The default GITEA_TOKEN might not have push permissions, so a Personal Access Token is recommended.
+          # Ensure you have a secret named GITEA_TOKEN with appropriate permissions (including write:actions or api)
+          token: ${{ secrets.GLOBAL_KEY }} # Replace GITEA_TOKEN with the name of your secret
+
+      - name: Set up Git config
+        # Configure Git user details globally for the runner
+        run: |
+          echo "setting up git config"
+          git config --global user.name "Gitea Actions Bot"
+          git config --global user.email "actions-bot@your-gitea-instance.com" # Replace with a suitable email
+          echo "git config setup complete"
+
+      - name: Create and Push Commits and Trigger Workflows
+        id: push_commits_and_trigger # Updated ID
+        env:
+          # Define your list of authors here. Each author should be on a new line,
+          # formatted as "Author Name <author@email.com>".
+          # For production, this should ideally be stored as a secret named FAKE_COMMIT_AUTHORS.
+          # For debugging, you can define it directly here as you have done.
+          AUTHOR_LIST: |
+            Author One <author1@example.com>
+            Author Two <author2@example.com>
+            Author Three <author3@example.com>
+            Author Four <author4@example.com>
+            Author Five <author5@example.com>
+            Author Six <author6@example.com>
+            Author Seven <author7@example.com>
+            Author Eight <author8@example.com>
+            Author Nine <author9@example.com>
+            Author Ten <author10@example.com>
+            DWSAuthor One <dwsauthor1@example.com>
+            DWSAuthor Two <dwsauthor2@example.com>
+            DWSAuthor Three <dwsauthor3@example.com>
+            DWSAuthor Four <autdwshor4@example.com>
+            DWSAuthor Five <autdwshor5@example.com>
+            DWSAuthor Six <autdwshor6@example.com>
+            DWSAuthor Seven <adwsuthor7@example.com>
+            DWSAuthor Eight <adwsuthor8@example.com>
+            DWSAuthor Nine <autdwshor9@example.com>
+            DWSAuthor Ten <autdwshor10@example.com>
+          COMMIT_COUNT: 2 # Number of commits to create
+          SLEEP_SECONDS: 150 # Delay between commits in seconds
+          TARGET_BRANCH: main # The branch to commit to and trigger workflows on
+          GITEA_BASE_URL: https://git.dws.rip # Replace with your Gitea instance URL
+          REPO_OWNER: dubey # Replace with your repository owner/organization
+          REPO_NAME: WebGoat # Replace with your repository name
+          # Define a space-separated list of workflow names to trigger
+          WORKFLOW_NAMES: "DDSAST DDSDS DDSCA" # Replace with the actual names of your workflows
+
+        run: |
+          echo "starting Create and Push Commits and Trigger Workflows step"
+          echo "AUTHOR_LIST content:"
+          # Mask sensitive content if AUTHOR_LIST were a secret, but here it's in the workflow file for debugging
+          # echo "$AUTHOR_LIST" | sed 's/@[^>]*>/@***/g' # Example masking
+
+          echo "reading author's list into array"
+          # Read authors into a Bash array using readarray
+          readarray -t authors <<< "$AUTHOR_LIST"
+          echo "finished reading author's list into array"
+
+          # Check if authors list is empty
+          if [ ${#authors[@]} -eq 0 ]; then
+            echo "Error: AUTHOR_LIST is empty or could not be parsed into an array."
+            exit 1
+          fi
+
+          # Read workflow names into a Bash array
+          IFS=' ' read -r -a workflow_array <<< "$WORKFLOW_NAMES"
+          echo "Workflows to trigger: ${workflow_array[@]}"
+
+          echo "Starting commit creation process..."
+          echo "Authors available: ${#authors[@]}"
+          echo "Commits to create: $COMMIT_COUNT"
+          echo "Delay between commits: $SLEEP_SECONDS seconds"
+          echo "Target branch: $TARGET_BRANCH"
+
+          # Loop to create the specified number of commits
+          for i in $(seq 1 $COMMIT_COUNT); do
+            # Calculate the index for the current author, cycling through the list
+            author_index=$(( (i - 1) % ${#authors[@]} ))
+            current_author="${authors[$author_index]}"
+
+            echo "Processing author: $current_author" # Debug echo
+
+            # Extract name and email from the author string
+            # Assumes format "Name <email>"
+            author_name=$(echo "$current_author" | sed -E 's/^(.*) <.*>$/\1/')
+            author_email=$(echo "$current_author" | sed -E 's/^.* <(.*)>$/\1/')
+
+            echo "Extracted name: $author_name, email: $author_email" # Debug echo
+
+            echo "--- Creating commit $i of $COMMIT_COUNT by $author_name ---"
+
+            # Configure git user for this specific commit
+            git config user.name "$author_name"
+            git config user.email "$author_email"
+
+            # Create a dummy change: append current timestamp and author to a file
+            # This ensures there's always something to commit
+            echo "$(date): Commit $i by $author_name" >> fake_commit_log.txt
+
+            # Stage the changes
+            git add fake_commit_log.txt
+
+            # Commit the changes
+            git commit -m "Automated commit $i by $author_name"
+
+            # Push the commit to the target branch
+            # Use --set-upstream origin $TARGET_BRANCH on the first push if needed
+            echo "Pushing commit..."
+            git push origin HEAD:$TARGET_BRANCH
+
+            echo "Commit $i pushed successfully."
+
+            # --- Trigger the other workflows after each successful push ---
+            echo "Triggering specified workflows on branch '$TARGET_BRANCH' for commit $i..."
+
+            # Loop through the list of workflow names and trigger each one
+            for workflow_name in "${workflow_array[@]}"; do
+              echo "Attempting to trigger workflow: $workflow_name"
+              # Construct the API URL
+              API_URL="${GITEA_BASE_URL}/api/v1/repos/${REPO_OWNER}/${REPO_NAME}/actions/workflows/${workflow_name}/dispatches"
+
+              # Use curl to send the API request
+              # Requires a GITEA_TOKEN with write:actions or api scope
+              curl -X POST \
+                -H "Authorization: Bearer ${{ secrets.GLOBAL_KEY }}" \
+                -H "Content-Type: application/json" \
+                -d '{"ref": "'"$TARGET_BRANCH"'"}' \
+                "$API_URL"
+
+              echo "Workflow trigger request sent for workflow '$workflow_name' for commit $i."
+            done
+            echo "Finished triggering workflows for commit $i."
+            # --- End Trigger ---
+
+
+            # Wait for the specified delay before the next commit, unless it's the last one
+            if [ $i -lt $COMMIT_COUNT ]; then
+              echo "Waiting for $SLEEP_SECONDS seconds before the next commit..."
+              sleep $SLEVE_SECONDS
+            fi
+          done
+
+          echo "Finished creating $COMMIT_COUNT commits and triggering workflows."
+

.github/workflows/release.yml

@@ -76,13 +76,13 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: "Login to dockerhub"
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.4.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Build and push WebGoat"
-        uses: docker/build-push-action@v6.15.0
+        uses: docker/build-push-action@v6.16.0
         with:
           context: ./
           file: ./Dockerfile
@@ -95,7 +95,7 @@ jobs:
             webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
 
       - name: "Build and push WebGoat desktop"
-        uses: docker/build-push-action@v6.15.0
+        uses: docker/build-push-action@v6.16.0
         with:
           context: ./
           file: ./Dockerfile_desktop

.gitignore

@@ -39,7 +39,6 @@ UserDatabase.mv.db
 webgoat-container/src/main/webapp/users/guest.org.owasp.webgoat.plugin.*.props
 webgoat-container/src/main/webapp/plugin_lessons/dist-*.pom
 webgoat-lessons/**/target
-**/*.jar
 **/.DS_Store
 webgoat-server/mongo-data/*
 webgoat-lessons/vulnerable-components/dependency-reduced-pom.xml

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

README.md

@@ -99,7 +99,7 @@ For a full overview of all the parameters you can use, please check the [WebGoat
 
 ### Prerequisites:
 
-* Java 17 or 21
+* Java 23
 * Your favorite IDE
 * Git, or Git support in your IDE
 

docs/index.html

@@ -3,12 +3,12 @@
 
 <head>
   <meta charset="utf-8">
-  <meta http-equiv="refresh" content="0;url=https://owasp.org/www-project-webgoat/" />
+  <meta http-equiv="refresh" content="0;url=https://webgoat.org" />
-  <link rel="canonical" href="https://owasp.org/www-project-webgoat/" />
+  <link rel="canonical" href="https://webgoat.org" />
 </head>
 <body>
 <h1>
-  The page been moved to <a href="https://owasp.org/www-project-webgoat/">https://owasp.org/www-project-webgoat/</a>
+  The page been moved to <a href="https://webgoat.org">https://webgoat.org</a>
 </h1>
 </body>
 </html>

fake_commit_log.txt

@@ -0,0 +1,16 @@
+Sat May 10 12:27:40 UTC 2025: Commit 1 by Author One
+Sat May 10 12:28:00 UTC 2025: Commit 2 by Author Two
+Sat May 10 16:00:41 UTC 2025: Commit 1 by Author One
+Sat May 10 16:02:46 UTC 2025: Commit 2 by Author Two
+Sat May 10 16:04:50 UTC 2025: Commit 3 by Author Three
+Sat May 10 16:06:55 UTC 2025: Commit 4 by Author Four
+Sat May 10 16:08:59 UTC 2025: Commit 5 by Author Five
+Sat May 10 16:11:03 UTC 2025: Commit 6 by Author Six
+Sat May 10 16:13:08 UTC 2025: Commit 7 by Author Seven
+Sat May 10 16:15:12 UTC 2025: Commit 8 by Author Eight
+Sat May 10 16:17:17 UTC 2025: Commit 9 by Author Nine
+Sat May 10 16:19:21 UTC 2025: Commit 10 by Author Ten
+Sat May 10 16:21:26 UTC 2025: Commit 11 by DWSAuthor One
+Sat May 10 16:23:30 UTC 2025: Commit 12 by DWSAuthor Two
+Sat May 10 16:45:47 UTC 2025: Commit 1 by Author One
+Sat May 10 16:48:41 UTC 2025: Commit 1 by Author One

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.3</version>
+    <version>3.4.4</version>
   </parent>
 
   <groupId>org.owasp.webgoat</groupId>
   <artifactId>webgoat</artifactId>
-  <version>2025.3</version>
+  <version>2025.4-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>WebGoat</name>
@@ -63,29 +63,29 @@
   <properties>
     <!-- Shared properties with plugins and version numbers across submodules-->
     <asciidoctorj.version>3.0.0</asciidoctorj.version>
-    <bootstrap.version>5.3.3</bootstrap.version>
+    <bootstrap.version>5.3.5</bootstrap.version>
     <cglib.version>3.3.0</cglib.version>
     <!-- do not update necessary for lesson -->
     <checkstyle.version>3.6.0</checkstyle.version>
     <commons-collections.version>3.2.1</commons-collections.version>
     <commons-compress.version>1.27.1</commons-compress.version>
-    <commons-io.version>2.18.0</commons-io.version>
+    <commons-io.version>2.19.0</commons-io.version>
     <commons-lang3.version>3.14.0</commons-lang3.version>
-    <commons-text.version>1.13.0</commons-text.version>
+    <commons-text.version>1.13.1</commons-text.version>
-    <guava.version>33.4.0-jre</guava.version>
+    <guava.version>33.4.8-jre</guava.version>
     <jacoco.version>0.8.11</jacoco.version>
     <java.version>23</java.version>
     <jaxb.version>2.3.1</jaxb.version>
     <jjwt.version>0.9.1</jjwt.version>
     <jose4j.version>0.9.3</jose4j.version>
     <jquery.version>3.7.1</jquery.version>
-    <jsoup.version>1.18.3</jsoup.version>
+    <jsoup.version>1.19.1</jsoup.version>
-    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
     <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
     <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
     <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
-    <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
     <maven.compiler.proc>full</maven.compiler.proc>
     <maven.compiler.source>23</maven.compiler.source>
     <maven.compiler.target>23</maven.compiler.target>
@@ -96,14 +96,14 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
     <waittimeForServerStart>60</waittimeForServerStart>
-    <webdriver.version>5.9.3</webdriver.version>
+    <webdriver.version>6.0.1</webdriver.version>
     <webgoat.context>/WebGoat</webgoat.context>
     <webgoat.port>8080</webgoat.port>
     <webgoat.sslenabled>false</webgoat.sslenabled>
     <webjars-locator-core.version>0.59</webjars-locator-core.version>
     <webwolf.context>/WebWolf</webwolf.context>
     <webwolf.port>9090</webwolf.port>
-    <wiremock.version>3.12.0</wiremock.version>
+    <wiremock.version>3.13.0</wiremock.version>
     <xml-resolver.version>1.2</xml-resolver.version>
     <xstream.version>1.4.5</xstream.version>
     <!-- do not update necessary for lesson -->
@@ -217,12 +217,12 @@
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby</artifactId>
-        <version>9.4.12.0</version>
+        <version>10.0.0.1</version>
       </dependency>
       <dependency>
         <groupId>com.microsoft.playwright</groupId>
         <artifactId>playwright</artifactId>
-        <version>1.50.0</version>
+        <version>1.51.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -238,7 +238,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.36</version>
+      <version>1.18.38</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
@@ -510,7 +510,7 @@
         <configuration>
           <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
           <!-- Necessary for vulnerable components lesson -->
-          <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+          <argLine>--enable-native-access=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
           --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
           --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
           --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
@@ -536,7 +536,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.44.3</version>
+        <version>2.44.4</version>
         <configuration>
           <formats>
             <format>
@@ -694,6 +694,7 @@
                     <argument>-Dwebgoat.server.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
                     <argument>-Dwebgoat.user.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
                     <argument>-Dspring.main.banner-mode=off</argument>
+                    <argument>--enable-native-access=ALL-UNNAMED</argument>
                     <argument>--add-opens</argument>
                     <argument>java.base/java.lang=ALL-UNNAMED</argument>
                     <argument>--add-opens</argument>

src/it/java/org/owasp/webgoat/integration/ChallengeIntegrationTest.java

@@ -4,12 +4,9 @@
  */
 package org.owasp.webgoat.integration;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import io.restassured.RestAssured;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -57,19 +54,6 @@ public class ChallengeIntegrationTest extends IntegrationTest {
     checkAssignment(webGoatUrlConfig.url("challenge/flag/1"), params, true);
 
     checkResults("Challenge1");
-
-      List<String> capturefFlags =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(webGoatUrlConfig.url("scoreboard-data"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
-    assertTrue(capturefFlags.contains("Admin lost password"));
   }
 
   @Test
@@ -99,19 +83,6 @@ public class ChallengeIntegrationTest extends IntegrationTest {
     checkAssignment(webGoatUrlConfig.url("challenge/flag/5"), params, true);
 
     checkResults("Challenge5");
-
-      List<String> capturefFlags =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(webGoatUrlConfig.url("scoreboard-data"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
-    assertTrue(capturefFlags.contains("Without password"));
   }
 
   @Test
@@ -162,7 +133,9 @@ public class ChallengeIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(webGoatUrlConfig.url("challenge/7/reset-password/{link}"), "375afe1104f4a487a73823c50a9292a2")
+            .get(
+                webGoatUrlConfig.url("challenge/7/reset-password/{link}"),
+                "375afe1104f4a487a73823c50a9292a2")
             .then()
             .statusCode(HttpStatus.ACCEPTED.value())
             .extract()

src/it/java/org/owasp/webgoat/integration/SessionManagementIntegrationTest.java

@@ -7,9 +7,6 @@ package org.owasp.webgoat.integration;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 
-/**
- * @author Angel Olle Blazquez
- */
 class SessionManagementIT extends IntegrationTest {
 
   private static final String HIJACK_LOGIN_CONTEXT_PATH = "HijackSession/login";

src/it/java/org/owasp/webgoat/playwright/webgoat/PlaywrightTest.java

@@ -19,12 +19,17 @@ public class PlaywrightTest {
   public static class WebGoatOptions implements OptionsFactory {
     @Override
     public Options getOptions() {
-      return new Options().setHeadless(true).setContextOptions(getContextOptions());
+      return new Options()
+              .setHeadless(true)
+              .setContextOptions(getContextOptions());
     }
+
   }
 
   protected static Browser.NewContextOptions getContextOptions() {
-    return new Browser.NewContextOptions().setBaseURL(webGoatUrlConfig.getBaseUrl());
+    return new Browser.NewContextOptions()
+            .setLocale("en-US")
+            .setBaseURL(webGoatUrlConfig.getBaseUrl());
   }
 
   public static String webGoatUrl(String path) {

src/it/java/org/owasp/webgoat/playwright/webgoat/RegistrationUITest.java

@@ -35,7 +35,7 @@ public class RegistrationUITest extends PlaywrightTest {
   @Test
   @DisplayName("Should register a new user")
   void registerNewUser(Browser browser) {
-    var page = browser.newContext().newPage();
+    var page = browser.newContext(new Browser.NewContextOptions().setLocale("en-US")).newPage();
     var registrationPage = new RegistrationPage(page);
     registrationPage.open();
 

src/it/java/org/owasp/webgoat/playwright/webgoat/helpers/Authentication.java

@@ -33,19 +33,19 @@ public class Authentication {
 
   public static Page sylvester(Browser browser) {
     User user = login(browser, sylvester);
-    return browser.newContext(new Browser.NewContextOptions().setStorageState(user.auth)).newPage();
+    return browser.newContext(new Browser.NewContextOptions().setLocale("en-US").setStorageState(user.auth)).newPage();
   }
 
   public static Page tweety(Browser browser) {
     User user = login(browser, tweety);
-    return browser.newContext(new Browser.NewContextOptions().setStorageState(user.auth)).newPage();
+    return browser.newContext(new Browser.NewContextOptions().setLocale("en-US").setStorageState(user.auth)).newPage();
   }
 
   private static User login(Browser browser, User user) {
     if (user.loggedIn()) {
       return user;
     }
-    var page = browser.newContext().newPage();
+    var page = browser.newContext(new Browser.NewContextOptions().setLocale("en-US")).newPage();
     RegistrationPage registrationPage = new RegistrationPage(page);
     registrationPage.open();
     registrationPage.register(user.name, user.password);

src/main/java/org/dummy/insecure/framework/VulnerableTaskHolder.java

@@ -42,8 +42,6 @@ public class VulnerableTaskHolder implements Serializable {
 
   /**
    * Execute a task when de-serializing a saved or received object.
-   *
-   * @author stupid develop
    */
   private void readObject(ObjectInputStream stream) throws Exception {
     // unserialize data so taskName and taskAction are available

src/main/java/org/owasp/webgoat/container/AjaxAuthenticationEntryPoint.java

@@ -11,11 +11,6 @@ import java.io.IOException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
 
-/**
- * AjaxAuthenticationEntryPoint class.
- *
- * @author zupzup
- */
 public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
   public AjaxAuthenticationEntryPoint(String loginFormUrl) {
     super(loginFormUrl);

src/main/java/org/owasp/webgoat/container/LessonTemplateResolver.java

@@ -47,17 +47,26 @@ public class LessonTemplateResolver extends FileTemplateResolver {
     var templateName = resourceName.substring(PREFIX.length());
     byte[] resource = resources.get(templateName);
     if (resource == null) {
-      try {
+      resource = loadAndCache(templateName);
-        resource =
-            resourceLoader
-                .getResource("classpath:/" + templateName)
-                .getInputStream()
-                .readAllBytes();
-      } catch (IOException e) {
-        log.error("Unable to find lesson HTML: {}", template);
     }
-      resources.put(templateName, resource);
+
+    if (resource == null) {
+      return new StringTemplateResource("Unable to find lesson HTML: %s".formatted(templateName));
     }
     return new StringTemplateResource(new String(resource, StandardCharsets.UTF_8));
   }
+
+  private byte[] loadAndCache(String templateName) {
+    try {
+      var resource =
+          resourceLoader.getResource("classpath:/" + templateName).getInputStream().readAllBytes();
+      resources.put(templateName, resource);
+      return resource;
+    } catch (IOException e) {
+      log.error(
+          "Unable to find lesson HTML: '{}', does the name of HTML file name match the lesson class name?",
+          templateName);
+      return null;
+    }
+  }
 }

src/main/java/org/owasp/webgoat/container/MvcConfiguration.java

@@ -53,7 +53,6 @@ public class MvcConfiguration implements WebMvcConfigurer {
     registry.addViewController("/login").setViewName("login");
     registry.addViewController("/lesson_content").setViewName("lesson_content");
     registry.addViewController("/start.mvc").setViewName("main_new");
-    registry.addViewController("/scoreboard").setViewName("scoreboard");
   }
 
   @Bean

src/main/java/org/owasp/webgoat/container/controller/Welcome.java

@@ -10,12 +10,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-/**
- * Welcome class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
 @Controller
 public class Welcome {
 

src/main/java/org/owasp/webgoat/container/i18n/Messages.java

@@ -11,8 +11,6 @@ import org.springframework.context.support.ReloadableResourceBundleMessageSource
 /**
  * ExposedReloadableResourceMessageBundleSource class. Extends the reloadable message source with a
  * way to get all messages
- *
- * @author zupzup
  */
 @AllArgsConstructor
 public class Messages extends ReloadableResourceBundleMessageSource {

src/main/java/org/owasp/webgoat/container/lessons/LessonInfoModel.java

@@ -7,12 +7,6 @@ package org.owasp.webgoat.container.lessons;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-/**
- * LessonInfoModel class.
- *
- * @author dm
- * @version $Id: $Id
- */
 @Getter
 @AllArgsConstructor
 public class LessonInfoModel {

src/main/java/org/owasp/webgoat/container/lessons/LessonMenuItem.java

@@ -7,12 +7,6 @@ package org.owasp.webgoat.container.lessons;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * LessonMenuItem class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
 public class LessonMenuItem {
 
   private String name;

src/main/java/org/owasp/webgoat/container/service/LessonProgressService.java

@@ -18,11 +18,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-/**
- * LessonProgressService class.
- *
- * @author webgoat
- */
 @Controller
 @RequiredArgsConstructor
 public class LessonProgressService {

src/main/java/org/owasp/webgoat/container/session/LabelDebugger.java

@@ -6,12 +6,6 @@ package org.owasp.webgoat.container.session;
 
 import java.io.Serializable;
 
-/**
- * LabelDebugger class.
- *
- * @author dm
- * @version $Id: $Id
- */
 public class LabelDebugger implements Serializable {
 
   private boolean enabled = false;

src/main/java/org/owasp/webgoat/container/users/LessonProgress.java

@@ -84,6 +84,6 @@ public class LessonProgress {
   }
 
   long numberOfSolvedAssignments() {
-    return assignments.size();
+    return assignments.stream().filter(AssignmentProgress::isSolved).count();
   }
 }

src/main/java/org/owasp/webgoat/container/users/RegistrationController.java

@@ -20,10 +20,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Controller
 @RequiredArgsConstructor
 @Slf4j

src/main/java/org/owasp/webgoat/container/users/Scoreboard.java

@@ -1,83 +0,0 @@
-/*
- * SPDX-FileCopyrightText: Copyright © 2017 WebGoat authors
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-package org.owasp.webgoat.container.users;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.Course;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Temp endpoint just for the CTF.
- *
- * @author nbaars
- * @since 3/23/17.
- */
-@RestController
-@AllArgsConstructor
-public class Scoreboard {
-
-  private final UserProgressRepository userTrackerRepository;
-  private final UserRepository userRepository;
-  private final Course course;
-  private final PluginMessages pluginMessages;
-
-  @AllArgsConstructor
-  @Getter
-  private class Ranking {
-    private String username;
-    private List<String> flagsCaptured;
-  }
-
-  @GetMapping("/scoreboard-data")
-  public List<Ranking> getRankings() {
-    return userRepository.findAll().stream()
-        .filter(user -> !user.getUsername().startsWith("csrf-"))
-        .map(
-            user ->
-                new Ranking(
-                    user.getUsername(),
-                    challengesSolved(userTrackerRepository.findByUser(user.getUsername()))))
-        .sorted((o1, o2) -> o2.getFlagsCaptured().size() - o1.getFlagsCaptured().size())
-        .collect(Collectors.toList());
-  }
-
-  private List<String> challengesSolved(UserProgress userTracker) {
-    List<String> challenges =
-        List.of(
-            "Challenge1",
-            "Challenge2",
-            "Challenge3",
-            "Challenge4",
-            "Challenge5",
-            "Challenge6",
-            "Challenge7",
-            "Challenge8",
-            "Challenge9");
-    return challenges.stream()
-        .map(userTracker::getLessonProgress)
-        .flatMap(Optional::stream)
-        .filter(LessonProgress::isLessonSolved)
-        .map(LessonProgress::getLessonName)
-        .map(this::toLessonTitle)
-        .toList();
-  }
-
-  private String toLessonTitle(String id) {
-    String titleKey =
-        course.getLessons().stream()
-            .filter(l -> l.getId().equals(id))
-            .findFirst()
-            .map(Lesson::getTitle)
-            .orElse("No title");
-    return pluginMessages.getMessage(titleKey, titleKey);
-  }
-}

src/main/java/org/owasp/webgoat/container/users/UserForm.java

@@ -10,10 +10,6 @@ import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Getter
 @Setter
 public class UserForm {

src/main/java/org/owasp/webgoat/container/users/UserProgress.java

@@ -41,7 +41,7 @@ public class UserProgress {
   }
 
   /**
-   * Returns an existing lesson tracker or create a new one based on the lesson
+   * Returns an existing lesson progress or create a new one based on the lesson
    *
    * @param lesson the lesson
    * @return a lesson tracker created if not already present
@@ -49,7 +49,7 @@ public class UserProgress {
   public LessonProgress getLessonProgress(Lesson lesson) {
     Optional<LessonProgress> progress =
         lessonProgress.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
-    if (!progress.isPresent()) {
+    if (progress.isEmpty()) {
       LessonProgress newLessonTracker = new LessonProgress(lesson);
       lessonProgress.add(newLessonTracker);
       return newLessonTracker;
@@ -58,16 +58,6 @@ public class UserProgress {
     }
   }
 
-  /**
-   * Query method for finding a specific lesson tracker based on id
-   *
-   * @param id the id of the lesson
-   * @return optional due to the fact we can only create a lesson tracker based on a lesson
-   */
-  public Optional<LessonProgress> getLessonProgress(String id) {
-    return lessonProgress.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
-  }
-
   public void assignmentSolved(Lesson lesson, String assignmentName) {
     LessonProgress progress = getLessonProgress(lesson);
     progress.incrementAttempts();

src/main/java/org/owasp/webgoat/container/users/UserRepository.java

@@ -7,10 +7,6 @@ package org.owasp.webgoat.container.users;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 public interface UserRepository extends JpaRepository<WebGoatUser, String> {
 
   WebGoatUser findByUsername(String username);

src/main/java/org/owasp/webgoat/container/users/UserService.java

@@ -14,10 +14,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Service
 @AllArgsConstructor
 public class UserService implements UserDetailsService {

src/main/java/org/owasp/webgoat/container/users/UserSession.java

@@ -10,10 +10,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.Id;
 
-/**
- * @author nbaars
- * @since 8/15/17.
- */
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/org/owasp/webgoat/container/users/UserValidator.java

@@ -9,10 +9,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Component
 @AllArgsConstructor
 public class UserValidator implements Validator {

src/main/java/org/owasp/webgoat/container/users/WebGoatUser.java

@@ -15,10 +15,6 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Getter
 @Entity
 public class WebGoatUser implements UserDetails {

src/main/java/org/owasp/webgoat/lessons/challenges/ChallengeIntro.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author nbaars
- * @since 3/21/17.
- */
 @Component
 public class ChallengeIntro extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/challenges/Email.java

@@ -9,10 +9,6 @@ import java.time.LocalDateTime;
 import lombok.Builder;
 import lombok.Data;
 
-/**
- * @author nbaars
- * @since 8/20/17.
- */
 @Builder
 @Data
 public class Email implements Serializable {

src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/Challenge1.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author nbaars
- * @since 3/21/17.
- */
 @Component
 public class Challenge1 extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/challenges/challenge5/Challenge5.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author nbaars
- * @since 3/21/17.
- */
 @Component
 public class Challenge5 extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/Assignment7.java

@@ -29,10 +29,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-/**
- * @author nbaars
- * @since 4/8/17.
- */
 @RestController
 @Slf4j
 public class Assignment7 implements AssignmentEndpoint {

src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/Challenge7.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author nbaars
- * @since 3/21/17.
- */
 @Component
 public class Challenge7 extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/PasswordResetLink.java

@@ -8,9 +8,6 @@ import java.util.Random;
 
 /**
  * WARNING: DO NOT CHANGE FILE WITHOUT CHANGING .git contents
- *
- * @author nbaars
- * @since 8/17/17.
  */
 public class PasswordResetLink {
 

src/main/java/org/owasp/webgoat/lessons/challenges/challenge8/Challenge8.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author nbaars
- * @since 3/21/17.
- */
 @Component
 public class Challenge8 extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevTools.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author TMelzer
- * @since 30.11.18
- */
 @Component
 public class ChromeDevTools extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkDummy.java

@@ -15,12 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * This is just a class used to make the HTTP request.
- *
- * @author TMelzer
- * @since 30.11.18
- */
 @RestController
 public class NetworkDummy implements AssignmentEndpoint {
 

src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkLesson.java

@@ -19,9 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * Assignment where the user has to look through an HTTP Request using the Developer Tools and find
  * a specific number.
- *
- * @author TMelzer
- * @since 30.11.18
  */
 @RestController
 @AssignmentHints({"networkHint1", "networkHint2"})

src/main/java/org/owasp/webgoat/lessons/cia/CIA.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author BenediktStuhrmann
- * @since 11/2/18.
- */
 @Component
 public class CIA extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignment.java

@@ -15,10 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author nbaars
- * @since 4/6/17.
- */
 @RestController
 @AssignmentHints({
   "client.side.filtering.free.hint1",

src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpoint.java

@@ -15,10 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author nbaars
- * @since 4/6/17.
- */
 @RestController
 @RequestMapping("/clientSideFiltering/challenge-store")
 public class ShopEndpoint {

src/main/java/org/owasp/webgoat/lessons/csrf/Review.java

@@ -10,10 +10,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-/**
- * @author nbaars
- * @since 4/8/17.
- */
 @Getter
 @Setter
 @AllArgsConstructor

src/main/java/org/owasp/webgoat/lessons/hijacksession/HijackSession.java

@@ -8,12 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
 @Component
 public class HijackSession extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/hijacksession/HijackSessionAssignment.java

@@ -21,12 +21,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
 @RestController
 @AssignmentHints({
   "hijacksession.hints.1",

src/main/java/org/owasp/webgoat/lessons/hijacksession/cas/Authentication.java

@@ -9,9 +9,6 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
 
-/**
- * @author Angel Olle Blazquez
- */
 @Getter
 @ToString
 public class Authentication implements Principal {

src/main/java/org/owasp/webgoat/lessons/hijacksession/cas/AuthenticationProvider.java

@@ -6,9 +6,6 @@ package org.owasp.webgoat.lessons.hijacksession.cas;
 
 import java.security.Principal;
 
-/**
- * @author Angel Olle Blazquez
- */
 @FunctionalInterface
 public interface AuthenticationProvider<T extends Principal> {
 

src/main/java/org/owasp/webgoat/lessons/hijacksession/cas/HijackSessionAuthenticationProvider.java

@@ -15,10 +15,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.ApplicationScope;
 
-/**
- * @author Angel Olle Blazquez
- */
-
 // weak id value and mechanism
 
 @ApplicationScope

src/main/java/org/owasp/webgoat/lessons/jwt/JWT.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author nbaars
- * @since 3/22/17.
- */
 @Component
 public class JWT extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/jwt/votes/Views.java

@@ -4,10 +4,6 @@
  */
 package org.owasp.webgoat.lessons.jwt.votes;
 
-/**
- * @author nbaars
- * @since 4/30/17.
- */
 public class Views {
   public interface GuestView {}
 

src/main/java/org/owasp/webgoat/lessons/jwt/votes/Vote.java

@@ -7,10 +7,6 @@ package org.owasp.webgoat.lessons.jwt.votes;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.Getter;
 
-/**
- * @author nbaars
- * @since 5/2/17.
- */
 @Getter
 public class Vote {
   @JsonView(Views.GuestView.class)

src/main/java/org/owasp/webgoat/lessons/passwordreset/QuestionsAssignment.java

@@ -17,10 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author nbaars
- * @since 8/20/17.
- */
 @RestController
 public class QuestionsAssignment implements AssignmentEndpoint {
 

src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignment.java

@@ -29,10 +29,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-/**
- * @author nbaars
- * @since 8/20/17.
- */
 @RestController
 @AssignmentHints({
   "password-reset-hint1",

src/main/java/org/owasp/webgoat/lessons/passwordreset/ResetLinkAssignmentForgotPassword.java

@@ -22,12 +22,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-/**
- * Part of the password reset assignment. Used to send the e-mail.
- *
- * @author nbaars
- * @since 8/20/17.
- */
 @RestController
 public class ResetLinkAssignmentForgotPassword implements AssignmentEndpoint {
 

src/main/java/org/owasp/webgoat/lessons/passwordreset/SecurityQuestionAssignment.java

@@ -17,12 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * Assignment for picking a good security question.
- *
- * @author Tobias Melzer
- * @since 11.12.18
- */
 @RestController
 public class SecurityQuestionAssignment implements AssignmentEndpoint {
 

src/main/java/org/owasp/webgoat/lessons/passwordreset/SimpleMailAssignment.java

@@ -23,10 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
-/**
- * @author nbaars
- * @since 8/20/17.
- */
 @RestController
 public class SimpleMailAssignment implements AssignmentEndpoint {
   private final String webWolfURL;

src/main/java/org/owasp/webgoat/lessons/passwordreset/resetlink/PasswordChangeForm.java

@@ -9,10 +9,6 @@ import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 
-/**
- * @author nbaars
- * @since 8/18/17.
- */
 @Getter
 @Setter
 public class PasswordChangeForm {

src/main/java/org/owasp/webgoat/lessons/securepasswords/SecurePasswords.java

@@ -8,10 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
- * @author BenediktStuhrmann
- * @since 12/2/18.
- */
 @Component
 public class SecurePasswords extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/spoofcookie/SpoofCookie.java

@@ -8,12 +8,6 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
 @Component
 public class SpoofCookie extends Lesson {
 

src/main/java/org/owasp/webgoat/lessons/spoofcookie/SpoofCookieAssignment.java

@@ -25,12 +25,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
 @AssignmentHints({"spoofcookie.hint1", "spoofcookie.hint2", "spoofcookie.hint3"})
 @RestController
 public class SpoofCookieAssignment implements AssignmentEndpoint {

src/main/java/org/owasp/webgoat/lessons/spoofcookie/encoders/EncDec.java

@@ -9,12 +9,6 @@ import java.util.Base64;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.security.crypto.codec.Hex;
 
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
 public class EncDec {
 
   // PoC: weak encoding method

src/main/java/org/owasp/webgoat/lessons/sqlinjection/mitigation/Servers.java

@@ -17,10 +17,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author nbaars
- * @since 6/13/17.
- */
 @RestController
 @RequestMapping("SqlInjectionMitigations/servers")
 @Slf4j

src/main/java/org/owasp/webgoat/lessons/webwolfintroduction/LandingAssignment.java

@@ -18,10 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-/**
- * @author nbaars
- * @since 8/20/17.
- */
 @RestController
 public class LandingAssignment implements AssignmentEndpoint {
   private final String landingPageUrl;

src/main/java/org/owasp/webgoat/lessons/webwolfintroduction/MailAssignment.java

@@ -20,10 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
-/**
- * @author nbaars
- * @since 8/20/17.
- */
 @RestController
 public class MailAssignment implements AssignmentEndpoint {
 

src/main/java/org/owasp/webgoat/lessons/xss/Comment.java

@@ -10,10 +10,6 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-/**
- * @author nbaars
- * @since 4/8/17.
- */
 @Getter
 @Setter
 @AllArgsConstructor

src/main/java/org/owasp/webgoat/lessons/xxe/Comment.java

@@ -12,10 +12,6 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
-/**
- * @author nbaars
- * @since 4/8/17.
- */
 @Getter
 @Setter
 @AllArgsConstructor

src/main/java/org/owasp/webgoat/lessons/xxe/CommentsEndpoint.java

@@ -14,10 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @author nbaars
- * @since 5/4/17.
- */
 @RestController
 @RequestMapping("xxe/comments")
 @AllArgsConstructor

src/main/java/org/owasp/webgoat/webwolf/MvcConfiguration.java

@@ -14,10 +14,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-/**
- * @author nbaars
- * @since 8/13/17.
- */
 @Configuration
 public class MvcConfiguration implements WebMvcConfigurer {
 

src/main/java/org/owasp/webgoat/webwolf/mailbox/Email.java

@@ -18,10 +18,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-/**
- * @author nbaars
- * @since 8/20/17.
- */
 @Data
 @Builder
 @AllArgsConstructor

src/main/java/org/owasp/webgoat/webwolf/mailbox/MailboxRepository.java

@@ -7,10 +7,6 @@ package org.owasp.webgoat.webwolf.mailbox;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-/**
- * @author nbaars
- * @since 8/17/17.
- */
 public interface MailboxRepository extends JpaRepository<Email, String> {
 
   List<Email> findByRecipientOrderByTimeDesc(String recipient);

src/main/java/org/owasp/webgoat/webwolf/requests/Requests.java

@@ -21,9 +21,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 /**
  * Controller for fetching all the HTTP requests from WebGoat to WebWolf for a specific user.
- *
- * @author nbaars
- * @since 8/13/17.
  */
 @Controller
 @RequiredArgsConstructor

src/main/java/org/owasp/webgoat/webwolf/requests/WebWolfTraceRepository.java

@@ -16,9 +16,6 @@ import org.springframework.boot.actuate.web.exchanges.HttpExchangeRepository;
 /**
  * Keep track of all the incoming requests, we are only keeping track of request originating from
  * WebGoat.
- *
- * @author nbaars
- * @since 8/13/17.
  */
 public class WebWolfTraceRepository implements HttpExchangeRepository {
   private enum MatchingMode {

src/main/java/org/owasp/webgoat/webwolf/user/UserRepository.java

@@ -7,10 +7,6 @@ package org.owasp.webgoat.webwolf.user;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Repository("webWolfUserRepository")
 public interface UserRepository extends JpaRepository<WebWolfUser, String> {
 

src/main/java/org/owasp/webgoat/webwolf/user/UserService.java

@@ -8,10 +8,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Service
 public class UserService implements UserDetailsService {
 

src/main/java/org/owasp/webgoat/webwolf/user/WebWolfUser.java

@@ -15,10 +15,6 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 
-/**
- * @author nbaars
- * @since 3/19/17.
- */
 @Getter
 @Entity
 @Table(name = "WEB_GOAT_USER")

src/main/resources/application-webgoat.properties

@@ -36,10 +36,6 @@ logging.level.org.hidbernate.SQL=INFO
 webgoat.server.directory=${user.home}/.webgoat-${webgoat.build.version}/
 webgoat.user.directory=${user.home}/.webgoat-${webgoat.build.version}/
 webgoat.build.version=@project.version@
-webgoat.email=webgoat@owasp.org
-webgoat.emaillist=owasp-webgoat@lists.owasp.org
-webgoat.feedback.address=webgoat@owasp.org
-webgoat.feedback.address.html=<A HREF=mailto:webgoat@owasp.org>webgoat@owasp.org</A>
 webgoat.database.connection.string=jdbc:hsqldb:mem:{USER}
 webgoat.default.language=en
 webgoat.url=http://${server.address}:${server.port}${server.servlet.context-path}
@@ -51,9 +47,9 @@ webwolf.url=http://${webwolf.host}:${webwolf.port}${webwolf.context}
 webwolf.landingpage.url=${webwolf.url}/landing
 webwolf.mail.url=${webwolf.url}/mail
 
-spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=create
+#spring.jpa.properties.jakarta.persistence.schema-generation.scripts.action=create
-spring.jpa.properties.jakarta.persistence.schema-generation.scripts.create-target=create.sql
+#spring.jpa.properties.jakarta.persistence.schema-generation.scripts.create-target=create.sql
-spring.jpa.properties.jakarta.persistence.schema-generation.scripts.create-source=metadata
+#spring.jpa.properties.jakarta.persistence.schema-generation.scripts.create-source=metadata
 
 spring.jackson.serialization.indent_output=true
 spring.jackson.serialization.write-dates-as-timestamps=false

src/main/resources/lessons/challenges/documentation/Challenge_introduction.adoc

@@ -4,7 +4,7 @@
 
 The challenges contain more a CTF like lessons where we do not provide any explanations what you need to do, no hints
 will be provided. You can use these challenges in a CTF style where you can run WebGoat on one server and all
-participants can join and hack the challenges. A scoreboard is available at link:scoreboard["scoreboard",window=_blank]
+participants can join and hack the challenges.
 
 :hardbreaks:
 In this CTF you will need to solve a couple of challenges, each challenge will give you a flag which you will

src/main/resources/lessons/challenges/html/Challenge1.html

@@ -2,9 +2,6 @@
 
 <html xmlns:th="http://www.thymeleaf.org">
 
-<div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="~{doc:lessons/challenges/documentation/Challenge_introduction.adoc}"></div>
-</div>
 <div class="lesson-page-wrapper">
     <div class="attack-container">
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>

src/main/resources/lessons/chromedevtools/html/ChromeDevTools.html

@@ -45,7 +45,7 @@
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
               method="POST" name="form"
-              th:action="@{/chromeDevTools/network}">
+              th:action="@{/ChromeDevTools/network}">
             <script>
                 // sample custom javascript in the recommended way ...
                 // a namespace has been assigned for it, but you can roll your own if you prefer
@@ -66,7 +66,7 @@
 
         <form class="attack-form" accept-charset="UNKNOWN"
               method="POST" name="form"
-              th:action="@{/chromeDevTools/network}">
+              th:action="@{/ChromeDevTools/network}">
             <table>
                 <tr>
                     <td>What is the number you found:   </td>

src/main/resources/lessons/jwt/documentation/JWT_claim_misuse_jku.adoc

@@ -16,9 +16,9 @@ An example JKU would look like this:
 }
 ----
 
-=== Vulnerability
+=== Vulnerability: JWT claim misuse with JKU
 
-JWT claim misuse with JKU The vulnerability arises when a JWT is signed with a weak or predictable key and the server provides a JKU that points to an external location hosting the public key.
+The vulnerability arises when a JWT is signed with a weak or predictable key and the server provides a JKU that points to an external location hosting the public key.
 
 Attackers can exploit this vulnerability by crafting a JWT with malicious claims and using the `jku` to trick the server into verifying the JWT using a weak or manipulated key.
 It all depends on the library being used inside the application.
@@ -39,6 +39,7 @@ However, filtering on URLs is quite challenging to implement, and this can be by
 
 - **Successful attack**: If the server uses the weak or manipulated key to verify the JWT, the attacker gains unauthorized access or executes their intended exploit.
 
+
 === Mitigation
 
 To prevent JWT claim misuse with JKU, developers and security professionals should follow these best practices:

src/main/resources/lessons/sqlinjection/html/SqlInjectionMitigations.html

@@ -72,7 +72,7 @@
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
               method="POST" name="form"
-              th:action="@{/SqlInjectionMitigations/attack}"
+              th:action="@{/SqlOnlyInputValidation/attack}"
               enctype="application/json;charset=UTF-8">
             <table>
                 <tr>
@@ -95,7 +95,7 @@
         <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
         <form class="attack-form" accept-charset="UNKNOWN"
               method="POST" name="form"
-              th:action="@{/SqlInjectionMitigations/attack}"
+              th:action="@{/SqlOnlyInputValidationOnKeywords/attack}"
               enctype="application/json;charset=UTF-8">
             <table>
                 <tr>

src/main/resources/webgoat/static/css/main.css

@@ -1172,46 +1172,10 @@ span.show-next-page, span.show-prev-page {
     width: 95% !important
 }
 
-/* scoreboard */
-div.scoreboard-title {
-    font-size: xx-large;
-}
-
-.scoreboard-table tr {
-}
-
-div.scoreboard-username {
-    background-color: #222;
-    color: aliceblue;
-    padding: 4px;
-    padding-left: 8px;
-    font-size: medium;
-    border-radius: 6px;
-}
-
 th.username {
     padding-bottom: 6px;
 }
 
-td.user-flags {
-    padding-left: 8px;
-    padding-bottom: 6px;
-}
-
-div.captured-flag {
-    border-radius: 6px;
-    background-color: #444;
-    color: white;
-    padding: 4px;
-    font-size: medium;
-    display: inline-block;
-}
-
-.scoreboard-page {
-    background-color: #e0dfdc;
-    padding: 20px;
-}
-
 .fa-flag {
     color: red
 }

src/main/resources/webgoat/static/js/goatApp/model/FlagModel.js

@@ -1,9 +0,0 @@
-define(['jquery',
-	'underscore',
-	'backbone'],
-	function($,
-		_,
-		Backbone) {
-	return Backbone.Model.extend({
-	});
-});

src/main/resources/webgoat/static/js/goatApp/model/FlagsCollection.js

@@ -1,13 +0,0 @@
-define(['jquery',
-	'underscore',
-	'backbone',
-	'goatApp/model/FlagModel'],
-	function($,
-		_,
-		Backbone,
-		FlagModel) {
-	return Backbone.Collection.extend({
-		url:'scoreboard-data',
-		model:FlagModel
-	});
-});

src/main/resources/webgoat/static/js/goatApp/scoreboardApp.js

@@ -1,16 +0,0 @@
-define(['underscore',
-        'goatApp/support/goatAsyncErrorHandler',
-        'goatApp/view/ScoreboardView'],
-    function (
-         _,
-         asyncErrorHandler,
-         ScoreboardView) {
-        'use strict'
-        class ScoreboardApp {
-            initApp() {
-                asyncErrorHandler.init();
-                this.scoreboard = new ScoreboardView();
-            }
-        }
-        return new ScoreboardApp();
-    });

src/main/resources/webgoat/static/js/goatApp/templates/scoreboard.html

@@ -1,14 +0,0 @@
-<table class="scoreboard-table">
-    <% _.each(rankings, function(userRanking, index) { %>
-    <tr>
-        <th class="username"> <div class="scoreboard-username"><%= index+1%> - <%=userRanking.username %> </div></th>
-        <td class="user-flags"> <% _.each(userRanking.flagsCaptured, function(flag) { %>
-
-             <div class="captured-flag">
-                 <i class="fa fa-flag" aria-hidden="true"></i>
-                 <%=flag%> </div>
-            <% }); %>
-        </td>
-    </tr>
-    <% }); %>
-</table>

src/main/resources/webgoat/static/js/goatApp/view/ScoreboardView.js

@@ -1,32 +0,0 @@
-define(['jquery',
-	'underscore',
-	'backbone',
-	'goatApp/model/FlagsCollection',
-	'text!templates/scoreboard.html'],
-function($,
-	_,
-	Backbone,
-	FlagsCollection,
-	ScoreboardTemplate) {
-	return Backbone.View.extend({
-		el:'#scoreboard',
-
-		initialize: function() {
-		    this.template = ScoreboardTemplate,
-		    this.collection = new FlagsCollection();
-		    this.listenTo(this.collection,'reset',this.render)
-		    this.collection.fetch({reset:true});
-		},
-
-		render: function() {
-			//this.$el.html('test');
-			var t = _.template(this.template);
-            this.$el.html(t({'rankings':this.collection.toJSON()}));
-            setTimeout(this.pollData.bind(this), 5000);
-		},
-
-		pollData: function() {
-		    this.collection.fetch({reset:true});
-		}
-	});
-});

src/main/resources/webgoat/static/js/scoreboard.js

@@ -1,44 +0,0 @@
-//main.js
-/*
-/js
-js/main.js << main file for require.js
---/libs/(jquery,backbone,etc.) << base libs
---/goatApp/ << base dir for goat application, js-wise
---/goatApp/model
---/goatApp/view
---/goatApp/support
---/goatApp/controller
-*/
-
-require.config({
-  baseUrl: "js/",
-  paths: {
-    jquery: 'libs/jquery.min',
-    jqueryvuln: 'libs/jquery-2.1.4.min',
-    jqueryuivuln: 'libs/jquery-ui-1.10.4',
-    jqueryui: 'libs/jquery-ui.min',
-    underscore: 'libs/underscore-min',
-    backbone: 'libs/backbone-min',
-    text: 'libs/text',
-    templates: 'goatApp/templates',
-    polyglot: 'libs/polyglot.min'
-  },
-
-  shim: {
-	"jqueryui": {
-	  exports:"$",
-	  deps: ['jquery']
-	},
-    underscore: {
-      exports: "_"
-    },
-    backbone: {
-      deps: ['underscore', 'jquery'],
-      exports: 'Backbone'
-    }
-  }
-});
-
-require(['underscore','backbone','goatApp/scoreboardApp'], function(_,Backbone,ScoreboardApp){
-    ScoreboardApp.initApp();
-});

src/main/resources/webgoat/templates/about.html

@@ -25,33 +25,15 @@
 
         <div class="row">
             <div class="col-md-6">
-                <p>Contact us:
+                <p>Visit our <a href="https://webgoat.org">homepage</a>
-                <ul>
-                    <li>WebGoat mailing list: <span th:text="${@environment.getProperty('webgoat.emaillist')}"></span></li>
-                    <li>Bruce Mayhew: <span th:text="${@environment.getProperty('webgoat.email')}"></span></li>
-                </ul>
                 </p>
             </div>
         </div>
         <div class="row">
             <div class="col-md-6">
-                <p>WebGoat Authors
+                <p><b>Active Contributors</b>
                 <ul>
-                    <li>Bruce Mayhew (Author &amp; Project Lead)</li>
+                    <li>Nanne Baars (Project lead)</li>
-                    <li>Jeff Williams (Author &amp; Original Idea)</li>
-                    <li>Jason White (Architect)</li>
-                    <li>Nanne Baars (Plugin &amp; Platform Architecture)</li>
-                    <li>Richard Lawson (Architect)</li>
-                </ul>
-                </p>
-            </div>
-            <div class="col-md-6">
-                <p>Active Contributors
-                <ul>
-                    <li>Nanne Baars (Developer)</li>
-                    <li>Jason White (Developer)</li>
-                    <li>Doug Morato (Developer &amp; CI)</li>
-                    <li>Bruce Mayhew (Developer)</li>
                     <li>Ren&eacute; Zubcevic (Developer)</li>
                     <li>&Agrave;ngel Oll&eacute; Bl&aacute;zquez (Developer)</li>
                 </ul>
@@ -60,15 +42,7 @@
         </div>
         <div class="row">
             <div class="col-md-6">
-                <p>WebGoat Design Team (Active)
+                <p><b>Corporate Sponsorship</b> - Companies that have donated significant time to WebGoat development
-                <ul>
-                    <li>Nanne Baars (Plugin &amp; Platform Architecture)</li>
-                    <li>Bruce Mayhew (Goat Herder)</li>
-                    <li>Jason White (User Interface)</li>
-                </ul>
-                </p><br/>
-
-                <p>Corporate Sponsorship - Companies that have donated significant time to WebGoat development
                 <ul>
                     <li>Aspect Security</li>
                     <li>Ounce Labs</li>
@@ -81,8 +55,11 @@
                     get you added with no further sacrifices required.</p>
             </div>
             <div class="col-md-6">
-                <p>Past Contributors
+                <p><b>Past Contributors</b>
                 <ul>
+                    <li>Bruce Mayhew (Author / Project lead / Goat herder)</li>
+                    <li>Jason White (Architect UX)</li>
+                    <li>Doug Morato (Developer &amp; CI)</li>
                     <li>Richard Lawson (Architect)</li>
                     <li>Michael Dever (Developer)</li>
                     <li>Jeff Wayman (Docs)</li>
@@ -109,6 +86,7 @@
                     <li>Alex Smolen (Lessons)</li>
                     <li>Chuck Willis (Lessons)</li>
                     <li>Marcel Wirth (Lessons)</li>
+                    <li>Jeff Williams (Author &amp; Original Idea)</li>
                 </ul>
                 </p>
             </div>

src/main/resources/webgoat/templates/main_new.html

@@ -139,16 +139,12 @@
                     data-toggle="modal" data-target="#about-modal">
                 <i class="fa fa-info"></i>
             </button>
-            <!-- mailto menu item -->
+            <!-- GitHub menu item -->
-            <a th:href="'mailto:' + ${@environment.getProperty('webgoat.email')} + '?Subject=Webgoat%20feedback'" target="_top">
+            <a th:href="@{https://github.com/WebGoat/WebGoat}" target="_blank">
-                <button type="button" class="btn btn-default right_nav_button" data-toggle="tooltip"
+                <button type="button" class="btn btn-default right_nav_button" data-toggle="tooltip">
-                        th:title="#{contact}">
+                    <i class="fa fa-github"></i>
-                    <i class="fa fa-envelope"></i>
                 </button>
             </a>
-
-
-
         </div>
     </header>