added modsec chart for webgoat behind modsecurity crs

.dockerignore

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

.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/stale.yml

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

.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/build.yml

@@ -1,68 +0,0 @@
-name: "Build"
-on:
-  pull_request:
-    paths-ignore:
-      - '.txt'
-      - 'LICENSE'
-      - 'docs/**'
-  push:
-    branches:
-      - main
-      - develop
-      - release/*
-    tags-ignore:
-      - '*'
-    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.2.2
-        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
-
-  build:
-    if: github.repository == 'WebGoat/WebGoat' && github.event_name == 'push'
-    runs-on: ubuntu-latest
-    name: "Branch build"
-    steps:
-        - uses: actions/checkout@v3
-        - name: set up JDK 17
-          uses: actions/setup-java@v3
-          with:
-              distribution: 'temurin'
-              java-version: 17
-              architecture: x64
-        - name: Cache Maven packages
-          uses: actions/cache@v3.2.2
-          with:
-              path: ~/.m2
-              key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
-              restore-keys: ubuntu-latest-m2-
-        - name: Test with Maven
-          run: mvn --no-transfer-progress verify

.github/workflows/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,21 +11,21 @@ jobs:
     environment:
       name: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2.3.4
 
       - name: "Get tag name"
         id: tag
         uses: dawidd6/action-get-tag@v1
 
-      - name: Set up JDK 17
+      - name: Set up JDK 15
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 15
           architecture: x64
 
       - name: Cache Maven packages
-        uses: actions/cache@v3.2.2
+        uses: actions/cache@v2.1.7
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -38,15 +38,16 @@ jobs:
           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 ${{ steps.tag.outputs.tag }}
 
@@ -57,8 +58,6 @@ jobs:
             ### Bug fixes
 
             - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
-              
-            Full change log: https://github.com/WebGoat/WebGoat/compare/${{ steps.tag.outputs.tag }}...${{ steps.tag.outputs.tag }}  
 
 
             ## Contributors
@@ -76,37 +75,35 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v1.1.0
         with:
           platforms: all
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
 
       - name: "Login to dockerhub"
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v1.9.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Build and push"
-        uses: docker/build-push-action@v3.2.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: "Image digest"
         run: echo ${{ steps.docker_build.outputs.digest }}
   new_version:
-    permissions:
-      contents: write  # for Git to git push
     if: github.repository == 'WebGoat/WebGoat'
     name: Update development version
     needs: [ release ]
@@ -114,15 +111,15 @@ jobs:
     environment:
       name: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2.3.4
         with:
           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:
-          java-version: 17
+          java-version: 15
           architecture: x64
 
       - name: Set version to next snapshot

.github/workflows/test.yml

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

.github/workflows/welcome.yml

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

.gitignore

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

CONTRIBUTING.md

@@ -1,5 +1,4 @@
 # Contributing
-
 [![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors)
 ![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/WebGoat/WebGoat/help%20wanted.svg)
 ![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/WebGoat/WebGoat/good%20first%20issue.svg)
@@ -25,7 +24,7 @@ There are a couple of ways on how you can contribute to the project:
 Your PR is valuable to us, and to make sure we can integrate it smoothly, we have a few items for you to consider. In short:
 The minimum requirements for code contributions are:
 
-1. The code _must_ be compliant with the configured Java Google Formatter, Checkstyle and PMD rules.
+1. The code _must_ be compliant with the configured Checkstyle and PMD rules.
 2. All new and changed code _should_ have a corresponding unit and/or integration test.
 3. New and changed lessons _must_ have a corresponding integration test.
 4. [Status checks](https://docs.github.com/en/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) should pass for your last commit.
@@ -39,13 +38,14 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
 * If you are making spelling corrections in the docs, don't modify other files.
 * If you are adding new functions don't '*cleanup*' unrelated functions. That cleanup belongs in another pull request.
 
+
 ### Write a good commit message
 
 * Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
 
 * If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.
 
-For example: `Fix #545` or `Closes #10`
+  For example: `Fix #545` or `Closes #10`
 
 ## How to set up your Contributor Environment
 
@@ -54,34 +54,27 @@ For example: `Fix #545` or `Closes #10`
 3. Clone your own repository to your host computer so that you can make modifications. If you followed the GitHub tutorial from step 2, you have already done this.
 4. Go to the newly cloned directory "WebGoat" and add the remote upstream repository:
 
-   ```bash
+    ```bash
-   	$ git remote -v
+    $ git remote -v
-   	origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
-   	origin git@github.com:<your Github handle>/WebGoat.git (push)
+    origin git@github.com:<your Github handle>/WebGoat.git (push)
 
-   	$ git remote add upstream git@github.com:WebGoat/WebGoat.git
+    $ git remote add upstream git@github.com:WebGoat/WebGoat.git
 
-   	$ git remote -v
+    $ git remote -v
-   	origin git@github.com:<your Github handle>/WebGoat.git (fetch)
+    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
-   	origin git@github.com:<your Github handle>/WebGoat.git (push)
+    origin git@github.com:<your Github handle>/WebGoat.git (push)
-   	upstream git@github.com:OWASP/WebGoat.git (fetch)
+    upstream git@github.com:OWASP/WebGoat.git (fetch)
-   	upstream git@github.com:OWASP/WebGoat.git (push)
+    upstream git@github.com:OWASP/WebGoat.git (push)
-   ```
+    ```
-
-   See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
 
+    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

CREATE_RELEASE.md

@@ -1,21 +1,21 @@
 ## Release WebGoat
 
+
 ### Version numbers
 
 For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
-and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use
+ 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`
+ `v8.0.0` in the `pom.xml`
-
+ 
 ### Release notes:
-
+Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of 
-Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of
 committers.
 
 At the moment we use Gitflow, for a release you create a new release branch and take the following steps:
 
 ```
 git checkout develop
-git flow release start <version>
+git flow release start <version> 
 git flow release publish
 
 <<Make changes if necessary>>
@@ -30,3 +30,5 @@ 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,32 +0,0 @@
-FROM docker.io/eclipse-temurin:17-jre-focal
-
-RUN useradd -ms /bin/bash webgoat
-RUN chgrp -R 0 /home/webgoat
-RUN chmod -R g=u /home/webgoat
-
-USER webgoat
-
-COPY --chown=webgoat target/webgoat-*.jar /home/webgoat/webgoat.jar
-
-EXPOSE 8080
-EXPOSE 9090
-
-WORKDIR /home/webgoat
-ENTRYPOINT [ "java", \
-   "-Duser.home=/home/webgoat", \
-   "-Dfile.encoding=UTF-8", \
-   "--add-opens", "java.base/java.lang=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.util=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.text=ALL-UNNAMED", \
-   "--add-opens", "java.desktop/java.beans=ALL-UNNAMED", \
-   "--add-opens", "java.desktop/java.awt.font=ALL-UNNAMED", \
-   "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.io=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.util=ALL-UNNAMED", \
-   "-Drunning.in.docker=true", \
-   "-Dwebgoat.host=0.0.0.0", \
-   "-Dwebwolf.host=0.0.0.0", \
-   "-Dwebgoat.port=8080", \
-   "-Dwebwolf.port=9090", \
-   "-jar", "webgoat.jar" ]

PULL_REQUEST_TEMPLATE.md

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

README.md

@@ -1,6 +1,6 @@
 # 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)
@@ -33,45 +33,42 @@ For more details check [the Contribution guide](/CONTRIBUTING.md)
 
 ## 1. Run using Docker
 
-Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).
+Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/goatandwolf).
 
 The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
 
 ```shell
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
+
+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
 
-```shell
+**Important**: *Change the ports if necessary, for example use `127.0.0.1:7777:9090` to map WebWolf to `http://localhost:7777/WebGoat`*  
-docker run --name webgoat -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
-```
-
-As long as you don't remove the container you can use:
-
-```shell
-docker start webgoat
-```
-
-This way, you can start where you left off. If you remove the container, you need to use `docker run` again.
 
 **Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
 
+
 ## 2. Standalone
 
-Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
+Download the latest WebGoat and WebWolf release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
 
 ```shell
-java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-2023.3.jar
+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]
 ```
 
-Click the link in the log to start WebGoat.
+WebGoat will be located at: http://localhost:8080/WebGoat and   
+WebWolf will be located at: http://localhost:9090/WebWolf (change ports if necessary)
 
 ## 3. Run from the sources
 
 ### Prerequisites:
 
 * Java 17
+* Maven > 3.2.1
 * Your favorite IDE
 * Git, or Git support in your IDE
 
@@ -86,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 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
@@ -121,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.3-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 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -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,58 +1,16 @@
-# WebGoat release notes
+# WebGoat release notes 
 
-## Version 2023.3
+## Unreleased
-
-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.
+- Update the Docker startup script, it is now possible to pass `skip-nginx` or set `SKIP_NGINX` as environment variable.
-- Move away from multi-project setup:
-  * This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
-  * No longer add Maven dependencies in several places
-  * H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure the correct database connection.
-- More explicit paths in html files to reference `adoc` files, less magic.
-- Integrate WebWolf in WebGoat, the setup was way too complicated and needed configuration which could lead to mistakes and a not working application. This also simplifies the Docker configuration as there is only 1 Docker image.
-- Add WebWolf button in WebGoat
-- Move all lessons into `src/main/resources`
-- WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease the user experience.
-- WebGoat logs URL after startup: `Please browse to http://127.0.0.1:8080/WebGoat to get started...`
-- Simplify `Dockerfile` as we no longer need a script to start everything
-- Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
-- Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific user and to reset the assignment back to its original state when a reset lesson occurs. See `BlindSendFileAssignment` for an example.
-- Integration tests now use the same user. This saves a lot of time as before every test used a different user which triggered the Flyway migration to set up the database schema for the user. This migration took a lot of time.
-- Updated introduction lesson to WebWolf.
-- Added language switch for support for multiple languages.
-- Removed logic to start WebGoat on a random port when port `8080` is taken. We would loop until we found a free port. We simplified this to just start on the specified port.
-- Add Google formatter for all our code, a PR now checks whether the code adheres to the standard.
-- Renaming of all packages and folders.
-- [#1039 New OWASP Top 10](https://github.com/WebGoat/WebGoat/issues/1093)
-- [#1065 New lesson about logging](https://github.com/WebGoat/WebGoat/issues/1065)
-
-### Bug fixes
-
-- [#1193 Vulnerable component lesson - java.desktop does not "opens java.beans" to unnamed module](https://github.com/WebGoat/WebGoat/issues/1193)
-- [#1176 Minor: XXE lesson 12 patch not reset by 'lesson reset' while it IS reset by leaving/returning to lesson](https://github.com/WebGoat/WebGoat/issues/1176)
-- [#1134 "Exploiting XStream" assignment does not work](https://github.com/WebGoat/WebGoat/issues/1134)
-- [#1130 Typo: Using Indrect References](https://github.com/WebGoat/WebGoat/issues/1130)
-- [#1101 SQL lesson not correct](https://github.com/WebGoat/WebGoat/issues/1101)
-- [#1079 startup.sh issues of WebWolf - cannot connect to the WebGoat DB](https://github.com/WebGoat/WebGoat/issues/1079)
-- [#1379 Move XXE to A05:2021-_Security_ Misconfiguration](https://github.com/WebGoat/WebGoat/issues/1379)
-- [#1298 SocketUtils is deprecated and will be removed in Spring Security 6](https://github.com/WebGoat/WebGoat/issues/1298)
-- [#1248 Rewrite the WebWolf Introduction Lesson with the new changes](https://github.com/WebGoat/WebGoat/issues/1248)
-- [#1200 Type cast error in sample code at JWT token section](https://github.com/WebGoat/WebGoat/issues/1200)
-- [#1173 --server.port=9000 is not respected on Windows (both cmd as Powershell)](https://github.com/WebGoat/WebGoat/issues/1173)
-- [#1103 (A1) path traversel lesson 7 seems broken](https://github.com/WebGoat/WebGoat/issues/1103)
-- [#986 - User registration not persistant](https://github.com/WebGoat/WebGoat/issues/986)
 
 ## Version 8.2.2
 
 ### New functionality
 
-- Docker image now supports nginx when browsing to http://localhost a landing page is shown.
+- Docker image now supports nginx when browsing to http://localhost a landing page is shown. 
 
 ### Bug fixes
 
@@ -60,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
@@ -100,10 +60,11 @@ Special thanks to the following contributors providing us with a pull request:
 - maximmasiutin
 - toshihue
 - avivmu
-- KellyMarchewa
+- KellyMarchewa 
 - NatasG
 - gabe-sky
 
+
 ## Version 8.1.0
 
 ### New functionality
@@ -111,27 +72,27 @@ Special thanks to the following contributors providing us with a pull request:
 - Added new lessons for cryptography and path-traversal
 - Extra content added to the XXE lesson
 - Explanation of the assignments will be part of WebGoat, in this release we added detailed descriptions on how to solve the XXE lesson. In the upcoming releases new explanations will be added. If you want to contribute please create a pull request on Github.
-- Docker improvements + docker stack for complete container with nginx
+- Docker improvements + docker stack for complete container with nginx 
-- Included JWT token decoding and generation, since jwt.io does not support None anymore
+- Included JWT token decoding and generation, since jwt.io does not support None anymore 
 
 ### Bug fixes
 
 - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
 - [#811 -  Flag submission fails](https://github.com/WebGoat/WebGoat/issues/811)
 - [#810 - Scoreboard for challenges shows csrf users](https://github.com/WebGoat/WebGoat/issues/810)
-- [#788 - strange copy in constructor](https://github.com/WebGoat/WebGoat/issues/788)
+- [#788 - strange copy in constructor](https://github.com/WebGoat/WebGoat/issues/788) 
 - [#760 - Execution of standalone jar fails (Flyway migration step](https://github.com/WebGoat/WebGoat/issues/760)
 - [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766)
 - [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708)
 - [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719)
-- [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
+ - [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
-- [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
+ - [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
-- [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
+ - [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
-- [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
+ - [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
-- [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
+ - [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
-
+ 
-## Contributors
+ ## Contributors
-
+ 
 Special thanks to the following contributors providing us with a pull request:
 
 - Satoshi SAKAO
@@ -146,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>
+    <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>
+    <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>
-     </suppress>
+        <cve>CVE-2018-1000180</cve>
-    <suppress>
+        <cve>CVE-2017-18640</cve>
-        <notes><![CDATA[
+        <cve>CVE-2011-4838</cve>
-        file name: xstream-1.4.5.jar
+    </suppress>
-        ]]></notes>
+    <suppress base="true"><!-- vulnerable components lesson -->
-        <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>
+    </suppress>
-        <vulnerabilityName>CVE-2020-26259</vulnerabilityName>
+    <suppress base="true"><!-- webgoat-server -->
-        <vulnerabilityName>CVE-2021-21341</vulnerabilityName>
+        <cpe>cpe:/a:postgresql:postgresql</cpe>
-        <vulnerabilityName>CVE-2021-21342</vulnerabilityName>
+        <cve>CVE-2018-10936</cve>
-        <vulnerabilityName>CVE-2021-21343</vulnerabilityName>
+    </suppress>
-        <vulnerabilityName>CVE-2021-21344</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-21345</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-21346</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-21347</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-21348</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-21349</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-21350</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-21351</vulnerabilityName>
-        <vulnerabilityName>CVE-2021-43859</vulnerabilityName>
-     </suppress>
-     <suppress>
-        <notes><![CDATA[
-        file name: spring-jcl-5.3.21.jar
-        ]]></notes>
-        <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-.*@.*$</packageUrl>
-        <cve>CVE-2016-1000027</cve>
-     </suppress>
 </suppressions>

docker/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-wolf.yaml

@@ -0,0 +1,11 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: {{ .Values.webwolf_server.name }}-configmap
+  namespace: {{ .Values.namespace }}
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+data:
+  TZ: 'Europe/Amsterdam'
+  WEBGOAT_HOST: {{ .Values.webgoat_server.name }}-service
+

platformQuickStarts/helm/webgoat/templates/configmap.yaml

@@ -0,0 +1,13 @@
+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.webwolf_server.name }}-wolf-{{ .Values.namespace }}{{ .Values.urlpostfix }}'
+  WEBWOLF_PORT: '80'

platformQuickStarts/helm/webgoat/templates/deployment.yaml

@@ -0,0 +1,159 @@
+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: "2Gi"
+              cpu: "1"
+            requests:
+              memory: "1Gi"
+              cpu: "0.5"
+          name: webgoat
+          ports:
+            - containerPort: 8080
+              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",
+                 "-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
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  labels:
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }} 
+  name: {{ .Values.webwolf_server.name }}
+  namespace: {{ .Values.namespace }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Values.webwolf_server.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.webwolf_server.name }} 
+    spec:
+      volumes:
+        - name: webgoat-volume-1
+          persistentVolumeClaim:
+            claimName: {{ .Values.webgoat_server.name }}-pvc 
+      containers:
+        - resources:
+            limits:
+              memory: "2Gi"
+              cpu: "1"
+            requests:
+              memory: "1Gi"
+              cpu: "0.5"
+          name: webwolf
+          ports:
+            - containerPort: 9090
+              protocol: TCP
+          #livenessProbe:
+          #  failureThreshold: 3
+          #  periodSeconds: 10
+          #  httpGet:
+          #    path: /WebWolf
+          #    port: 9090
+          #readinessProbe:
+            #failureThreshold: 3
+            #periodSeconds: 10
+            #initialDelaySeconds: 100
+            #httpGet:
+            #  path: /WebWolf
+            #  port: 9090
+          image: {{ .Values.webwolf_server.image }}
+          command:
+            - 'java'
+          args: ["-Duser.home=/home/webgoat",
+                "-Djava.io.tmpdir=/home/webgoat/.webgoat-{{ .Chart.AppVersion }}",
+                "-Dfile.encoding=UTF-8",
+                "-jar","/home/webgoat/webwolf.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.webwolf_server.name }}-configmap   
+      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,19 @@
+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

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

@@ -0,0 +1,16 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+    app: {{ .Values.webwolf_server.name }}
+  name: {{ .Values.webwolf_server.name }}-wolf
+  namespace: {{ .Values.namespace }}
+spec:
+  path: /
+  port:
+    targetPort: 9090
+  to:
+    kind: Service
+    name: {{ .Values.webwolf_server.name }}-service
+    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,39 @@
+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
+  - name: 9001-tcp
+    port: 9001
+    protocol: TCP
+    targetPort: 9001
+  selector:
+    app: {{ .Values.webgoat_server.name }}
+  sessionAffinity: None
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: {{ .Values.webwolf_server.name }}
+    app.kubernetes.io/part-of: {{ .Values.webgoat_server.name }}
+  name: {{ .Values.webwolf_server.name }}-service
+  namespace: {{ .Values.namespace }}
+spec:
+  ports:
+  - name: 9090-tcp
+    port: 9090
+    protocol: TCP
+    targetPort: 9090
+  selector:
+    app: {{ .Values.webwolf_server.name }}
+  sessionAffinity: None

platformQuickStarts/helm/webgoat/values.yaml

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

robot/README.md

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

robot/goat.robot

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

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

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

src/it/java/org/owasp/webgoat/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("/WebGoat/cia/quiz"), params, true);
-    checkResults("/cia/");
-  }
-
-  @Test
-  public void vulnerableComponents() {
-    if (StringUtils.hasText(System.getProperty("running.in.docker"))) {
-      String solution =
-          "<contact class='dynamic-proxy'>\n"
-              + "<interface>org.owasp.webgoat.lessons.vulnerablecomponents.Contact</interface>\n"
-              + "  <handler class='java.beans.EventHandler'>\n"
-              + "    <target class='java.lang.ProcessBuilder'>\n"
-              + "      <command>\n"
-              + "        <string>calc.exe</string>\n"
-              + "      </command>\n"
-              + "    </target>\n"
-              + "    <action>start</action>\n"
-              + "  </handler>\n"
-              + "</contact>";
-      startLesson("VulnerableComponents");
-      Map<String, Object> params = new HashMap<>();
-      params.clear();
-      params.put("payload", solution);
-      checkAssignment(url("/WebGoat/VulnerableComponents/attack1"), params, true);
-      checkResults("/VulnerableComponents/");
-    }
-  }
-
-  @Test
-  public void insecureLogin() {
-    startLesson("InsecureLogin");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("username", "CaptainJack");
-    params.put("password", "BlackPearl");
-    checkAssignment(url("/WebGoat/InsecureLogin/task"), params, true);
-    checkResults("/InsecureLogin/");
-  }
-
-  @Test
-  public void securePasswords() {
-    startLesson("SecurePasswords");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("password", "ajnaeliclm^&&@kjn.");
-    checkAssignment(url("/WebGoat/SecurePasswords/assignment"), params, true);
-    checkResults("SecurePasswords/");
-
-    startLesson("AuthBypass");
-    params.clear();
-    params.put("secQuestion2", "John");
-    params.put("secQuestion3", "Main");
-    params.put("jsEnabled", "1");
-    params.put("verifyMethod", "SEC_QUESTIONS");
-    params.put("userId", "12309746");
-    checkAssignment(url("/WebGoat/auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
-
-    startLesson("HttpProxies");
-    MatcherAssert.assertThat(
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("x-request-intercepted", "true")
-            .contentType(ContentType.JSON)
-            .get(
-                url("/WebGoat/HttpProxies/intercept-request?changeMe=Requests are tampered easily"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("lessonCompleted"),
-        CoreMatchers.is(true));
-    checkResults("/HttpProxies/");
-  }
-
-  @Test
-  public void chrome() {
-    startLesson("ChromeDevTools");
-
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("param1", "42");
-    params.put("param2", "24");
-
-    String result =
-        RestAssured.given()
-            .when()
-            .relaxedHTTPSValidation()
-            .cookie("JSESSIONID", getWebGoatCookie())
-            .header("webgoat-requested-by", "dom-xss-vuln")
-            .header("X-Requested-With", "XMLHttpRequest")
-            .formParams(params)
-            .post(url("/WebGoat/CrossSiteScripting/phone-home-xss"))
-            .then()
-            .statusCode(200)
-            .extract()
-            .path("output");
-    String secretNumber = result.substring("phoneHome Response is ".length());
-
-    params.clear();
-    params.put("successMessage", secretNumber);
-    checkAssignment(url("/WebGoat/ChromeDevTools/dummy"), params, true);
-
-    params.clear();
-    params.put("number", "24");
-    params.put("network_num", "24");
-    checkAssignment(url("/WebGoat/ChromeDevTools/network"), params, true);
-
-    checkResults("/ChromeDevTools/");
-  }
-
-  @Test
-  public void authByPass() {
-    startLesson("AuthBypass");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("secQuestion2", "John");
-    params.put("secQuestion3", "Main");
-    params.put("jsEnabled", "1");
-    params.put("verifyMethod", "SEC_QUESTIONS");
-    params.put("userId", "12309746");
-    checkAssignment(url("/auth-bypass/verify-account"), params, true);
-    checkResults("/auth-bypass/");
-  }
-
-  @Test
-  public void lessonTemplate() {
-    startLesson("LessonTemplate");
-    Map<String, Object> params = new HashMap<>();
-    params.clear();
-    params.put("param1", "secr37Value");
-    params.put("param2", "Main");
-    checkAssignment(url("/lesson-template/sample-attack"), params, true);
-    checkResults("/lesson-template/");
-  }
-}

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

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

src/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 java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
-
-/**
- * AjaxAuthenticationEntryPoint class.
- *
- * @author zupzup
- */
-public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
-  public AjaxAuthenticationEntryPoint(String loginFormUrl) {
-    super(loginFormUrl);
-  }
-
-  @Override
-  public void commence(
-      HttpServletRequest request,
-      HttpServletResponse response,
-      AuthenticationException authException)
-      throws IOException, ServletException {
-    if (request.getHeader("x-requested-with") != null) {
-      response.sendError(401, authException.getMessage());
-    } else {
-      super.commence(request, response, authException);
-    }
-  }
-}

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

