chore: new release 2025.1

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>

.github/workflows/build.yml

@@ -11,8 +11,28 @@ on:
             - main
 
 jobs:
+    pre-commit:
+        name: Pre-commit check
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout git repository
+                uses: actions/checkout@v4.1.6
+            -   name: Setup python
+                uses: actions/setup-python@v5
+                with:
+                    python-version: "3.9"
+            -   uses: actions/setup-java@v4
+                with:
+                    distribution: 'temurin'
+                    java-version: '23'
+            -   name: Pre-commit checks
+                uses: pre-commit/action@v3.0.1
+            -   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:
@@ -20,17 +40,12 @@ jobs:
             max-parallel: 1
         steps:
             -   uses: actions/checkout@v4.1.6
-            -   name: Set up JDK 21
+            -   name: Set up JDK 23
                 uses: actions/setup-java@v4.2.1
                 with:
                     distribution: 'temurin'
-                    java-version: 21
+                    java-version: 23
                     architecture: x64
-            -   name: Cache Maven packages
+                    cache: 'maven'
-                uses: actions/cache@v4.1.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

.github/workflows/pre-commit.yaml

@@ -1,29 +0,0 @@
-name: Pre-commit check
-
-on:
-    pull_request:
-        branches: [main]
-    workflow_dispatch:
-
-permissions:
-    contents: read
-jobs:
-    pre-commit:
-        name: Pre-commit check
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout git repository
-              uses: actions/checkout@v4
-            - name: Setup python
-              uses: actions/setup-python@v5
-              with:
-                    python-version: "3.9"
-            - uses: actions/setup-java@v4
-              with:
-                  distribution: 'temurin'
-                  java-version: '21'
-            - name: Pre-commit checks
-              uses: pre-commit/action@v3.0.0
-            - name: pre-commit-ci-lite
-              uses: pre-commit-ci/lite-action@v1.1.0
-              if: always()

.github/workflows/release.yml

@@ -15,19 +15,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK 23
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 23
           architecture: x64
-
+          cache: 'maven'
-      - name: Cache Maven packages
-        uses: actions/cache@v4.1.1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
 
       - name: "Set labels for ${{ github.ref }}"
         run: |
@@ -74,7 +68,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.4.0
         with:
           platforms: all
 
@@ -88,7 +82,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Build and push WebGoat"
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6.14.0
         with:
           context: ./
           file: ./Dockerfile
@@ -101,7 +95,7 @@ jobs:
             webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
 
       - name: "Build and push WebGoat desktop"
-        uses: docker/build-push-action@v6.9.0
+        uses: docker/build-push-action@v6.14.0
         with:
           context: ./
           file: ./Dockerfile_desktop
@@ -122,11 +116,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 23
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 23
           architecture: x64
 
       - name: Set version to next snapshot
@@ -134,7 +128,7 @@ jobs:
           mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}-SNAPSHOT versions:commit
 
       - name: Push the changes to new branch
-        uses: devops-infra/action-commit-push@v0.9.2
+        uses: devops-infra/action-commit-push@v0.10.0
         with:
             github_token: "${{ secrets.GITHUB_TOKEN }}"
             add_timestamp: true
@@ -142,7 +136,7 @@ jobs:
             force: false
 
       - name: Create PR
-        uses: devops-infra/action-pull-request@v0.5.5
+        uses: devops-infra/action-pull-request@v0.6.0
         with:
             github_token: "${{ secrets.GITHUB_TOKEN }}"
             title: ${{ github.event.commits[0].message }}

.github/workflows/test.yml

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

.gitignore

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

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

Dockerfile

@@ -1,5 +1,5 @@
 # We need JDK as some of the lessons needs to be able to compile Java code
-FROM docker.io/eclipse-temurin:21-jdk-jammy
+FROM docker.io/eclipse-temurin:23-jdk-noble
 
 LABEL name="WebGoat: A deliberately insecure Web Application"
 LABEL maintainer="WebGoat team"

Dockerfile_desktop

@@ -1,6 +1,6 @@
 FROM lscr.io/linuxserver/webtop:ubuntu-xfce
-LABEL NAME = "WebGoat: A deliberately insecure Web Application"
+LABEL name="WebGoat: A deliberately insecure Web Application"
-LABEL maintainer = "WebGoat team"
+LABEL maintainer="WebGoat team"
 
 WORKDIR /config
 
@@ -33,14 +33,15 @@ RUN \
   *) ARCH=unknown;; \
  esac && \
  echo "oeps == ${ARCH}==" && \
- curl -L https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_"${ARCH}"_linux_hotspot_21.0.3_9.tar.gz -o java.tar.gz && \
+ 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 && \
- echo "JAVA_HOME=/config/jdk-21.0.3+9-jre/" >> .bash_aliases && \
+ 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/jdk-21.0.3+9-jre
+ENV JAVA_HOME=/config/java-jdk
 
 WORKDIR /config/Desktop

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,7 +1,7 @@
 # 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-21-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)
@@ -85,6 +85,16 @@ java -Dfile.encoding=UTF-8 -jar webgoat-2023.8.jar
 
 Click the link in the log to start WebGoat.
 
+### 3.1 Running on a different port
+
+If for some reason you want to run WebGoat on a different port, you can do so by adding the following parameter:
+
+```shell
+java -jar webgoat-2023.8.jar --webgoat.port=8001 --webwolf.port=8002
+```
+
+For a full overview of all the parameters you can use, please check the [WebGoat properties file](webgoat-container/src/main/resources/application-{webgoat, webwolf}.properties).
+
 ## 4. Run from the sources
 
 ### Prerequisites:

RELEASE_NOTES.md

@@ -1,5 +1,61 @@
 # WebGoat release notes
 
+## Version 2025.1
+
+### 🚀 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
+
+## Contributors
+
+Special thanks to the following contributors providing us with a pull request:
+
+- François Capon
+- GoogTech HackHuang
+- Peter Potrowl
+- cap-dev0x
+- Benjamin Mouncer
+- Jeong Rok Suh
+- Rui Melo
+- Vandeputte Brice
+
 ## Version 2023.8
 
 ### 🚀 New functionality
@@ -53,13 +109,17 @@
 - 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
+- update challenge code - Flags are now wired through a Spring config - Introduced Flag class - Removed Flags from the
+  FlagController
 
 ## Version 2023.4
 
 ### New functionality
 
