chore: release version 2023.4

2023-02-17 13:07:22 +01:00
614 changed files with 4875 additions and 7895 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +1 @@
-custom: https://owasp.org/donate/?reponame=www-project-webgoat&title=OWASP+WebGoat
+custom: https://owasp.org/donate/?reponame=www-project-webgoat&title=OWASP+WebGoat
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,14 +1,7 @@
 version: 2
 updates:
-    -   package-ecosystem: "github-actions"
-        directory: "/"
-        schedule:
-            interval: "weekly"
-    -   package-ecosystem: "maven"
-        directory: "/"
-        schedule:
-            interval: "weekly"
-    -   package-ecosystem: "docker"
-        directory: "/"
-        schedule:
-            interval: "weekly"
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
--- a/.github/workflows/branchbuild.txt
+++ b/.github/workflows/branchbuild.txt
@ -1,54 +0,0 @@
-name: "Branch build"
-on:
-    push:
-      branches:
-        - "*"
-        - "!main"
-
-jobs:
-    branch-build:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            matrix:
-                os: [ ubuntu-latest, windows-latest, macos-latest ]
-                java-version: [ 21 ]
-        steps:
-            -   uses: actions/checkout@v4
-            -   name: Set up JDK ${{ matrix.java-version }}
-                uses: actions/setup-java@v4
-                with:
-                    distribution: 'temurin'
-                    java-version: ${{ matrix.java-version }}
-                    architecture: x64
-            -   name: Cache Maven packages
-                uses: actions/cache@v3.3.1
-                with:
-                    path: ~/.m2
-                    key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-                    restore-keys: ${{ runner.os }}-m2-
-            -   name: Build with Maven
-                run: mvn --no-transfer-progress verify
-            -   name: "Set up QEMU"
-                if: runner.os == 'Linux'
-                uses: docker/setup-qemu-action@v2.2.0
-            -   name: "Set up Docker Buildx"
-                if: runner.os == 'Linux'
-                uses: docker/setup-buildx-action@v2
-            -   name: "Verify Docker WebGoat build"
-                if: runner.os == 'Linux'
-                uses: docker/build-push-action@v5.1.0
-                with:
-                    context: ./
-                    file: ./Dockerfile
-                    push: false
-                    build-args: |
-                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
-            -   name: "Verify Docker WebGoat desktop build"
-                uses: docker/build-push-action@v5.1.0
-                if: runner.os == 'Linux'
-                with:
-                    context: ./
-                    file: ./Dockerfile_desktop
-                    push: false
-                    build-args: |
-                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,50 +1,60 @@
-name: "Main / Pull requests build"
+name: "Pull requests build"
 on:
    pull_request:
        paths-ignore:
            - '.txt'
            - 'LICENSE'
            - 'docs/**'
-        branches: [ main ]
-    push:
-        branches:
-            - main

 jobs:
-    pre-commit:
-        name: Pre-commit check
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Checkout git repository
-                uses: actions/checkout@v4
-            -   name: Setup python
-                uses: actions/setup-python@v5
-                with:
-                    python-version: "3.9"
-            -   uses: actions/setup-java@v4
-                with:
-                    distribution: 'temurin'
-                    java-version: '21'
-            -   name: Pre-commit checks
-                uses: pre-commit/action@v3.0.0
-            -   name: pre-commit-ci-lite
-                uses: pre-commit-ci/lite-action@v1.1.0
-                if: always()
-    build:
+    pr-build:
+        if: >
+            github.event_name == 'pull_request' && !github.event.pull_request.draft && (
+              github.event.action == 'opened' ||
+              github.event.action == 'reopened' ||
+              github.event.action == 'synchronize' 
+            )
        runs-on: ${{ matrix.os }}
        strategy:
-            fail-fast: true
            matrix:
-                os: [ windows-latest, ubuntu-latest, macos-13 ]
-            max-parallel: 1
+                os: [ ubuntu-latest, windows-latest, macos-latest ]
        steps:
-            -   uses: actions/checkout@v4.1.6
-            -   name: Set up JDK 21
-                uses: actions/setup-java@v4.2.1
+            -   uses: actions/checkout@v3
+            -   name: Set up JDK 17
+                uses: actions/setup-java@v3
                with:
                    distribution: 'temurin'
-                    java-version: 21
+                    java-version: 17
                    architecture: x64
-                    cache: 'maven'
+            -   name: Cache Maven packages
+                uses: actions/cache@v3.2.5
+                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.1.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@v4.0.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@v4.0.0
+                if: runner.os == 'Linux'
+                with:
+                    context: ./
+                    file: ./Dockerfile_desktop
+                    push: false
+                    build-args: |
+                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} 
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -8,20 +8,24 @@ jobs:
    if: github.repository == 'WebGoat/WebGoat'
    name: Release WebGoat
    runs-on: ubuntu-latest
-    permissions:
-        contents: write
    environment:
      name: release
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
-          java-version: 21
+          java-version: 17
          architecture: x64
-          cache: 'maven'
+
+      - name: Cache Maven packages
+        uses: actions/cache@v3.2.5
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2

      - name: "Set labels for ${{ github.ref }}"
        run: |
@ -40,7 +44,7 @@ jobs:
          files: |
            target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
          body: |
-           ## Version ${{ github.ref_name }}
+            ## Version ${{ steps.tag.outputs.tag }}

            ### New functionality

@ -49,8 +53,8 @@ jobs:
            ### Bug fixes

            - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
-
-            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ github.ref_name }}...${{ github.ref_name }}
+              
+            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ steps.tag.outputs.tag }}...${{ steps.tag.outputs.tag }}  


            ## Contributors
@ -68,26 +72,26 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v2.1.0
        with:
          platforms: all

      - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2

      - name: "Login to dockerhub"
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: "Build and push WebGoat"
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v4.0.0
        with:
          context: ./
          file: ./Dockerfile
          push: true
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64, linux/arm64, linux/arm/v7
          tags: |
            webgoat/webgoat:${{ env.WEBGOAT_TAG_VERSION }}
            webgoat/webgoat:latest
@ -95,12 +99,12 @@ jobs:
            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}

      - name: "Build and push WebGoat desktop"
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v4.0.0
        with:
          context: ./
          file: ./Dockerfile_desktop
          push: true
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64, linux/arm64, linux/arm/v7
          tags: |
            webgoat/webgoat-desktop:${{ env.WEBGOAT_TAG_VERSION }}
            webgoat/webgoat-desktop:latest
@ -112,15 +116,14 @@ jobs:
    needs: [ release ]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          fetch-depth: 0

-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
        with:
-          distribution: 'temurin'
-          java-version: 21
+          java-version: 17
          architecture: x64

      - name: Set version to next snapshot
@ -141,3 +144,4 @@ jobs:
            github_token: "${{ secrets.GITHUB_TOKEN }}"
            title: ${{ github.event.commits[0].message }}
            target_branch: main
+
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -21,29 +21,33 @@ jobs:
        name: "Robot framework test"
        steps:
            # Uses an default action to checkout the code
-            -   uses: actions/checkout@v4.1.6
+            -   uses: actions/checkout@v3
            # Uses an action to add Python to the VM
-            -   name: Setup Python
-                uses: actions/setup-python@v5
+            -   name: Setup Pyton
+                uses: actions/setup-python@v4
                with:
                    python-version: '3.7'
                    architecture: x64
-            # Uses an action to add JDK 21 to the VM (and mvn?)
-            -   name: set up JDK 21
-                uses: actions/setup-java@v4.2.1
+            # Uses an action to add JDK 17 to the VM (and mvn?)
+            -   name: set up JDK 17
+                uses: actions/setup-java@v3
                with:
                    distribution: 'temurin'
-                    java-version: 21
+                    java-version: 17
                    architecture: x64
-                    cache: 'maven'
+            #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.5
+                with:
+                    path: ~/.m2
+                    key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+                    restore-keys: ubuntu-latest-m2-
            -   uses: BSFishy/pip-action@v1
                with:
                    packages: |
                        robotframework
                        robotframework-SeleniumLibrary
                        webdriver-manager
-                        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
@ -55,7 +59,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.2
+                uses: joonvena/robotframework-reporter-action@v2.1
                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.3.0