@@ -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 java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.extension.JavaExtensionRegistry;
-import org.owasp.webgoat.container.asciidoc.*;
-import org.owasp.webgoat.container.i18n.Language;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-import org.thymeleaf.IEngineConfiguration;
-import org.thymeleaf.templateresolver.FileTemplateResolver;
-import org.thymeleaf.templateresource.ITemplateResource;
-import org.thymeleaf.templateresource.StringTemplateResource;
-
-/**
- * Thymeleaf resolver for AsciiDoc used in the lesson, can be used as follows inside a lesson file:
- *
- * <p><code>
- * <div th:replace="doc:AccessControlMatrix_plan.adoc"></div>
- * </code>
- */
-@Slf4j
-public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
-
-  private static final Asciidoctor asciidoctor = create();
-  private static final String PREFIX = "doc:";
-
-  private final Language language;
-  private final ResourceLoader resourceLoader;
-
-  public AsciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) {
-    this.resourceLoader = resourceLoader;
-    this.language = language;
-    setResolvablePatterns(Set.of(PREFIX + "*"));
-  }
-
-  @Override
-  protected ITemplateResource computeTemplateResource(
-      IEngineConfiguration configuration,
-      String ownerTemplate,
-      String template,
-      String resourceName,
-      String characterEncoding,
-      Map<String, Object> templateResolutionAttributes) {
-    var templateName = resourceName.substring(PREFIX.length());
-    log.debug("template used: {}", templateName);
-    try (InputStream is = getInputStream(templateName)) {
-      JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
-      extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
-      extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
-      extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class);
-      extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class);
-      extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class);
-      extensionRegistry.inlineMacro("username", UsernameMacro.class);
-
-      StringWriter writer = new StringWriter();
-      asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
-      return new StringTemplateResource(writer.getBuffer().toString());
-    } catch (IOException e) {
-      return new StringTemplateResource(
-          "<div>Unable to find documentation for: " + templateName + " </div>");
-    }
-  }
-
-  private InputStream getInputStream(String templateName) throws IOException {
-    log.debug("locale: {}", language.getLocale().getLanguage());
-    String computedResourceName =
-        computeResourceName(templateName, language.getLocale().getLanguage());
-    if (resourceLoader
-        .getResource("classpath:/" + computedResourceName)
-        .isReadable() /*isFile()*/) {
-      log.debug("localized file exists");
-      return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream();
-    } else {
-      log.debug("using english template");
-      return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
-    }
-  }
-
-  private String computeResourceName(String resourceName, String language) {
-    String computedResourceName;
-    if (language.equals("en")) {
-      computedResourceName = resourceName;
-    } else {
-      computedResourceName = resourceName.replace(".adoc", "_".concat(language).concat(".adoc"));
-    }
-    log.debug("computed local file name: {}", computedResourceName);
-    log.debug(
-        "file exists: {}",
-        resourceLoader.getResource("classpath:/" + computedResourceName).isReadable());
-    return computedResourceName;
-  }
-
-  private Map<String, Object> createAttributes() {
-    Map<String, Object> attributes = new HashMap<>();
-    attributes.put("source-highlighter", "coderay");
-    attributes.put("backend", "xhtml");
-    attributes.put("lang", determineLanguage());
-    attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);
-
-    Map<String, Object> options = new HashMap<>();
-    options.put("attributes", attributes);
-
-    return options;
-  }
-
-  private String determineLanguage() {
-    HttpServletRequest request =
-        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-
-    Locale browserLocale =
-        (Locale)
-            request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
-    if (null != browserLocale) {
-      log.debug("browser locale {}", browserLocale);
-      return browserLocale.getLanguage();
-    } else {
-      String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING);
-      if (null != langHeader) {
-        log.debug("browser locale {}", langHeader);
-        return langHeader.substring(0, 2);
-      } else {
-        log.debug("browser default english");
-        return "en";
-      }
-    }
-  }
-}

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

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

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