-- [#1422 Add Docker Linux Desktop variant with all tools installed](https://github.com/WebGoat/WebGoat/issues/1422). Thanks to the [OWASP WrongSecrets project](https://owasp.org/www-project-wrongsecrets/) we now have a Docker Linux desktop image with all the tools installed. No need to install any tools locally only run the new Docker image. See README.md for details on how to start it.
+- [#1422 Add Docker Linux Desktop variant with all tools installed](https://github.com/WebGoat/WebGoat/issues/1422).
+  Thanks to the [OWASP WrongSecrets project](https://owasp.org/www-project-wrongsecrets/) we now have a Docker Linux
+  desktop image with all the tools installed. No need to install any tools locally only run the new Docker image. See
+  README.md for details on how to start it.
 - [#1411 JWT: looks that buy as Tom also works with alg:none](https://github.com/WebGoat/WebGoat/issues/1411).
 
 ### Bug fixes
@@ -70,31 +130,42 @@
 
 ## 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)
@@ -178,7 +249,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
 

config/desktop/start_webgoat.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-/config/jdk-21.0.3+9-jre/bin/java \
+/config/java-jdk/bin/java \
   -Duser.home=/config \
   -Dfile.encoding=UTF-8 \
   -DTZ=Europe/Amsterdam \

config/desktop/start_zap.sh

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

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.3.5</version>
+    <version>3.4.3</version>
   </parent>
 
   <groupId>org.owasp.webgoat</groupId>
   <artifactId>webgoat</artifactId>
-  <version>2024.2-SNAPSHOT</version>
+  <version>2025.1</version>
   <packaging>jar</packaging>
 
   <name>WebGoat</name>
@@ -66,40 +66,44 @@
     <bootstrap.version>5.3.3</bootstrap.version>
     <cglib.version>3.3.0</cglib.version>
     <!-- do not update necessary for lesson -->
-    <checkstyle.version>3.4.0</checkstyle.version>
+    <checkstyle.version>3.6.0</checkstyle.version>
     <commons-collections.version>3.2.1</commons-collections.version>
     <commons-compress.version>1.27.1</commons-compress.version>
-    <commons-io.version>2.16.1</commons-io.version>
+    <commons-io.version>2.18.0</commons-io.version>
     <commons-lang3.version>3.14.0</commons-lang3.version>
-    <commons-text.version>1.12.0</commons-text.version>
+    <commons-text.version>1.13.0</commons-text.version>
-    <guava.version>33.3.0-jre</guava.version>
+    <guava.version>33.4.0-jre</guava.version>
     <jacoco.version>0.8.11</jacoco.version>
-    <java.version>21</java.version>
+    <java.version>23</java.version>
     <jaxb.version>2.3.1</jaxb.version>
     <jjwt.version>0.9.1</jjwt.version>
     <jose4j.version>0.9.3</jose4j.version>
     <jquery.version>3.7.1</jquery.version>
-    <jsoup.version>1.18.1</jsoup.version>
+    <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.5.1</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
-    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.proc>full</maven.compiler.proc>
-    <maven.compiler.target>21</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.1.2.RELEASE</thymeleaf.version>
-    <waittimeForServerStart>30</waittimeForServerStart>
+    <waittimeForServerStart>60</waittimeForServerStart>
-    <webdriver.version>5.9.2</webdriver.version>
+    <webdriver.version>5.9.3</webdriver.version>
-    <webgoat.context>/</webgoat.context>
+    <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.context>
+    <webwolf.context>/WebWolf</webwolf.context>
-    <wiremock.version>3.9.1</wiremock.version>
+    <webwolf.port>9090</webwolf.port>
+    <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 -->
@@ -158,7 +162,7 @@
       <dependency>
         <groupId>com.auth0</groupId>
         <artifactId>java-jwt</artifactId>
-        <version>4.4.0</version>
+        <version>4.5.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -213,7 +217,12 @@
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby</artifactId>
-        <version>9.4.8.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>
@@ -229,21 +238,10 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
+      <version>1.18.36</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
-      <version>1.20.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>1.20.1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
@@ -374,7 +372,7 @@
     <dependency>
       <groupId>com.github.terma</groupId>
       <artifactId>javaniotcpproxy</artifactId>
-      <version>1.5</version>
+      <version>1.6</version>
       <scope>test</scope>
     </dependency>
 
@@ -397,6 +395,11 @@
       <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>
@@ -483,7 +486,7 @@
             <logback.configurationFile>${basedir}/src/test/resources/logback-test.xml</logback.configurationFile>
           </systemPropertyVariables>
           <argLine>-Xmx512m</argLine>
-          <includes>org/owasp/webgoat/*Test</includes>
+          <includes>org/owasp/webgoat/integration/*Test, org/owasp/webgoat/playwright/**/*Test</includes>
         </configuration>
         <executions>
           <execution>
@@ -514,6 +517,7 @@
           --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
           <excludes>
             <exclude>**/*IntegrationTest.java</exclude>
+            <exclude>**/*UITest.java</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -532,9 +536,18 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.41.1</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>
@@ -699,7 +712,7 @@
                   </arguments>
                   <waitForInterrupt>false</waitForInterrupt>
                   <waitAfterLaunch>${waittimeForServerStart}</waitAfterLaunch>
-                  <healthCheckUrl>http://127.0.0.1:${webgoat.port}${webgoat.context}login</healthCheckUrl>
+                  <healthCheckUrl>http://127.0.0.1:${webgoat.port}${webgoat.context}/login</healthCheckUrl>
                 </configuration>
               </execution>
               <execution>

robot/README.md

@@ -1,21 +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 --upgrade robotframework
-        pip install --upgrade robotframework-SeleniumLibrary
-        pip install --upgrade webdriver-manager
-        brew upgrade
-        robot --variable HEADLESS:"0" --variable ENDPOINT:"http://127.0.0.1:8080/WebGoat" goat.robot
-
-Make sure that the Chrome version, the webdriver version and all related components are up-to-date and compatible!

robot/goat.robot

@@ -1,129 +0,0 @@
-*** Settings ***
-Documentation  Setup WebGoat Robotframework tests
-Library  SeleniumLibrary  timeout=100  run_on_failure=Capture Page Screenshot
-Library  String
-Library  OperatingSystem
-
-Suite Setup  Initial_Page  ${ENDPOINT}  ${BROWSER}
-Suite Teardown  Close_Page
-
-*** Variables ***
-${BROWSER}  chrome
-${SLEEP}  100
-${DELAY}  0.25
-${ENDPOINT}  http://127.0.0.1:8080/WebGoat
-${ENDPOINT_WOLF}  http://127.0.0.1:9090/WebWolf
-${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_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'});add_argument("-headless");add_argument("--start-maximized")  alias=webgoat
-  ELSE
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webgoat
-  END
-  Switch Browser  webgoat
-  Maximize Browser Window
-  Set Window Size  ${1400}  ${1000}
-  Set Window Position  ${0}  ${0}
-  Set Selenium Speed  ${DELAY}
-  Log To Console  Start WebWolf UI Testing
-  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT_WOLF}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'});add_argument("-headless");add_argument("--start-maximized")  alias=webwolf
-  ELSE
-      Open Browser  ${ENDPOINT_WOLF}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webwolf
-  END
-  Switch Browser  webwolf
-  Maximize Browser Window
-  Set Window Size  ${1400}  ${1000}
-  Set Window Position  ${500}  ${0}
-  Set 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
-  [Tags]  WebGoatTests
-  Switch Browser  webgoat
-  Page Should Contain  Username
-  Click Button  Sign in
-  Page Should Contain  Invalid username
-  Click Link  /WebGoat/registration
-
-Check_Registration_Page
-  [Tags]  WebGoatTests
-  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
-  [Tags]  WebGoatTests
-  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
-  [Tags]  WebGoatTests
-  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}/login
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Click Button  Sign In
-  Go To  ${ENDPOINT_WOLF}/mail
-  Go To  ${ENDPOINT_WOLF}/requests
-  Go To  ${ENDPOINT_WOLF}/files
-
-Check_JWT_Page
-  Go To  ${ENDPOINT_WOLF}/jwt
-  Click Element  token
-  Wait Until Element Is Enabled  token  5s
-  Input Text     token  eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
-  Click Element  secretKey
-  Input Text     secretKey  none
-  Sleep  2s  # Pause before reading the result
-  ${OUT_VALUE}   Get Value  xpath=//textarea[@id='token']
-  Log To Console  Found token ${OUT_VALUE}
-  ${OUT_RESULT}  Evaluate  "ImuPnHvLdU7ULKfbD4aJU" in """${OUT_VALUE}"""
-  Log To Console  Found token ${OUT_RESULT}
-  Capture Page Screenshot
-
-Check_Files_Page
-  Go To  ${ENDPOINT_WOLF}/files
-  Choose File  css:input[type="file"]  ${CURDIR}/goat.robot
-  Click Button  Upload files

src/it/java/org/owasp/webgoat/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,45 +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 = "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/integration/AccessControlIntegrationTest.java

@@ -1,4 +1,8 @@
-package org.owasp.webgoat;
+/*
+ * 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;
@@ -25,7 +29,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
         .contentType(ContentType.JSON)
-        .get(url("access-control/users-admin-fix"))
+        .get(webGoatUrlConfig.url("access-control/users-admin-fix"))
         .then()
         .statusCode(HttpStatus.SC_FORBIDDEN);
 
@@ -40,7 +44,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
         .cookie("JSESSIONID", getWebGoatCookie())
         .contentType(ContentType.JSON)
         .body(String.format(userTemplate, this.getUser(), this.getUser()))
-        .post(url("access-control/users"))
+        .post(webGoatUrlConfig.url("access-control/users"))
         .then()
         .statusCode(HttpStatus.SC_OK);
 
@@ -51,14 +55,14 @@ class AccessControlIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .contentType(ContentType.JSON)
-            .get(url("access-control/users-admin-fix"))
+            .get(webGoatUrlConfig.url("access-control/users-admin-fix"))
             .then()
             .statusCode(200)
             .extract()
             .jsonPath()
             .get("find { it.username == \"Jerry\" }.userHash");
 
-    checkAssignment(url("access-control/user-hash-fix"), Map.of("userHash", userHash), true);
+      checkAssignment(webGoatUrlConfig.url("access-control/user-hash-fix"), Map.of("userHash", userHash), true);
   }
 
   private void assignment2() {
@@ -68,18 +72,18 @@ class AccessControlIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .contentType(ContentType.JSON)
-            .get(url("access-control/users"))
+            .get(webGoatUrlConfig.url("access-control/users"))
             .then()
             .statusCode(200)
             .extract()
             .jsonPath()
             .get("find { it.username == \"Jerry\" }.userHash");
 
-    checkAssignment(url("access-control/user-hash"), Map.of("userHash", userHash), true);
+      checkAssignment(webGoatUrlConfig.url("access-control/user-hash"), Map.of("userHash", userHash), true);
   }
 
   private void assignment1() {
     var params = Map.of("hiddenMenu1", "Users", "hiddenMenu2", "Config");
-    checkAssignment(url("access-control/hidden-menu"), params, true);
+      checkAssignment(webGoatUrlConfig.url("access-control/hidden-menu"), params, true);
   }
 }

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

@@ -1,7 +1,11 @@
-package org.owasp.webgoat;
+/*
+ * 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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
 import io.restassured.RestAssured;
@@ -64,12 +68,12 @@ public class CSRFIntegrationTest extends IntegrationTest {
   public void init() {
     startLesson("CSRF");
     webwolfFileDir = getWebWolfFileServerLocation();
-    uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", url("csrf/basic-get-flag")));
+      uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", webGoatUrlConfig.url("csrf/basic-get-flag")));
-    uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", url("csrf/review")));
+      uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", webGoatUrlConfig.url("csrf/review")));
-    uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", url("csrf/feedback/message")));
+      uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", webGoatUrlConfig.url("csrf/feedback/message")));
       uploadTrickHtml(
         "csrf8.html",
-        trickHTML8.replace("WEBGOATURL", url("login")).replace("USERNAME", this.getUser()));
+        trickHTML8.replace("WEBGOATURL", webGoatUrlConfig.url("login")).replace("USERNAME", this.getUser()));
   }
 
   @TestFactory
@@ -103,7 +107,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("WEBWOLFSESSION", getWebWolfCookie())
         .multiPart("file", htmlName, htmlContent.getBytes())
-        .post(new WebWolfUrlBuilder().path("fileupload").build())
+        .post(webWolfUrlConfig.url("fileupload"))
         .then()
         .extract()
         .response()
@@ -118,7 +122,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("files/%s/%s", this.getUser(), htmlName).build())
+            .get(webWolfUrlConfig.url("files/%s/%s".formatted(this.getUser(), htmlName)))
             .then()
             .extract()
             .response()
@@ -136,7 +140,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
             .post(goatURL)
             .then()
             .extract()
@@ -144,15 +148,13 @@ public class CSRFIntegrationTest extends IntegrationTest {
             .toString();
 
     Map<String, Object> params = new HashMap<>();
-    params.clear();
     params.put("confirmFlagVal", flag);
-    checkAssignment(url("csrf/confirm-flag-1"), params, true);
+      checkAssignment(webGoatUrlConfig.url("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(
@@ -163,13 +165,13 @@ public class CSRFIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
             .formParams(params)
             .post(goatURL)
             .then()
             .extract()
             .path("lessonCompleted");
-    assertEquals(true, result);
+    assertTrue(result);
   }
 
   private void checkAssignment7(String goatURL) {
@@ -184,7 +186,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
             .contentType(ContentType.TEXT)
             .body(
                 "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is"
@@ -198,7 +200,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
 
     params.clear();
     params.put("confirmFlagVal", flag);
-    checkAssignment(url("csrf/feedback"), params, true);
+      checkAssignment(webGoatUrlConfig.url("csrf/feedback"), params, true);
   }
 
   private void checkAssignment8(String goatURL) {
@@ -207,7 +209,6 @@ public class CSRFIntegrationTest extends IntegrationTest {
     registerCSRFUser();
 
     Map<String, Object> params = new HashMap<>();
-    params.clear();
     params.put("username", "csrf-" + this.getUser());
     params.put("password", "password");
 
@@ -217,7 +218,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .header("Referer", new WebWolfUrlBuilder().path("files/fake.html").build())
+            .header("Referer", webWolfUrlConfig.url("files/fake.html"))
             .params(params)
             .post(goatURL)
             .then()
@@ -229,7 +230,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
         .when()
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", newCookie)
-        .get(url("CSRF.lesson.lesson"))
+        .get(webGoatUrlConfig.url("CSRF.lesson.lesson"))
         .then()
         .statusCode(200);
 
@@ -239,7 +240,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", newCookie)
-            .post(url("csrf/login"))
+            .post(webGoatUrlConfig.url("csrf/login"))
             .then()
             .statusCode(200)
             .extract()
@@ -254,7 +255,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
         RestAssured.given()
             .cookie("JSESSIONID", getWebGoatCookie())
             .relaxedHTTPSValidation()
-            .get(url("service/lessonoverview.mvc/CSRF"))
+            .get(webGoatUrlConfig.url("service/lessonoverview.mvc/CSRF"))
             .then()
             .extract()
             .jsonPath()
@@ -281,6 +282,6 @@ public class CSRFIntegrationTest extends IntegrationTest {
         .formParam("password", "password")
         .formParam("matchingPassword", "password")
         .formParam("agree", "agree")
-        .post(url("register.mvc"));
+        .post(webGoatUrlConfig.url("register.mvc"));
   }
 }

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

@@ -1,4 +1,8 @@
-package org.owasp.webgoat;
+/*
+ * 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;
 
@@ -22,7 +26,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("challenge/logo"))
+            .get(webGoatUrlConfig.url("challenge/logo"))
             .then()
             .statusCode(200)
             .extract()
@@ -34,14 +38,14 @@ public class ChallengeIntegrationTest extends IntegrationTest {
     params.put("username", "admin");
     params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));
 
-    checkAssignment(url("challenge/1"), params, true);
+      checkAssignment(webGoatUrlConfig.url("challenge/1"), params, true);
       String result =
         RestAssured.given()
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .formParams(params)
-            .post(url("challenge/1"))
+            .post(webGoatUrlConfig.url("challenge/1"))
             .then()
             .statusCode(200)
             .extract()
@@ -50,7 +54,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
     String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
     params.clear();
     params.put("flag", flag);
-    checkAssignment(url("challenge/flag/1"), params, true);
+      checkAssignment(webGoatUrlConfig.url("challenge/flag/1"), params, true);
 
     checkResults("Challenge1");
 
@@ -59,7 +63,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("scoreboard-data"))
+            .get(webGoatUrlConfig.url("scoreboard-data"))
             .then()
             .statusCode(200)
             .extract()
@@ -83,7 +87,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .formParams(params)
-            .post(url("challenge/5"))
+            .post(webGoatUrlConfig.url("challenge/5"))
             .then()
             .statusCode(200)
             .extract()
@@ -92,7 +96,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
     String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
     params.clear();
     params.put("flag", flag);
-    checkAssignment(url("challenge/flag/5"), params, true);
+      checkAssignment(webGoatUrlConfig.url("challenge/flag/5"), params, true);
 
     checkResults("Challenge5");
 
@@ -101,7 +105,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("scoreboard-data"))
+            .get(webGoatUrlConfig.url("scoreboard-data"))
             .then()
             .statusCode(200)
             .extract()
@@ -120,7 +124,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
         .when()
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url("challenge/7/.git"))
+        .get(webGoatUrlConfig.url("challenge/7/.git"))
         .then()
         .statusCode(200)
         .extract()
@@ -132,7 +136,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
         .formParams("email", getUser() + "@webgoat.org")
-        .post(url("challenge/7"))
+        .post(webGoatUrlConfig.url("challenge/7"))
         .then()
         .statusCode(200)
         .extract()
@@ -144,7 +148,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("mail").build())
+            .get(webWolfUrlConfig.url("mail"))
             .then()
             .extract()
             .response()
@@ -158,13 +162,13 @@ public class ChallengeIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("challenge/7/reset-password/{link}"), "375afe1104f4a487a73823c50a9292a2")
+            .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(url("challenge/flag/7"), Map.of("flag", flag), true);
+      checkAssignment(webGoatUrlConfig.url("challenge/flag/7"), Map.of("flag", flag), true);
   }
 }

src/it/java/org/owasp/webgoat/integration/CryptoIntegrationTest.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 static org.junit.jupiter.api.Assertions.fail;
 
@@ -52,7 +56,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/encoding/basic"))
+            .get(webGoatUrlConfig.url("crypto/encoding/basic"))
             .then()
             .extract()
             .asString();
@@ -64,7 +68,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("answer_user", answer_user);
     params.put("answer_pwd", answer_pwd);
-    checkAssignment(url("crypto/encoding/basic-auth"), params, true);
+      checkAssignment(webGoatUrlConfig.url("crypto/encoding/basic-auth"), params, true);
   }
 
   private void checkAssignment3() {
@@ -72,7 +76,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
     Map<String, Object> params = new HashMap<>();
     params.clear();
     params.put("answer_pwd1", answer_1);
-    checkAssignment(url("crypto/encoding/xor"), params, true);
+      checkAssignment(webGoatUrlConfig.url("crypto/encoding/xor"), params, true);
   }
 
   private void checkAssignment4() throws NoSuchAlgorithmException {
@@ -82,7 +86,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/hashing/md5"))
+            .get(webGoatUrlConfig.url("crypto/hashing/md5"))
             .then()
             .extract()
             .asString();
@@ -92,7 +96,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/hashing/sha256"))
+            .get(webGoatUrlConfig.url("crypto/hashing/sha256"))
             .then()
             .extract()
             .asString();
@@ -112,7 +116,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("answer_pwd1", answer_1);
     params.put("answer_pwd2", answer_2);
-    checkAssignment(url("crypto/hashing"), params, true);
+      checkAssignment(webGoatUrlConfig.url("crypto/hashing"), params, true);
   }
 
   private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
@@ -122,7 +126,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("crypto/signing/getprivate"))
+            .get(webGoatUrlConfig.url("crypto/signing/getprivate"))
             .then()
             .extract()
             .asString();
@@ -135,7 +139,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("modulus", modulus);
     params.put("signature", signature);
-    checkAssignment(url("crypto/signing/verify"), params, true);
+      checkAssignment(webGoatUrlConfig.url("crypto/signing/verify"), params, true);
   }
 
   private void checkAssignmentDefaults() {
@@ -151,6 +155,6 @@ public class CryptoIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("secretText", text);
     params.put("secretFileName", "default_secret");
-    checkAssignment(url("crypto/secure/defaults"), params, true);
+      checkAssignment(webGoatUrlConfig.url("crypto/secure/defaults"), params, true);
   }
 }

src/it/java/org/owasp/webgoat/integration/DeserializationIntegrationTest.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 java.io.IOException;
 import java.util.HashMap;
@@ -26,7 +30,7 @@ public class DeserializationIntegrationTest extends IntegrationTest {
       params.put(
           "token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
     }
-    checkAssignment(url("InsecureDeserialization/task"), params, true);
+      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,19 +21,19 @@ 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");
   }
@@ -41,7 +45,7 @@ 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);
   }
 
   @Test
@@ -54,7 +58,7 @@ 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()
@@ -82,7 +86,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put(
         "question_3_solution",
         "Solution 2: The systems security is compromised even if only one goal is harmed.");
-    checkAssignment(url("cia/quiz"), params, true);
+      checkAssignment(webGoatUrlConfig.url("cia/quiz"), params, true);
     checkResults("CIA");
   }
 
@@ -105,7 +109,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
       Map<String, Object> params = new HashMap<>();
       params.clear();
       params.put("payload", solution);
-      checkAssignment(url("VulnerableComponents/attack1"), params, true);
+        checkAssignment(webGoatUrlConfig.url("VulnerableComponents/attack1"), params, true);
       checkResults("VulnerableComponents");
     }
   }
@@ -117,7 +121,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("username", "CaptainJack");
     params.put("password", "BlackPearl");
-    checkAssignment(url("InsecureLogin/task"), params, true);
+      checkAssignment(webGoatUrlConfig.url("InsecureLogin/task"), params, true);
     checkResults("InsecureLogin");
   }
 
@@ -127,7 +131,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     Map<String, Object> params = new HashMap<>();
     params.clear();
     params.put("password", "ajnaeliclm^&&@kjn.");
-    checkAssignment(url("SecurePasswords/assignment"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SecurePasswords/assignment"), params, true);
     checkResults("SecurePasswords");
 
     startLesson("AuthBypass");
@@ -137,7 +141,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put("jsEnabled", "1");
     params.put("verifyMethod", "SEC_QUESTIONS");
     params.put("userId", "12309746");
-    checkAssignment(url("auth-bypass/verify-account"), params, true);
+      checkAssignment(webGoatUrlConfig.url("auth-bypass/verify-account"), params, true);
     checkResults("AuthBypass");
 
     startLesson("HttpProxies");
@@ -148,7 +152,7 @@ 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()
@@ -174,7 +178,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
             .header("webgoat-requested-by", "dom-xss-vuln")
             .header("X-Requested-With", "XMLHttpRequest")
             .formParams(params)
-            .post(url("CrossSiteScripting/phone-home-xss"))
+            .post(webGoatUrlConfig.url("CrossSiteScripting/phone-home-xss"))
             .then()
             .statusCode(200)
             .extract()
@@ -183,12 +187,12 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
 
     params.clear();
     params.put("successMessage", secretNumber);
-    checkAssignment(url("ChromeDevTools/dummy"), params, true);
+      checkAssignment(webGoatUrlConfig.url("ChromeDevTools/dummy"), params, true);
 
     params.clear();
     params.put("number", "24");
     params.put("network_num", "24");
-    checkAssignment(url("ChromeDevTools/network"), params, true);
+      checkAssignment(webGoatUrlConfig.url("ChromeDevTools/network"), params, true);
 
     checkResults("ChromeDevTools");
   }
@@ -203,7 +207,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     params.put("jsEnabled", "1");
     params.put("verifyMethod", "SEC_QUESTIONS");
     params.put("userId", "12309746");
-    checkAssignment(url("auth-bypass/verify-account"), params, true);
+      checkAssignment(webGoatUrlConfig.url("auth-bypass/verify-account"), params, true);
     checkResults("AuthBypass");
   }
 
@@ -214,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("LessonTemplate");
   }
 }

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

@@ -1,4 +1,8 @@
-package org.owasp.webgoat;
+/*
+ * 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;
 
@@ -39,7 +43,7 @@ public class IDORIntegrationTest extends IntegrationTest {
     params.put("username", "tom");
     params.put("password", "cat");
 
-    checkAssignment(url("IDOR/login"), params, true);
+      checkAssignment(webGoatUrlConfig.url("IDOR/login"), params, true);
   }
 
   private void profile() {
@@ -50,7 +54,7 @@ public class IDORIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("IDOR/profile"))
+            .get(webGoatUrlConfig.url("IDOR/profile"))
             .then()
             .statusCode(200)
             .extract()
@@ -60,12 +64,12 @@ public class IDORIntegrationTest extends IntegrationTest {
     // Show difference - assignment 3b
     Map<String, Object> params = new HashMap<>();
     params.put("attributes", "userId,role");
-    checkAssignment(url("IDOR/diff-attributes"), params, true);
+      checkAssignment(webGoatUrlConfig.url("IDOR/diff-attributes"), params, true);
 
     // View profile another way - assignment 4
     params.clear();
     params.put("url", "WebGoat/IDOR/profile/2342384");
-    checkAssignment(url("IDOR/profile/alt-path"), params, true);
+      checkAssignment(webGoatUrlConfig.url("IDOR/profile/alt-path"), params, true);
 
     // assignment 5a
       MatcherAssert.assertThat(
@@ -73,7 +77,7 @@ public class IDORIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("IDOR/profile/2342388"))
+            .get(webGoatUrlConfig.url("IDOR/profile/2342388"))
             .then()
             .statusCode(200)
             .extract()
@@ -90,7 +94,7 @@ public class IDORIntegrationTest extends IntegrationTest {
             .body(
                 "{\"role\":\"1\", \"color\":\"red\", \"size\":\"large\", \"name\":\"Buffalo Bill\","
                     + " \"userId\":\"2342388\"}")
-            .put(url("IDOR/profile/2342388"))
+            .put(webGoatUrlConfig.url("IDOR/profile/2342388"))
             .then()
             .statusCode(200)
             .extract()

src/it/java/org/owasp/webgoat/integration/IntegrationTest.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 static io.restassured.RestAssured.given;
 
@@ -11,79 +15,18 @@ 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 {
 
-  private static String webGoatPort = System.getenv().getOrDefault("WEBGOAT_PORT", "8080");
+  protected final ServerUrlConfig webGoatUrlConfig = ServerUrlConfig.webGoat();
-  @Getter private static String webWolfPort = System.getenv().getOrDefault("WEBWOLF_PORT", "9090");
+  protected final ServerUrlConfig webWolfUrlConfig = ServerUrlConfig.webWolf();
-
-  @Getter
-  private static String webWolfHost = System.getenv().getOrDefault("WEBWOLF_HOST", "127.0.0.1");
-
-  private static String webGoatContext =
-      System.getenv().getOrDefault("WEBGOAT_CONTEXT", "/WebGoat/");
-  private static String webWolfContext =
-      System.getenv().getOrDefault("WEBWOLF_CONTEXT", "/WebWolf/");
 
   @Getter private String webGoatCookie;
   @Getter private String webWolfCookie;
   @Getter private final String user = "webgoat";
 
-  protected String url(String url) {
-    return "http://localhost:%s%s%s".formatted(webGoatPort, webGoatContext, url);
-  }
-
-  protected class WebWolfUrlBuilder {
-
-    private boolean attackMode = false;
-    private String path = null;
-
-    protected String build() {
-      return "http://localhost:%s%s%s"
-          .formatted(webWolfPort, webWolfContext, path != null ? path : "");
-    }
-
-    /**
-     * In attack mode it means WebGoat calls WebWolf to perform an attack. In this case we need to
-     * use port 9090 in a Docker environment.
-     */
-    protected WebWolfUrlBuilder attackMode() {
-      attackMode = true;
-      return this;
-    }
-
-    protected WebWolfUrlBuilder path(String path) {
-      this.path = path;
-      return this;
-    }
-
-    protected WebWolfUrlBuilder path(String path, String... uriVariables) {
-      this.path = path.formatted(uriVariables);
-      return this;
-    }
-  }
-
-  /**
-   * Debugging options: install TestContainers Desktop and map port 5005 to the host machine with
-   * https://newsletter.testcontainers.com/announcements/set-fixed-ports-to-easily-debug-development-services
-   *
-   * <p>Start the test and connect a remote debugger in IntelliJ to localhost:5005 and attach it.
-   */
-  //  private static GenericContainer<?> webGoatContainer =
-  //      new GenericContainer(new ImageFromDockerfile("webgoat").withFileFromPath("/",
-  // Paths.get(".")))
-  //          .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("webgoat")))
-  //          .withExposedPorts(8080, 9090, 5005)
-  //          .withEnv(
-  //              "_JAVA_OPTIONS",
-  //              "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005")
-  //          .waitingFor(Wait.forHealthcheck());
-  //
-  //  static {
-  //    webGoatContainer.start();
-  //  }
-
   @BeforeEach
   public void login() {
     login("webgoat");
@@ -96,7 +39,7 @@ public abstract class IntegrationTest {
             .relaxedHTTPSValidation()
             .formParam("username", user)
             .formParam("password", "password")
-            .post(url("login"))
+            .post(webGoatUrlConfig.url("login"))
             .then()
             .log()
             .ifValidationFails(LogDetail.ALL) // Log the response details if validation fails
@@ -113,7 +56,7 @@ public abstract class IntegrationTest {
               .formParam("password", "password")
               .formParam("matchingPassword", "password")
               .formParam("agree", "agree")
-              .post(url("register.mvc"))
+              .post(webGoatUrlConfig.url("register.mvc"))
               .then()
               .cookie("JSESSIONID")
               .statusCode(302)
@@ -126,7 +69,7 @@ public abstract class IntegrationTest {
               .relaxedHTTPSValidation()
               .formParam("username", user)
               .formParam("password", "password")
-              .post(url("login"))
+              .post(webGoatUrlConfig.url("login"))
               .then()
               .cookie("JSESSIONID")
               .statusCode(302)
@@ -140,7 +83,7 @@ public abstract class IntegrationTest {
             .relaxedHTTPSValidation()
             .formParam("username", user)
             .formParam("password", "password")
-            .post(new WebWolfUrlBuilder().path("login").build())
+            .post(webWolfUrlConfig.url("login"))
             .then()
             .statusCode(302)
             .cookie("WEBWOLFSESSION")
@@ -150,7 +93,12 @@ public abstract class IntegrationTest {
 
   @AfterEach
   public void logout() {
-    RestAssured.given().when().relaxedHTTPSValidation().get(url("logout")).then().statusCode(200);
+    RestAssured.given()
+        .when()
+        .relaxedHTTPSValidation()
+        .get(webGoatUrlConfig.url("logout"))
+        .then()
+        .statusCode(200);
   }
 
   public void startLesson(String lessonName) {
@@ -162,7 +110,7 @@ public abstract class IntegrationTest {
         .when()
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url(lessonName + ".lesson.lesson"))
+        .get(webGoatUrlConfig.url(lessonName + ".lesson.lesson"))
         .then()
         .statusCode(200);
 
@@ -171,7 +119,7 @@ public abstract class IntegrationTest {
           .when()
           .relaxedHTTPSValidation()
           .cookie("JSESSIONID", getWebGoatCookie())
-          .get(url("service/restartlesson.mvc/%s.lesson".formatted(lessonName)))
+          .get(webGoatUrlConfig.url("service/restartlesson.mvc/%s.lesson".formatted(lessonName)))
           .then()
           .statusCode(200);
     }
@@ -213,7 +161,7 @@ public abstract class IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/lessonoverview.mvc/%s.lesson".formatted(lesson)))
+            .get(webGoatUrlConfig.url("service/lessonoverview.mvc/%s.lesson".formatted(lesson)))
             .andReturn();
 
     MatcherAssert.assertThat(
@@ -227,7 +175,7 @@ public abstract class IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/lessonoverview.mvc"))
+            .get(webGoatUrlConfig.url("service/lessonoverview.mvc"))
             .andReturn();
 
     MatcherAssert.assertThat(
@@ -273,7 +221,7 @@ public abstract class IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("file-server-location").build())
+            .get(webWolfUrlConfig.url("file-server-location"))
             .then()
             .extract()
             .response()
@@ -288,7 +236,7 @@ public abstract class IntegrationTest {
         .when()
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url("server-directory"))
+        .get(webGoatUrlConfig.url("server-directory"))
         .then()
         .extract()
         .response()
@@ -301,7 +249,7 @@ public abstract class IntegrationTest {
         .when()
         .relaxedHTTPSValidation()
         .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .delete(new WebWolfUrlBuilder().path("mail").build())
+        .delete(webWolfUrlConfig.url("mail"))
         .then()
         .statusCode(HttpStatus.ACCEPTED.value());
   }

src/it/java/org/owasp/webgoat/integration/JWTLessonIntegrationTest.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 com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -86,7 +90,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .formParam("jwt-encode-user", "user")
-            .post(url("JWT/decode"))
+            .post(webGoatUrlConfig.url("JWT/decode"))
             .then()
             .statusCode(200)
             .extract()
@@ -101,7 +105,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("JWT/secret/gettoken"))
+            .get(webGoatUrlConfig.url("JWT/secret/gettoken"))
             .then()
             .extract()
             .response()
@@ -115,7 +119,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .formParam("token", generateToken(secret))
-            .post(url("JWT/secret"))
+            .post(webGoatUrlConfig.url("JWT/secret"))
             .then()
             .statusCode(200)
             .extract()
@@ -129,7 +133,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("JWT/votings/login?user=Tom"))
+            .get(webGoatUrlConfig.url("JWT/votings/login?user=Tom"))
             .then()
             .extract()
             .cookie("access_token");
@@ -162,7 +166,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .cookie("access_token", replacedToken)
-            .post(url("JWT/votings"))
+            .post(webGoatUrlConfig.url("JWT/votings"))
             .then()
             .statusCode(200)
             .extract()
@@ -203,7 +207,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .header("Authorization", "Bearer " + replacedToken)
-            .post(url("JWT/refresh/checkout"))
+            .post(webGoatUrlConfig.url("JWT/refresh/checkout"))
             .then()
             .statusCode(200)
             .extract()
@@ -236,7 +240,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .post(url("JWT/kid/delete?token=" + token))
+            .post(webGoatUrlConfig.url("JWT/kid/delete?token=" + token))
             .then()
             .statusCode(200)
             .extract()
@@ -254,7 +258,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("WEBWOLFSESSION", getWebWolfCookie())
         .multiPart("file", "jwks.json", jwks.toJson().getBytes())
-        .post(new WebWolfUrlBuilder().path("fileupload").build())
+        .post(webWolfUrlConfig.url("fileupload"))
         .then()
         .extract()
         .response()
@@ -264,8 +268,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
     Map<String, Object> header = new HashMap();
     header.put(Header.TYPE, Header.JWT_TYPE);
     header.put(
-        JwsHeader.JWK_SET_URL,
+        JwsHeader.JWK_SET_URL, webWolfUrlConfig.url("files/%s/jwks.json".formatted(getUser())));
-        new WebWolfUrlBuilder().attackMode().path("files/%s/jwks.json", getUser()).build());
 
     String token =
         Jwts.builder()
@@ -286,7 +289,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
-            .post(url("JWT/jku/delete?token=" + token))
+            .post(webGoatUrlConfig.url("JWT/jku/delete?token=" + token))
             .then()
             .statusCode(200)
             .extract()
@@ -299,6 +302,6 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
     params.put("question_0_solution", "Solution 1");
     params.put("question_1_solution", "Solution 2");
 
-    checkAssignment(url("JWT/quiz"), params, true);
+    checkAssignment(webGoatUrlConfig.url("JWT/quiz"), params, true);
   }
 }

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

@@ -1,4 +1,8 @@
-package org.owasp.webgoat;
+/*
+ * 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;
@@ -24,7 +28,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
             .contentType(ContentType.JSON)
             .header("Accept-Language", "en")
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc"))
+            .get(webGoatUrlConfig.url("service/labels.mvc"))
             .then()
             .statusCode(200)
             .extract()
@@ -42,7 +46,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
             .contentType(ContentType.JSON)
             .header("Accept-Language", "en")
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc?lang=nl"))
+            .get(webGoatUrlConfig.url("service/labels.mvc?lang=nl"))
             .then()
             .statusCode(200)
             .extract()
@@ -58,7 +62,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
             .contentType(ContentType.JSON)
             .header("Accept-Language", "en")
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc?lang=de"))
+            .get(webGoatUrlConfig.url("service/labels.mvc?lang=de"))
             .then()
             .statusCode(200)
             .extract()
@@ -75,7 +79,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
             .contentType(ContentType.JSON)
             .header("Accept-Language", "nl")
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc?lang=xx"))
+            .get(webGoatUrlConfig.url("service/labels.mvc?lang=xx"))
             .then()
             .statusCode(200)
             .extract()
@@ -91,7 +95,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
             .contentType(ContentType.JSON)
             .header("Accept-Language", "xx_YY")
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/labels.mvc"))
+            .get(webGoatUrlConfig.url("service/labels.mvc"))
             .then()
             .statusCode(200)
             .extract()
@@ -203,7 +207,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
         .header("Accept-Language", lang)
         .cookie("JSESSIONID", getWebGoatCookie())
         // .log().headers()
-        .get(url("service/labels.mvc"))
+        .get(webGoatUrlConfig.url("service/labels.mvc"))
         .then()
         // .log().all()
         .statusCode(200)
@@ -218,7 +222,7 @@ public class LabelAndHintIntegrationTest extends IntegrationTest {
             .relaxedHTTPSValidation()
             .contentType(ContentType.JSON)
             .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/hint.mvc"))
+            .get(webGoatUrlConfig.url("service/hint.mvc"))
             .then()
             // .log().all()
             .statusCode(200)

src/it/java/org/owasp/webgoat/integration/PasswordResetLessonIntegrationTest.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 static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
@@ -32,11 +36,11 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
 
   public void assignment2() {
       checkAssignment(
-        url("PasswordReset/simple-mail/reset"),
+              webGoatUrlConfig.url("PasswordReset/simple-mail/reset"),
         Map.of("emailReset", this.getUser() + "@webgoat.org"),
         false);
       checkAssignment(
-        url("PasswordReset/simple-mail"),
+              webGoatUrlConfig.url("PasswordReset/simple-mail"),
         Map.of(
             "email",
             this.getUser() + "@webgoat.org",
@@ -47,18 +51,18 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
 
   public void assignment4() {
       checkAssignment(
-        url("PasswordReset/questions"),
+              webGoatUrlConfig.url("PasswordReset/questions"),
         Map.of("username", "tom", "securityQuestion", "purple"),
         true);
   }
 
   public void assignment5() {
       checkAssignment(
-        url("PasswordReset/SecurityQuestions"),
+              webGoatUrlConfig.url("PasswordReset/SecurityQuestions"),
         Map.of("question", "What is your favorite animal?"),
         false);
       checkAssignment(
-        url("PasswordReset/SecurityQuestions"),
+              webGoatUrlConfig.url("PasswordReset/SecurityQuestions"),
         Map.of("question", "What is your favorite color?"),
         true);
   }
@@ -72,7 +76,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
     // WebGoat
     changePassword(link);
       checkAssignment(
-        url("PasswordReset/reset/login"),
+              webGoatUrlConfig.url("PasswordReset/reset/login"),
         Map.of("email", "tom@webgoat-cloud.org", "password", "123456"),
         true);
   }
@@ -85,7 +89,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("mail").build())
+            .get(webWolfUrlConfig.url("mail"))
             .then()
             .extract()
             .response()
@@ -108,7 +112,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
         .formParams("resetLink", link, "password", "123456")
-        .post(url("PasswordReset/reset/change-password"))
+        .post(webGoatUrlConfig.url("PasswordReset/reset/change-password"))
         .then()
         .statusCode(200);
   }
@@ -119,7 +123,7 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("requests").build())
+            .get(webWolfUrlConfig.url("requests"))
             .then()
             .extract()
             .response()
@@ -136,11 +140,11 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
   private void clickForgotEmailLink(String user) {
       RestAssured.given()
         .when()
-        .header(HttpHeaders.HOST, String.format("%s:%s", getWebWolfHost(), getWebWolfPort()))
+        .header(HttpHeaders.HOST, String.format("%s:%s", "127.0.0.1", webWolfUrlConfig.port()))
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
         .formParams("email", user)
-        .post(url("PasswordReset/ForgotPassword/create-password-reset-link"))
+        .post(webGoatUrlConfig.url("PasswordReset/ForgotPassword/create-password-reset-link"))
         .then()
         .statusCode(200);
   }

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

@@ -1,4 +1,8 @@
-package org.owasp.webgoat;
+/*
+ * 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;
 
@@ -55,7 +59,7 @@ class PathTraversalIT extends IntegrationTest {
             .cookie("JSESSIONID", getWebGoatCookie())
             .multiPart("uploadedFile", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
             .param("fullName", "../John Doe")
-            .post(url("PathTraversal/profile-upload"))
+            .post(webGoatUrlConfig.url("PathTraversal/profile-upload"))
             .then()
             .statusCode(200)
             .extract()
@@ -71,7 +75,7 @@ class PathTraversalIT extends IntegrationTest {
             .cookie("JSESSIONID", getWebGoatCookie())
             .multiPart("uploadedFileFix", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
             .param("fullNameFix", "..././John Doe")
-            .post(url("PathTraversal/profile-upload-fix"))
+            .post(webGoatUrlConfig.url("PathTraversal/profile-upload-fix"))
             .then()
             .statusCode(200)
             .extract()
@@ -89,7 +93,7 @@ class PathTraversalIT extends IntegrationTest {
                 "uploadedFileRemoveUserInput",
                 "../test.jpg",
                 Files.readAllBytes(fileToUpload.toPath()))
-            .post(url("PathTraversal/profile-upload-remove-user-input"))
+            .post(webGoatUrlConfig.url("PathTraversal/profile-upload-remove-user-input"))
             .then()
             .statusCode(200)
             .extract()
@@ -104,13 +108,13 @@ class PathTraversalIT extends IntegrationTest {
         .when()
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url(uri))
+        .get(webGoatUrlConfig.url(uri))
         .then()
         .statusCode(200)
         .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
 
       checkAssignment(
-        url("PathTraversal/random"),
+              webGoatUrlConfig.url("PathTraversal/random"),
         Map.of("secret", Sha512DigestUtils.shaHex(this.getUser())),
         true);
   }
@@ -133,7 +137,7 @@ class PathTraversalIT extends IntegrationTest {
             .relaxedHTTPSValidation()
             .cookie("JSESSIONID", getWebGoatCookie())
             .multiPart("uploadedFileZipSlip", "upload.zip", Files.readAllBytes(zipFile.toPath()))
-            .post(url("PathTraversal/zip-slip"))
+            .post(webGoatUrlConfig.url("PathTraversal/zip-slip"))
             .then()
             .log()
             .all()

src/it/java/org/owasp/webgoat/integration/ProgressRaceConditionIntegrationTest.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.response.Response;
@@ -29,7 +33,7 @@ public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
               .relaxedHTTPSValidation()
               .cookie("JSESSIONID", getWebGoatCookie())
               .formParams(Map.of("flag", "test"))
-              .post(url("challenge/flag/1"));
+              .post(webGoatUrlConfig.url("challenge/flag/1"));
         };
     ExecutorService executorService = Executors.newFixedThreadPool(NUMBER_OF_PARALLEL_THREADS);
     List<? extends Callable<Response>> flagCalls =

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

@@ -1,4 +1,8 @@
-package org.owasp.webgoat;
+/*
+ * 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;
@@ -14,11 +18,11 @@ public class SSRFIntegrationTest extends IntegrationTest {
     params.clear();
     params.put("url", "images/jerry.png");
 
-    checkAssignment(url("SSRF/task1"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SSRF/task1"), params, true);
     params.clear();
     params.put("url", "http://ifconfig.pro");
 
-    checkAssignment(url("SSRF/task2"), params, true);
+      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

@@ -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 java.util.HashMap;
 import java.util.Map;
@@ -16,27 +20,27 @@ public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
     params.put("password_reg", "password");
     params.put("email_reg", "someone@microsoft.com");
     params.put("confirm_password", "password");
-    checkAssignmentWithPUT(url("SqlInjectionAdvanced/challenge"), params, true);
+      checkAssignmentWithPUT(webGoatUrlConfig.url("SqlInjectionAdvanced/challenge"), params, true);
 
     params.clear();
     params.put("username_login", "tom");
     params.put("password_login", "thisisasecretfortomonly");
-    checkAssignment(url("SqlInjectionAdvanced/challenge_Login"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/challenge_Login"), params, true);
 
     params.clear();
     params.put("userid_6a", "'; SELECT * FROM user_system_data;--");
-    checkAssignment(url("SqlInjectionAdvanced/attack6a"), params, true);
+      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(url("SqlInjectionAdvanced/attack6a"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/attack6a"), params, true);
 
     params.clear();
     params.put("userid_6b", "passW0rD");
-    checkAssignment(url("SqlInjectionAdvanced/attack6b"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/attack6b"), params, true);
 
     params.clear();
     params.put(
@@ -54,7 +58,7 @@ public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
     params.put(
         "question_4_solution",
         "Solution 4: The database registers 'Robert' ); DROP TABLE Students;--'.");
-    checkAssignment(url("SqlInjectionAdvanced/quiz"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionAdvanced/quiz"), params, true);
 
     checkResults("SqlInjectionAdvanced");
   }

src/it/java/org/owasp/webgoat/integration/SqlInjectionLessonIntegrationTest.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 java.util.HashMap;
 import java.util.Map;
@@ -34,44 +38,44 @@ public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
     Map<String, Object> params = new HashMap<>();
     params.clear();
     params.put("query", sql_2);
-    checkAssignment(url("SqlInjection/attack2"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack2"), params, true);
 
     params.clear();
     params.put("query", sql_3);
-    checkAssignment(url("SqlInjection/attack3"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack3"), params, true);
 
     params.clear();
     params.put("query", sql_4_add);
-    checkAssignment(url("SqlInjection/attack4"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack4"), params, true);
 
     params.clear();
     params.put("query", sql_5);
-    checkAssignment(url("SqlInjection/attack5"), params, true);
+      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(url("SqlInjection/assignment5a"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/assignment5a"), params, true);
 
     params.clear();
     params.put("login_count", sql_10_login_count);
     params.put("userid", sql_10_userid);
-    checkAssignment(url("SqlInjection/assignment5b"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/assignment5b"), params, true);
 
     params.clear();
     params.put("name", sql_11_a);
     params.put("auth_tan", sql_11_b);
-    checkAssignment(url("SqlInjection/attack8"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack8"), params, true);
 
     params.clear();
     params.put("name", sql_12_a);
     params.put("auth_tan", sql_12_b);
-    checkAssignment(url("SqlInjection/attack9"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack9"), params, true);
 
     params.clear();
     params.put("action_string", sql_13);
-    checkAssignment(url("SqlInjection/attack10"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjection/attack10"), params, true);
 
     checkResults("SqlInjection");
   }

src/it/java/org/owasp/webgoat/integration/SqlInjectionMitigationIntegrationTest.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 static org.hamcrest.CoreMatchers.containsString;
 
@@ -23,7 +27,7 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
     params.put("field5", "?");
     params.put("field6", "prep.setString(1,\"\")");
     params.put("field7", "prep.setString(2,\\\"\\\")");
-    checkAssignment(url("SqlInjectionMitigations/attack10a"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionMitigations/attack10a"), params, true);
 
     params.put(
         "editor",
@@ -37,18 +41,18 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
             + "} catch (Exception e) {\r\n"
             + "    System.out.println(\"Oops. Something went wrong!\");\r\n"
             + "}");
-    checkAssignment(url("SqlInjectionMitigations/attack10b"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionMitigations/attack10b"), params, true);
 
     params.clear();
     params.put(
         "userid_sql_only_input_validation", "Smith';SELECT/**/*/**/from/**/user_system_data;--");
-    checkAssignment(url("SqlOnlyInputValidation/attack"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlOnlyInputValidation/attack"), params, true);
 
     params.clear();
     params.put(
         "userid_sql_only_input_validation_on_keywords",
         "Smith';SESELECTLECT/**/*/**/FRFROMOM/**/user_system_data;--");
-    checkAssignment(url("SqlOnlyInputValidationOnKeywords/attack"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlOnlyInputValidationOnKeywords/attack"), params, true);
 
       RestAssured.given()
         .when()
@@ -56,8 +60,7 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
         .cookie("JSESSIONID", getWebGoatCookie())
         .contentType(ContentType.JSON)
         .get(
-            url(
+                webGoatUrlConfig.url("SqlInjectionMitigations/servers?column=(case when (true) then hostname"
-                "SqlInjectionMitigations/servers?column=(case when (true) then hostname"
                         + " else id end)"))
         .then()
         .statusCode(200);
@@ -67,7 +70,7 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
         .contentType(ContentType.JSON)
-        .get(url("SqlInjectionMitigations/servers?column=unknown"))
+        .get(webGoatUrlConfig.url("SqlInjectionMitigations/servers?column=unknown"))
         .then()
         .statusCode(500)
         .body(
@@ -78,7 +81,7 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
 
     params.clear();
     params.put("ip", "104.130.219.202");
-    checkAssignment(url("SqlInjectionMitigations/attack12a"), params, true);
+      checkAssignment(webGoatUrlConfig.url("SqlInjectionMitigations/attack12a"), params, true);
 
     checkResults("SqlInjectionMitigations");
   }

src/it/java/org/owasp/webgoat/integration/WebWolfIntegrationTest.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 static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -16,14 +20,14 @@ public class WebWolfIntegrationTest extends IntegrationTest {
     // Assignment 3
     Map<String, Object> params = new HashMap<>();
     params.put("email", this.getUser() + "@webgoat.org");
-    checkAssignment(url("WebWolf/mail/send"), params, false);
+      checkAssignment(webGoatUrlConfig.url("WebWolf/mail/send"), params, false);
 
     String responseBody =
         RestAssured.given()
             .when()
             .relaxedHTTPSValidation()
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("mail").build())
+            .get(webWolfUrlConfig.url("mail"))
             .then()
             .extract()
             .response()
@@ -37,7 +41,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
             uniqueCode.lastIndexOf("your unique code is: ") + (21 + this.getUser().length()));
     params.clear();
     params.put("uniqueCode", uniqueCode);
-    checkAssignment(url("WebWolf/mail"), params, true);
+      checkAssignment(webGoatUrlConfig.url("WebWolf/mail"), params, true);
 
     // Assignment 4
       RestAssured.given()
@@ -45,7 +49,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("JSESSIONID", getWebGoatCookie())
         .queryParams(params)
-        .get(url("WebWolf/landing/password-reset"))
+        .get(webGoatUrlConfig.url("WebWolf/landing/password-reset"))
         .then()
         .statusCode(200);
     RestAssured.given()
@@ -53,7 +57,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("WEBWOLFSESSION", getWebWolfCookie())
         .queryParams(params)
-        .get(new WebWolfUrlBuilder().path("landing").build())
+        .get(webWolfUrlConfig.url("landing"))
         .then()
         .statusCode(200);
     responseBody =
@@ -61,7 +65,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("requests").build())
+            .get(webWolfUrlConfig.url("requests"))
             .then()
             .extract()
             .response()
@@ -70,7 +74,7 @@ public class WebWolfIntegrationTest extends IntegrationTest {
     assertTrue(responseBody.contains(uniqueCode));
     params.clear();
     params.put("uniqueCode", uniqueCode);
-    checkAssignment(url("WebWolf/landing"), params, true);
+      checkAssignment(webGoatUrlConfig.url("WebWolf/landing"), params, true);
 
     checkResults("WebWolfIntroduction");
   }

src/it/java/org/owasp/webgoat/integration/XSSIntegrationTest.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 java.util.HashMap;
@@ -14,7 +18,7 @@ public class XSSIntegrationTest extends IntegrationTest {
     Map<String, Object> params = new HashMap<>();
     params.clear();
     params.put("checkboxAttack1", "value");
-    checkAssignment(url("CrossSiteScripting/attack1"), params, true);
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack1"), params, true);
 
     params.clear();
     params.put("QTY1", "1");
@@ -23,11 +27,11 @@ public class XSSIntegrationTest extends IntegrationTest {
     params.put("QTY4", "1");
     params.put("field1", "<script>alert('XSS+Test')</script>");
     params.put("field2", "111");
-    checkAssignmentWithGet(url("CrossSiteScripting/attack5a"), params, true);
+      checkAssignmentWithGet(webGoatUrlConfig.url("CrossSiteScripting/attack5a"), params, true);
 
     params.clear();
     params.put("DOMTestRoute", "start.mvc#test");
-    checkAssignment(url("CrossSiteScripting/attack6a"), params, true);
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack6a"), params, true);
 
     params.clear();
     params.put("param1", "42");
@@ -41,7 +45,7 @@ public class XSSIntegrationTest extends IntegrationTest {
             .header("webgoat-requested-by", "dom-xss-vuln")
             .header("X-Requested-With", "XMLHttpRequest")
             .formParams(params)
-            .post(url("CrossSiteScripting/phone-home-xss"))
+            .post(webGoatUrlConfig.url("CrossSiteScripting/phone-home-xss"))
             .then()
             .statusCode(200)
             .extract()
@@ -50,7 +54,7 @@ public class XSSIntegrationTest extends IntegrationTest {
 
     params.clear();
     params.put("successMessage", secretNumber);
-    checkAssignment(url("CrossSiteScripting/dom-follow-up"), params, true);
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/dom-follow-up"), params, true);
 
     params.clear();
     params.put(
@@ -73,7 +77,7 @@ public class XSSIntegrationTest extends IntegrationTest {
         "question_4_solution",
         "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that"
             + " the browser executes.");
-    checkAssignment(url("CrossSiteScripting/quiz"), params, true);
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/quiz"), params, true);
 
     params.clear();
     params.put(
@@ -99,7 +103,7 @@ public class XSSIntegrationTest extends IntegrationTest {
             + "</table>"
             + "</body>"
             + "</html>");
-    checkAssignment(url("CrossSiteScripting/attack3"), params, true);
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack3"), params, true);
 
     params.clear();
     params.put(
@@ -109,7 +113,7 @@ public class XSSIntegrationTest extends IntegrationTest {
             + "s.scan(newComment,\"\");"
             + "CleanResults();"
             + "MyCommentDAO.addComment(threadID, userID).getCleanHTML());");
-    checkAssignment(url("CrossSiteScripting/attack4"), params, true);
+      checkAssignment(webGoatUrlConfig.url("CrossSiteScripting/attack4"), params, true);
 
     checkResults("CrossSiteScripting");
   }

src/it/java/org/owasp/webgoat/integration/XXEIntegrationTest.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;
@@ -9,20 +13,20 @@ 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>
+<?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>
+<?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;
+<?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>
+<?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;
 
@@ -57,7 +61,7 @@ public class XXEIntegrationTest extends IntegrationTest {
    */
   private String getSecret() {
     String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
-    String webWolfCallback = new WebWolfUrlBuilder().path("landing").attackMode().build();
+    String webWolfCallback = webWolfUrlConfig.url("landing");
     String dtd7String = dtd7.replace("WEBWOLFURL", webWolfCallback).replace("SECRET", secretFile);
 
     // upload DTD
@@ -66,7 +70,7 @@ public class XXEIntegrationTest extends IntegrationTest {
         .relaxedHTTPSValidation()
         .cookie("WEBWOLFSESSION", getWebWolfCookie())
         .multiPart("file", "blind.dtd", dtd7String.getBytes())
-        .post(new WebWolfUrlBuilder().path("fileupload").build())
+        .post(webWolfUrlConfig.url("fileupload"))
         .then()
         .extract()
         .response()
@@ -75,9 +79,9 @@ public class XXEIntegrationTest extends IntegrationTest {
 
     // upload attack
     String xxe7String =
-        xxe7.replace("WEBWOLFURL", new WebWolfUrlBuilder().attackMode().path("files").build())
+        xxe7.replace("WEBWOLFURL", webWolfUrlConfig.url("files"))
             .replace("USERNAME", this.getUser());
-    checkAssignment(url("xxe/blind"), ContentType.XML, xxe7String, false);
+      checkAssignment(webGoatUrlConfig.url("xxe/blind"), ContentType.XML, xxe7String, false);
 
     // read results from WebWolf
     String result =
@@ -85,7 +89,7 @@ public class XXEIntegrationTest extends IntegrationTest {
             .when()
             .relaxedHTTPSValidation()
             .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(new WebWolfUrlBuilder().path("requests").build())
+            .get(webWolfUrlConfig.url("requests"))
             .then()
             .extract()
             .response()
@@ -105,10 +109,10 @@ public class XXEIntegrationTest extends IntegrationTest {
   public void runTests() throws IOException {
     startLesson("XXE", true);
     webGoatHomeDirectory = webGoatServerDirectory();
-    checkAssignment(url("xxe/simple"), ContentType.XML, xxe3, true);
+      checkAssignment(webGoatUrlConfig.url("xxe/simple"), ContentType.XML, xxe3, true);
-    checkAssignment(url("xxe/content-type"), ContentType.XML, xxe4, true);
+      checkAssignment(webGoatUrlConfig.url("xxe/content-type"), ContentType.XML, xxe4, true);
       checkAssignment(
-        url("xxe/blind"),
+              webGoatUrlConfig.url("xxe/blind"),
         ContentType.XML,
         "<comment><text>" + getSecret() + "</text></comment>",
         true);

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,29 +1,6 @@
-/**
+/*
- * *************************************************************************************************
+ * 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;
 

src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.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;
 

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

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

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

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

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;

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;
@@ -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) {

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2023 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container;
 
 import jakarta.servlet.http.HttpServletRequest;

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

@@ -1,39 +1,11 @@
-/**
+/*
- * ************************************************************************************************
+ * 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.LessonSession;
-import org.owasp.webgoat.container.users.UserRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -54,12 +26,6 @@ import org.springframework.web.client.RestTemplate;
 @EntityScan(basePackages = "org.owasp.webgoat.container")
 public class WebGoat {
 
-  private final UserRepository userRepository;
-
-  public WebGoat(UserRepository userRepository) {
-    this.userRepository = userRepository;
-  }
-
   @Bean(name = "pluginTargetDirectory")
   public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
     return new File(webgoatHome);

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;
 

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;

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

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

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

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

src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatTmpDirMacro.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 java.util.Map;

src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatVersionMacro.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 java.util.Map;

src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfMacro.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 java.util.HashMap;

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

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

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

@@ -1,75 +1,7 @@
 /*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- * please see http://www.owasp.org/
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- * Copyright (c) 2002 - 2017 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>
  */
-
 package org.owasp.webgoat.container.assignments;
 
-import org.owasp.webgoat.container.i18n.PluginMessages;
+public interface AssignmentEndpoint {}
-import org.springframework.beans.factory.annotation.Autowired;
-
-public abstract class AssignmentEndpoint {
-
-  // TODO: move this to different bean.
-  @Autowired private PluginMessages messages;
-
-  /**
-   * Convenience method for create a successful result:
-   *
-   * <p>- Assignment is set to solved - Feedback message is set to 'assignment.solved'
-   *
-   * <p>Of course you can overwrite these values in a specific lesson
-   *
-   * @return a builder for creating a result from a lesson
-   * @param assignment
-   */
-  protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
-    return AttackResult.builder(messages)
-        .lessonCompleted(true)
-        .attemptWasMade()
-        .feedback("assignment.solved")
-        .assignment(assignment);
-  }
-
-  /**
-   * Convenience method for create a failed result:
-   *
-   * <p>- Assignment is set to not solved - Feedback message is set to 'assignment.not.solved'
-   *
-   * <p>Of course you can overwrite these values in a specific lesson
-   *
-   * @return a builder for creating a result from a lesson
-   * @param assignment
-   */
-  protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
-    return AttackResult.builder(messages)
-        .lessonCompleted(false)
-        .attemptWasMade()
-        .feedback("assignment.not.solved")
-        .assignment(assignment);
-  }
-
-  protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
-    return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
-  }
-}

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2017 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container.assignments;
 
 import java.lang.annotation.ElementType;

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

@@ -1,19 +0,0 @@
-package org.owasp.webgoat.container.assignments;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-/** Created by nbaars on 1/14/17. */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface AssignmentPath {
-
-  String[] path() default {};
-
-  RequestMethod[] method() default {};
-
-  String value() default "";
-}

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

@@ -1,28 +1,7 @@
 /*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * SPDX-FileCopyrightText: Copyright © 2014 WebGoat authors
- * please see http://www.owasp.org/
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- * Copyright (c) 2002 - 2017 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>
  */
-
 package org.owasp.webgoat.container.assignments;
 
 import static org.apache.commons.text.StringEscapeUtils.escapeJson;
@@ -30,82 +9,18 @@ import static org.apache.commons.text.StringEscapeUtils.escapeJson;
 import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
 
+@Getter
 public class AttackResult {
 
-  public static class AttackResultBuilder {
+  private final boolean lessonCompleted;
-
+  private final String feedback;
-    private boolean lessonCompleted;
-    private PluginMessages messages;
   private Object[] feedbackArgs;
-    private String feedbackResourceBundleKey;
+  private final String output;
-    private String output;
   private Object[] outputArgs;
-    private AssignmentEndpoint assignment;
+  private final String assignment;
-    private boolean attemptWasMade = false;
+  private final boolean attemptWasMade;
 
-    public AttackResultBuilder(PluginMessages messages) {
+  private AttackResult(
-      this.messages = messages;
-    }
-
-    public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
-      this.lessonCompleted = lessonCompleted;
-      this.feedbackResourceBundleKey = "lesson.completed";
-      return this;
-    }
-
-    public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
-      this.lessonCompleted = lessonCompleted;
-      this.feedbackResourceBundleKey = resourceBundleKey;
-      return this;
-    }
-
-    public AttackResultBuilder feedbackArgs(Object... args) {
-      this.feedbackArgs = args;
-      return this;
-    }
-
-    public AttackResultBuilder feedback(String resourceBundleKey) {
-      this.feedbackResourceBundleKey = resourceBundleKey;
-      return this;
-    }
-
-    public AttackResultBuilder output(String output) {
-      this.output = output;
-      return this;
-    }
-
-    public AttackResultBuilder outputArgs(Object... args) {
-      this.outputArgs = args;
-      return this;
-    }
-
-    public AttackResultBuilder attemptWasMade() {
-      this.attemptWasMade = true;
-      return this;
-    }
-
-    public AttackResult build() {
-      return new AttackResult(
-          lessonCompleted,
-          messages.getMessage(feedbackResourceBundleKey, feedbackArgs),
-          messages.getMessage(output, output, outputArgs),
-          assignment.getClass().getSimpleName(),
-          attemptWasMade);
-    }
-
-    public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
-      this.assignment = assignment;
-      return this;
-    }
-  }
-
-  @Getter private boolean lessonCompleted;
-  @Getter private String feedback;
-  @Getter private String output;
-  @Getter private final String assignment;
-  @Getter private boolean attemptWasMade;
-
-  public AttackResult(
       boolean lessonCompleted,
       String feedback,
       String output,
@@ -118,11 +33,33 @@ public class AttackResult {
     this.attemptWasMade = attemptWasMade;
   }
 
-  public static AttackResultBuilder builder(PluginMessages messages) {
+  public AttackResult(
-    return new AttackResultBuilder(messages);
+      boolean lessonCompleted,
+      String feedback,
+      Object[] feedbackArgs,
+      String output,
+      Object[] outputArgs,
+      String assignment,
+      boolean attemptWasMade) {
+    this.lessonCompleted = lessonCompleted;
+    this.feedback = feedback;
+    this.feedbackArgs = feedbackArgs;
+    this.output = output;
+    this.outputArgs = outputArgs;
+    this.assignment = assignment;
+    this.attemptWasMade = attemptWasMade;
   }
 
   public boolean assignmentSolved() {
     return lessonCompleted;
   }
+
+  public AttackResult apply(PluginMessages pluginMessages) {
+    return new AttackResult(
+        lessonCompleted,
+        pluginMessages.getMessage(feedback, feedback, feedbackArgs),
+        pluginMessages.getMessage(output, output, outputArgs),
+        assignment,
+        attemptWasMade);
+  }
 }

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

@@ -0,0 +1,111 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2024 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container.assignments;
+
+import org.owasp.webgoat.container.i18n.PluginMessages;
+
+public class AttackResultBuilder {
+
+  private boolean lessonCompleted;
+  private Object[] feedbackArgs;
+  private String feedbackResourceBundleKey;
+  private String output;
+  private Object[] outputArgs;
+  private AssignmentEndpoint assignment;
+  private boolean attemptWasMade = false;
+
+  public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
+    this.lessonCompleted = lessonCompleted;
+    this.feedbackResourceBundleKey = "lesson.completed";
+    return this;
+  }
+
+  public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
+    this.lessonCompleted = lessonCompleted;
+    this.feedbackResourceBundleKey = resourceBundleKey;
+    return this;
+  }
+
+  public AttackResultBuilder feedbackArgs(Object... args) {
+    this.feedbackArgs = args;
+    return this;
+  }
+
+  public AttackResultBuilder feedback(String resourceBundleKey) {
+    this.feedbackResourceBundleKey = resourceBundleKey;
+    return this;
+  }
+
+  public AttackResultBuilder output(String output) {
+    this.output = output;
+    return this;
+  }
+
+  public AttackResultBuilder outputArgs(Object... args) {
+    this.outputArgs = args;
+    return this;
+  }
+
+  public AttackResultBuilder attemptWasMade() {
+    this.attemptWasMade = true;
+    return this;
+  }
+
+  public AttackResult build() {
+    return new AttackResult(
+        lessonCompleted,
+        feedbackResourceBundleKey,
+        feedbackArgs,
+        output,
+        outputArgs,
+        assignment.getClass().getSimpleName(),
+        attemptWasMade);
+  }
+
+  public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
+    this.assignment = assignment;
+    return this;
+  }
+
+  /**
+   * Convenience method for create a successful result:
+   *
+   * <p>- Assignment is set to solved - Feedback message is set to 'assignment.solved'
+   *
+   * <p>Of course, you can overwrite these values in a specific lesson
+   *
+   * @param assignment the assignment that was solved
+   * @return a builder for creating a result from a lesson
+   */
+  public static AttackResultBuilder success(AssignmentEndpoint assignment) {
+    return new AttackResultBuilder()
+        .lessonCompleted(true)
+        .attemptWasMade()
+        .feedback("assignment.solved")
+        .assignment(assignment);
+  }
+
+  /**
+   * Convenience method for create a failed result:
+   *
+   * <p>- Assignment is set to not solved - Feedback message is set to 'assignment.not.solved'
+   *
+   * <p>Of course, you can overwrite these values in a specific lesson
+   *
+   * @param assignment the assignment that was not solved
+   * @return a builder for creating a result from a lesson
+   */
+  public static AttackResultBuilder failed(AssignmentEndpoint assignment) {
+    return new AttackResultBuilder()
+        .lessonCompleted(false)
+        .attemptWasMade()
+        .feedback("assignment.not.solved")
+        .assignment(assignment);
+  }
+
+  public static AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
+    return new AttackResultBuilder().lessonCompleted(false).assignment(assignment);
+  }
+}

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

@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2024 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package org.owasp.webgoat.container.assignments;
+
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+/** This class intercepts the response body and applies the plugin messages to the attack result. */
+@RestControllerAdvice
+public class AttackResultMessageResponseBodyAdvice implements ResponseBodyAdvice<Object> {
+
+  private final PluginMessages pluginMessages;
+
+  public AttackResultMessageResponseBodyAdvice(PluginMessages pluginMessages) {
+    this.pluginMessages = pluginMessages;
+  }
+
+  @Override
+  public boolean supports(
+      MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType) {
+    return true;
+  }
+
+  @Override
+  public Object beforeBodyWrite(
+      Object body,
+      MethodParameter returnType,
+      MediaType selectedContentType,
+      Class<? extends HttpMessageConverter<?>> selectedConverterType,
+      ServerHttpRequest request,
+      ServerHttpResponse response) {
+    if (body instanceof AttackResult a) {
+      return a.apply(pluginMessages);
+    }
+    return body;
+  }
+}

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

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

src/main/java/org/owasp/webgoat/container/controller/StartLesson.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.controller;
 

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

@@ -1,31 +1,6 @@
-/**
+/*
- * ************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2014 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <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
- * @since October 28, 2003
- * @version $Id: $Id
  */
 package org.owasp.webgoat.container.controller;
 

src/main/java/org/owasp/webgoat/container/i18n/Language.java

@@ -1,28 +1,7 @@
 /*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- * please see http://www.owasp.org/
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- * Copyright (c) 2002 - 2017 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>
  */
-
 package org.owasp.webgoat.container.i18n;
 
 import java.util.Locale;
@@ -34,9 +13,6 @@ import org.springframework.web.servlet.LocaleResolver;
 /**
  * Wrapper around the LocaleResolver from Spring so we do not need to bother with passing the
  * HttpRequest object when asking for a Locale.
- *
- * @author nbaars
- * @date 2/7/17
  */
 @AllArgsConstructor
 public class Language {

src/main/java/org/owasp/webgoat/container/i18n/Messages.java

@@ -1,28 +1,7 @@
 /*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
- * please see http://www.owasp.org/
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- * Copyright (c) 2002 - 2017 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>
  */
-
 package org.owasp.webgoat.container.i18n;
 
 import java.util.Properties;

src/main/java/org/owasp/webgoat/container/i18n/PluginMessages.java

@@ -1,28 +1,7 @@
 /*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * SPDX-FileCopyrightText: Copyright © 2017 WebGoat authors
- * please see http://www.owasp.org/
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * <p>
- * Copyright (c) 2002 - 2017 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>
  */
-
 package org.owasp.webgoat.container.i18n;
 
 import java.io.IOException;
@@ -32,9 +11,6 @@ import org.springframework.core.io.support.ResourcePatternResolver;
 
 /**
  * Message resource bundle for plugins.
- *
- * @author nbaars
- * @date 2/4/17
  */
 public class PluginMessages extends ReloadableResourceBundleMessageSource {
   private static final String PROPERTIES_SUFFIX = ".properties";

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container.lessons;
 
 import jakarta.persistence.Entity;
@@ -10,36 +14,6 @@ import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
-/**
- * ************************************************************************************************
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * 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 nbaars
- * @version $Id: $Id
- * @since November 25, 2016
- */
 @Getter
 @EqualsAndHashCode
 @Entity
@@ -51,7 +25,6 @@ public class Assignment {
 
   private String name;
   private String path;
-  private boolean solved = false;
 
   @Transient private List<String> hints;
 
@@ -75,8 +48,4 @@ public class Assignment {
     this.path = path;
     this.hints = hints;
   }
-
-  public void solved() {
-    this.solved = true;
-  }
 }

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

@@ -1,38 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2008 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container.lessons;
 
 import lombok.Getter;
 
-/**
- * *************************************************************************************************
- *
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- *
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @version $Id: $Id
- * @since October 28, 2003
- */
 public enum Category {
   INTRODUCTION("Introduction"),
   GENERAL("General"),

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

@@ -1,25 +1,7 @@
 /*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
+ * SPDX-FileCopyrightText: Copyright © 2014 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright (c) 2002 - 2019 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
-
 package org.owasp.webgoat.container.lessons;
 
 import java.lang.reflect.Method;
@@ -30,6 +12,7 @@ import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
 import org.owasp.webgoat.container.session.Course;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
@@ -42,10 +25,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public class CourseConfiguration {
   private final List<Lesson> lessons;
   private final List<AssignmentEndpoint> assignments;
+  private final String contextPath;
 
-  public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
+  public CourseConfiguration(
+      List<Lesson> lessons,
+      List<AssignmentEndpoint> assignments,
+      @Value("${server.servlet.context-path}") String contextPath) {
     this.lessons = lessons;
     this.assignments = assignments;
+    this.contextPath = contextPath.equals("/") ? "" : contextPath;
   }
 
   private void attachToLessonInParentPackage(
@@ -124,7 +112,7 @@ public class CourseConfiguration {
       if (methodReturnTypeIsOfTypeAttackResult(m)) {
         var mapping = getMapping(m);
         if (mapping != null) {
-          return mapping;
+          return contextPath + mapping;
         }
       }
     }

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

@@ -1,43 +1,7 @@
-/***************************************************************************************************
+/*
- *
+ * SPDX-FileCopyrightText: Copyright © 2014 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 2014 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.container.lessons;
 
-import lombok.Value;
+public record Hint(String hint, String assignmentPath) {}
-
-/**
- * Hint class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Value
-public class Hint {
-
-  private String hint;
-  private String assignmentPath;
-}

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

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

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

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

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

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

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

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

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

@@ -1,29 +1,6 @@
-/**
+/*
- * *************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2014 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.lessons;
 

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

@@ -1,40 +1,10 @@
-/***************************************************************************************************
+/*
- *
+ * SPDX-FileCopyrightText: Copyright © 2014 WebGoat authors
- *
+ * SPDX-License-Identifier: GPL-2.0-or-later
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 2014 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.container.lessons;
 
-/**
- * LessonMenuItemType class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
 public enum LessonMenuItemType {
   CATEGORY,
-  LESSON,
+  LESSON
-  STAGE
 }

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

@@ -1,3 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: Copyright © 2024 WebGoat authors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 package org.owasp.webgoat.container.lessons;
 
 import org.springframework.util.Assert;
@@ -18,4 +22,9 @@ public record LessonName(String lessonName) {
       lessonName = lessonName.substring(0, lessonName.indexOf(".lesson"));
     }
   }
+
+  @Override
+  public String toString() {
+    return lessonName;
+  }
 }

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

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

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

@@ -1,29 +1,6 @@
-/**
+/*
- * *************************************************************************************************
+ * SPDX-FileCopyrightText: Copyright © 2014 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.report;
 
@@ -77,12 +54,12 @@ public class ReportCardController {
         lessonStatistics);
   }
 
-  private record ReportCard(
+  public record ReportCard(
       int totalNumberOfLessons,
       int totalNumberOfAssignments,
       long numberOfAssignmentsSolved,
       long numberOfLessonsSolved,
       List<LessonStatistics> lessonStatistics) {}
 
-  private record LessonStatistics(String name, boolean solved, int numberOfAttempts) {}
+  public record LessonStatistics(String name, boolean solved, int numberOfAttempts) {}
 }

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

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