+      - uses: actions/first-interaction@v1.1.1
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          issue-message: 'Thanks for submitting your first issue, we will have a look as quickly as possible.'
--- a/.gitignore
+++ b/.gitignore
@ -56,4 +56,4 @@ TestClass.class
 **/*.flattened-pom.xml
 /.gitconfig

-webgoat.gitconfig
+webgoat.gitconfig
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,28 +0,0 @@
-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,7 +3,6 @@
 [![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.

@ -42,19 +41,6 @@ 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.
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@ -16,4 +16,4 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, B

 Getting Source ==============

-Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
+Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
--- a/CREATE_RELEASE.md
+++ b/CREATE_RELEASE.md
@ -8,14 +8,13 @@ and 2023.01 in the `pom.xml`.
 ### Release notes:

 Update the release notes with the correct version. Use `git shortlog -s -n --since "JAN 06 2023"` for the list of
-committers. In order to fetch the list of issues included use: `git log --graph --pretty='%C(auto)%d%Creset%s' v2023.4..origin/main`
+committers.

 ```
-mvn versions:set
+mvn versions:set 
 << update release notes >>
-mvn verify
 git commit ....
-git tag v2023.01
+git tag v2023.01 
 git push --tags
 ```

--- a/21
+++ b/21
@ -1,8 +1,6 @@
-# We need JDK as some of the lessons needs to be able to compile Java code
-FROM docker.io/eclipse-temurin:21-jdk-jammy
-
-LABEL name="WebGoat: A deliberately insecure Web Application"
-LABEL maintainer="WebGoat team"
+FROM docker.io/eclipse-temurin:17-jre-focal
+LABEL NAME = "WebGoat: A deliberately insecure Web Application"
+MAINTAINER "WebGoat team"

 RUN \
  useradd -ms /bin/bash webgoat && \
@ -16,8 +14,6 @@ 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", \
@ -31,10 +27,9 @@ 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", \
-   "-jar", "webgoat.jar", "--server.address", "0.0.0.0" ]
-
-HEALTHCHECK --interval=5s --timeout=3s \
-  CMD curl --fail http://localhost:8080/WebGoat/actuator/health || exit 1
+   "-Dwebgoat.host=0.0.0.0", \
+   "-Dwebwolf.host=0.0.0.0", \
+   "-Dwebgoat.port=8080", \
+   "-Dwebwolf.port=9090", \
+   "-jar", "webgoat.jar" ]
--- a/41
+++ b/41
@ -1,6 +1,6 @@
 FROM lscr.io/linuxserver/webtop:ubuntu-xfce
 LABEL NAME = "WebGoat: A deliberately insecure Web Application"
-LABEL maintainer = "WebGoat team"
+MAINTAINER "WebGoat team"

 WORKDIR /config

@ -10,37 +10,20 @@ COPY config/desktop/start_zap.sh /config/start_zap.sh
 COPY config/desktop/WebGoat.txt /config/Desktop/

 RUN \
- apt-get update &&  \
- apt-get --yes install vim nano gzip
-
-RUN \
- case $(uname -m) in \
-  x86_64) ARCH=x64;; \
-  aarch64) ARCH=aarch64;; \
-  *) ARCH=unknown;; \
- esac && \
- echo ${ARCH}
-
-RUN \
- curl -LO https://github.com/zaproxy/zaproxy/releases/download/v2.15.0/ZAP_2.15.0_Linux.tar.gz && \
- tar zfxv ZAP_2.15.0_Linux.tar.gz && \
- rm -rf ZAP_2.15.0_Linux.tar.gz
-
-RUN \
- case $(uname -m) in \
-  x86_64) ARCH=x64;; \
-  aarch64) ARCH=aarch64;; \
-  *) ARCH=unknown;; \
- esac && \
- echo "oeps == ${ARCH}==" && \
- curl -L https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_"${ARCH}"_linux_hotspot_21.0.3_9.tar.gz -o java.tar.gz && \
- tar zfxv java.tar.gz && \
- rm -rf java.tar.gz && \
+ 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_aarch64_linux_hotspot_17.0.6_10.tar.gz && \
+ tar zfxv OpenJDK17U-jre_aarch64_linux_hotspot_17.0.6_10.tar.gz && \
+ rm -rf OpenJDK17U-jre_aarch64_linux_hotspot_17.0.6_10.tar.gz && \
 chmod +x /config/start_webgoat.sh && \
 chmod +x /config/start_zap.sh && \
- echo "JAVA_HOME=/config/jdk-21.0.3+9-jre/" >> .bash_aliases && \
+ 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=/config/jdk-21.0.3+9-jre
+
+ENV JAVA_HOME=/home/webgoat/jdk-17.0.6+10-jre

 WORKDIR /config/Desktop
--- a/FAQ.md
+++ b/FAQ.md
@ -1,7 +0,0 @@
-# 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/LICENSE.txt
+++ b/LICENSE.txt
@ -16,4 +16,4 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, B

 Getting Source ==============

-Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
+Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
--- a/README.md
+++ b/README.md
@ -1,12 +1,11 @@
-# WebGoat: A deliberately insecure Web Application
+# WebGoat 8: A deliberately insecure Web Application

 [![Build](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml)
-[![java-jdk](https://img.shields.io/badge/java%20jdk-21-green.svg)](https://jdk.java.net/)
+[![java-jdk](https://img.shields.io/badge/java%20jdk-17-green.svg)](https://jdk.java.net/)
 [![OWASP Labs](https://img.shields.io/badge/OWASP-Lab%20project-f7b73c.svg)](https://owasp.org/projects/)
 [![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
 [![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Discussions](https://img.shields.io/github/discussions/WebGoat/WebGoat)](https://github.com/WebGoat/WebGoat/discussions)
-[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)

 # Introduction

@ -44,27 +43,19 @@ Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/
 docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
 ```

-For some lessons you need the container run in the same timezone. For this you can set the TZ environment variable.
-E.g.
+If you want to reuse the container, give it a name:

 ```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=America/Boise webgoat/webgoat
+docker run --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
 ```

-If you want to use OWASP ZAP or another proxy, you can no longer use 127.0.0.1 or localhost. but
-you can use custom host entries. For example:
+As long as you don't remove the container you can use:

 ```shell
-127.0.0.1 www.webgoat.local www.webwolf.local
+docker start webgoat
 ```

-Then you can run the container with:
-
-```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e WEBGOAT_HOST=www.webgoat.local -e WEBWOLF_HOST=www.webwolf.local -e TZ=America/Boise webgoat/webgoat
-```
-
-Then visit http://www.webgoat.local:8080/WebGoat/ and http://www.webwolf.local:9090/WebWolf/
+This way, you can start where you left off. If you remove the container, you need to use `docker run` again.

 ## 2. Run using Docker with complete Linux Desktop

@ -79,27 +70,16 @@ docker run -p 127.0.0.1:3000:3000 webgoat/webgoat-desktop
 Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)

 ```shell
-export TZ=Europe/Amsterdam # or your timezone
-java -Dfile.encoding=UTF-8 -jar webgoat-2023.8.jar
+java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.3.jar
 ```

 Click the link in the log to start WebGoat.

-### 3.1 Running on a different port
-
-If for some reason you want to run WebGoat on a different port, you can do so by adding the following parameter:
-
-```shell
-java -jar webgoat-2023.8.jar --webgoat.port=8001 --webwolf.port=8002
-```
-
-For a full overview of all the parameters you can use, please check the [WebGoat properties file](webgoat-container/src/main/resources/application-{webgoat, webwolf}.properties).
-
 ## 4. Run from the sources

 ### Prerequisites:

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

@ -151,10 +131,9 @@ 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.8-SNAPSHOT.jar
+java -jar target/webgoat-2023.3-SNAPSHOT.jar
 ```

 Or in a docker run it would (once this version is pushed into docker hub) look like this:
--- a/README_I18N.md
+++ b/README_I18N.md
@ -16,19 +16,19 @@ The following steps are required when you want to add a new language

 1. Update [main_new.html](src/main/resources/webgoat/static/main_new.html)
   1. Add the parts for showing the flag and providing the correct value for the flag= parameter
-      2.
-2. Add a flag image to src/main/resources/webgoat/static/css/img
+2. 
+3. Add a flag image to src/main/resources/webgoat/static/css/img
   1. See the main_new.html for a link to download flag resources
-3. Add a welcome page to the introduction lesson
+4. Add a welcome page to the introduction lesson
   1. Copy Introduction_.adoc to Introduction_es.adoc (if in this case you want to add Spanish)
   2. Add a highlighted section that explains that most parts of WebGoat will still be in English and invite people to translate parts where it would be valuable
-4. Translate the main labels
+5. Translate the main labels
   1. Copy messages.properties to messages_es.properties (if in this case you want to add Spanish)
   2. Translate the label values
-5. Optionally translate lessons by
+6. Optionally translate lessons by
   1. Adding lang specifc adoc files in documentation folder of the lesson
   2. Adding WebGoatLabels.properties of a specific language if you want to
-6. Run mvn clean to see if the LabelAndHintIntegration test passes
-7. Run WebGoat and verify that your own language and the other languages work as expected
+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

 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,65 +1,10 @@
 # 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.
+- [#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
@ -215,3 +160,4 @@ Special thanks to the following contributors providing us with a pull request:
 And everyone who provided feedback through Github.

 Team WebGoat
+
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@ -8,4 +8,4 @@
    <suppress files="ContentTypeAssignment.java" checks="IllegalImportCheck" />
    <suppress files="SimpleXXE.java" checks="IllegalImportCheck" />
    <suppress files="HtmlTamperingTask.java" checks="ParameterName" />
-</suppressions>
+</suppressions>
--- a/config/desktop/WebGoat.txt
+++ b/config/desktop/WebGoat.txt
@ -3,7 +3,7 @@
 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-webgoat.sh
 ./start_zap.sh

 Happy hacking,
--- a/config/desktop/start_webgoat.sh
+++ b/config/desktop/start_webgoat.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-/config/jdk-21.0.3+9-jre/bin/java \
+/config/jdk-17.0.6+10-jre/bin/java \
  -Duser.home=/config \
  -Dfile.encoding=UTF-8 \
  -DTZ=Europe/Amsterdam \
--- a/config/desktop/start_zap.sh
+++ b/config/desktop/start_zap.sh
@ -1,3 +1,3 @@
 #!/bin/sh

-/config/jdk-21.0.3+9-jre/bin/java -jar /config/ZAP_2.15.0/zap-2.15.0.jar
+/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,3 +1,4 @@
 # WebGoat landing page

 Old GitHub page which now redirects to OWASP website.
+
--- a/docs/index.html
+++ b/docs/index.html
@ -11,4 +11,4 @@
  The page been moved to <a href="https://owasp.org/www-project-webgoat/">https://owasp.org/www-project-webgoat/</a>
 </h1>
 </body>
-</html>
+</html>
--- a/2
+++ b/2
@ -246,7 +246,7 @@ else
        else
            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
        fi
-
+        
    else
        if [ "$MVNW_VERBOSE" = true ]; then
          echo "Falling back to using Java to download"
--- 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 https://maven.apache.org/xsd/maven-4.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 http://maven.apache.org/maven-v4_0_0.xsd">
+
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <groupId>org.springframework.boot</groupId>
    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.5</version>
+    <version>2.7.1</version>
  </parent>
-
  <groupId>org.owasp.webgoat</groupId>
  <artifactId>webgoat</artifactId>
-  <version>2024.2-SNAPSHOT</version>
+  <version>2023.4</version>
  <packaging>jar</packaging>

  <name>WebGoat</name>
@ -27,8 +27,14 @@
      <url>https://www.gnu.org/licenses/gpl-2.0.txt</url>
    </license>
  </licenses>
-
  <developers>
+    <developer>
+      <id>mayhew64</id>
+      <name>Bruce Mayhew</name>
+      <email>webgoat@owasp.org</email>
+      <organization>OWASP</organization>
+      <organizationUrl>https://github.com/WebGoat/WebGoat</organizationUrl>
+    </developer>
    <developer>
      <id>nbaars</id>
      <name>Nanne Baars</name>
@ -36,6 +42,11 @@
      <organizationUrl>https://github.com/nbaars</organizationUrl>
      <timezone>Europe/Amsterdam</timezone>
    </developer>
+    <developer>
+      <id>misfir3</id>
+      <name>Jason White</name>
+      <email>jason.white@owasp.org</email>
+    </developer>
    <developer>
      <id>zubcevic</id>
      <name>René Zubcevic</name>
@ -46,8 +57,44 @@
      <name>Àngel Ollé Blázquez</name>
      <email>angel@olleb.com</email>
    </developer>
+    <developer>
+      <id>jwayman</id>
+      <name>Jeff Wayman</name>
+      <email></email>
+    </developer>
+    <developer>
+      <id>dcowden</id>
+      <name>Dave Cowden</name>
+      <email></email>
+    </developer>
+    <developer>
+      <id>lawson89</id>
+      <name>Richard Lawson</name>
+      <email></email>
+    </developer>
+    <developer>
+      <id>dougmorato</id>
+      <name>Doug Morato</name>
+      <email>doug.morato@owasp.org</email>
+      <organization>OWASP</organization>
+      <organizationUrl>https://github.com/dougmorato</organizationUrl>
+      <timezone>America/New_York</timezone>
+      <properties>
+        <picUrl>https://avatars2.githubusercontent.com/u/9654?v=3&amp;s=150</picUrl>
+      </properties>
+    </developer>
  </developers>

+  <mailingLists>
+    <mailingList>
+      <name>OWASP WebGoat Mailing List</name>
+      <subscribe>https://lists.owasp.org/mailman/listinfo/owasp-webgoat</subscribe>
+      <unsubscribe>Owasp-webgoat-request@lists.owasp.org</unsubscribe>
+      <post>owasp-webgoat@lists.owasp.org</post>
+      <archive>http://lists.owasp.org/pipermail/owasp-webgoat/</archive>
+    </mailingList>
+  </mailingLists>
+
  <scm>
    <connection>scm:git:git@github.com:WebGoat/WebGoat.git</connection>
    <developerConnection>scm:git:git@github.com:WebGoat/WebGoat.git</developerConnection>
@ -61,57 +108,59 @@
  </issueManagement>

  <properties>
+
    <!-- Shared properties with plugins and version numbers across submodules-->
-    <asciidoctorj.version>3.0.0</asciidoctorj.version>
-    <bootstrap.version>5.3.3</bootstrap.version>
-    <cglib.version>3.3.0</cglib.version>
+    <asciidoctorj.version>2.5.3</asciidoctorj.version>
+    <bootstrap.version>3.3.7</bootstrap.version>
+    <cglib.version>2.2</cglib.version>
    <!-- do not update necessary for lesson -->
-    <checkstyle.version>3.4.0</checkstyle.version>
+    <checkstyle.version>3.1.2</checkstyle.version>
    <commons-collections.version>3.2.1</commons-collections.version>
-    <commons-compress.version>1.27.1</commons-compress.version>
-    <commons-io.version>2.16.1</commons-io.version>
-    <commons-lang3.version>3.14.0</commons-lang3.version>
-    <commons-text.version>1.12.0</commons-text.version>
-    <guava.version>33.3.0-jre</guava.version>
-    <jacoco.version>0.8.11</jacoco.version>
-    <java.version>21</java.version>
-    <jaxb.version>2.3.1</jaxb.version>
+    <commons-io.version>2.6</commons-io.version>
+    <commons-lang3.version>3.12.0</commons-lang3.version>
+    <commons-text.version>1.9</commons-text.version>
+    <guava.version>30.1-jre</guava.version>
+    <java.version>17</java.version>
    <jjwt.version>0.9.1</jjwt.version>
-    <jose4j.version>0.9.3</jose4j.version>
-    <jquery.version>3.7.1</jquery.version>
-    <jsoup.version>1.18.1</jsoup.version>
+    <jose4j.version>0.7.6</jose4j.version>
+    <jquery.version>3.5.1</jquery.version>
+    <jsoup.version>1.14.3</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.5.1</maven-surefire-plugin.version>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
+    <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
    <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.1.2.RELEASE</thymeleaf.version>
-    <waittimeForServerStart>30</waittimeForServerStart>
-    <webdriver.version>5.9.2</webdriver.version>
-    <webgoat.context>/</webgoat.context>
-    <webgoat.sslenabled>false</webgoat.sslenabled>
-    <webjars-locator-core.version>0.59</webjars-locator-core.version>
-    <webwolf.context>/</webwolf.context>
-    <wiremock.version>3.9.1</wiremock.version>
+    <thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
+    <webdriver.version>4.3.1</webdriver.version>
+    <webgoat.port>8080</webgoat.port>
+    <webwolf.port>9090</webwolf.port>
+    <wiremock.version>2.27.2</wiremock.version>
    <xml-resolver.version>1.2</xml-resolver.version>
    <xstream.version>1.4.5</xstream.version>
    <!-- do not update necessary for lesson -->
-    <zxcvbn.version>1.9.0</zxcvbn.version>
+    <zxcvbn.version>1.5.2</zxcvbn.version>
  </properties>

  <dependencyManagement>
    <dependencies>
+
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>9.1</version>
+      </dependency>
+
      <dependency>
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-exec</artifactId>
-        <version>1.4.0</version>
+        <version>1.3</version>
      </dependency>
      <dependency>
        <groupId>org.asciidoctor</groupId>
@ -149,17 +198,6 @@
        <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>
@ -191,13 +229,8 @@
        <version>${jquery.version}</version>
      </dependency>
      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>webjars-locator-core</artifactId>
-        <version>${webjars-locator-core.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.wiremock</groupId>
-        <artifactId>wiremock-standalone</artifactId>
+        <groupId>com.github.tomakehurst</groupId>
+        <artifactId>wiremock</artifactId>
        <version>${wiremock.version}</version>
      </dependency>
      <dependency>
@ -208,15 +241,16 @@
      <dependency>
        <groupId>org.apache.commons</groupId>
        <artifactId>commons-compress</artifactId>
-        <version>${commons-compress.version}</version>
+        <version>1.21</version>
      </dependency>
      <dependency>
        <groupId>org.jruby</groupId>
        <artifactId>jruby</artifactId>
-        <version>9.4.8.0</version>
+        <version>9.3.6.0</version>
      </dependency>
    </dependencies>
  </dependencyManagement>
+
  <dependencies>
    <dependency>
      <groupId>org.apache.commons</groupId>
@ -232,26 +266,23 @@
      <scope>provided</scope>
      <optional>true</optional>
    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
-      <version>1.20.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>1.20.1</version>
-      <scope>test</scope>
-    </dependency>
    <dependency>
      <groupId>javax.xml.bind</groupId>
      <artifactId>jaxb-api</artifactId>
-      <version>${jaxb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-undertow</artifactId>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </exclusion>
+      </exclusions>
    </dependency>
    <dependency>
      <groupId>org.springframework.boot</groupId>
@ -261,10 +292,6 @@
      <groupId>org.flywaydb</groupId>
      <artifactId>flyway-core</artifactId>
    </dependency>
-    <dependency>
-      <groupId>org.flywaydb</groupId>
-      <artifactId>flyway-database-hsqldb</artifactId>
-    </dependency>
    <dependency>
      <groupId>org.asciidoctor</groupId>
      <artifactId>asciidoctorj</artifactId>
@ -281,17 +308,9 @@
      <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-springsecurity6</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
+      <artifactId>thymeleaf-extras-springsecurity5</artifactId>
    </dependency>
    <dependency>
      <groupId>org.hsqldb</groupId>
@ -321,15 +340,6 @@
      <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>
@ -359,23 +369,8 @@
      <artifactId>jquery</artifactId>
    </dependency>
    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>webjars-locator-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.github.terma</groupId>
-      <artifactId>javaniotcpproxy</artifactId>
-      <version>1.5</version>
-      <scope>test</scope>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
    </dependency>

    <dependency>
@ -389,19 +384,15 @@
      <scope>test</scope>
    </dependency>
    <dependency>
-      <groupId>org.wiremock</groupId>
-      <artifactId>wiremock-standalone</artifactId>
+      <groupId>com.github.tomakehurst</groupId>
+      <artifactId>wiremock</artifactId>
+      <scope>test</scope>
    </dependency>
    <dependency>
      <groupId>io.rest-assured</groupId>
      <artifactId>rest-assured</artifactId>
      <scope>test</scope>
    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-properties-migrator</artifactId>
-      <scope>runtime</scope>
-    </dependency>
  </dependencies>

  <repositories>
@ -470,19 +461,10 @@
        <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</argLine>
+          <argLine>-Xmx512m -Dwebgoatport=${webgoat.port} -Dwebwolfport=${webwolf.port}</argLine>
          <includes>org/owasp/webgoat/*Test</includes>
        </configuration>
        <executions>
@ -505,15 +487,14 @@
        <artifactId>maven-surefire-plugin</artifactId>
        <version>${maven-surefire-plugin.version}</version>
        <configuration>
-          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
-          <!-- Necessary for vulnerable components lesson -->
          <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-          --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-          --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
-          --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
-          --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED</argLine>
          <excludes>
            <exclude>**/*IntegrationTest.java</exclude>