@@ -1,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,260 +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.springsecurity5.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring5.SpringTemplateEngine;
-import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
-import org.thymeleaf.spring5.view.ThymeleafViewResolver;
-import org.thymeleaf.templatemode.TemplateMode;
-import org.thymeleaf.templateresolver.FileTemplateResolver;
-import org.thymeleaf.templateresolver.ITemplateResolver;
-import org.thymeleaf.templateresource.ITemplateResource;
-import org.thymeleaf.templateresource.StringTemplateResource;
-
-/** Configuration for Spring MVC */
-@Configuration
-@RequiredArgsConstructor
-@Slf4j
-public class MvcConfiguration implements WebMvcConfigurer {
-
-  private static final String UTF8 = "UTF-8";
-
-  private final LessonScanner lessonScanner;
-
-  @Override
-  public void addViewControllers(ViewControllerRegistry registry) {
-    registry.addViewController("/login").setViewName("login");
-    registry.addViewController("/lesson_content").setViewName("lesson_content");
-    registry.addViewController("/start.mvc").setViewName("main_new");
-    registry.addViewController("/scoreboard").setViewName("scoreboard");
-  }
-
-  @Bean
-  public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) {
-    ThymeleafViewResolver resolver = new ThymeleafViewResolver();
-    resolver.setTemplateEngine(thymeleafTemplateEngine);
-    resolver.setCharacterEncoding(StandardCharsets.UTF_8.displayName());
-    return resolver;
-  }
-
-  /**
-   * Responsible for loading lesson templates based on Thymeleaf, for example:
-   *
-   * <p><div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
-   */
-  @Bean
-  public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
-    var resolver =
-        new FileTemplateResolver() {
-          @Override
-          protected ITemplateResource computeTemplateResource(
-              IEngineConfiguration configuration,
-              String ownerTemplate,
-              String template,
-              String resourceName,
-              String characterEncoding,
-              Map<String, Object> templateResolutionAttributes) {
-            try (var is =
-                resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
-              return new StringTemplateResource(
-                  new String(is.readAllBytes(), StandardCharsets.UTF_8));
-            } catch (IOException e) {
-              return null;
-            }
-          }
-        };
-    resolver.setOrder(1);
-    return resolver;
-  }
-
-  /** Loads all normal WebGoat specific Thymeleaf templates */
-  @Bean
-  public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
-    SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
-    resolver.setPrefix("classpath:/webgoat/templates/");
-    resolver.setSuffix(".html");
-    resolver.setTemplateMode(TemplateMode.HTML);
-    resolver.setOrder(2);
-    resolver.setCharacterEncoding(UTF8);
-    resolver.setApplicationContext(applicationContext);
-    return resolver;
-  }
-
-  /** Loads the html for the complete lesson, see lesson_content.html */
-  @Bean
-  public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
-    LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
-    resolver.setOrder(0);
-    resolver.setCacheable(false);
-    resolver.setCharacterEncoding(UTF8);
-    return resolver;
-  }
-
-  /** Loads the lesson asciidoc. */
-  @Bean
-  public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(
-      Language language, ResourceLoader resourceLoader) {
-    log.debug("template locale {}", language);
-    AsciiDoctorTemplateResolver resolver =
-        new AsciiDoctorTemplateResolver(language, resourceLoader);
-    resolver.setCacheable(false);
-    resolver.setOrder(1);
-    resolver.setCharacterEncoding(UTF8);
-    return resolver;
-  }
-
-  @Bean
-  public SpringTemplateEngine thymeleafTemplateEngine(
-      ITemplateResolver springThymeleafTemplateResolver,
-      LessonTemplateResolver lessonTemplateResolver,
-      AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
-      ITemplateResolver lessonThymeleafTemplateResolver) {
-    SpringTemplateEngine engine = new SpringTemplateEngine();
-    engine.setEnableSpringELCompiler(true);
-    engine.addDialect(new SpringSecurityDialect());
-    engine.setTemplateResolvers(
-        Set.of(
-            lessonTemplateResolver,
-            asciiDoctorTemplateResolver,
-            lessonThymeleafTemplateResolver,
-            springThymeleafTemplateResolver));
-    return engine;
-  }
-
-  @Override
-  public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    // WebGoat internal
-    registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/");
-    registry.addResourceHandler("/js/**").addResourceLocations("classpath:/webgoat/static/js/");
-    registry
-        .addResourceHandler("/plugins/**")
-        .addResourceLocations("classpath:/webgoat/static/plugins/");
-    registry
-        .addResourceHandler("/fonts/**")
-        .addResourceLocations("classpath:/webgoat/static/fonts/");
-
-    // WebGoat lessons
-    registry
-        .addResourceHandler("/images/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_js/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_css/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/lesson_templates/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
-    registry
-        .addResourceHandler("/video/**")
-        .addResourceLocations(
-            lessonScanner.applyPattern("classpath:/lessons/%s/video/").toArray(String[]::new));
-  }
-
-  @Bean
-  public PluginMessages pluginMessages(
-      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
-    PluginMessages pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
-    pluginMessages.setDefaultEncoding("UTF-8");
-    pluginMessages.setBasenames("i18n/WebGoatLabels");
-    pluginMessages.setFallbackToSystemLocale(false);
-    return pluginMessages;
-  }
-
-  @Bean
-  public Language language(LocaleResolver localeResolver) {
-    return new Language(localeResolver);
-  }
-
-  @Bean
-  public LocaleResolver localeResolver() {
-    SessionLocaleResolver localeResolver = new SessionLocaleResolver();
-    return localeResolver;
-  }
-
-  @Bean
-  public LocaleChangeInterceptor localeChangeInterceptor() {
-    LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-    lci.setParamName("lang");
-    return lci;
-  }
-
-  @Override
-  public void addInterceptors(InterceptorRegistry registry) {
-    registry.addInterceptor(localeChangeInterceptor());
-  }
-
-  @Bean
-  public Messages messageSource(Language language) {
-    Messages messages = new Messages(language);
-    messages.setDefaultEncoding("UTF-8");
-    messages.setBasename("classpath:i18n/messages");
-    messages.setFallbackToSystemLocale(false);
-    return messages;
-  }
-
-  @Bean
-  public LabelDebugger labelDebugger() {
-    return new LabelDebugger();
-  }
-}

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