+            <exclude>src/it/java</exclude>
+            <exclude>org/owasp/webgoat/*Test</exclude>
          </excludes>
        </configuration>
      </plugin>
@ -522,6 +503,7 @@
        <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>
@ -532,7 +514,7 @@
      <plugin>
        <groupId>com.diffplug.spotless</groupId>
        <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.41.1</version>
+        <version>2.29.0</version>
        <configuration>
          <formats>
            <format>
@ -593,7 +575,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.5.0</version>
+        <version>3.0.0</version>
        <executions>
          <execution>
            <id>restrict-log4j-versions</id>
@ -617,6 +599,10 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>17</source>
+          <target>17</target>
+        </configuration>
      </plugin>
    </plugins>
  </build>
@ -646,15 +632,16 @@
                  <portNames>
                    <portName>webgoat.port</portName>
                    <portName>webwolf.port</portName>
+                    <portName>jmxPort</portName>
                  </portNames>
                </configuration>
              </execution>
            </executions>
          </plugin>
          <plugin>
-            <groupId>org.honton.chas</groupId>
+            <groupId>com.bazaarvoice.maven.plugins</groupId>
            <artifactId>process-exec-maven-plugin</artifactId>
-            <version>0.9.2</version>
+            <version>0.9</version>
            <executions>
              <execution>
                <id>start-jar</id>
@ -662,18 +649,8 @@
                  <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>
@ -681,6 +658,8 @@
                    <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>-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>
@ -688,8 +667,12 @@
                    <argument>--add-opens</argument>
                    <argument>java.base/java.lang.reflect=ALL-UNNAMED</argument>
                    <argument>--add-opens</argument>
+                    <argument>java.base/java.text=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
                    <argument>java.desktop/java.beans=ALL-UNNAMED</argument>
                    <argument>--add-opens</argument>
+                    <argument>java.desktop/java.awt.font=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
                    <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
                    <argument>--add-opens</argument>
                    <argument>java.base/java.io=ALL-UNNAMED</argument>
@ -698,8 +681,7 @@
                    <argument>${project.build.directory}/webgoat-${project.version}.jar</argument>
                  </arguments>
                  <waitForInterrupt>false</waitForInterrupt>
-                  <waitAfterLaunch>${waittimeForServerStart}</waitAfterLaunch>
-                  <healthCheckUrl>http://127.0.0.1:${webgoat.port}${webgoat.context}login</healthCheckUrl>
+                  <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/actuator/health</healthcheckUrl>
                </configuration>
              </execution>
              <execution>
@ -724,6 +706,7 @@
          <plugin>
            <groupId>org.owasp</groupId>
            <artifactId>dependency-check-maven</artifactId>
+            <version>6.5.1</version>
            <configuration>
              <failBuildOnCVSS>7</failBuildOnCVSS>
              <skipProvidedScope>false</skipProvidedScope>
@ -744,81 +727,6 @@
        </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,10 +12,8 @@ Then see security settings and allow the file to run
        pip3 install virtualenv --user
        python3 -m virtualenv .venv
        source .venv/bin/activate
-        pip install --upgrade robotframework
-        pip install --upgrade robotframework-SeleniumLibrary
-        pip install --upgrade webdriver-manager
-        brew upgrade
+        pip install robotframework
+        pip install robotframework-SeleniumLibrary
+        pip install webdriver-manager
        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,7 +2,6 @@
 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
@ -12,7 +11,7 @@ ${BROWSER}  chrome
 ${SLEEP}  100
 ${DELAY}  0.25
 ${ENDPOINT}  http://127.0.0.1:8080/WebGoat
-${ENDPOINT_WOLF}  http://127.0.0.1:9090/WebWolf
+${ENDPOINT_WOLF}  http://127.0.0.1:9090
 ${USERNAME}  robotuser
 ${PASSWORD}  password
 ${HEADLESS}  ${FALSE}
@ -23,25 +22,22 @@ Initial_Page
  [Arguments]  ${ENDPOINT}  ${BROWSER}
  Log To Console  Start WebGoat UI Testing
  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'});add_argument("-headless");add_argument("--start-maximized")  alias=webgoat
+      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_argument("-headless");add_argument("--start-maximized");add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  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  ${500}  ${0}
+  Set Window Position  ${400}  ${200}
  Set Selenium Speed  ${DELAY}

 Close_Page
@ -57,7 +53,6 @@ Close_Page
 *** Test Cases ***

 Check_Initial_Page
-  [Tags]  WebGoatTests
  Switch Browser  webgoat
  Page Should Contain  Username
  Click Button  Sign in
@ -65,7 +60,6 @@ Check_Initial_Page
  Click Link  /WebGoat/registration

 Check_Registration_Page
-  [Tags]  WebGoatTests
  Page Should Contain  Username
  Input Text  username  ${USERNAME}
  Input Text  password  ${PASSWORD}
@ -74,7 +68,6 @@ Check_Registration_Page
  Click Button  Sign up

 Check_Welcome_Page
-  [Tags]  WebGoatTests
  Page Should Contain  WebGoat
  Go To  ${ENDPOINT}/login
  Page Should Contain  Username
@ -84,7 +77,6 @@ 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
@ -101,29 +93,9 @@ Check_Menu_Page

 Check_WebWolf
  Switch Browser  webwolf
-  location should be  ${ENDPOINT_WOLF}/login
+  location should be  ${ENDPOINT_WOLF}/WebWolf
+  Go To  ${ENDPOINT_WOLF}/mail
  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
@ -15,7 +15,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
    assignment2();
    assignment3();

-    checkResults("MissingFunctionAC");
+    checkResults("/access-control");
  }

  private void assignment3() {
@ -25,7 +25,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
        .contentType(ContentType.JSON)
-        .get(url("access-control/users-admin-fix"))
+        .get(url("/WebGoat/access-control/users-admin-fix"))
        .then()
        .statusCode(HttpStatus.SC_FORBIDDEN);

@ -40,7 +40,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
        .cookie("JSESSIONID", getWebGoatCookie())
        .contentType(ContentType.JSON)
        .body(String.format(userTemplate, this.getUser(), this.getUser()))
-        .post(url("access-control/users"))
+        .post(url("/WebGoat/access-control/users"))
        .then()
        .statusCode(HttpStatus.SC_OK);

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

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

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

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

  private void assignment1() {
    var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
-    checkAssignment(url("access-control/hidden-menu"), params, true);
+    checkAssignment(url("/WebGoat/access-control/hidden-menu"), params, true);
  }
 }
--- a/src/it/java/org/owasp/webgoat/CSRFIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/CSRFIntegrationTest.java
@ -64,12 +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("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()));
+        trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", this.getUser()));
  }

  @TestFactory
@ -86,7 +86,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
    // logout();
    login(); // because old cookie got replaced and invalidated
    startLesson("CSRF", false);
-    checkResults("CSRF");
+    checkResults("/csrf");
  }

  private void uploadTrickHtml(String htmlName, String htmlContent) throws IOException {
@ -103,7 +103,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("WEBWOLFSESSION", getWebWolfCookie())
        .multiPart("file", htmlName, htmlContent.getBytes())
-        .post(new WebWolfUrlBuilder().path("fileupload").build())
+        .post(webWolfUrl("/WebWolf/fileupload"))
        .then()
        .extract()
        .response()
@ -118,7 +118,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("files/%s/%s", this.getUser(), htmlName).build())
+            .get(webWolfUrl("/files/" + this.getUser() + "/" + htmlName))
            .then()
            .extract()
            .response()
@ -136,7 +136,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrl("/files/fake.html"))
            .post(goatURL)
            .then()
            .extract()
@ -146,7 +146,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
    Map<String, Object> params = new HashMap<>();
    params.clear();
    params.put("confirmFlagVal", flag);
-    checkAssignment(url("csrf/confirm-flag-1"), params, true);
+    checkAssignment(url("/WebGoat/csrf/confirm-flag-1"), params, true);
  }

  private void checkAssignment4(String goatURL) {
@ -163,7 +163,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrl("/files/fake.html"))
            .formParams(params)
            .post(goatURL)
            .then()
@ -184,7 +184,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrl("/files/fake.html"))
            .contentType(ContentType.TEXT)
            .body(
                "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is"
@ -198,7 +198,7 @@ public class CSRFIntegrationTest extends IntegrationTest {

    params.clear();
    params.put("confirmFlagVal", flag);
-    checkAssignment(url("csrf/feedback"), params, true);
+    checkAssignment(url("/WebGoat/csrf/feedback"), params, true);
  }

  private void checkAssignment8(String goatURL) {
@ -217,7 +217,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrl("/files/fake.html"))
            .params(params)
            .post(goatURL)
            .then()
@ -239,7 +239,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", newCookie)
-            .post(url("csrf/login"))
+            .post(url("/csrf/login"))
            .then()
            .statusCode(200)
            .extract()
@ -253,16 +253,15 @@ public class CSRFIntegrationTest extends IntegrationTest {
    Overview[] assignments =
        RestAssured.given()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .relaxedHTTPSValidation()
-            .get(url("service/lessonoverview.mvc/CSRF"))
+            .get(url("/service/lessonoverview.mvc"))
            .then()
            .extract()
            .jsonPath()
            .getObject("$", Overview[].class);
-    assertThat(assignments)
-        .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
-        .extracting(o -> o.solved)
-        .containsExactly(true);
+    //		assertThat(assignments)
+    //                .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
+    //                .extracting(o -> o.solved)
+    //                .containsExactly(true);
  }

  @Data
--- a/src/it/java/org/owasp/webgoat/ChallengeIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/ChallengeIntegrationTest.java
@ -7,14 +7,12 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpStatus;

 public class ChallengeIntegrationTest extends IntegrationTest {

  @Test
-  void testChallenge1() {
+  public void testChallenge1() {
    startLesson("Challenge1");

    byte[] resultBytes =
@ -22,7 +20,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("challenge/logo"))
+            .get(url("/WebGoat/challenge/logo"))
            .then()
            .statusCode(200)
            .extract()
@ -34,14 +32,14 @@ public class ChallengeIntegrationTest extends IntegrationTest {
    params.put("username", "admin");
    params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));

-    checkAssignment(url("challenge/1"), params, true);
+    checkAssignment(url("/WebGoat/challenge/1"), params, true);
    String result =
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParams(params)
-            .post(url("challenge/1"))
+            .post(url("/WebGoat/challenge/1"))
            .then()
            .statusCode(200)
            .extract()
@ -50,16 +48,16 @@ public class ChallengeIntegrationTest extends IntegrationTest {
    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
    params.clear();
    params.put("flag", flag);
-    checkAssignment(url("challenge/flag/1"), params, true);
+    checkAssignment(url("/WebGoat/challenge/flag"), params, true);

-    checkResults("Challenge1");
+    checkResults("/challenge/1");

    List<String> capturefFlags =
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("scoreboard-data"))
+            .get(url("/WebGoat/scoreboard-data"))
            .then()
            .statusCode(200)
            .extract()
@ -69,7 +67,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
  }

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

    Map<String, Object> params = new HashMap<>();
@ -83,7 +81,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParams(params)
-            .post(url("challenge/5"))
+            .post(url("/WebGoat/challenge/5"))
            .then()
            .statusCode(200)
            .extract()
@ -92,16 +90,16 @@ public class ChallengeIntegrationTest extends IntegrationTest {
    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
    params.clear();
    params.put("flag", flag);
-    checkAssignment(url("challenge/flag/5"), params, true);
+    checkAssignment(url("/WebGoat/challenge/flag"), params, true);

-    checkResults("Challenge5");
+    checkResults("/challenge/5");

    List<String> capturefFlags =
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("scoreboard-data"))
+            .get(url("/WebGoat/scoreboard-data"))
            .then()
            .statusCode(200)
            .extract()
@ -109,62 +107,4 @@ public class ChallengeIntegrationTest extends IntegrationTest {
            .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 email WebWolf inbox this should give a hint to the link being static
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .formParams("email", getUser() + "@webgoat.org")
-        .post(url("challenge/7"))
-        .then()
-        .statusCode(200)
-        .extract()
-        .asString();
-
-    // Check whether email has been received
-    var responseBody =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("mail").build())
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
-
-    // Call reset link with admin link
-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("challenge/7/reset-password/{link}"), "375afe1104f4a487a73823c50a9292a2")
-            .then()
-            .statusCode(HttpStatus.ACCEPTED.value())
-            .extract()
-            .asString();
-
-    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
-    checkAssignment(url("challenge/flag/7"), Map.of("flag", flag), true);
-  }
 }
--- a/src/it/java/org/owasp/webgoat/CryptoIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/CryptoIntegrationTest.java
@ -42,7 +42,7 @@ public class CryptoIntegrationTest extends IntegrationTest {

    checkAssignmentDefaults();

-    checkResults("Cryptography");
+    checkResults("/crypto");
  }

  private void checkAssignment2() {
@ -52,7 +52,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/encoding/basic"))
+            .get(url("/crypto/encoding/basic"))
            .then()
            .extract()
            .asString();
@ -64,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() {
@ -72,7 +72,7 @@ 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 {
@ -82,7 +82,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/hashing/md5"))
+            .get(url("/crypto/hashing/md5"))
            .then()
            .extract()
            .asString();
@ -92,7 +92,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/hashing/sha256"))
+            .get(url("/crypto/hashing/sha256"))
            .then()
            .extract()
            .asString();
@ -112,7 +112,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("answer_pwd1", answer_1);
    params.put("answer_pwd2", answer_2);
-    checkAssignment(url("crypto/hashing"), params, true);
+    checkAssignment(url("/WebGoat/crypto/hashing"), params, true);
  }

  private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
@ -122,7 +122,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/signing/getprivate"))
+            .get(url("/crypto/signing/getprivate"))
            .then()
            .extract()
            .asString();
@ -135,7 +135,7 @@ 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() {
@ -151,6 +151,6 @@ public class CryptoIntegrationTest extends IntegrationTest {
    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
@ -26,8 +26,8 @@ public class DeserializationIntegrationTest extends IntegrationTest {
      params.put(
          "token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
    }
-    checkAssignment(url("InsecureDeserialization/task"), params, true);
+    checkAssignment(url("/WebGoat/InsecureDeserialization/task"), params, true);

-    checkResults("InsecureDeserialization");
+    checkResults("/InsecureDeserialization/");
  }
 }
--- a/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
@ -31,17 +31,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.put("magic_num", "33");
    checkAssignment(url("HttpBasics/attack2"), params, true);

-    checkResults("HttpBasics");
-  }
-
-  @Test
-  public void solveAsOtherUserHttpBasics() {
-    login("steven");
-    startLesson("HttpBasics");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("person", "goatuser");
-    checkAssignment(url("HttpBasics/attack1"), params, true);
+    checkResults("/HttpBasics/");
  }

  @Test
@ -61,7 +51,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
            .path("lessonCompleted"),
        CoreMatchers.is(true));

-    checkResults("HttpProxies");
+    checkResults("/HttpProxies/");
  }

  @Test
@ -82,8 +72,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.put(
        "question_3_solution",
        "Solution 2: The systems security is compromised even if only one goal is harmed.");
-    checkAssignment(url("cia/quiz"), params, true);
-    checkResults("CIA");
+    checkAssignment(url("/WebGoat/cia/quiz"), params, true);
+    checkResults("/cia/");
  }

  @Test
@ -105,8 +95,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
      Map<String, Object> params = new HashMap<>();
      params.clear();
      params.put("payload", solution);
-      checkAssignment(url("VulnerableComponents/attack1"), params, true);
-      checkResults("VulnerableComponents");
+      checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
+      checkResults("/VulnerableComponents/");
    }
  }

@ -117,8 +107,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("username", "CaptainJack");
    params.put("password", "BlackPearl");
-    checkAssignment(url("InsecureLogin/task"), params, true);
-    checkResults("InsecureLogin");
+    checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
+    checkResults("/InsecureLogin/");
  }

  @Test
@ -127,8 +117,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    Map<String, Object> params = new HashMap<>();
    params.clear();
    params.put("password", "ajnaeliclm^&&@kjn.");
-    checkAssignment(url("SecurePasswords/assignment"), params, true);
-    checkResults("SecurePasswords");
+    checkAssignment(url("/WebGoat/SecurePasswords/assignment"), params, true);
+    checkResults("SecurePasswords/");

    startLesson("AuthBypass");
    params.clear();
@ -137,8 +127,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.put("jsEnabled", "1");
    params.put("verifyMethod", "SEC_QUESTIONS");
    params.put("userId", "12309746");
-    checkAssignment(url("auth-bypass/verify-account"), params, true);
-    checkResults("AuthBypass");
+    checkAssignment(url("/WebGoat/auth-bypass/verify-account"), params, true);
+    checkResults("/auth-bypass/");

    startLesson("HttpProxies");
    MatcherAssert.assertThat(
@ -148,13 +138,14 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
            .cookie("JSESSIONID", getWebGoatCookie())
            .header("x-request-intercepted", "true")
            .contentType(ContentType.JSON)
-            .get(url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+            .get(
+                url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
            .then()
            .statusCode(200)
            .extract()
            .path("lessonCompleted"),
        CoreMatchers.is(true));
-    checkResults("HttpProxies");
+    checkResults("/HttpProxies/");
  }

  @Test
@ -174,7 +165,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
            .header("webgoat-requested-by", "dom-xss-vuln")
            .header("X-Requested-With", "XMLHttpRequest")
            .formParams(params)
-            .post(url("CrossSiteScripting/phone-home-xss"))
+            .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
            .then()
            .statusCode(200)
            .extract()
@ -183,14 +174,14 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {

    params.clear();
    params.put("successMessage", secretNumber);
-    checkAssignment(url("ChromeDevTools/dummy"), params, true);
+    checkAssignment(url("/WebGoat/ChromeDevTools/dummy"), params, true);

    params.clear();
    params.put("number", "24");
    params.put("network_num", "24");
-    checkAssignment(url("ChromeDevTools/network"), params, true);
+    checkAssignment(url("/WebGoat/ChromeDevTools/network"), params, true);

-    checkResults("ChromeDevTools");
+    checkResults("/ChromeDevTools/");
  }

  @Test
@ -203,8 +194,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.put("jsEnabled", "1");
    params.put("verifyMethod", "SEC_QUESTIONS");
    params.put("userId", "12309746");
-    checkAssignment(url("auth-bypass/verify-account"), params, true);
-    checkResults("AuthBypass");
+    checkAssignment(url("/auth-bypass/verify-account"), params, true);
+    checkResults("/auth-bypass/");
  }

  @Test
@ -214,7 +205,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
    params.clear();
    params.put("param1", "secr37Value");
    params.put("param2", "Main");
-    checkAssignment(url("lesson-template/sample-attack"), params, true);
-    checkResults("LessonTemplate");
+    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
@ -4,9 +4,11 @@ import static org.junit.jupiter.api.DynamicTest.dynamicTest;

 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.SneakyThrows;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.AfterEach;
@ -17,6 +19,7 @@ import org.junit.jupiter.api.TestFactory;
 public class IDORIntegrationTest extends IntegrationTest {

  @BeforeEach
+  @SneakyThrows
  public void init() {
    startLesson("IDOR");
  }
@ -24,63 +27,56 @@ public class IDORIntegrationTest extends IntegrationTest {
  @TestFactory
  Iterable<DynamicTest> testIDORLesson() {
    return Arrays.asList(
-        dynamicTest("assignment 2 - login", this::loginIDOR),
-        dynamicTest("profile", this::profile));
+        dynamicTest("login", () -> loginIDOR()), dynamicTest("profile", () -> profile()));
  }

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

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

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

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

  private void profile() {
-
-    // View profile - assignment 3a
    MatcherAssert.assertThat(
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("IDOR/profile"))
+            .get(url("/WebGoat/IDOR/profile"))
            .then()
            .statusCode(200)
            .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("IDOR/diff-attributes"), params, true);
-
-    // View profile another way - assignment 4
+    checkAssignment(url("/WebGoat/IDOR/diff-attributes"), params, true);
    params.clear();
    params.put("url", "WebGoat/IDOR/profile/2342384");
-    checkAssignment(url("IDOR/profile/alt-path"), params, true);
+    checkAssignment(url("/WebGoat/IDOR/profile/alt-path"), params, true);

-    // assignment 5a
    MatcherAssert.assertThat(
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("IDOR/profile/2342388"))
+            .get(url("/WebGoat/IDOR/profile/2342388"))
            .then()
            .statusCode(200)
            .extract()
            .path("lessonCompleted"),
        CoreMatchers.is(true));

-    // assignment 5b
    MatcherAssert.assertThat(
        RestAssured.given()
            .when()
@ -90,7 +86,7 @@ public class IDORIntegrationTest extends IntegrationTest {
            .body(
                "{\"role\":\"1\", \"color\":\"red\", \"size\":\"large\", \"name\":\"Buffalo Bill\","
                    + " \"userId\":\"2342388\"}")
-            .put(url("IDOR/profile/2342388"))
+            .put(url("/WebGoat/IDOR/profile/2342388"))
            .then()
            .statusCode(200)
            .extract()
--- a/src/it/java/org/owasp/webgoat/IntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/IntegrationTest.java
@ -3,93 +3,47 @@ package org.owasp.webgoat;
 import static io.restassured.RestAssured.given;

 import io.restassured.RestAssured;
-import io.restassured.filter.log.LogDetail;
 import io.restassured.http.ContentType;
 import java.util.Map;
+import java.util.Objects;
 import lombok.Getter;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.springframework.http.HttpStatus;

 public abstract class IntegrationTest {

-  private static String webGoatPort = System.getenv().getOrDefault("WEBGOAT_PORT", "8080");
-  @Getter private static String webWolfPort = System.getenv().getOrDefault("WEBWOLF_PORT", "9090");
+  private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));

  @Getter
-  private static String webWolfHost = System.getenv().getOrDefault("WEBWOLF_HOST", "127.0.0.1");
-
-  private static String webGoatContext =
-      System.getenv().getOrDefault("WEBGOAT_CONTEXT", "/WebGoat/");
-  private static String webWolfContext =
-      System.getenv().getOrDefault("WEBWOLF_CONTEXT", "/WebWolf/");
+  private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));

+  private static boolean useSSL = false;
+  private static String webgoatUrl =
+      (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
+  private static String webWolfUrl =
+      (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
  @Getter private String webGoatCookie;
  @Getter private String webWolfCookie;
  @Getter private final String user = "webgoat";

  protected String url(String url) {
-    return "http://localhost:%s%s%s".formatted(webGoatPort, webGoatContext, url);
+    url = url.replaceFirst("/WebGoat/", "");
+    url = url.replaceFirst("/WebGoat", "");
+    url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
+    return webgoatUrl + url;
  }

-  protected class WebWolfUrlBuilder {
-
-    private boolean attackMode = false;
-    private String path = null;
-
-    protected String build() {
-      return "http://localhost:%s%s%s"
-          .formatted(webWolfPort, webWolfContext, path != null ? path : "");
-    }
-
-    /**
-     * In attack mode it means WebGoat calls WebWolf to perform an attack. In this case we need to
-     * use port 9090 in a Docker environment.
-     */
-    protected WebWolfUrlBuilder attackMode() {
-      attackMode = true;
-      return this;
-    }
-
-    protected WebWolfUrlBuilder path(String path) {
-      this.path = path;
-      return this;
-    }
-
-    protected WebWolfUrlBuilder path(String path, String... uriVariables) {
-      this.path = path.formatted(uriVariables);
-      return this;
-    }
+  protected String webWolfUrl(String url) {
+    url = url.replaceFirst("/WebWolf/", "");
+    url = url.replaceFirst("/WebWolf", "");
+    url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
+    return webWolfUrl + url;
  }

-  /**
-   * Debugging options: install TestContainers Desktop and map port 5005 to the host machine with
-   * https://newsletter.testcontainers.com/announcements/set-fixed-ports-to-easily-debug-development-services
-   *
-   * <p>Start the test and connect a remote debugger in IntelliJ to localhost:5005 and attach it.
-   */
-  //  private static GenericContainer<?> webGoatContainer =
-  //      new GenericContainer(new ImageFromDockerfile("webgoat").withFileFromPath("/",
-  // Paths.get(".")))
-  //          .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("webgoat")))
-  //          .withExposedPorts(8080, 9090, 5005)
-  //          .withEnv(
-  //              "_JAVA_OPTIONS",
-  //              "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005")
-  //          .waitingFor(Wait.forHealthcheck());
-  //
-  //  static {
-  //    webGoatContainer.start();
-  //  }
-
  @BeforeEach
  public void login() {
-    login("webgoat");
-  }
-
-  protected void login(String user) {
    String location =
        given()
            .when()
@ -98,8 +52,6 @@ public abstract class IntegrationTest {
            .formParam("password", "password")
            .post(url("login"))
            .then()
-            .log()
-            .ifValidationFails(LogDetail.ALL) // Log the response details if validation fails
            .cookie("JSESSIONID")
            .statusCode(302)
            .extract()
@ -140,7 +92,7 @@ public abstract class IntegrationTest {
            .relaxedHTTPSValidation()
            .formParam("username", user)
            .formParam("password", "password")
-            .post(new WebWolfUrlBuilder().path("login").build())
+            .post(webWolfUrl("login"))
            .then()
            .statusCode(302)
            .cookie("WEBWOLFSESSION")
@ -171,7 +123,7 @@ public abstract class IntegrationTest {
          .when()
          .relaxedHTTPSValidation()
          .cookie("JSESSIONID", getWebGoatCookie())
-          .get(url("service/restartlesson.mvc/%s.lesson".formatted(lessonName)))
+          .get(url("service/restartlesson.mvc"))
          .then()
          .statusCode(200);
    }
@ -207,18 +159,23 @@ public abstract class IntegrationTest {
        CoreMatchers.is(expectedResult));
  }

-  public void checkResults(String lesson) {
-    var result =
+  // 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()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/lessonoverview.mvc/%s.lesson".formatted(lesson)))
-            .andReturn();
-
-    MatcherAssert.assertThat(
-        result.then().statusCode(200).extract().jsonPath().getList("solved"),
-        CoreMatchers.everyItem(CoreMatchers.is(true)));
+            .get(url("service/lessonoverview.mvc"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .jsonPath()
+            .getList("assignment.path"),
+        CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
  }

  public void checkResults() {
@ -273,7 +230,7 @@ public abstract class IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("file-server-location").build())
+            .get(webWolfUrl("/file-server-location"))
            .then()
            .extract()
            .response()
@ -288,21 +245,11 @@ public abstract class IntegrationTest {
        .when()
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url("server-directory"))
+        .get(url("/server-directory"))
        .then()
        .extract()
        .response()
        .getBody()
        .asString();
  }
-
-  public void cleanMailbox() {
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .delete(new WebWolfUrlBuilder().path("mail").build())
-        .then()
-        .statusCode(HttpStatus.ACCEPTED.value());
-  }
 }
--- a/src/it/java/org/owasp/webgoat/JWTLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/JWTLessonIntegrationTest.java
@ -13,10 +13,8 @@ import io.jsonwebtoken.impl.TextCodec;
 import io.restassured.RestAssured;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
+import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.RSAPublicKey;
 import java.time.Instant;
 import java.util.Base64;
 import java.util.Calendar;
@ -25,15 +23,13 @@ import java.util.HashMap;
 import java.util.Map;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
-import org.jose4j.jwk.JsonWebKeySet;
-import org.jose4j.jwk.RsaJsonWebKey;
 import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.lessons.jwt.JWTSecretKeyEndpoint;

 public class JWTLessonIntegrationTest extends IntegrationTest {

  @Test
-  public void solveAssignment() throws IOException, NoSuchAlgorithmException {
+  public void solveAssignment() throws IOException, InvalidKeyException, NoSuchAlgorithmException {
    startLesson("JWT");

    decodingToken();
@ -44,16 +40,15 @@ public class JWTLessonIntegrationTest extends IntegrationTest {

    buyAsTom();

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

    quiz();

-    checkResults("JWT");
+    checkResults("/JWT/");
  }

  private String generateToken(String key) {
+
    return Jwts.builder()
        .setIssuer("WebGoat Token Builder")
        .setAudience("webgoat.org")
@ -86,7 +81,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParam("jwt-encode-user", "user")
-            .post(url("JWT/decode"))
+            .post(url("/WebGoat/JWT/decode"))
            .then()
            .statusCode(200)
            .extract()
@ -94,14 +89,14 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
        CoreMatchers.is(true));
  }

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

    String accessToken =
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("JWT/secret/gettoken"))
+            .get(url("/WebGoat/JWT/secret/gettoken"))
            .then()
            .extract()
            .response()
@ -115,7 +110,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .formParam("token", generateToken(secret))
-            .post(url("JWT/secret"))
+            .post(url("/WebGoat/JWT/secret"))
            .then()
            .statusCode(200)
            .extract()
@ -129,7 +124,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("JWT/votings/login?user=Tom"))
+            .get(url("/WebGoat/JWT/votings/login?user=Tom"))
            .then()
            .extract()
            .cookie("access_token");
@ -162,7 +157,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .cookie("access_token", replacedToken)
-            .post(url("JWT/votings"))
+            .post(url("/WebGoat/JWT/votings"))
            .then()
            .statusCode(200)
            .extract()
@ -203,7 +198,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .header("Authorization", "Bearer " + replacedToken)
-            .post(url("JWT/refresh/checkout"))
+            .post(url("/WebGoat/JWT/refresh/checkout"))
            .then()
            .statusCode(200)
            .extract()
@ -211,7 +206,8 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
        CoreMatchers.is(true));
  }