@@ -1,74 +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.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
-import org.springframework.web.client.RestTemplate;
-
-@Configuration
-@ComponentScan(basePackages = {"org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
-@PropertySource("classpath:application-webgoat.properties")
-@EnableAutoConfiguration
-public class WebGoat {
-
-  @Bean(name = "pluginTargetDirectory")
-  public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
-    return new File(webgoatHome);
-  }
-
-  @Bean
-  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-  public WebSession webSession() {
-    return new WebSession();
-  }
-
-  @Bean
-  @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
-  public UserSessionData userSessionData() {
-    return new UserSessionData("test", "data");
-  }
-
-  @Bean
-  public RestTemplate restTemplate() {
-    return new RestTemplate();
-  }
-}

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

@@ -1,108 +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.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.password.NoOpPasswordEncoder;
-
-/** Security configuration for WebGoat. */
-@Configuration
-@AllArgsConstructor
-@EnableWebSecurity
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-  private final UserService userDetailsService;
-
-  @Override
-  protected void configure(HttpSecurity http) throws Exception {
-    ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security =
-        http.authorizeRequests()
-            .antMatchers(
-                "/css/**",
-                "/images/**",
-                "/js/**",
-                "fonts/**",
-                "/plugins/**",
-                "/registration",
-                "/register.mvc",
-                "/actuator/**")
-            .permitAll()
-            .anyRequest()
-            .authenticated();
-    security
-        .and()
-        .formLogin()
-        .loginPage("/login")
-        .defaultSuccessUrl("/welcome.mvc", true)
-        .usernameParameter("username")
-        .passwordParameter("password")
-        .permitAll();
-    security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
-    security.and().csrf().disable();
-
-    http.headers().cacheControl().disable();
-    http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login"));
-  }
-
-  @Autowired
-  public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-    auth.userDetailsService(userDetailsService);
-  }
-
-  @Bean
-  @Override
-  public UserDetailsService userDetailsServiceBean() throws Exception {
-    return userDetailsService;
-  }
-
-  @Override
-  @Bean
-  protected AuthenticationManager authenticationManager() throws Exception {
-    return super.authenticationManager();
-  }
-
-  @SuppressWarnings("deprecation")
-  @Bean
-  public NoOpPasswordEncoder passwordEncoder() {
-    return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();
-  }
-}

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

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

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