-  private void deleteTomThroughKidClaim() {
+  private void deleteTom() {
+
    Map<String, Object> header = new HashMap();
    header.put(Header.TYPE, Header.JWT_TYPE);
    header.put(
@ -236,57 +232,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
-            .post(url("JWT/kid/delete?token=" + token))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
-
-  private void deleteTomThroughJkuClaim() throws NoSuchAlgorithmException {
-    KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-    keyPairGenerator.initialize(2048);
-    KeyPair keyPair = keyPairGenerator.generateKeyPair();
-    var jwks = new JsonWebKeySet(new RsaJsonWebKey((RSAPublicKey) keyPair.getPublic()));
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .multiPart("file", "jwks.json", jwks.toJson().getBytes())
-        .post(new WebWolfUrlBuilder().path("fileupload").build())
-        .then()
-        .extract()
-        .response()
-        .getBody()
-        .asString();
-
-    Map<String, Object> header = new HashMap();
-    header.put(Header.TYPE, Header.JWT_TYPE);
-    header.put(
-        JwsHeader.JWK_SET_URL,
-        new WebWolfUrlBuilder().attackMode().path("files/%s/jwks.json", getUser()).build());
-
-    String token =
-        Jwts.builder()
-            .setHeader(header)
-            .setIssuer("WebGoat Token Builder")
-            .setAudience("webgoat.org")
-            .setIssuedAt(Calendar.getInstance().getTime())
-            .setExpiration(Date.from(Instant.now().plusSeconds(60)))
-            .setSubject("tom@webgoat.org")
-            .claim("username", "Tom")
-            .claim("Email", "tom@webgoat.org")
-            .claim("Role", new String[] {"Manager", "Project Administrator"})
-            .signWith(SignatureAlgorithm.RS256, keyPair.getPrivate())
-            .compact();
-
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .post(url("JWT/jku/delete?token=" + token))
+            .post(url("/WebGoat/JWT/final/delete?token=" + token))
            .then()
            .statusCode(200)
            .extract()
@ -299,6 +245,6 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
    params.put("question_0_solution", "Solution 1");
    params.put("question_1_solution", "Solution 2");

-    checkAssignment(url("JWT/quiz"), params, true);
+    checkAssignment(url("/WebGoat/JWT/quiz"), params, true);
  }
 }
--- a/src/it/java/org/owasp/webgoat/LabelAndHintIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/LabelAndHintIntegrationTest.java
@ -151,6 +151,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
    checkLang(propsDefault, "nl");
    checkLang(propsDefault, "de");
    checkLang(propsDefault, "fr");
+    checkLang(propsDefault, "ru");
  }

  private Properties getProperties(String lang) {
--- a/src/it/java/org/owasp/webgoat/PasswordResetLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/PasswordResetLessonIntegrationTest.java
@ -5,19 +5,20 @@ import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 import io.restassured.RestAssured;
 import java.util.Arrays;
 import java.util.Map;
+import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
-import org.springframework.http.HttpHeaders;

 public class PasswordResetLessonIntegrationTest extends IntegrationTest {

  @BeforeEach
+  @SneakyThrows
  public void init() {
-    startLesson("PasswordReset");
+    startLesson("/PasswordReset");
  }

  @TestFactory
@ -69,6 +70,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {

    // WebWolf
    var link = getPasswordResetLinkFromLandingPage();
+
    // WebGoat
    changePassword(link);
    checkAssignment(
@ -85,7 +87,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("mail").build())
+            .get(webWolfUrl("/WebWolf/mail"))
            .then()
            .extract()
            .response()
@ -99,7 +101,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
  public void shutdown() {
    // this will run only once after the list of dynamic tests has run, this is to test if the
    // lesson is marked complete
-    checkResults("PasswordReset");
+    checkResults("/PasswordReset");
  }

  private void changePassword(String link) {
@ -119,7 +121,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("requests").build())
+            .get(webWolfUrl("/WebWolf/requests"))
            .then()
            .extract()
            .response()
@ -136,7 +138,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
  private void clickForgotEmailLink(String user) {
    RestAssured.given()
        .when()
-        .header(HttpHeaders.HOST, String.format("%s:%s", getWebWolfHost(), getWebWolfPort()))
+        .header("host", String.format("%s:%s", "localhost", 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
@ -55,7 +55,7 @@ class PathTraversalIT extends IntegrationTest {
            .cookie("JSESSIONID", getWebGoatCookie())
            .multiPart("uploadedFile", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
            .param("fullName", "../John Doe")
-            .post(url("PathTraversal/profile-upload"))
+            .post(url("/WebGoat/PathTraversal/profile-upload"))
            .then()
            .statusCode(200)
            .extract()
@ -71,7 +71,7 @@ class PathTraversalIT extends IntegrationTest {
            .cookie("JSESSIONID", getWebGoatCookie())
            .multiPart("uploadedFileFix", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
            .param("fullNameFix", "..././John Doe")
-            .post(url("PathTraversal/profile-upload-fix"))
+            .post(url("/WebGoat/PathTraversal/profile-upload-fix"))
            .then()
            .statusCode(200)
            .extract()
@ -89,7 +89,7 @@ class PathTraversalIT extends IntegrationTest {
                "uploadedFileRemoveUserInput",
                "../test.jpg",
                Files.readAllBytes(fileToUpload.toPath()))
-            .post(url("PathTraversal/profile-upload-remove-user-input"))
+            .post(url("/WebGoat/PathTraversal/profile-upload-remove-user-input"))
            .then()
            .statusCode(200)
            .extract()
@ -98,7 +98,7 @@ class PathTraversalIT extends IntegrationTest {
  }

  private void assignment4() throws IOException {
-    var uri = "PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
+    var uri = "/WebGoat/PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
    RestAssured.given()
        .urlEncodingEnabled(false)
        .when()
@ -110,7 +110,7 @@ class PathTraversalIT extends IntegrationTest {
        .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));

    checkAssignment(
-        url("PathTraversal/random"),
+        url("/WebGoat/PathTraversal/random"),
        Map.of("secret", Sha512DigestUtils.shaHex(this.getUser())),
        true);
  }
@ -133,10 +133,8 @@ class PathTraversalIT extends IntegrationTest {
            .relaxedHTTPSValidation()
            .cookie("JSESSIONID", getWebGoatCookie())
            .multiPart("uploadedFileZipSlip", "upload.zip", Files.readAllBytes(zipFile.toPath()))
-            .post(url("PathTraversal/zip-slip"))
+            .post(url("/WebGoat/PathTraversal/zip-slip"))
            .then()
-            .log()
-            .all()
            .statusCode(200)
            .extract()
            .path("lessonCompleted"),
@ -147,6 +145,6 @@ class PathTraversalIT extends IntegrationTest {
  void shutdown() {
    // this will run only once after the list of dynamic tests has run, this is to test if the
    // lesson is marked complete
-    checkResults("PathTraversal");
+    checkResults("/PathTraversal");
  }
 }
--- a/src/it/java/org/owasp/webgoat/ProgressRaceConditionIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/ProgressRaceConditionIntegrationTest.java
@ -29,9 +29,9 @@ public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
              .relaxedHTTPSValidation()
              .cookie("JSESSIONID", getWebGoatCookie())
              .formParams(Map.of("flag", "test"))
-              .post(url("challenge/flag/1"));
+              .post(url("/challenge/flag/"));
        };
-    ExecutorService executorService = Executors.newFixedThreadPool(NUMBER_OF_PARALLEL_THREADS);
+    ExecutorService executorService = Executors.newWorkStealingPool(NUMBER_OF_PARALLEL_THREADS);
    List<? extends Callable<Response>> flagCalls =
        IntStream.range(0, NUMBER_OF_CALLS).mapToObj(i -> call).collect(Collectors.toList());
    var responses = executorService.invokeAll(flagCalls);
--- a/src/it/java/org/owasp/webgoat/SSRFIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SSRFIntegrationTest.java
@ -1,5 +1,6 @@
 package org.owasp.webgoat;

+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
@ -7,19 +8,19 @@ import org.junit.jupiter.api.Test;
 public class SSRFIntegrationTest extends IntegrationTest {

  @Test
-  public void runTests() {
+  public void runTests() throws IOException {
    startLesson("SSRF");

    Map<String, Object> params = new HashMap<>();
    params.clear();
    params.put("url", "images/jerry.png");

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

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

-    checkResults("SSRF");
+    checkResults("/SSRF/");
  }
 }
--- a/src/it/java/org/owasp/webgoat/SessionManagementIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SessionManagementIntegrationTest.java
@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 */
 class SessionManagementIT extends IntegrationTest {

-  private static final String HIJACK_LOGIN_CONTEXT_PATH = "HijackSession/login";
+  private static final String HIJACK_LOGIN_CONTEXT_PATH = "/WebGoat/HijackSession/login";

  @Test
  void hijackSessionTest() {
--- a/src/it/java/org/owasp/webgoat/SqlInjectionAdvancedIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SqlInjectionAdvancedIntegrationTest.java
@ -16,27 +16,27 @@ public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
    params.put("password_reg", "password");
    params.put("email_reg", "someone@microsoft.com");
    params.put("confirm_password", "password");
-    checkAssignmentWithPUT(url("SqlInjectionAdvanced/challenge"), params, true);
+    checkAssignmentWithPUT(url("/WebGoat/SqlInjectionAdvanced/challenge"), params, true);

    params.clear();
    params.put("username_login", "tom");
    params.put("password_login", "thisisasecretfortomonly");
-    checkAssignment(url("SqlInjectionAdvanced/challenge_Login"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionAdvanced/challenge_Login"), params, true);

    params.clear();
    params.put("userid_6a", "'; SELECT * FROM user_system_data;--");
-    checkAssignment(url("SqlInjectionAdvanced/attack6a"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6a"), params, true);

    params.clear();
    params.put(
        "userid_6a",
        "Smith' union select userid,user_name, user_name,user_name,password,cookie,userid from"
            + " user_system_data --");
-    checkAssignment(url("SqlInjectionAdvanced/attack6a"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6a"), params, true);

    params.clear();
    params.put("userid_6b", "passW0rD");
-    checkAssignment(url("SqlInjectionAdvanced/attack6b"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6b"), params, true);

    params.clear();
    params.put(
@ -54,8 +54,8 @@ public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
    params.put(
        "question_4_solution",
        "Solution 4: The database registers 'Robert' ); DROP TABLE Students;--'.");
-    checkAssignment(url("SqlInjectionAdvanced/quiz"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionAdvanced/quiz"), params, true);

-    checkResults("SqlInjectionAdvanced");
+    checkResults("/SqlInjectionAdvanced/");
  }
 }
--- a/src/it/java/org/owasp/webgoat/SqlInjectionLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SqlInjectionLessonIntegrationTest.java
@ -34,45 +34,45 @@ public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
    Map<String, Object> params = new HashMap<>();
    params.clear();
    params.put("query", sql_2);
-    checkAssignment(url("SqlInjection/attack2"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjection/attack2"), params, true);

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

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

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

    params.clear();
    params.put("login_count", sql_10_login_count);
    params.put("userid", sql_10_userid);
-    checkAssignment(url("SqlInjection/assignment5b"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjection/assignment5b"), params, true);

    params.clear();
    params.put("name", sql_11_a);
    params.put("auth_tan", sql_11_b);
-    checkAssignment(url("SqlInjection/attack8"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjection/attack8"), params, true);

    params.clear();
    params.put("name", sql_12_a);
    params.put("auth_tan", sql_12_b);
-    checkAssignment(url("SqlInjection/attack9"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjection/attack9"), params, true);

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

-    checkResults("SqlInjection");
+    checkResults("/SqlInjection/");
  }
 }
--- a/src/it/java/org/owasp/webgoat/SqlInjectionMitigationIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SqlInjectionMitigationIntegrationTest.java
@ -23,7 +23,7 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
    params.put("field5", "?");
    params.put("field6", "prep.setString(1,\"\")");
    params.put("field7", "prep.setString(2,\\\"\\\")");
-    checkAssignment(url("SqlInjectionMitigations/attack10a"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10a"), params, true);

    params.put(
        "editor",
@ -37,18 +37,18 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
            + "} catch (Exception e) {\r\n"
            + "    System.out.println(\"Oops. Something went wrong!\");\r\n"
            + "}");
-    checkAssignment(url("SqlInjectionMitigations/attack10b"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10b"), params, true);

    params.clear();
    params.put(
        "userid_sql_only_input_validation", "Smith';SELECT/**/*/**/from/**/user_system_data;--");
-    checkAssignment(url("SqlOnlyInputValidation/attack"), params, true);
+    checkAssignment(url("/WebGoat/SqlOnlyInputValidation/attack"), params, true);

    params.clear();
    params.put(
        "userid_sql_only_input_validation_on_keywords",
        "Smith';SESELECTLECT/**/*/**/FRFROMOM/**/user_system_data;--");
-    checkAssignment(url("SqlOnlyInputValidationOnKeywords/attack"), params, true);
+    checkAssignment(url("/WebGoat/SqlOnlyInputValidationOnKeywords/attack"), params, true);

    RestAssured.given()
        .when()
@ -57,7 +57,7 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
        .contentType(ContentType.JSON)
        .get(
            url(
-                "SqlInjectionMitigations/servers?column=(case when (true) then hostname"
+                "/WebGoat/SqlInjectionMitigations/servers?column=(case when (true) then hostname"
                    + " else id end)"))
        .then()
        .statusCode(200);
@ -67,7 +67,7 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
        .contentType(ContentType.JSON)
-        .get(url("SqlInjectionMitigations/servers?column=unknown"))
+        .get(url("/WebGoat/SqlInjectionMitigations/servers?column=unknown"))
        .then()
        .statusCode(500)
        .body(
@ -78,8 +78,8 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {

    params.clear();
    params.put("ip", "104.130.219.202");
-    checkAssignment(url("SqlInjectionMitigations/attack12a"), params, true);
+    checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack12a"), params, true);

-    checkResults("SqlInjectionMitigations");
+    checkResults();
  }
 }
--- a/src/it/java/org/owasp/webgoat/WebWolfIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/WebWolfIntegrationTest.java
@ -3,6 +3,7 @@ package org.owasp.webgoat;
 import static org.junit.jupiter.api.Assertions.assertTrue;

 import io.restassured.RestAssured;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
@ -10,20 +11,21 @@ import org.junit.jupiter.api.Test;
 public class WebWolfIntegrationTest extends IntegrationTest {

  @Test
-  public void runTests() {
+  public void runTests() throws IOException {
    startLesson("WebWolfIntroduction");

    // Assignment 3
    Map<String, Object> params = new HashMap<>();
+    params.clear();
    params.put("email", this.getUser() + "@webgoat.org");
-    checkAssignment(url("WebWolf/mail/send"), params, false);
+    checkAssignment(url("/WebGoat/WebWolf/mail/send"), params, false);

    String responseBody =
        RestAssured.given()
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("mail").build())
+            .get(webWolfUrl("/WebWolf/mail"))
            .then()
            .extract()
            .response()
@ -37,7 +39,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
            uniqueCode.lastIndexOf("your unique code is: ") + (21 + this.getUser().length()));
    params.clear();
    params.put("uniqueCode", uniqueCode);
-    checkAssignment(url("WebWolf/mail"), params, true);
+    checkAssignment(url("/WebGoat/WebWolf/mail"), params, true);

    // Assignment 4
    RestAssured.given()
@ -45,7 +47,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("JSESSIONID", getWebGoatCookie())
        .queryParams(params)
-        .get(url("WebWolf/landing/password-reset"))
+        .get(url("/WebGoat/WebWolf/landing/password-reset"))
        .then()
        .statusCode(200);
    RestAssured.given()
@ -53,7 +55,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("WEBWOLFSESSION", getWebWolfCookie())
        .queryParams(params)
-        .get(new WebWolfUrlBuilder().path("landing").build())
+        .get(webWolfUrl("/landing"))
        .then()
        .statusCode(200);
    responseBody =
@ -61,7 +63,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("requests").build())
+            .get(webWolfUrl("/WebWolf/requests"))
            .then()
            .extract()
            .response()
@ -70,8 +72,8 @@ public class WebWolfIntegrationTest extends IntegrationTest {
    assertTrue(responseBody.contains(uniqueCode));
    params.clear();
    params.put("uniqueCode", uniqueCode);
-    checkAssignment(url("WebWolf/landing"), params, true);
+    checkAssignment(url("/WebGoat/WebWolf/landing"), params, true);

-    checkResults("WebWolfIntroduction");
+    checkResults("/WebWolf");
  }
 }
--- a/src/it/java/org/owasp/webgoat/XSSIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/XSSIntegrationTest.java
@ -14,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");
@ -23,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");
@ -41,7 +41,7 @@ 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()
@ -50,7 +50,7 @@ public class XSSIntegrationTest extends IntegrationTest {

    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(
@ -73,44 +73,8 @@ public class XSSIntegrationTest extends IntegrationTest {
        "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);
+    checkAssignment(url("/CrossSiteScripting/quiz"), params, true);

-    params.clear();
-    params.put(
-        "editor",
-        "<%@ taglib uri=\"https://www.owasp.org/index.php/OWASP_Java_Encoder_Project\" %>"
-            + "<html>"
-            + "<head>"
-            + "<title>Using GET and POST Method to Read Form Data</title>"
-            + "</head>"
-            + "<body>"
-            + "<h1>Using POST Method to Read Form Data</h1>"
-            + "<table>"
-            + "<tbody>"
-            + "<tr>"
-            + "<td><b>First Name:</b></td>"
-            + "<td>${e:forHtml(param.first_name)}</td>"
-            + "</tr>"
-            + "<tr>"
-            + "<td><b>Last Name:</b></td>"
-            + "<td>${e:forHtml(param.last_name)}</td>"
-            + "</tr>"
-            + "</tbody>"
-            + "</table>"
-            + "</body>"
-            + "</html>");
-    checkAssignment(url("CrossSiteScripting/attack3"), params, true);
-
-    params.clear();
-    params.put(
-        "editor2",
-        "Policy.getInstance(\"antisamy-slashdot.xml\");"
-            + "Sammy s = new AntiSamy();"
-            + "s.scan(newComment,\"\");"
-            + "CleanResults();"
-            + "MyCommentDAO.addComment(threadID, userID).getCleanHTML());");
-    checkAssignment(url("CrossSiteScripting/attack4"), params, true);
-
-    checkResults("CrossSiteScripting");
+    checkResults("/CrossSiteScripting/");
  }
 }
--- a/src/it/java/org/owasp/webgoat/XXEIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/XXEIntegrationTest.java
@ -3,6 +3,9 @@ package org.owasp.webgoat;
 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 org.junit.jupiter.api.Test;

 public class XXEIntegrationTest extends IntegrationTest {
@ -25,40 +28,47 @@ public class XXEIntegrationTest extends IntegrationTest {
      """;

  private String webGoatHomeDirectory;
+  private String webWolfFileServerLocation;

-  // TODO fix me
-  //  /*
-  //   * This test is to verify that all is secure when XXE security patch is applied.
-  //   */
-  //  @Test
-  //  public void xxeSecure() throws IOException {
-  //    startLesson("XXE");
-  //    webGoatHomeDirectory = webGoatServerDirectory();
-  //    RestAssured.given()
-  //        .when()
-  //        .relaxedHTTPSValidation()
-  //        .cookie("JSESSIONID", getWebGoatCookie())
-  //        .get(url("service/enable-security.mvc"))
-  //        .then()
-  //        .statusCode(200);
-  //    checkAssignment(url("xxe/simple"), ContentType.XML, xxe3, false);
-  //    checkAssignment(url("xxe/content-type"), ContentType.XML, xxe4, false);
-  //    checkAssignment(
-  //        url("xxe/blind"),
-  //        ContentType.XML,
-  //        "<comment><text>" + getSecret() + "</text></comment>",
-  //        false);
-  //  }
+  /*
+   * This test is to verify that all is secure when XXE security patch is applied.
+   */
+  @Test
+  public void xxeSecure() throws IOException {
+    startLesson("XXE");
+    webGoatHomeDirectory = webGoatServerDirectory();
+    webWolfFileServerLocation = getWebWolfFileServerLocation();
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .cookie("JSESSIONID", getWebGoatCookie())
+        .get(url("service/enable-security.mvc"))
+        .then()
+        .statusCode(200);
+    checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, false);
+    checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, false);
+    checkAssignment(
+        url("/WebGoat/xxe/blind"),
+        ContentType.XML,
+        "<comment><text>" + getSecret() + "</text></comment>",
+        false);
+  }

  /**
   * This performs the steps of the exercise before the secret can be committed in the final step.
   *
   * @return
+   * @throws IOException
   */
-  private String getSecret() {
+  private String getSecret() throws IOException {
+    // remove any left over DTD
+    Path webWolfFilePath = Paths.get(webWolfFileServerLocation);
+    if (webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")).toFile().exists()) {
+      Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")));
+    }
    String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
-    String webWolfCallback = new WebWolfUrlBuilder().path("landing").attackMode().build();
-    String dtd7String = dtd7.replace("WEBWOLFURL", webWolfCallback).replace("SECRET", secretFile);
+    String dtd7String =
+        dtd7.replace("WEBWOLFURL", webWolfUrl("/landing")).replace("SECRET", secretFile);

    // upload DTD
    RestAssured.given()
@ -66,18 +76,16 @@ public class XXEIntegrationTest extends IntegrationTest {
        .relaxedHTTPSValidation()
        .cookie("WEBWOLFSESSION", getWebWolfCookie())
        .multiPart("file", "blind.dtd", dtd7String.getBytes())
-        .post(new WebWolfUrlBuilder().path("fileupload").build())
+        .post(webWolfUrl("/fileupload"))
        .then()
        .extract()
        .response()
        .getBody()
        .asString();
-
    // upload attack
    String xxe7String =
-        xxe7.replace("WEBWOLFURL", new WebWolfUrlBuilder().attackMode().path("files").build())
-            .replace("USERNAME", this.getUser());
-    checkAssignment(url("xxe/blind"), ContentType.XML, xxe7String, false);
+        xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
+    checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, xxe7String, false);

    // read results from WebWolf
    String result =
@ -85,7 +93,7 @@ public class XXEIntegrationTest extends IntegrationTest {
            .when()
            .relaxedHTTPSValidation()
            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("requests").build())
+            .get(webWolfUrl("/WebWolf/requests"))
            .then()
            .extract()
            .response()
@ -105,13 +113,14 @@ public class XXEIntegrationTest extends IntegrationTest {
  public void runTests() throws IOException {
    startLesson("XXE", true);
    webGoatHomeDirectory = webGoatServerDirectory();
-    checkAssignment(url("xxe/simple"), ContentType.XML, xxe3, true);
-    checkAssignment(url("xxe/content-type"), ContentType.XML, xxe4, true);
+    webWolfFileServerLocation = getWebWolfFileServerLocation();
+    checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
+    checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
    checkAssignment(
-        url("xxe/blind"),
+        url("/WebGoat/xxe/blind"),
        ContentType.XML,
        "<comment><text>" + getSecret() + "</text></comment>",
        true);
-    checkResults("XXE");
+    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
@ -32,23 +32,22 @@ package org.owasp.webgoat.container;

 import static org.asciidoctor.Asciidoctor.Factory.create;

-import jakarta.servlet.http.HttpServletRequest;
+import io.undertow.util.Headers;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.Attributes;
-import org.asciidoctor.Options;
 import org.asciidoctor.extension.JavaExtensionRegistry;
 import org.owasp.webgoat.container.asciidoc.*;
 import org.owasp.webgoat.container.i18n.Language;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.http.HttpHeaders;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
@ -61,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
@ -136,17 +135,17 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
    return computedResourceName;
  }

-  private Options createAttributes() {
+  private Map<String, Object> createAttributes() {
+    Map<String, Object> attributes = new HashMap<>();
+    attributes.put("source-highlighter", "coderay");
+    attributes.put("backend", "xhtml");
+    attributes.put("lang", determineLanguage());
+    attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);

-    return Options.builder()
-        .attributes(
-            Attributes.builder()
-                .attribute("source-highlighter", "coderay")
-                .attribute("backend", "xhtml")
-                .attribute("lang", determineLanguage())
-                .attribute("icons", org.asciidoctor.Attributes.FONT_ICONS)
-                .build())
-        .build();
+    Map<String, Object> options = new HashMap<>();
+    options.put("attributes", attributes);
+
+    return options;
  }

  private String determineLanguage() {
@ -160,7 +159,7 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
      log.debug("browser locale {}", browserLocale);
      return browserLocale.getLanguage();
    } else {
-      String langHeader = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
+      String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING);
      if (null != langHeader) {
        log.debug("browser locale {}", langHeader);
        return langHeader.substring(0, 2);
--- a/src/main/java/org/owasp/webgoat/container/CurrentUser.java
+++ b/src/main/java/org/owasp/webgoat/container/CurrentUser.java
@ -1,14 +0,0 @@
-package org.owasp.webgoat.container;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-
-@Target({ElementType.PARAMETER, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@AuthenticationPrincipal
-public @interface CurrentUser {}
--- a/src/main/java/org/owasp/webgoat/container/CurrentUsername.java
+++ b/src/main/java/org/owasp/webgoat/container/CurrentUsername.java
@ -1,14 +0,0 @@
-package org.owasp.webgoat.container;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-
-@Target({ElementType.PARAMETER, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@AuthenticationPrincipal(expression = "#this.getUsername()")
-public @interface CurrentUsername {}
--- a/src/main/java/org/owasp/webgoat/container/DatabaseConfiguration.java
+++ b/src/main/java/org/owasp/webgoat/container/DatabaseConfiguration.java
@ -6,8 +6,8 @@ import javax.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
+import org.owasp.webgoat.container.lessons.LessonScanner;
 import org.owasp.webgoat.container.service.RestartLessonService;
-import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@ -20,6 +20,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 public class DatabaseConfiguration {

  private final DataSourceProperties properties;
+  private final LessonScanner lessonScanner;

  @Bean
  @Primary
@ -35,8 +36,8 @@ public class DatabaseConfiguration {
  /**
   * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users
   * and 1 for lesson specific tables we use. This way we clean the data in the lesson database
-   * quite easily see {@link RestartLessonService#restartLesson(String, WebGoatUser)} for how we
-   * clean the lesson related tables.
+   * quite easily see {@link RestartLessonService#restartLesson()} for how we clean the lesson
+   * related tables.
   */
  @Bean(initMethod = "migrate")
  public Flyway flyWayContainer() {
@ -49,19 +50,18 @@ public class DatabaseConfiguration {
  }

  @Bean
-  public Function<String, Flyway> flywayLessons() {
+  public Function<String, Flyway> flywayLessons(LessonDataSource lessonDataSource) {
    return schema ->
        Flyway.configure()
            .configuration(Map.of("driver", properties.getDriverClassName()))
            .schemas(schema)
-            .cleanDisabled(false)
-            .dataSource(dataSource())
+            .dataSource(lessonDataSource)
            .locations("lessons")
            .load();
  }

  @Bean
-  public LessonDataSource lessonDataSource(DataSource dataSource) {
-    return new LessonDataSource(dataSource);
+  public LessonDataSource lessonDataSource() {
+    return new LessonDataSource(dataSource());
  }
 }
--- 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.springsecurity6.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring6.SpringTemplateEngine;
-import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring6.view.ThymeleafViewResolver;
+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.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresolver.ITemplateResolver;
@ -242,7 +242,6 @@ 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
@ -1,53 +0,0 @@
-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
@ -32,34 +32,24 @@
 package org.owasp.webgoat.container;

 import java.io.File;
-import org.owasp.webgoat.container.session.LessonSession;
-import org.owasp.webgoat.container.users.UserRepository;
+import org.owasp.webgoat.container.session.UserSessionData;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.client.RestTemplate;

@Configuration
@ComponentScan(basePackages = {"org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
@PropertySource("classpath:application-webgoat.properties")
@EnableAutoConfiguration
-@EnableJpaRepositories(basePackages = {"org.owasp.webgoat.container"})
-@EntityScan(basePackages = "org.owasp.webgoat.container")
 public class WebGoat {

-  private final UserRepository userRepository;
-
-  public WebGoat(UserRepository userRepository) {
-    this.userRepository = userRepository;
-  }
-
  @Bean(name = "pluginTargetDirectory")
  public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
    return new File(webgoatHome);
@ -67,8 +57,14 @@ public class WebGoat {

  @Bean
  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-  public LessonSession userSessionData() {
-    return new LessonSession();
+  public WebSession webSession() {
+    return new WebSession();
+  }
+
+  @Bean
+  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
+  public UserSessionData userSessionData() {
+    return new UserSessionData("test", "data");
  }

  @Bean
--- a/src/main/java/org/owasp/webgoat/container/WebSecurityConfig.java
+++ b/src/main/java/org/owasp/webgoat/container/WebSecurityConfig.java
@ -35,61 +35,52 @@ import org.owasp.webgoat.container.users.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;

 /** Security configuration for WebGoat. */
@Configuration
@AllArgsConstructor
@EnableWebSecurity
-public class WebSecurityConfig {
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter {

  private final UserService userDetailsService;

-  @Bean
-  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-    return http.authorizeHttpRequests(
-            auth ->
-                auth.requestMatchers(
-                        "/favicon.ico",
-                        "/css/**",
-                        "/images/**",
-                        "/js/**",
-                        "fonts/**",
-                        "/plugins/**",
-                        "/registration",
-                        "/register.mvc",
-                        "/actuator/**")
-                    .permitAll()
-                    .anyRequest()
-                    .authenticated())
-        .formLogin(
-            login ->
-                login
-                    .loginPage("/login")
-                    .defaultSuccessUrl("/welcome.mvc", true)
-                    .usernameParameter("username")
-                    .passwordParameter("password")
-                    .permitAll())
-        .oauth2Login(
-            oidc -> {
-              oidc.defaultSuccessUrl("/login-oauth.mvc");
-              oidc.loginPage("/login");
-            })
-        .logout(logout -> logout.deleteCookies("JSESSIONID").invalidateHttpSession(true))
-        .csrf(csrf -> csrf.disable())
-        .headers(headers -> headers.disable())
-        .exceptionHandling(
-            handling ->
-                handling.authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login")))
-        .build();
+  @Override
+  protected void configure(HttpSecurity http) throws Exception {
+    ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security =
+        http.authorizeRequests()
+            .antMatchers(
+                "/css/**",
+                "/images/**",
+                "/js/**",
+                "fonts/**",
+                "/plugins/**",
+                "/registration",
+                "/register.mvc",
+                "/actuator/**")
+            .permitAll()
+            .anyRequest()
+            .authenticated();
+    security
+        .and()
+        .formLogin()
+        .loginPage("/login")
+        .defaultSuccessUrl("/welcome.mvc", true)
+        .usernameParameter("username")
+        .passwordParameter("password")
+        .permitAll();
+    security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
+    security.and().csrf().disable();
+
+    http.headers().cacheControl().disable();
+    http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login"));
  }

  @Autowired
@ -98,17 +89,18 @@ public class WebSecurityConfig {
  }

  @Bean
-  @Primary
-  public UserDetailsService userDetailsServiceBean() {
+  @Override
+  public UserDetailsService userDetailsServiceBean() throws Exception {
    return userDetailsService;
  }

+  @Override
  @Bean
-  public AuthenticationManager authenticationManager(
-      AuthenticationConfiguration authenticationConfiguration) throws Exception {
-    return authenticationConfiguration.getAuthenticationManager();
+  protected AuthenticationManager authenticationManager() throws Exception {
+    return super.authenticationManager();
  }

+  @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 null != context ? context.getEnvironment() : null;
+    return context.getEnvironment();
  }

  @Override
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/OperatingSystemMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/OperatingSystemMacro.java
@ -1,8 +1,7 @@
 package org.owasp.webgoat.container.asciidoc;

 import java.util.Map;
-import org.asciidoctor.ast.PhraseNode;
-import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;

 public class OperatingSystemMacro extends InlineMacroProcessor {
@ -16,8 +15,7 @@ public class OperatingSystemMacro extends InlineMacroProcessor {
  }

  @Override
-  public PhraseNode process(
-      StructuralNode contentNode, String target, Map<String, Object> attributes) {
+  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
    var osName = System.getProperty("os.name");

    // see
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/UsernameMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/UsernameMacro.java
@ -1,8 +1,7 @@
 package org.owasp.webgoat.container.asciidoc;

 import java.util.Map;
-import org.asciidoctor.ast.PhraseNode;
-import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
@ -18,8 +17,7 @@ public class UsernameMacro extends InlineMacroProcessor {
  }

  @Override
-  public PhraseNode process(
-      StructuralNode contentNode, String target, Map<String, Object> attributes) {
+  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
    var auth = SecurityContextHolder.getContext().getAuthentication();
    var username = "unknown";
    if (auth.getPrincipal() instanceof WebGoatUser webGoatUser) {
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatTmpDirMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatTmpDirMacro.java
@ -1,8 +1,7 @@
 package org.owasp.webgoat.container.asciidoc;

 import java.util.Map;
-import org.asciidoctor.ast.PhraseNode;
-import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;

 public class WebGoatTmpDirMacro extends InlineMacroProcessor {
@ -16,12 +15,11 @@ public class WebGoatTmpDirMacro extends InlineMacroProcessor {
  }

  @Override
-  public PhraseNode process(
-      StructuralNode structuralNode, String target, Map<String, Object> attributes) {
+  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
    var env = EnvironmentExposure.getEnv().getProperty("webgoat.server.directory");

    // see
    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
-    return createPhraseNode(structuralNode, "quoted", env);
+    return createPhraseNode(contentNode, "quoted", env);
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatVersionMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatVersionMacro.java
@ -1,8 +1,7 @@
 package org.owasp.webgoat.container.asciidoc;

 import java.util.Map;
-import org.asciidoctor.ast.PhraseNode;
-import org.asciidoctor.ast.StructuralNode;
+import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;

 public class WebGoatVersionMacro extends InlineMacroProcessor {
@ -16,8 +15,7 @@ public class WebGoatVersionMacro extends InlineMacroProcessor {
  }

  @Override
-  public PhraseNode process(
-      StructuralNode contentNode, String target, Map<String, Object> attributes) {
+  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
    var webgoatVersion = EnvironmentExposure.getEnv().getProperty("webgoat.build.version");

    // see
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfMacro.java
@ -2,9 +2,11 @@ package org.owasp.webgoat.container.asciidoc;

 import java.util.HashMap;
 import java.util.Map;
-import org.asciidoctor.ast.PhraseNode;
-import org.asciidoctor.ast.StructuralNode;
+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:
@ -22,10 +24,9 @@ public class WebWolfMacro extends InlineMacroProcessor {
  }

  @Override
-  public PhraseNode process(
-      StructuralNode contentNode, String linkText, Map<String, Object> attributes) {
+  public Object process(ContentNode contentNode, String linkText, Map<String, Object> attributes) {
    var env = EnvironmentExposure.getEnv();
-    var hostname = env.getProperty("webwolf.url");
+    var hostname = determineHost(env.getProperty("webwolf.port"));
    var target = (String) attributes.getOrDefault("target", "home");
    var href = hostname + "/" + target;

@ -38,10 +39,35 @@ public class WebWolfMacro extends InlineMacroProcessor {
    options.put("type", ":link");
    options.put("target", href);
    attributes.put("window", "_blank");
-    return createPhraseNode(contentNode, "anchor", linkText, attributes, options);
+    return createPhraseNode(contentNode, "anchor", linkText, attributes, options).convert();
  }

  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,4 +17,9 @@ 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/AssignmentEndpoint.java
+++ b/src/main/java/org/owasp/webgoat/container/assignments/AssignmentEndpoint.java
@ -25,13 +25,27 @@

 package org.owasp.webgoat.container.assignments;

+import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.lessons.Initializeable;
+import org.owasp.webgoat.container.session.UserSessionData;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.beans.factory.annotation.Autowired;

-public abstract class AssignmentEndpoint {
+public abstract class AssignmentEndpoint implements Initializeable {

-  // TODO: move this to different bean.
-  @Autowired private PluginMessages messages;
+  @Autowired private WebSession webSession;
+  @Autowired private UserSessionData userSessionData;
+  @Getter @Autowired private PluginMessages messages;
+
+  protected WebSession getWebSession() {
+    return webSession;
+  }
+
+  protected UserSessionData getUserSessionData() {
+    return userSessionData;
+  }

  /**
   * Convenience method for create a successful result:
@ -72,4 +86,7 @@ public abstract class AssignmentEndpoint {
  protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
    return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
  }
+
+  @Override
+  public void initialize(WebGoatUser user) {}
 }
--- a/src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java
+++ b/src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java
@ -22,30 +22,27 @@

 package org.owasp.webgoat.container.assignments;

-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.users.UserProgress;
-import org.owasp.webgoat.container.users.UserProgressRepository;
-import org.owasp.webgoat.container.users.WebGoatUser;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;

@RestControllerAdvice
 public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {

-  private final Course course;
-  private final UserProgressRepository userProgressRepository;
+  private UserTrackerRepository userTrackerRepository;
+  private WebSession webSession;

-  public LessonTrackerInterceptor(Course course, UserProgressRepository userProgressRepository) {
-    this.course = course;
-    this.userProgressRepository = userProgressRepository;
+  public LessonTrackerInterceptor(
+      UserTrackerRepository userTrackerRepository, WebSession webSession) {
+    this.userTrackerRepository = userTrackerRepository;
+    this.webSession = webSession;
  }

  @Override
@ -68,30 +65,17 @@ public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
    return o;
  }

-  private void trackProgress(AttackResult attackResult) {
-    var user = (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-    Assert.notNull(user, "User not found in SecurityContext");
-    var username = realUsername(user);
-
-    var userProgress = userProgressRepository.findByUser(username);
-    if (userProgress == null) {
-      userProgress = new UserProgress(username);
+  protected AttackResult trackProgress(AttackResult attackResult) {
+    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+    if (userTracker == null) {
+      userTracker = new UserTracker(webSession.getUserName());
    }
-    Lesson lesson = course.getLessonByAssignment(attackResult.getAssignment());
-    Assert.notNull(lesson, "Lesson not found for assignment " + attackResult.getAssignment());
-
    if (attackResult.assignmentSolved()) {
-      userProgress.assignmentSolved(lesson, attackResult.getAssignment());
+      userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
    } else {
-      userProgress.assignmentFailed(lesson);
+      userTracker.assignmentFailed(webSession.getCurrentLesson());
    }
-    userProgressRepository.save(userProgress);
-  }
-
-  private String realUsername(WebGoatUser user) {
-    // maybe we shouldn't hard code this with just csrf- prefix for now it works
-    return user.getUsername().startsWith("csrf-")
-        ? user.getUsername().substring("csrf-".length())
-        : user.getUsername();
+    userTrackerRepository.saveAndFlush(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,22 +31,44 @@
 */
 package org.owasp.webgoat.container.controller;

-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;

@Controller
 public class StartLesson {

+  private final WebSession ws;
  private final Course course;

-  public StartLesson(Course course) {
+  public StartLesson(WebSession ws, Course course) {
+    this.ws = ws;
    this.course = course;
  }

-  @GetMapping(
+  /**
+   * start.
+   *
+   * @return a {@link ModelAndView} object.
+   */
+  @RequestMapping(
+      path = "startlesson.mvc",
+      method = {RequestMethod.GET, RequestMethod.POST})
+  public ModelAndView start() {
+    var model = new ModelAndView();
+
+    model.addObject("course", course);
+    model.addObject("lesson", ws.getCurrentLesson());
+    model.setViewName("lesson_content");
+
+    return model;
+  }
+
+  @RequestMapping(
      value = {"*.lesson"},
      produces = "text/html")
  public ModelAndView lessonPage(HttpServletRequest request) {
@ -59,7 +81,8 @@ public class StartLesson {
        .findFirst()
        .ifPresent(
            lesson -> {
-              request.setAttribute("lesson", lesson);
+              ws.setCurrentLesson(lesson);
+              model.addObject("lesson", lesson);
            });

    return model;
--- 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 jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+import javax.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 jakarta.servlet.http.HttpServletRequest} object.
+   * @param request a {@link javax.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,14 +1,9 @@
 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 lombok.EqualsAndHashCode;
-import lombok.Getter;
+import javax.persistence.*;
+import lombok.*;

 /**
 * ************************************************************************************************
@ -46,16 +41,15 @@ import lombok.Getter;
 public class Assignment {

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

  private String name;
  private String path;
-  private boolean solved = false;

  @Transient private List<String> hints;

-  protected Assignment() {
+  private Assignment() {
    // Hibernate
  }

@ -75,8 +69,4 @@ public class Assignment {
    this.path = path;
    this.hints = hints;
  }
-
-  public void solved() {
-    this.solved = true;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/Category.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/Category.java
@ -34,28 +34,30 @@ import lombok.Getter;
 * @since October 28, 2003
 */
 public enum Category {
-  INTRODUCTION("Introduction"),
-  GENERAL("General"),
+  INTRODUCTION("Introduction", 5),
+  GENERAL("General", 100),

-  A1("(A1) Broken Access Control"),
-  A2("(A2) Cryptographic Failures"),
-  A3("(A3) Injection"),
+  A1("(A1) Broken Access Control", 301),
+  A2("(A2) Cryptographic Failures", 302),
+  A3("(A3) Injection", 303),

-  A5("(A5) Security Misconfiguration"),
-  A6("(A6) Vuln & Outdated Components"),
-  A7("(A7) Identity & Auth Failure"),
-  A8("(A8) Software & Data Integrity"),
-  A9("(A9) Security Logging Failures"),
-  A10("(A10) Server-side Request Forgery"),
+  A5("(A5) Security Misconfiguration", 305),
+  A6("(A6) Vuln & Outdated Components", 306),
+  A7("(A7) Identity & Auth Failure", 307),
+  A8("(A8) Software & Data Integrity", 308),
+  A9("(A9) Security Logging Failures", 309),
+  A10("(A10) Server-side Request Forgery", 310),

-  CLIENT_SIDE("Client side"),
+  CLIENT_SIDE("Client side", 1700),

-  CHALLENGE("Challenges");
+  CHALLENGE("Challenges", 3000);

  @Getter private String name;
+  @Getter private Integer ranking;

-  Category(String name) {
+  Category(String name, Integer ranking) {
    this.name = name;
+    this.ranking = ranking;
  }

  @Override
--- a/src/main/java/org/owasp/webgoat/container/lessons/CourseConfiguration.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/CourseConfiguration.java
@ -22,9 +22,12 @@

 package org.owasp.webgoat.container.lessons;

+import static java.util.stream.Collectors.groupingBy;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.util.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
@ -32,91 +35,45 @@ import org.owasp.webgoat.container.assignments.AttackResult;
 import org.owasp.webgoat.container.session.Course;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

+@Slf4j
@Configuration
 public class CourseConfiguration {
+
  private final List<Lesson> lessons;
  private final List<AssignmentEndpoint> assignments;
+  private final Map<String, List<AssignmentEndpoint>> assignmentsByPackage;

  public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
    this.lessons = lessons;
    this.assignments = assignments;
-  }
-
-  private void attachToLessonInParentPackage(
-      AssignmentEndpoint assignmentEndpoint, String packageName) {
-    if (packageName.equals("org.owasp.webgoat.lessons")) {
-      throw new IllegalStateException(
-          "No lesson found for assignment: '%s'"
-              .formatted(assignmentEndpoint.getClass().getSimpleName()));
-    }
-    lessons.stream()
-        .filter(l -> l.getClass().getPackageName().equals(packageName))
-        .findFirst()
-        .ifPresentOrElse(
-            l -> l.addAssignment(toAssignment(assignmentEndpoint)),
-            () ->
-                attachToLessonInParentPackage(
-                    assignmentEndpoint, packageName.substring(0, packageName.lastIndexOf("."))));
-  }
-
-  /**
-   * For each assignment endpoint, find the lesson in the same package or if not found, find the
-   * lesson in the parent package
-   */
-  private void attachToLesson(AssignmentEndpoint assignmentEndpoint) {
-    lessons.stream()
-        .filter(
-            l ->
-                l.getClass()
-                    .getPackageName()
-                    .equals(assignmentEndpoint.getClass().getPackageName()))
-        .findFirst()
-        .ifPresentOrElse(
-            l -> l.addAssignment(toAssignment(assignmentEndpoint)),
-            () -> {
-              var assignmentPackageName = assignmentEndpoint.getClass().getPackageName();
-              attachToLessonInParentPackage(
-                  assignmentEndpoint,
-                  assignmentPackageName.substring(0, assignmentPackageName.lastIndexOf(".")));
-            });
-  }
-
-  private Assignment toAssignment(AssignmentEndpoint endpoint) {
-    return new Assignment(
-        endpoint.getClass().getSimpleName(),
-        getPath(endpoint.getClass()),
-        getHints(endpoint.getClass()));
+    assignmentsByPackage =
+        this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
  }

  @Bean
  public Course course() {
-    assignments.stream().forEach(this::attachToLesson);
-
-    // Check if all assignments are attached to a lesson
-    var assignmentsAttachedToLessons =
-        lessons.stream().mapToInt(l -> l.getAssignments().size()).sum();
-    Assert.isTrue(
-        assignmentsAttachedToLessons == assignments.size(),
-        "Not all assignments are attached to a lesson, please check the configuration. The"
-            + " following assignments are not attached to any lesson: "
-            + findDiff());
+    lessons.stream().forEach(l -> l.setAssignments(createAssignment(l)));
    return new Course(lessons);
  }

-  private List<String> findDiff() {
-    var matchedToLessons =
-        lessons.stream().flatMap(l -> l.getAssignments().stream()).map(a -> a.getName()).toList();
-    var allAssignments = assignments.stream().map(a -> a.getClass().getSimpleName()).toList();
-
-    var diff = new ArrayList<>(allAssignments);
-    diff.removeAll(matchedToLessons);
-    return diff;
+  private List<Assignment> createAssignment(Lesson lesson) {
+    var endpoints = assignmentsByPackage.get(lesson.getClass().getPackageName());
+    if (CollectionUtils.isEmpty(endpoints)) {
+      log.warn("Lesson: {} has no endpoints, is this intentionally?", lesson.getTitle());
+      return new ArrayList<>();
+    }
+    return endpoints.stream()
+        .map(
+            e ->
+                new Assignment(
+                    e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
+        .toList();
  }

  private String getPath(Class<? extends AssignmentEndpoint> e) {
--- a/src/main/java/org/owasp/webgoat/container/lessons/Initializeable.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/Initializeable.java
@ -6,7 +6,7 @@ import org.owasp.webgoat.container.users.WebGoatUser;
 * Interface for initialization of a lesson. It is called when a new user is added to WebGoat and
 * when a users reset a lesson. Make sure to clean beforehand and then re-initialize the lesson.
 */
-public interface Initializable {
+public interface Initializeable {

-  default void initialize(WebGoatUser webGoatUser) {}
+  void initialize(WebGoatUser webGoatUser);
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/Lesson.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/Lesson.java
@ -22,7 +22,6 @@

 package org.owasp.webgoat.container.lessons;

-import java.util.ArrayList;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
@ -31,10 +30,13 @@ import lombok.Setter;
@Setter
 public abstract class Lesson {

-  private List<Assignment> assignments = new ArrayList<>();
+  private static int count = 1;
+  private Integer id = null;
+  private List<Assignment> assignments;

-  public void addAssignment(Assignment assignment) {
-    this.assignments.add(assignment);
+  /** Constructor for the Lesson object */
+  protected Lesson() {
+    id = ++count;
  }

  /**
@ -42,9 +44,9 @@ public abstract class Lesson {
   *
   * @return a {@link java.lang.String} object.
   */
-  public LessonName getName() {
+  public String getName() {
    String className = getClass().getName();
-    return new LessonName(className.substring(className.lastIndexOf('.') + 1));
+    return className.substring(className.lastIndexOf('.') + 1);
  }

  /**
@ -114,10 +116,6 @@ public abstract class Lesson {
    return this.getClass().getSimpleName();
  }

-  /**
-   * This is used in Thymeleaf to construct the HTML to load the lesson content from. See
-   * lesson_content.html
-   */
  public final String getPackage() {
    var packageName = this.getClass().getPackageName();
    // package name is the direct package name below lessons (any subpackage will be removed)
--- a/src/main/java/org/owasp/webgoat/container/lessons/LessonConnectionInvocationHandler.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/LessonConnectionInvocationHandler.java
@ -4,13 +4,15 @@ 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/lessons/LessonName.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/LessonName.java
@ -1,21 +0,0 @@
-package org.owasp.webgoat.container.lessons;
-
-import org.springframework.util.Assert;
-
-/**
- * Wrapper class for the name of a lesson. This class is used to ensure that the lesson name is not
- * null and does not contain the ".lesson" suffix. The front-end passes the lesson name as a string
- * to the back-end, which then creates a new LessonName object with the lesson name as a parameter.
- * The constructor of the LessonName class checks if the lesson name is null and removes the
- * ".lesson" suffix if it is present.
- *
- * @param lessonName
- */
-public record LessonName(String lessonName) {
-  public LessonName {
-    Assert.notNull(lessonName, "Lesson name cannot be null");
-    if (lessonName.contains(".lesson")) {
-      lessonName = lessonName.substring(0, lessonName.indexOf(".lesson"));
-    }
-  }
-}
--- a/src/main/java/org/owasp/webgoat/container/report/LessonStatistics.java
+++ b/src/main/java/org/owasp/webgoat/container/report/LessonStatistics.java
@ -1,3 +0,0 @@
-package org.owasp.webgoat.container.report;
-
-record LessonStatistics(String name, boolean solved, int numberOfAttempts) {}
--- a/src/main/java/org/owasp/webgoat/container/report/ReportCardController.java
+++ b/src/main/java/org/owasp/webgoat/container/report/ReportCardController.java
@ -1,88 +0,0 @@
-/**
- * *************************************************************************************************
- *
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- */
-package org.owasp.webgoat.container.report;
-
-import java.util.List;
-import org.owasp.webgoat.container.CurrentUsername;
-import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.users.UserProgressRepository;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class ReportCardController {
-
-  private final UserProgressRepository userProgressRepository;
-  private final Course course;
-  private final PluginMessages pluginMessages;
-
-  public ReportCardController(
-      UserProgressRepository userProgressRepository, Course course, PluginMessages pluginMessages) {
-    this.userProgressRepository = userProgressRepository;
-    this.course = course;
-    this.pluginMessages = pluginMessages;
-  }
-
-  /**
-   * Endpoint which generates the report card for the current use to show the stats on the solved
-   * lessons
-   */
-  @GetMapping(path = "/service/reportcard.mvc", produces = "application/json")
-  @ResponseBody
-  public ReportCard reportCard(@CurrentUsername String username) {
-    var userProgress = userProgressRepository.findByUser(username);
-    var lessonStatistics =
-        course.getLessons().stream()
-            .map(
-                lesson -> {
-                  var lessonTracker = userProgress.getLessonProgress(lesson);
-                  return new LessonStatistics(
-                      pluginMessages.getMessage(lesson.getTitle()),
-                      lessonTracker.isLessonSolved(),
-                      lessonTracker.getNumberOfAttempts());
-                })
-            .toList();
-    return new ReportCard(
-        course.getTotalOfLessons(),
-        course.getTotalOfAssignments(),
-        userProgress.numberOfAssignmentsSolved(),
-        userProgress.numberOfLessonsSolved(),
-        lessonStatistics);
-  }
-
-  private record ReportCard(
-      int totalNumberOfLessons,
-      int totalNumberOfAssignments,
-      long numberOfAssignmentsSolved,
-      long numberOfLessonsSolved,
-      List<LessonStatistics> lessonStatistics) {}
-
-  private record LessonStatistics(String name, boolean solved, int numberOfAttempts) {}
-}
--- a/src/main/java/org/owasp/webgoat/container/service/HintService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/HintService.java
@ -10,24 +10,26 @@ import java.util.Collection;
 import java.util.List;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Hint;
-import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

+/**
+ * HintService class.
+ *
+ * @author rlawson
+ * @version $Id: $Id
+ */
@RestController
 public class HintService {

  public static final String URL_HINTS_MVC = "/service/hint.mvc";
-  private final List<Hint> allHints;
+  private final WebSession webSession;

-  public HintService(Course course) {
-    this.allHints =
-        course.getLessons().stream()
-            .flatMap(lesson -> lesson.getAssignments().stream())
-            .map(this::createHint)
-            .flatMap(Collection::stream)
-            .toList();
+  public HintService(WebSession webSession) {
+    this.webSession = webSession;
  }

  /**
@ -38,7 +40,15 @@ public class HintService {
  @GetMapping(path = URL_HINTS_MVC, produces = "application/json")
  @ResponseBody
  public List<Hint> getHints() {
-    return allHints;
+    Lesson l = webSession.getCurrentLesson();
+    return createAssignmentHints(l);
+  }
+
+  private List<Hint> createAssignmentHints(Lesson l) {
+    if (l != null) {
+      return l.getAssignments().stream().map(this::createHint).flatMap(Collection::stream).toList();
+    }
+    return List.of();
  }

  private List<Hint> createHint(Assignment a) {
--- a/src/main/java/org/owasp/webgoat/container/service/LessonInfoService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LessonInfoService.java
@ -1,24 +1,33 @@
 package org.owasp.webgoat.container.service;

-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
+import org.owasp.webgoat.container.lessons.Lesson;
 import org.owasp.webgoat.container.lessons.LessonInfoModel;
-import org.owasp.webgoat.container.lessons.LessonName;
-import org.owasp.webgoat.container.session.Course;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.owasp.webgoat.container.session.WebSession;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

+/**
+ * LessonInfoService class.
+ *
+ * @author dm
+ * @version $Id: $Id
+ */
@RestController
-@RequiredArgsConstructor
+@AllArgsConstructor
 public class LessonInfoService {

-  private final Course course;
+  private final WebSession webSession;

-  @GetMapping(path = "/service/lessoninfo.mvc/{lesson}")
-  public @ResponseBody LessonInfoModel getLessonInfo(
-      @PathVariable("lesson") LessonName lessonName) {
-    var lesson = course.getLessonByName(lessonName);
+  /**
+   * getLessonInfo.
+   *
+   * @return a {@link LessonInfoModel} object.
+   */
+  @RequestMapping(path = "/service/lessoninfo.mvc", produces = "application/json")
+  public @ResponseBody LessonInfoModel getLessonInfo() {
+    Lesson lesson = webSession.getCurrentLesson();
    return new LessonInfoModel(lesson.getTitle(), false, false, false);
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/LessonMenuService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LessonMenuService.java
@ -32,16 +32,16 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import lombok.AllArgsConstructor;
-import org.owasp.webgoat.container.CurrentUsername;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.owasp.webgoat.container.lessons.LessonMenuItem;
 import org.owasp.webgoat.container.lessons.LessonMenuItemType;
 import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.users.LessonProgress;
-import org.owasp.webgoat.container.users.UserProgress;
-import org.owasp.webgoat.container.users.UserProgressRepository;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.LessonTracker;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@ -59,7 +59,8 @@ public class LessonMenuService {

  public static final String URL_LESSONMENU_MVC = "/service/lessonmenu.mvc";
  private final Course course;
-  private UserProgressRepository userTrackerRepository;
+  private final WebSession webSession;
+  private UserTrackerRepository userTrackerRepository;

  @Value("#{'${exclude.categories}'.split(',')}")
  private List<String> excludeCategories;
@ -73,13 +74,10 @@ public class LessonMenuService {
   * @return a {@link java.util.List} object.
   */
  @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
-  public @ResponseBody List<LessonMenuItem> showLeftNav(@CurrentUsername String username) {
-    // TODO: this looks way too complicated. Either we save it incorrectly or we miss something to
-    // easily find out
-    // if a lesson if solved or not.
+  public @ResponseBody List<LessonMenuItem> showLeftNav() {
    List<LessonMenuItem> menu = new ArrayList<>();
    List<Category> categories = course.getCategories();
-    UserProgress userTracker = userTrackerRepository.findByUser(username);
+    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());

    for (Category category : categories) {
      if (excludeCategories.contains(category.name())) {
@ -99,12 +97,12 @@ public class LessonMenuService {
        lessonItem.setName(lesson.getTitle());
        lessonItem.setLink(lesson.getLink());
        lessonItem.setType(LessonMenuItemType.LESSON);
-        LessonProgress lessonTracker = userTracker.getLessonProgress(lesson);
+        LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
        boolean lessonSolved = lessonCompleted(lessonTracker.getLessonOverview(), lesson);
        lessonItem.setComplete(lessonSolved);
        categoryItem.addChild(lessonItem);
      }
-      categoryItem.getChildren().sort(Comparator.comparingInt(LessonMenuItem::getRanking));
+      categoryItem.getChildren().sort((o1, o2) -> o1.getRanking() - o2.getRanking());
      menu.add(categoryItem);
    }
    return menu;
--- a/src/main/java/org/owasp/webgoat/container/service/LessonProgressService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LessonProgressService.java
@ -4,15 +4,11 @@ import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.owasp.webgoat.container.CurrentUsername;
 import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.container.lessons.LessonName;
-import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.users.UserProgressRepository;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

 /**
@ -24,8 +20,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequiredArgsConstructor
 public class LessonProgressService {

-  private final UserProgressRepository userProgressRepository;
-  private final Course course;
+  private final UserTrackerRepository userTrackerRepository;
+  private final WebSession webSession;

  /**
   * Endpoint for fetching the complete lesson overview which informs the user about whether all the
@ -33,19 +29,19 @@ public class LessonProgressService {
   *
   * @return list of assignments
   */
-  @GetMapping(value = "/service/lessonoverview.mvc/{lesson}")
+  @RequestMapping(value = "/service/lessonoverview.mvc", produces = "application/json")
  @ResponseBody
-  public List<LessonOverview> lessonOverview(
-      @PathVariable("lesson") LessonName lessonName, @CurrentUsername String username) {
-    var userProgress = userProgressRepository.findByUser(username);
-    var lesson = course.getLessonByName(lessonName);
+  public List<LessonOverview> lessonOverview() {
+    var userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+    var currentLesson = webSession.getCurrentLesson();

-    Assert.isTrue(lesson != null, "Lesson not found: " + lessonName);
-
-    var lessonProgress = userProgress.getLessonProgress(lesson);
-    return lessonProgress.getLessonOverview().entrySet().stream()
-        .map(entry -> new LessonOverview(entry.getKey(), entry.getValue()))
-        .toList();
+    if (currentLesson != null) {
+      var lessonTracker = userTracker.getLessonTracker(currentLesson);
+      return lessonTracker.getLessonOverview().entrySet().stream()
+          .map(entry -> new LessonOverview(entry.getKey(), entry.getValue()))
+          .toList();
+    }
+    return List.of();
  }

  @AllArgsConstructor
--- a/src/main/java/org/owasp/webgoat/container/service/LessonTitleService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LessonTitleService.java
@ -0,0 +1,34 @@
+package org.owasp.webgoat.container.service;
+
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.WebSession;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * LessonTitleService class.
+ *
+ * @author dm
+ * @version $Id: $Id
+ */
+@Controller
+public class LessonTitleService {
+
+  private final WebSession webSession;
+
+  public LessonTitleService(final WebSession webSession) {
+    this.webSession = webSession;
+  }
+
+  /**
+   * Returns the title for the current attack
+   *
+   * @return a {@link java.lang.String} object.
+   */
+  @RequestMapping(path = "/service/lessontitle.mvc", produces = "application/html")
+  public @ResponseBody String showPlan() {
+    Lesson lesson = webSession.getCurrentLesson();
+    return lesson != null ? lesson.getTitle() : "";
+  }
+}
--- a/src/main/java/org/owasp/webgoat/container/service/ReportCardService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/ReportCardService.java
@ -0,0 +1,105 @@
+/**
+ * *************************************************************************************************
+ *
+ * <p>
+ *
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ *
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ *
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * <p>Getting Source ==============
+ *
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * for free software projects.
+ */
+package org.owasp.webgoat.container.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.LessonTracker;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * ReportCardService
+ *
+ * @author nbaars
+ * @version $Id: $Id
+ */
+@Controller
+@AllArgsConstructor
+public class ReportCardService {
+
+  private final WebSession webSession;
+  private final UserTrackerRepository userTrackerRepository;
+  private final Course course;
+  private final PluginMessages pluginMessages;
+
+  /**
+   * Endpoint which generates the report card for the current use to show the stats on the solved
+   * lessons
+   */
+  @GetMapping(path = "/service/reportcard.mvc", produces = "application/json")
+  @ResponseBody
+  public ReportCard reportCard() {
+    final ReportCard reportCard = new ReportCard();
+    reportCard.setTotalNumberOfLessons(course.getTotalOfLessons());
+    reportCard.setTotalNumberOfAssignments(course.getTotalOfAssignments());
+
+    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+    reportCard.setNumberOfAssignmentsSolved(userTracker.numberOfAssignmentsSolved());
+    reportCard.setNumberOfLessonsSolved(userTracker.numberOfLessonsSolved());
+    for (Lesson lesson : course.getLessons()) {
+      LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
+      final LessonStatistics lessonStatistics = new LessonStatistics();
+      lessonStatistics.setName(pluginMessages.getMessage(lesson.getTitle()));
+      lessonStatistics.setNumberOfAttempts(lessonTracker.getNumberOfAttempts());
+      lessonStatistics.setSolved(lessonTracker.isLessonSolved());
+      reportCard.lessonStatistics.add(lessonStatistics);
+    }
+    return reportCard;
+  }
+
+  @Getter
+  @Setter
+  private final class ReportCard {
+
+    private int totalNumberOfLessons;
+    private int totalNumberOfAssignments;
+    private int solvedLessons;
+    private int numberOfAssignmentsSolved;
+    private int numberOfLessonsSolved;
+    private List<LessonStatistics> lessonStatistics = new ArrayList<>();
+  }
+
+  @Setter
+  @Getter
+  private final class LessonStatistics {
+    private String name;
+    private boolean solved;
+    private int numberOfAttempts;
+  }
+}
--- a/src/main/java/org/owasp/webgoat/container/service/RestartLessonService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/RestartLessonService.java
@ -29,17 +29,14 @@ import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
-import org.owasp.webgoat.container.CurrentUser;
-import org.owasp.webgoat.container.lessons.Initializable;
-import org.owasp.webgoat.container.lessons.LessonName;
-import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.users.UserProgress;
-import org.owasp.webgoat.container.users.UserProgressRepository;
-import org.owasp.webgoat.container.users.WebGoatUser;
+import org.owasp.webgoat.container.lessons.Initializeable;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;

@Controller
@ -47,25 +44,25 @@ import org.springframework.web.bind.annotation.ResponseStatus;
@Slf4j
 public class RestartLessonService {

-  private final Course course;
-  private final UserProgressRepository userTrackerRepository;
+  private final WebSession webSession;
+  private final UserTrackerRepository userTrackerRepository;
  private final Function<String, Flyway> flywayLessons;
-  private final List<Initializable> lessonsToInitialize;
+  private final List<Initializeable> lessonsToInitialize;

-  @GetMapping(path = "/service/restartlesson.mvc/{lesson}")
+  @RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text")
  @ResponseStatus(value = HttpStatus.OK)
-  public void restartLesson(
-      @PathVariable("lesson") LessonName lessonName, @CurrentUser WebGoatUser user) {
-    var lesson = course.getLessonByName(lessonName);
+  public void restartLesson() {
+    Lesson al = webSession.getCurrentLesson();
+    log.debug("Restarting lesson: " + al);

-    UserProgress userTracker = userTrackerRepository.findByUser(user.getUsername());
-    userTracker.reset(lesson);
+    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+    userTracker.reset(al);
    userTrackerRepository.save(userTracker);

-    var flyway = flywayLessons.apply(user.getUsername());
+    var flyway = flywayLessons.apply(webSession.getUserName());
    flyway.clean();
    flyway.migrate();

-    lessonsToInitialize.forEach(i -> i.initialize(user));
+    lessonsToInitialize.forEach(i -> i.initialize(webSession.getUser()));
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/SessionService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/SessionService.java
@ -7,9 +7,8 @@
 package org.owasp.webgoat.container.service;

 import lombok.RequiredArgsConstructor;
-import org.owasp.webgoat.container.CurrentUser;
 import org.owasp.webgoat.container.i18n.Messages;
-import org.owasp.webgoat.container.users.WebGoatUser;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@ -18,17 +17,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequiredArgsConstructor
 public class SessionService {

+  private final WebSession webSession;
  private final RestartLessonService restartLessonService;
  private final Messages messages;

  @RequestMapping(path = "/service/enable-security.mvc", produces = "application/json")
  @ResponseBody
-  public String applySecurity(@CurrentUser WebGoatUser user) {
-    // webSession.toggleSecurity();
-    // restartLessonService.restartLesson(user);
+  public String applySecurity() {
+    webSession.toggleSecurity();
+    restartLessonService.restartLesson();

-    // TODO disabled for now
-    // var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled";
-    return messages.getMessage("Not working...");
+    var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled";
+    return messages.getMessage(msg);
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/session/Course.java
+++ b/src/main/java/org/owasp/webgoat/container/session/Course.java
@ -4,7 +4,6 @@ import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.lessons.LessonName;

 /**
 * ************************************************************************************************
@ -97,21 +96,4 @@ public class Course {
    return this.lessons.stream()
        .reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
  }
-
-  public Lesson getLessonByName(LessonName lessonName) {
-    return lessons.stream()
-        .filter(lesson -> lesson.getName().equals(lessonName))
-        .findFirst()
-        .orElse(null);
-  }
-
-  public Lesson getLessonByAssignment(String assignmentName) {
-    return lessons.stream()
-        .filter(
-            lesson ->
-                lesson.getAssignments().stream()
-                    .anyMatch(assignment -> assignment.getName().equals(assignmentName)))
-        .findFirst()
-        .orElse(null);
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/session/LessonSession.java
+++ b/src/main/java/org/owasp/webgoat/container/session/LessonSession.java
@ -1,44 +0,0 @@
-package org.owasp.webgoat.container.session;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class is responsible for managing user session data within a lesson. It uses a HashMap to
- * store key-value pairs representing session data.
- */
-public class LessonSession {
-
-  private Map<String, Object> userSessionData = new HashMap<>();
-
-  /** Default constructor initializing an empty session. */
-  public LessonSession() {}
-
-  /**
-   * Retrieves the value associated with the given key.
-   *
-   * @param key the key for the session data
-   * @return the value associated with the key, or null if the key does not exist
-   */
-  public Object getValue(String key) {
-    if (!userSessionData.containsKey(key)) {
-      return null;
-    }
-    // else
-    return userSessionData.get(key);
-  }
-
-  /**
-   * Sets the value for the given key. If the key already exists, its value is updated.
-   *
-   * @param key the key for the session data
-   * @param value the value to be associated with the key
-   */
-  public void setValue(String key, Object value) {
-    if (userSessionData.containsKey(key)) {
-      userSessionData.replace(key, value);
-    } else {
-      userSessionData.put(key, value);
-    }
-  }
-}
--- a/src/main/java/org/owasp/webgoat/container/session/UserSessionData.java
+++ b/src/main/java/org/owasp/webgoat/container/session/UserSessionData.java
@ -0,0 +1,32 @@
+package org.owasp.webgoat.container.session;
+
+import java.util.HashMap;
+
+/** Created by jason on 1/4/17. */
+public class UserSessionData {
+
+  private HashMap<String, Object> userSessionData = new HashMap<>();
+
+  public UserSessionData() {}
+
+  public UserSessionData(String key, String value) {
+    setValue(key, value);
+  }
+
+  // GETTERS & SETTERS
+  public Object getValue(String key) {
+    if (!userSessionData.containsKey(key)) {
+      return null;
+    }
+    // else
+    return userSessionData.get(key);
+  }
+
+  public void setValue(String key, Object value) {
+    if (userSessionData.containsKey(key)) {
+      userSessionData.replace(key, value);
+    } else {
+      userSessionData.put(key, value);
+    }
+  }
+}
--- a/src/main/java/org/owasp/webgoat/container/session/WebSession.java
+++ b/src/main/java/org/owasp/webgoat/container/session/WebSession.java
@ -0,0 +1,90 @@
+package org.owasp.webgoat.container.session;
+
+import java.io.Serializable;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * *************************************************************************************************
+ *
+ * <p>
+ *
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ *
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ *
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * <p>Getting Source ==============
+ *
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * for free software projects.
+ *
+ * @author Jeff Williams <a href="http://www.aspectsecurity.com">Aspect Security</a>
+ * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
+ * @version $Id: $Id
+ * @since October 28, 2003
+ */
+public class WebSession implements Serializable {
+
+  private static final long serialVersionUID = -4270066103101711560L;
+  private final WebGoatUser currentUser;
+  private transient Lesson currentLesson;
+  private boolean securityEnabled;
+
+  public WebSession() {
+    this.currentUser =
+        (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+  }
+
+  /**
+   * Setter for the field <code>currentScreen</code>.
+   *
+   * @param lesson current lesson
+   */
+  public void setCurrentLesson(Lesson lesson) {
+    this.currentLesson = lesson;
+  }
+
+  /**
+   * getCurrentLesson.
+   *
+   * @return a {@link Lesson} object.
+   */
+  public Lesson getCurrentLesson() {
+    return this.currentLesson;
+  }
+
+  /**
+   * Gets the userName attribute of the WebSession object
+   *
+   * @return The userName value
+   */
+  public String getUserName() {
+    return currentUser.getUsername();
+  }
+
+  public WebGoatUser getUser() {
+    return currentUser;
+  }
+
+  public void toggleSecurity() {
+    this.securityEnabled = !this.securityEnabled;
+  }
+
+  public boolean isSecurityEnabled() {
+    return securityEnabled;
+  }
+}
--- a/src/main/java/org/owasp/webgoat/container/users/LessonProgress.java
+++ b/src/main/java/org/owasp/webgoat/container/users/LessonProgress.java
@ -1,20 +1,8 @@
 package org.owasp.webgoat.container.users;

-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.*;
 import java.util.stream.Collectors;
-import lombok.EqualsAndHashCode;
+import javax.persistence.*;
 import lombok.Getter;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Lesson;
@ -51,32 +39,34 @@ import org.owasp.webgoat.container.lessons.Lesson;
 * @since October 29, 2003
 */
@Entity
-@EqualsAndHashCode
-public class LessonProgress {
+public class LessonTracker {

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

  @Getter private String lessonName;

  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private final Set<Assignment> assignments = new HashSet<>();
+  private final Set<Assignment> solvedAssignments = new HashSet<>();
+
+  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+  private final Set<Assignment> allAssignments = new HashSet<>();

  @Getter private int numberOfAttempts = 0;
  @Version private Integer version;

-  protected LessonProgress() {
+  private LessonTracker() {
    // JPA
  }

-  public LessonProgress(Lesson lesson) {
+  public LessonTracker(Lesson lesson) {
    lessonName = lesson.getId();
-    assignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
+    allAssignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
  }

  public Optional<Assignment> getAssignment(String name) {
-    return assignments.stream().filter(a -> a.getName().equals(name)).findFirst();
+    return allAssignments.stream().filter(a -> a.getName().equals(name)).findFirst();
  }

  /**
@ -85,14 +75,14 @@ public class LessonProgress {
   * @param solvedAssignment the assignment which the user solved
   */
  public void assignmentSolved(String solvedAssignment) {
-    getAssignment(solvedAssignment).ifPresent(Assignment::solved);
+    getAssignment(solvedAssignment).ifPresent(solvedAssignments::add);
  }

  /**
   * @return did they user solved all solvedAssignments for the lesson?
   */
  public boolean isLessonSolved() {
-    return assignments.stream().allMatch(Assignment::isSolved);
+    return allAssignments.size() == solvedAssignments.size();
  }

  /** Increase the number attempts to solve the lesson */
@ -102,17 +92,18 @@ public class LessonProgress {

  /** Reset the tracker. We do not reset the number of attempts here! */
  void reset() {
-    assignments.clear();
+    solvedAssignments.clear();
  }

  /**
   * @return list containing all the assignments solved or not
   */
  public Map<Assignment, Boolean> getLessonOverview() {
-    return assignments.stream().collect(Collectors.toMap(a -> a, Assignment::isSolved));
-  }
-
-  long numberOfSolvedAssignments() {
-    return assignments.size();
+    List<Assignment> notSolved =
+        allAssignments.stream().filter(i -> !solvedAssignments.contains(i)).toList();
+    Map<Assignment, Boolean> overview =
+        notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
+    overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
+    return overview;
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/users/RegistrationController.java
+++ b/src/main/java/org/owasp/webgoat/container/users/RegistrationController.java
@ -1,12 +1,11 @@
 package org.owasp.webgoat.container.users;

-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.Valid;
-import java.util.UUID;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.Authentication;
+import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@ -24,6 +23,7 @@ public class RegistrationController {

  private UserValidator userValidator;
  private UserService userService;
+  private AuthenticationManager authenticationManager;

  @GetMapping("/registration")
  public String showForm(UserForm userForm) {
@ -46,12 +46,4 @@ 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
@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
@AllArgsConstructor
 public class Scoreboard {

-  private final UserProgressRepository userTrackerRepository;
+  private final UserTrackerRepository userTrackerRepository;
  private final UserRepository userRepository;
  private final Course course;
  private final PluginMessages pluginMessages;
@ -46,7 +46,7 @@ public class Scoreboard {
        .collect(Collectors.toList());
  }

-  private List<String> challengesSolved(UserProgress userTracker) {
+  private List<String> challengesSolved(UserTracker userTracker) {
    List<String> challenges =
        List.of(
            "Challenge1",
@ -59,10 +59,10 @@ public class Scoreboard {
            "Challenge8",
            "Challenge9");
    return challenges.stream()
-        .map(userTracker::getLessonProgress)
+        .map(userTracker::getLessonTracker)
        .flatMap(Optional::stream)
-        .filter(LessonProgress::isLessonSolved)
-        .map(LessonProgress::getLessonName)
+        .filter(LessonTracker::isLessonSolved)
+        .map(LessonTracker::getLessonName)
        .map(this::toLessonTitle)
        .toList();
  }
--- 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 jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;

--- a/src/main/java/org/owasp/webgoat/container/users/UserProgressRepository.java
+++ b/src/main/java/org/owasp/webgoat/container/users/UserProgressRepository.java
@ -1,9 +0,0 @@
-package org.owasp.webgoat.container.users;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface UserProgressRepository extends JpaRepository<UserProgress, String> {
-
-  // TODO: make optional
-  UserProgress findByUser(String user);
-}
--- a/src/main/java/org/owasp/webgoat/container/users/UserService.java
+++ b/src/main/java/org/owasp/webgoat/container/users/UserService.java
@ -4,7 +4,7 @@ import java.util.List;
 import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import org.flywaydb.core.Flyway;
-import org.owasp.webgoat.container.lessons.Initializable;
+import org.owasp.webgoat.container.lessons.Initializeable;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@ -19,10 +19,10 @@ import org.springframework.stereotype.Service;
 public class UserService implements UserDetailsService {

  private final UserRepository userRepository;
-  private final UserProgressRepository userTrackerRepository;
+  private final UserTrackerRepository userTrackerRepository;
  private final JdbcTemplate jdbcTemplate;
  private final Function<String, Flyway> flywayLessons;
-  private final List<Initializable> lessonInitializables;
+  private final List<Initializeable> lessonInitializables;

  @Override
  public WebGoatUser loadUserByUsername(String username) throws UsernameNotFoundException {
@ -43,7 +43,7 @@ public class UserService implements UserDetailsService {

    if (!userAlreadyExists) {
      userTrackerRepository.save(
-          new UserProgress(username)); // if user previously existed it will not get another tracker
+          new UserTracker(username)); // if user previously existed it will not get another tracker
      createLessonsForUser(webGoatUser);
    }
  }
--- a/src/main/java/org/owasp/webgoat/container/users/UserProgress.java
+++ b/src/main/java/org/owasp/webgoat/container/users/UserProgress.java
@ -1,18 +1,13 @@
 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 lombok.EqualsAndHashCode;
+import java.util.stream.Collectors;
+import javax.persistence.*;
 import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Lesson;

 /**
@ -48,22 +43,21 @@ import org.owasp.webgoat.container.lessons.Lesson;
 */
@Slf4j
@Entity
-@EqualsAndHashCode
-public class UserProgress {
+public class UserTracker {

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

  @Column(name = "username")
  private String user;

  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private Set<LessonProgress> lessonProgress = new HashSet<>();
+  private Set<LessonTracker> lessonTrackers = new HashSet<>();

-  protected UserProgress() {}
+  private UserTracker() {}

-  public UserProgress(final String user) {
+  public UserTracker(final String user) {
    this.user = user;
  }

@ -73,15 +67,15 @@ public class UserProgress {
   * @param lesson the lesson
   * @return a lesson tracker created if not already present
   */
-  public LessonProgress getLessonProgress(Lesson lesson) {
-    Optional<LessonProgress> progress =
-        lessonProgress.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
-    if (!progress.isPresent()) {
-      LessonProgress newLessonTracker = new LessonProgress(lesson);
-      lessonProgress.add(newLessonTracker);
+  public LessonTracker getLessonTracker(Lesson lesson) {
+    Optional<LessonTracker> lessonTracker =
+        lessonTrackers.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
+    if (!lessonTracker.isPresent()) {
+      LessonTracker newLessonTracker = new LessonTracker(lesson);
+      lessonTrackers.add(newLessonTracker);
      return newLessonTracker;
    } else {
-      return progress.get();
+      return lessonTracker.get();
    }
  }

@ -91,34 +85,43 @@ public class UserProgress {
   * @param id the id of the lesson
   * @return optional due to the fact we can only create a lesson tracker based on a lesson
   */
-  public Optional<LessonProgress> getLessonProgress(String id) {
-    return lessonProgress.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
+  public Optional<LessonTracker> getLessonTracker(String id) {
+    return lessonTrackers.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
  }

  public void assignmentSolved(Lesson lesson, String assignmentName) {
-    LessonProgress progress = getLessonProgress(lesson);
-    progress.incrementAttempts();
-    progress.assignmentSolved(assignmentName);
+    LessonTracker lessonTracker = getLessonTracker(lesson);
+    lessonTracker.incrementAttempts();
+    lessonTracker.assignmentSolved(assignmentName);
  }

  public void assignmentFailed(Lesson lesson) {
-    LessonProgress progress = getLessonProgress(lesson);
-    progress.incrementAttempts();
+    LessonTracker lessonTracker = getLessonTracker(lesson);
+    lessonTracker.incrementAttempts();
  }

  public void reset(Lesson al) {
-    LessonProgress progress = getLessonProgress(al);
-    progress.reset();
+    LessonTracker lessonTracker = getLessonTracker(al);
+    lessonTracker.reset();
  }

-  public long numberOfLessonsSolved() {
-    return lessonProgress.stream().filter(LessonProgress::isLessonSolved).count();
+  public int numberOfLessonsSolved() {
+    int numberOfLessonsSolved = 0;
+    for (LessonTracker lessonTracker : lessonTrackers) {
+      if (lessonTracker.isLessonSolved()) {
+        numberOfLessonsSolved = numberOfLessonsSolved + 1;
+      }
+    }
+    return numberOfLessonsSolved;
  }

-  public long numberOfAssignmentsSolved() {
-    return lessonProgress.stream()
-        .map(LessonProgress::numberOfSolvedAssignments)
-        .mapToLong(Long::valueOf)
-        .sum();
+  public int numberOfAssignmentsSolved() {
+    int numberOfAssignmentsSolved = 0;
+    for (LessonTracker lessonTracker : lessonTrackers) {
+      Map<Assignment, Boolean> lessonOverview = lessonTracker.getLessonOverview();
+      numberOfAssignmentsSolved =
+          lessonOverview.values().stream().filter(b -> b).collect(Collectors.counting()).intValue();
+    }
+    return numberOfAssignmentsSolved;
  }
 }
--- a/src/main/java/org/owasp/webgoat/container/users/UserTrackerRepository.java
+++ b/src/main/java/org/owasp/webgoat/container/users/UserTrackerRepository.java
@ -0,0 +1,12 @@
+package org.owasp.webgoat.container.users;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @author nbaars
+ * @since 4/30/17.
+ */
+public interface UserTrackerRepository extends JpaRepository<UserTracker, String> {
+
+  UserTracker findByUser(String user);
+}
--- 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/Show More
+++ b/Show More