@@ -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,81 +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.saveAndFlush(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 javax.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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * Welcome class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Controller
-public class Welcome {
-
-  private static final String WELCOMED = "welcomed";
-
-  /**
-   * welcome.
-   *
-   * @param request a {@link javax.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,72 +0,0 @@
-package org.owasp.webgoat.container.lessons;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.persistence.*;
-import lombok.*;
-
-/**
- * ************************************************************************************************
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * <p>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.AUTO)
-  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();
-  }
-}

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

@@ -1,143 +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.lessons;
-
-import static java.util.stream.Collectors.groupingBy;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.util.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ArrayUtils;
-import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
-import org.owasp.webgoat.container.assignments.AssignmentHints;
-import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.container.session.Course;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Slf4j
-@Configuration
-public class CourseConfiguration {
-
-  private final List<Lesson> lessons;
-  private final List<AssignmentEndpoint> assignments;
-  private final Map<String, List<AssignmentEndpoint>> assignmentsByPackage;
-
-  public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
-    this.lessons = lessons;
-    this.assignments = assignments;
-    assignmentsByPackage =
-        this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
-  }
-
-  @Bean
-  public Course course() {
-    lessons.stream().forEach(l -> l.setAssignments(createAssignment(l)));
-    return new Course(lessons);
-  }
-
-  private List<Assignment> createAssignment(Lesson lesson) {
-    var endpoints = assignmentsByPackage.get(lesson.getClass().getPackageName());
-    if (CollectionUtils.isEmpty(endpoints)) {
-      log.warn("Lesson: {} has no endpoints, is this intentionally?", lesson.getTitle());
-      return new ArrayList<>();
-    }
-    return endpoints.stream()
-        .map(
-            e ->
-                new Assignment(
-                    e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
-        .toList();
-  }
-
-  private String getPath(Class<? extends AssignmentEndpoint> e) {
-    for (Method m : e.getMethods()) {
-      if (methodReturnTypeIsOfTypeAttackResult(m)) {
-        var mapping = getMapping(m);
-        if (mapping != null) {
-          return mapping;
-        }
-      }
-    }
-    throw new IllegalStateException(
-        "Assignment endpoint: "
-            + e
-            + " has no mapping like @GetMapping/@PostMapping etc,with return type 'AttackResult' or"
-            + " 'ResponseEntity<AttackResult>' please consider adding one");
-  }
-
-  private boolean methodReturnTypeIsOfTypeAttackResult(Method m) {
-    if (m.getReturnType() == AttackResult.class) {
-      return true;
-    }
-    var genericType = m.getGenericReturnType();
-    if (genericType instanceof ParameterizedType) {
-      return ((ParameterizedType) m.getGenericReturnType()).getActualTypeArguments()[0]
-          == AttackResult.class;
-    }
-    return false;
-  }
-
-  private String getMapping(Method m) {
-    String[] paths = null;
-    // Find the path, either it is @GetMapping("/attack") of GetMapping(path = "/attack") both are
-    // valid, we need to consider both
-    if (m.getAnnotation(RequestMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(RequestMapping.class).value(),
-              m.getAnnotation(RequestMapping.class).path());
-    } else if (m.getAnnotation(PostMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(PostMapping.class).value(),
-              m.getAnnotation(PostMapping.class).path());
-    } else if (m.getAnnotation(GetMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(GetMapping.class).value(), m.getAnnotation(GetMapping.class).path());
-    } else if (m.getAnnotation(PutMapping.class) != null) {
-      paths =
-          ArrayUtils.addAll(
-              m.getAnnotation(PutMapping.class).value(), m.getAnnotation(PutMapping.class).path());
-    }
-    if (paths == null) {
-      return null;
-    } else {
-      return Arrays.stream(paths).filter(path -> !"".equals(path)).findFirst().orElse("");
-    }
-  }
-
-  private List<String> getHints(Class<? extends AssignmentEndpoint> e) {
-    if (e.isAnnotationPresent(AssignmentHints.class)) {
-      return List.of(e.getAnnotationsByType(AssignmentHints.class)[0].value());
-    }
-    return Collections.emptyList();
-  }
-}

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

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

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

@@ -1,124 +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.lessons;
-
-import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public abstract class Lesson {
-
-  private static int count = 1;
-  private Integer id = null;
-  private List<Assignment> assignments;
-
-  /** Constructor for the Lesson object */
-  protected Lesson() {
-    id = ++count;
-  }
-
-  /**
-   * getName.
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  public String getName() {
-    String className = getClass().getName();
-    return className.substring(className.lastIndexOf('.') + 1);
-  }
-
-  /**
-   * Gets the category attribute of the Lesson object
-   *
-   * @return The category value
-   */
-  public Category getCategory() {
-    return getDefaultCategory();
-  }
-
-  /**
-   * getDefaultCategory.
-   *
-   * @return a {@link org.owasp.webgoat.container.lessons.Category} object.
-   */
-  protected abstract Category getDefaultCategory();
-
-  /**
-   * Gets the title attribute of the HelloScreen object
-   *
-   * @return The title value
-   */
-  public abstract String getTitle();
-
-  /**
-   * Returns the default "path" portion of a lesson's URL.
-   *
-   * <p>
-   *
-   * <p>Legacy webgoat lesson links are of the form "attack?Screen=Xmenu=Ystage=Z". This method
-   * returns the path portion of the url, i.e., "attack" in the string above.
-   *
-   * <p>Newer, Spring-Controller-based classes will override this method to return "*.do"-styled
-   * paths.
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  protected String getPath() {
-    return "#lesson/";
-  }
-
-  /**
-   * Get the link that can be used to request this screen.
-   *
-   * <p>Rendering the link in the browser may result in Javascript sending additional requests to
-   * perform necessary actions or to obtain data relevant to the lesson or the element of the lesson
-   * selected by the user. Thanks to using the hash mark "#" and Javascript handling the clicks, the
-   * user will experience less waiting as the pages do not have to reload entirely.
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  public String getLink() {
-    return String.format("%s%s.lesson", getPath(), getId());
-  }
-
-  /**
-   * Description of the Method
-   *
-   * @return Description of the Return Value
-   */
-  public String toString() {
-    return getTitle();
-  }
-
-  public final String getId() {
-    return this.getClass().getSimpleName();
-  }
-
-  public final String getPackage() {
-    var packageName = this.getClass().getPackageName();
-    // package name is the direct package name below lessons (any subpackage will be removed)
-    return packageName.replaceAll("org.owasp.webgoat.lessons.", "").replaceAll("\\..*", "");
-  }
-}

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

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

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

@@ -1,20 +0,0 @@
-package org.owasp.webgoat.container.lessons;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * LessonInfoModel class.
- *
- * @author dm
- * @version $Id: $Id
- */
-@Getter
-@AllArgsConstructor
-public class LessonInfoModel {
-
-  private String lessonTitle;
-  private boolean hasSource;
-  private boolean hasSolution;
-  private boolean hasPlan;
-}

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

@@ -1,162 +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.lessons;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * LessonMenuItem class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
-public class LessonMenuItem {
-
-  private String name;
-  private LessonMenuItemType type;
-  private List<LessonMenuItem> children = new ArrayList<>();
-  private boolean complete;
-  private String link;
-  private int ranking;
-
-  /**
-   * Getter for the field <code>name</code>.
-   *
-   * @return the name
-   */
-  public String getName() {
-    return name;
-  }
-
-  /**
-   * Setter for the field <code>name</code>.
-   *
-   * @param name the name to set
-   */
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  /**
-   * Getter for the field <code>children</code>.
-   *
-   * @return the children
-   */
-  public List<LessonMenuItem> getChildren() {
-    return children;
-  }
-
-  /**
-   * Setter for the field <code>children</code>.
-   *
-   * @param children the children to set
-   */
-  public void setChildren(List<LessonMenuItem> children) {
-    this.children = children;
-  }
-
-  /**
-   * Getter for the field <code>type</code>.
-   *
-   * @return the type
-   */
-  public LessonMenuItemType getType() {
-    return type;
-  }
-
-  /**
-   * Setter for the field <code>type</code>.
-   *
-   * @param type the type to set
-   */
-  public void setType(LessonMenuItemType type) {
-    this.type = type;
-  }
-
-  /**
-   * addChild.
-   *
-   * @param child a {@link LessonMenuItem} object.
-   */
-  public void addChild(LessonMenuItem child) {
-    children.add(child);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder bldr = new StringBuilder();
-    bldr.append("Name: ").append(name).append(" | ");
-    bldr.append("Type: ").append(type).append(" | ");
-    return bldr.toString();
-  }
-
-  /**
-   * isComplete.
-   *
-   * @return the complete
-   */
-  public boolean isComplete() {
-    return complete;
-  }
-
-  /**
-   * Setter for the field <code>complete</code>.
-   *
-   * @param complete the complete to set
-   */
-  public void setComplete(boolean complete) {
-    this.complete = complete;
-  }
-
-  /**
-   * Getter for the field <code>link</code>.
-   *
-   * @return the link
-   */
-  public String getLink() {
-    return link;
-  }
-
-  /**
-   * Setter for the field <code>link</code>.
-   *
-   * @param link the link to set
-   */
-  public void setLink(String link) {
-    this.link = link;
-  }
-
-  public void setRanking(int ranking) {
-    this.ranking = ranking;
-  }
-
-  public int getRanking() {
-    return this.ranking;
-  }
-}

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

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

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

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

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

@@ -1,57 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.owasp.webgoat.container.service;
-
-import java.util.Collection;
-import java.util.List;
-import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.container.lessons.Hint;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.WebSession;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * HintService class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@RestController
-public class HintService {
-
-  public static final String URL_HINTS_MVC = "/service/hint.mvc";
-  private final WebSession webSession;
-
-  public HintService(WebSession webSession) {
-    this.webSession = webSession;
-  }
-
-  /**
-   * Returns hints for current lesson
-   *
-   * @return a {@link java.util.List} object.
-   */
-  @GetMapping(path = URL_HINTS_MVC, produces = "application/json")
-  @ResponseBody
-  public List<Hint> getHints() {
-    Lesson l = webSession.getCurrentLesson();
-    return createAssignmentHints(l);
-  }
-
-  private List<Hint> createAssignmentHints(Lesson l) {
-    if (l != null) {
-      return l.getAssignments().stream().map(this::createHint).flatMap(Collection::stream).toList();
-    }
-    return List.of();
-  }
-
-  private List<Hint> createHint(Assignment a) {
-    return a.getHints().stream().map(h -> new Hint(h, a.getPath())).toList();
-  }
-}

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

@@ -1,96 +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.service;
-
-import java.util.Map;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.session.LabelDebugger;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * LabelDebugService class.
- *
- * @author nbaars
- * @version $Id: $Id
- */
-@Controller
-@Slf4j
-@AllArgsConstructor
-public class LabelDebugService {
-
-  private static final String URL_DEBUG_LABELS_MVC = "/service/debug/labels.mvc";
-  private static final String KEY_ENABLED = "enabled";
-  private static final String KEY_SUCCESS = "success";
-
-  private LabelDebugger labelDebugger;
-
-  /**
-   * Checks if debugging of labels is enabled or disabled
-   *
-   * @return a {@link org.springframework.http.ResponseEntity} object.
-   */
-  @RequestMapping(path = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
-  public @ResponseBody ResponseEntity<Map<String, Object>> checkDebuggingStatus() {
-    log.debug("Checking label debugging, it is {}", labelDebugger.isEnabled());
-    Map<String, Object> result = createResponse(labelDebugger.isEnabled());
-    return new ResponseEntity<>(result, HttpStatus.OK);
-  }
-
-  /**
-   * Sets the enabled flag on the label debugger to the given parameter
-   *
-   * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
-   * @return a {@link org.springframework.http.ResponseEntity} object.
-   */
-  @RequestMapping(
-      value = URL_DEBUG_LABELS_MVC,
-      produces = MediaType.APPLICATION_JSON_VALUE,
-      params = KEY_ENABLED)
-  public @ResponseBody ResponseEntity<Map<String, Object>> setDebuggingStatus(
-      @RequestParam("enabled") Boolean enabled) {
-    log.debug("Setting label debugging to {} ", labelDebugger.isEnabled());
-    Map<String, Object> result = createResponse(enabled);
-    labelDebugger.setEnabled(enabled);
-    return new ResponseEntity<>(result, HttpStatus.OK);
-  }
-
-  /**
-   * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
-   * @return a {@link java.util.Map} object.
-   */
-  private Map<String, Object> createResponse(Boolean enabled) {
-    return Map.of(KEY_SUCCESS, Boolean.TRUE, KEY_ENABLED, enabled);
-  }
-}

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

@@ -1,67 +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.service;
-
-import java.util.Properties;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.i18n.Messages;
-import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * LabelService class.
- *
- * @author zupzup
- */
-@RestController
-@Slf4j
-@RequiredArgsConstructor
-public class LabelService {
-
-  public static final String URL_LABELS_MVC = "/service/labels.mvc";
-  private final Messages messages;
-  private final PluginMessages pluginMessages;
-
-  /**
-   * @return a map of all the labels
-   */
-  @GetMapping(path = URL_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
-  @ResponseBody
-  public ResponseEntity<Properties> fetchLabels() {
-    var allProperties = new Properties();
-    allProperties.putAll(messages.getMessages());
-    allProperties.putAll(pluginMessages.getMessages());
-    return new ResponseEntity<>(allProperties, HttpStatus.OK);
-  }
-}

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

@@ -1,33 +0,0 @@
-package org.owasp.webgoat.container.service;
-
-import lombok.AllArgsConstructor;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.lessons.LessonInfoModel;
-import org.owasp.webgoat.container.session.WebSession;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * LessonInfoService class.
- *
- * @author dm
- * @version $Id: $Id
- */
-@RestController
-@AllArgsConstructor
-public class LessonInfoService {
-
-  private final WebSession webSession;
-
-  /**
-   * getLessonInfo.
-   *
-   * @return a {@link LessonInfoModel} object.
-   */
-  @RequestMapping(path = "/service/lessoninfo.mvc", produces = "application/json")
-  public @ResponseBody LessonInfoModel getLessonInfo() {
-    Lesson lesson = webSession.getCurrentLesson();
-    return new LessonInfoModel(lesson.getTitle(), false, false, false);
-  }
-}

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

@@ -1,124 +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.service;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import lombok.AllArgsConstructor;
-import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.container.lessons.Category;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.lessons.LessonMenuItem;
-import org.owasp.webgoat.container.lessons.LessonMenuItemType;
-import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.LessonTracker;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * LessonMenuService class.
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Controller
-@AllArgsConstructor
-public class LessonMenuService {
-
-  public static final String URL_LESSONMENU_MVC = "/service/lessonmenu.mvc";
-  private final Course course;
-  private final WebSession webSession;
-  private UserTrackerRepository userTrackerRepository;
-
-  @Value("#{'${exclude.categories}'.split(',')}")
-  private List<String> excludeCategories;
-
-  @Value("#{'${exclude.lessons}'.split(',')}")
-  private List<String> excludeLessons;
-
-  /**
-   * Returns the lesson menu which is used to build the left nav
-   *
-   * @return a {@link java.util.List} object.
-   */
-  @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
-  public @ResponseBody List<LessonMenuItem> showLeftNav() {
-    List<LessonMenuItem> menu = new ArrayList<>();
-    List<Category> categories = course.getCategories();
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-
-    for (Category category : categories) {
-      if (excludeCategories.contains(category.name())) {
-        continue;
-      }
-      LessonMenuItem categoryItem = new LessonMenuItem();
-      categoryItem.setName(category.getName());
-      categoryItem.setType(LessonMenuItemType.CATEGORY);
-      // check for any lessons for this category
-      List<Lesson> lessons = course.getLessons(category);
-      lessons = lessons.stream().sorted(Comparator.comparing(Lesson::getTitle)).toList();
-      for (Lesson lesson : lessons) {
-        if (excludeLessons.contains(lesson.getName())) {
-          continue;
-        }
-        LessonMenuItem lessonItem = new LessonMenuItem();
-        lessonItem.setName(lesson.getTitle());
-        lessonItem.setLink(lesson.getLink());
-        lessonItem.setType(LessonMenuItemType.LESSON);
-        LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
-        boolean lessonSolved = lessonCompleted(lessonTracker.getLessonOverview(), lesson);
-        lessonItem.setComplete(lessonSolved);
-        categoryItem.addChild(lessonItem);
-      }
-      categoryItem.getChildren().sort((o1, o2) -> o1.getRanking() - o2.getRanking());
-      menu.add(categoryItem);
-    }
-    return menu;
-  }
-
-  private boolean lessonCompleted(Map<Assignment, Boolean> map, Lesson currentLesson) {
-    boolean result = true;
-    for (Map.Entry<Assignment, Boolean> entry : map.entrySet()) {
-      Assignment storedAssignment = entry.getKey();
-      for (Assignment lessonAssignment : currentLesson.getAssignments()) {
-        if (lessonAssignment.getName().equals(storedAssignment.getName())) {
-          result = result && entry.getValue();
-          break;
-        }
-      }
-    }
-    return result;
-  }
-}

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

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

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

@@ -1,34 +0,0 @@
-package org.owasp.webgoat.container.service;
-
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.WebSession;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * LessonTitleService class.
- *
- * @author dm
- * @version $Id: $Id
- */
-@Controller
-public class LessonTitleService {
-
-  private final WebSession webSession;
-
-  public LessonTitleService(final WebSession webSession) {
-    this.webSession = webSession;
-  }
-
-  /**
-   * Returns the title for the current attack
-   *
-   * @return a {@link java.lang.String} object.
-   */
-  @RequestMapping(path = "/service/lessontitle.mvc", produces = "application/html")
-  public @ResponseBody String showPlan() {
-    Lesson lesson = webSession.getCurrentLesson();
-    return lesson != null ? lesson.getTitle() : "";
-  }
-}

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

@@ -1,105 +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.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-import org.owasp.webgoat.container.i18n.PluginMessages;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.session.Course;
-import org.owasp.webgoat.container.session.WebSession;
-import org.owasp.webgoat.container.users.LessonTracker;
-import org.owasp.webgoat.container.users.UserTracker;
-import org.owasp.webgoat.container.users.UserTrackerRepository;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * ReportCardService
- *
- * @author nbaars
- * @version $Id: $Id
- */
-@Controller
-@AllArgsConstructor
-public class ReportCardService {
-
-  private final WebSession webSession;
-  private final UserTrackerRepository userTrackerRepository;
-  private final Course course;
-  private final PluginMessages pluginMessages;
-
-  /**
-   * Endpoint which generates the report card for the current use to show the stats on the solved
-   * lessons
-   */
-  @GetMapping(path = "/service/reportcard.mvc", produces = "application/json")
-  @ResponseBody
-  public ReportCard reportCard() {
-    final ReportCard reportCard = new ReportCard();
-    reportCard.setTotalNumberOfLessons(course.getTotalOfLessons());
-    reportCard.setTotalNumberOfAssignments(course.getTotalOfAssignments());
-
-    UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
-    reportCard.setNumberOfAssignmentsSolved(userTracker.numberOfAssignmentsSolved());
-    reportCard.setNumberOfLessonsSolved(userTracker.numberOfLessonsSolved());
-    for (Lesson lesson : course.getLessons()) {
-      LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
-      final LessonStatistics lessonStatistics = new LessonStatistics();
-      lessonStatistics.setName(pluginMessages.getMessage(lesson.getTitle()));
-      lessonStatistics.setNumberOfAttempts(lessonTracker.getNumberOfAttempts());
-      lessonStatistics.setSolved(lessonTracker.isLessonSolved());
-      reportCard.lessonStatistics.add(lessonStatistics);
-    }
-    return reportCard;
-  }
-
-  @Getter
-  @Setter
-  private final class ReportCard {
-
-    private int totalNumberOfLessons;
-    private int totalNumberOfAssignments;
-    private int solvedLessons;
-    private int numberOfAssignmentsSolved;
-    private int numberOfLessonsSolved;
-    private List<LessonStatistics> lessonStatistics = new ArrayList<>();
-  }
-
-  @Setter
-  @Getter
-  private final class LessonStatistics {
-    private String name;
-    private boolean solved;
-    private int numberOfAttempts;
-  }
-}

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

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

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

@@ -1,99 +0,0 @@
-package org.owasp.webgoat.container.session;
-
-import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.lessons.Category;
-import org.owasp.webgoat.container.lessons.Lesson;
-
-/**
- * ************************************************************************************************
- *
- * <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
- */
-@Slf4j
-public class Course {
-
-  private List<Lesson> lessons;
-
-  public Course(List<Lesson> lessons) {
-    this.lessons = lessons;
-  }
-
-  /**
-   * Gets the categories attribute of the Course object
-   *
-   * @return The categories value
-   */
-  public List<Category> getCategories() {
-    return lessons.parallelStream().map(Lesson::getCategory).distinct().sorted().toList();
-  }
-
-  /**
-   * Gets the firstLesson attribute of the Course object
-   *
-   * @return The firstLesson value
-   */
-  public Lesson getFirstLesson() {
-    // Category 0 is the admin function. We want the first real category
-    // to be returned. This is normally the General category and the Http Basics lesson
-    return getLessons(getCategories().get(0)).get(0);
-  }
-
-  /**
-   * Getter for the field <code>lessons</code>.
-   *
-   * @return a {@link java.util.List} object.
-   */
-  public List<Lesson> getLessons() {
-    return this.lessons;
-  }
-
-  /**
-   * Getter for the field <code>lessons</code>.
-   *
-   * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
-   * @return a {@link java.util.List} object.
-   */
-  public List<Lesson> getLessons(Category category) {
-    return this.lessons.stream().filter(l -> l.getCategory() == category).toList();
-  }
-
-  public void setLessons(List<Lesson> lessons) {
-    this.lessons = lessons;
-  }
-
-  public int getTotalOfLessons() {
-    return this.lessons.size();
-  }
-
-  public int getTotalOfAssignments() {
-    return this.lessons.stream()
-        .reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
-  }
-}

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

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

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

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

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

@@ -1,90 +0,0 @@
-package org.owasp.webgoat.container.session;
-
-import java.io.Serializable;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.owasp.webgoat.container.users.WebGoatUser;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * *************************************************************************************************
- *
- * <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 <a href="http://www.aspectsecurity.com">Aspect Security</a>
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @version $Id: $Id
- * @since October 28, 2003
- */
-public class WebSession implements Serializable {
-
-  private static final long serialVersionUID = -4270066103101711560L;
-  private final WebGoatUser currentUser;
-  private transient Lesson currentLesson;
-  private boolean securityEnabled;
-
-  public WebSession() {
-    this.currentUser =
-        (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-  }
-
-  /**
-   * Setter for the field <code>currentScreen</code>.
-   *
-   * @param lesson current lesson
-   */
-  public void setCurrentLesson(Lesson lesson) {
-    this.currentLesson = lesson;
-  }
-
-  /**
-   * getCurrentLesson.
-   *
-   * @return a {@link Lesson} object.
-   */
-  public Lesson getCurrentLesson() {
-    return this.currentLesson;
-  }
-
-  /**
-   * Gets the userName attribute of the WebSession object
-   *
-   * @return The userName value
-   */
-  public String getUserName() {
-    return currentUser.getUsername();
-  }
-
-  public WebGoatUser getUser() {
-    return currentUser;
-  }
-
-  public void toggleSecurity() {
-    this.securityEnabled = !this.securityEnabled;
-  }
-
-  public boolean isSecurityEnabled() {
-    return securityEnabled;
-  }
-}

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

@@ -1,109 +0,0 @@
-package org.owasp.webgoat.container.users;
-
-import java.util.*;
-import java.util.stream.Collectors;
-import javax.persistence.*;
-import lombok.Getter;
-import org.owasp.webgoat.container.lessons.Assignment;
-import org.owasp.webgoat.container.lessons.Lesson;
-
-/**
- * ************************************************************************************************
- *
- * <p>
- *
- * <p>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 29, 2003
- */
-@Entity
-public class LessonTracker {
-
-  @Id
-  @GeneratedValue(strategy = GenerationType.AUTO)
-  private Long id;
-
-  @Getter private String lessonName;
-
-  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private final Set<Assignment> solvedAssignments = new HashSet<>();
-
-  @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-  private final Set<Assignment> allAssignments = new HashSet<>();
-
-  @Getter private int numberOfAttempts = 0;
-  @Version private Integer version;
-
-  private LessonTracker() {
-    // JPA
-  }
-
-  public LessonTracker(Lesson lesson) {
-    lessonName = lesson.getId();
-    allAssignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
-  }
-
-  public Optional<Assignment> getAssignment(String name) {
-    return allAssignments.stream().filter(a -> a.getName().equals(name)).findFirst();
-  }
-
-  /**
-   * Mark an assignment as solved
-   *
-   * @param solvedAssignment the assignment which the user solved
-   */
-  public void assignmentSolved(String solvedAssignment) {
-    getAssignment(solvedAssignment).ifPresent(solvedAssignments::add);
-  }
-
-  /**
-   * @return did they user solved all solvedAssignments for the lesson?
-   */
-  public boolean isLessonSolved() {
-    return allAssignments.size() == solvedAssignments.size();
-  }
-
-  /** Increase the number attempts to solve the lesson */
-  public void incrementAttempts() {
-    numberOfAttempts++;
-  }
-
-  /** Reset the tracker. We do not reset the number of attempts here! */
-  void reset() {
-    solvedAssignments.clear();
-  }
-
-  /**
-   * @return list containing all the assignments solved or not
-   */
-  public Map<Assignment, Boolean> getLessonOverview() {
-    List<Assignment> notSolved =
-        allAssignments.stream().filter(i -> !solvedAssignments.contains(i)).toList();
-    Map<Assignment, Boolean> overview =
-        notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
-    overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
-    return overview;
-  }
-}

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

@@ -1,49 +0,0 @@
-package org.owasp.webgoat.container.users;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- * @author nbaars
- * @since 3/19/17.
- */
-@Controller
-@AllArgsConstructor
-@Slf4j
-public class RegistrationController {
-
-  private UserValidator userValidator;
-  private UserService userService;
-  private AuthenticationManager authenticationManager;
-
-  @GetMapping("/registration")
-  public String showForm(UserForm userForm) {
-    return "registration";
-  }
-
-  @PostMapping("/register.mvc")
-  public String registration(
-      @ModelAttribute("userForm") @Valid UserForm userForm,
-      BindingResult bindingResult,
-      HttpServletRequest request)
-      throws ServletException {
-    userValidator.validate(userForm, bindingResult);
-
-    if (bindingResult.hasErrors()) {
-      return "registration";
-    }
-    userService.addUser(userForm.getUsername(), userForm.getPassword());
-    request.login(userForm.getUsername(), userForm.getPassword());
-
-    return "redirect:/attack";
-  }
-}