WIP

The CI pipeline should take care of this.

.dockerignore

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

.editorconfig

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

.github/FUNDING.yml

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

.github/lock.yml

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

.github/stale.yml

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

.github/workflows/build.yml

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

.github/workflows/rebase.yml

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

.github/workflows/release.yml

@@ -4,133 +4,120 @@ on:
     tags:
       - v*
 jobs:
-  release:
+#  release:
-    if: github.repository == 'WebGoat/WebGoat'
+#    name: Release WebGoat
-    name: Release WebGoat
+#    runs-on: ubuntu-latest
-    runs-on: ubuntu-latest
+#    steps:
-    environment:
+#      - uses: actions/checkout@v2
-      name: release
+#
-    steps:
+#      - name: "Get tag name"
-      - uses: actions/checkout@v3
+#        id: tag
-
+#        uses: dawidd6/action-get-tag@v1
-      - name: "Get tag name"
+#
-        id: tag
+#      - name: Set up JDK 11
-        uses: dawidd6/action-get-tag@v1
+#        uses: actions/setup-java@v1
-
+#        with:
-      - name: Set up JDK 15
+#          java-version: 11
-        uses: actions/setup-java@v3
+#          architecture: x64
-        with:
+#
-          distribution: 'zulu'
+#      - name: Cache Maven packages
-          java-version: 15
+#        uses: actions/cache@v2.1.4
-          architecture: x64
+#        with:
-
+#          path: ~/.m2
-      - name: Cache Maven packages
+#          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        uses: actions/cache@v3.0.5
+#          restore-keys: ${{ runner.os }}-m2
-        with:
+#
-          path: ~/.m2
+#      - name: "Set labels for ${{ github.ref }}"
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+#        run: |
-          restore-keys: ${{ runner.os }}-m2
+#          echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
-
+#          WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
-      - name: "Set labels for ${{ github.ref }}"
+#          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
-        run: |
+#      - name: Build with Maven
-          echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
+#        run: |
-          WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
+#          mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
-          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
+#          mvn clean install -DskipTests
-      - name: Build with Maven
+#
-        run: |
+#      - name: "Create release"
-          mvn --no-transfer-progress versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
+#        uses: softprops/action-gh-release@v1
-          mvn --no-transfer-progress install -DskipTests
+#        with:
-
+#          draft: false
-      - name: "Create release"
+#          files: |
-        uses: softprops/action-gh-release@v1
+#            webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
-        with:
+#            webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
-          draft: false
+#          body: |
-          files: |
+#            ## Version ${{ steps.tag.outputs.tag }}
-            webgoat/target/webgoat-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+#
-          body: |
+#            ### New functionality
-            ## Version ${{ steps.tag.outputs.tag }}
+#
-
+#            - test
-            ### New functionality
+#
-
+#            ### Bug fixes
-            - test
+#
-
+#            - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
-            ### Bug fixes
+#
-
+#
-            - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
+#            ## Contributors
-
+#
-
+#            Special thanks to the following contributors providing us with a pull request:
-            ## Contributors
+#
-
+#            - Person 1
-            Special thanks to the following contributors providing us with a pull request:
+#            - Person 2
-
+#
-            - Person 1
+#            And everyone who provided feedback through Github.
-            - Person 2
+#
-
+#
-            And everyone who provided feedback through Github.
+#            Team WebGoat
-
+#        env:
-
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            Team WebGoat
+#
-        env:
+#      - name: "Set up QEMU"
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        uses: docker/setup-qemu-action@v1
-
+#
-      - name: "Set up QEMU"
+#      - name: "Set up Docker Buildx"
-        uses: docker/setup-qemu-action@v2.0.0
+#        uses: docker/setup-buildx-action@v1
-        with:
+#
-          platforms: all
+#      - name: "Login to dockerhub"
-
+#        uses: docker/login-action@v1
-      - name: "Set up Docker Buildx"
+#        with:
-        uses: docker/setup-buildx-action@v2
+#          username: ${{ secrets.DOCKERHUB_USERNAME }}
-
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: "Login to dockerhub"
+#
-        uses: docker/login-action@v2.0.0
+#      - name: "Build and push"
-        with:
+#        uses: docker/build-push-action@v2
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+#        with:
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#          context: ./docker
-
+#          file: docker/Dockerfile
-      - name: "Build and push"
+#          push: false #todo enable
-        uses: docker/build-push-action@v3.0.0
+#          platforms: linux/amd64
-        with:
+#          tags: |
-          context: ./
+#            webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
-          file: ./Dockerfile
+#            webgoat/goatandwolf:latest
-          push: true 
+#          build-args: |
-          platforms: linux/amd64, linux/arm64, linux/arm/v7
+#            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
-          tags: |
+#
-            webgoat/webgoat:${{ env.WEBGOAT_TAG_VERSION }}
+#      - name: "Image digest"
-            webgoat/webgoat:latest
+#        run: echo ${{ steps.docker_build.outputs.digest }}
-          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 ]
+#    needs: [ release ]
     runs-on: ubuntu-latest
-    environment:
-      name: release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
-        with:
+        run: |
-          ref: develop
+          git checkout develop
-          token: ${{ secrets.WEBGOAT_DEPLOYER_TOKEN }}
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 11
           architecture: x64
 
       - name: Set version to next snapshot
         run: |
           mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
-
       - name: Commit pom.xml
+        uses: actions/checkout@v2
         run: |
-          git config user.name webgoat-github
-          git config user.email owasp.webgoat@gmail.com
           find . -name 'pom.xml' | xargs git add
           git commit -m "Updating to the new development version"
-          git push
+          git push origin develop

.github/workflows/welcome.yml

@@ -1,17 +1,13 @@
 name: Welcome
 
-on:
+on: [pull_request, issues]
-  issues:
-    types:
-      - opened
 
 jobs:
   greeting:
-    if: github.repository == 'WebGoat/WebGoat'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/first-interaction@v1.1.0
+      - uses: actions/first-interaction@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-message: 'Thanks for submitting your first issue, we will have a look as quickly as possible.'
-          pr-message: 'Thanks so much for your contribution, really appreciated! We will have a look and merge it if everything checks out!'
+          pr-message: 'Thanks so much for your contribution, really appreciated! We will have a look and merge it if everything checks out!'

.mvn/wrapper/maven-wrapper.properties

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

CODE_OF_CONDUCT.md

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

CONTRIBUTING.md

@@ -1,98 +0,0 @@
-# Contributing
-[![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors)
-![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/WebGoat/WebGoat/help%20wanted.svg)
-![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/WebGoat/WebGoat/good%20first%20issue.svg)
-
-This document describes how you can contribute to WebGoat. Please read it carefully.
-
-**Table of Contents**
-
-* [How to Contribute to the Project](#how-to-contribute-to-the-project)
-* [How to set up your Contributor Environment](#how-to-set-up-your-contributor-environment)
-* [How to get your PR Accepted](#how-to-get-your-pr-accepted)
-
-## How to Contribute to the project
-
-There are a couple of ways on how you can contribute to the project:
-
-* **File [issues](https://github.com/WebGoat/WebGoat/issues "Webgoat Issues")** for missing content or errors. Explain what you think is missing and give a suggestion as to where it could be added.
-* **Create a [pull request (PR)](https://github.com/WebGoat/WebGoat/pulls "Create a pull request")**. This is a direct contribution to the project and may be merged after review. You should ideally [create an issue](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues") for any PR you would like to submit, as we can first review the merit of the PR and avoid any unnecessary work. This is of course not needed for small modifications such as correcting typos.
-* **Help out financially** by donating via [OWASP donations](https://owasp.org/donate/?reponame=www-project-webgoat&title=OWASP+WebGoat).
-
-## How to get your PR accepted
-
-Your PR is valuable to us, and to make sure we can integrate it smoothly, we have a few items for you to consider. In short:
-The minimum requirements for code contributions are:
-
-1. The code _must_ be compliant with the configured Checkstyle and PMD rules.
-2. All new and changed code _should_ have a corresponding unit and/or integration test.
-3. New and changed lessons _must_ have a corresponding integration test.
-4. [Status checks](https://docs.github.com/en/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) should pass for your last commit.
-
-Additionally, the following guidelines can help:
-
-### Keep your pull requests limited to a single issue
-
-Pull requests should be as small/atomic as possible. Large, wide-sweeping changes in a pull request will be **rejected**, with comments to isolate the specific code in your pull request. Some examples:
-
-* If you are making spelling corrections in the docs, don't modify other files.
-* If you are adding new functions don't '*cleanup*' unrelated functions. That cleanup belongs in another pull request.
-
-
-### Write a good commit message
-
-* Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
-
-* If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.
-
-  For example: `Fix #545` or `Closes #10`
-
-## How to set up your Contributor Environment
-
-1. Create a GitHub account. Multiple different GitHub subscription plans are available, but you only need a free one. Follow [these steps](https://help.github.com/en/articles/signing-up-for-a-new-github-account "Signing up for a new GitHub account") to set up your account.
-2. Fork the repository. Creating a fork means creating a copy of the repository on your own account, which you can modify without any impact on this repository. GitHub has an [article that describes all the needed steps](https://help.github.com/en/articles/fork-a-repo "Fork a repo").
-3. Clone your own repository to your host computer so that you can make modifications. If you followed the GitHub tutorial from step 2, you have already done this.
-4. Go to the newly cloned directory "WebGoat" and add the remote upstream repository:
-
-    ```bash
-    $ git remote -v
-    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
-    origin git@github.com:<your Github handle>/WebGoat.git (push)
-
-    $ git remote add upstream git@github.com:WebGoat/WebGoat.git
-
-    $ git remote -v
-    origin git@github.com:<your Github handle>/WebGoat.git (fetch)
-    origin git@github.com:<your Github handle>/WebGoat.git (push)
-    upstream git@github.com:OWASP/WebGoat.git (fetch)
-    upstream git@github.com:OWASP/WebGoat.git (push)
-    ```
-
-    See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
-5. Choose what to work on, based on any of the outstanding [issues](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues").
-6. Create a branch so that you can cleanly work on the chosen issue: `git checkout -b FixingIssue66`
-7. Open your favorite editor and start making modifications. We recommend using the [IntelliJ Idea](https://www.jetbrains.com/idea/).
-8. After your modifications are done, push them to your forked repository. This can be done by executing the command `git add MYFILE` for every file you have modified, followed by `git commit -m 'your commit message here'` to commit the modifications and `git push` to push your modifications to GitHub.
-9. Create a Pull Request (PR) by going to your fork, <https://github.com/Your_Github_Handle/WebGoat> and click on the "New Pull Request" button. The target branch should typically be the Master branch. When submitting a PR, be sure to follow the checklist that is provided in the PR template. The checklist itself will be filled out by the reviewer.
-10. Your PR will be reviewed and comments may be given. In order to process a comment, simply make modifications to the same branch as before and push them to your repository. GitHub will automatically detect these changes and add them to your existing PR.
-11. When starting on a new PR in the future, make sure to always keep your local repo up to date:
-
-    ```bash
-    $ git fetch upstream
-    $ git merge upstream/develop
-    ```
-
-    See also the following article for further explanation on "[How to Keep a Downstream git Repository Current with Upstream Repository Changes](https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97 "How to Keep a Downstream git Repository Current with Upstream Repository Changes")".
-
-If at any time you want to work on a different issue, you can simply switch to a different branch, as explained in step 5.
-
-> Tip: Don't try to work on too many issues at once though, as it will be a lot more difficult to merge branches the longer they are open.
-
-## What not to do
-
-Although we greatly appreciate any and all contributions to the project, there are a few things that you should take into consideration:
-
-* The WebGoat project should not be used as a platform for advertisement for commercial tools, companies or individuals. Write-ups should be written with free and open-source tools in mind and commercial tools are typically not accepted, unless as a reference in the security tools section.
-* Unnecessary self-promotion of tools or blog posts is frowned upon. If you have a relation with on of the URLs or tools you are referencing, please state so in the PR so that we can verify that the reference is in line with the rest of the guide.
-
-Please be sure to take a careful look at our [Code of Conduct](https://github.com/WebGoat/WebGoat/blob/master/CODE_OF_CONDUCT.md) for all the details.

CREATE_RELEASE.MD

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

Dockerfile

@@ -1,32 +0,0 @@
-FROM docker.io/eclipse-temurin:17-jdk-focal
-
-RUN useradd -ms /bin/bash webgoat
-RUN chgrp -R 0 /home/webgoat
-RUN chmod -R g=u /home/webgoat
-
-USER webgoat
-
-COPY --chown=webgoat target/webgoat-*.jar /home/webgoat/webgoat.jar
-
-EXPOSE 8080
-EXPOSE 9090
-
-WORKDIR /home/webgoat
-ENTRYPOINT [ "java", \
-   "-Duser.home=/home/webgoat", \
-   "-Dfile.encoding=UTF-8", \
-   "--add-opens", "java.base/java.lang=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.util=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.text=ALL-UNNAMED", \
-   "--add-opens", "java.desktop/java.beans=ALL-UNNAMED", \
-   "--add-opens", "java.desktop/java.awt.font=ALL-UNNAMED", \
-   "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.io=ALL-UNNAMED", \
-   "--add-opens", "java.base/java.util=ALL-UNNAMED", \
-   "-Drunning.in.docker=true", \
-   "-Dwebgoat.host=0.0.0.0", \
-   "-Dwebwolf.host=0.0.0.0", \
-   "-Dwebgoat.port=8080", \
-   "-Dwebwolf.port=9090", \
-   "-jar", "webgoat.jar" ]

PULL_REQUEST_TEMPLATE.md

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

README.MD

@@ -0,0 +1,146 @@
+# WebGoat 8: A deliberately insecure Web Application
+
+[![Build Status](https://travis-ci.org/WebGoat/WebGoat.svg?branch=develop)](https://travis-ci.org/WebGoat/WebGoat)
+[![Coverage Status](https://coveralls.io/repos/WebGoat/WebGoat/badge.svg?branch=develop&service=github)](https://coveralls.io/github/WebGoat/WebGoat?branch=master)
+[![Codacy Badge](https://api.codacy.com/project/badge/b69ee3a86e3b4afcaf993f210fccfb1d)](https://www.codacy.com/app/dm/WebGoat)
+[![OWASP Labs](https://img.shields.io/badge/owasp-lab%20project-f7b73c.svg)](https://www.owasp.org/index.php/OWASP_Project_Inventory#tab=Labs_Projects)
+[![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
+[![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+# Introduction
+
+WebGoat is a deliberately insecure web application maintained by [OWASP](http://www.owasp.org/) designed to teach web
+application security lessons.
+
+This program is a demonstration of common server-side application flaws. The
+exercises are intended to be used by people to learn about application security and
+penetration testing techniques.
+
+**WARNING 1:** *While running this program your machine will be extremely
+vulnerable to attack. You should disconnect from the Internet while using
+this program.*  WebGoat's default configuration binds to localhost to minimize
+the exposure.
+
+**WARNING 2:** *This program is for educational purposes only. If you attempt
+these techniques without authorization, you are very likely to get caught. If
+you are caught engaging in unauthorized hacking, most companies will fire you.
+Claiming that you were doing security research will not work as that is the
+first thing that all hackers claim.*
+
+# Installation Instructions:
+
+## 1. Run using Docker
+
+Every release is also published on [DockerHub]((https://hub.docker.com/r/webgoat/webgoat-8.0/)).
+
+### Using docker run
+
+The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
+
+```shell
+docker run -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf
+```
+
+WebGoat will be located at: http://127.0.0.1:8080/WebGoat
+WebWolf will be located at: http://127.0.0.1:9090/WebWolf
+
+**Important**: Choose the correct timezone, so that the docker container and your host are in the same timezone. As it important for the validity of JWT tokens used in certain exercises.
+
+### Using docker stack deploy
+
+Another way to deply WebGoat and WebWolf in a more advanced way is to use a compose-file in a docker stack deploy.
+You can define which containers should run in which combinations and define all of this in a yaml file.
+An example of such a file is: [goat-with-reverseproxy.yaml](goat-with-reverseproxy.yaml)
+
+This sets up an nginx webserver as reverse proxy to WebGoat and WebWolf. You can change the timezone by adjusting the value in the yaml file.
+
+```shell
+docker stack init
+docker stack deploy --compose-file goat-with-reverseproxy.yaml webgoatdemo
+```
+
+Add the following entries in your local hosts file:
+
+```shell
+127.0.0.1 www.webgoat.local www.webwolf.localhost
+```
+
+You can use the overall start page: http://www.webgoat.local or:
+
+WebGoat will be located at: http://www.webgoat.local/WebGoat
+
+WebWolf will be located at: http://www.webwolf.local/WebWolf
+
+**Important**: the current directory on your host will be mapped into the container for keeping state.
+
+## 2. Standalone
+
+Download the latest WebGoat and WebWolf release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
+
+```Shell
+java -jar webgoat-server-8.1.0.jar [--server.port=8080] [--server.address=localhost]
+java -jar webwolf-8.1.0.jar [--server.port=9090] [--server.address=localhost]
+```
+
+The latest version of WebGoat needs Java 11 or above. By default WebGoat and WebWolf start on port 8080,9000 and 9090 with the environment variable WEBGOAT_PORT, WEBWOLF_PORT and WEBGOAT_HSQLPORT you can set different values.
+```Shell
+export WEBGOAT_PORT=18080
+export WEBGOAT_HSQLPORT=19001
+export WEBWOLF_PORT=19090
+java -jar webgoat-server-8.1.0.jar
+java -jar webwolf-8.1.0.jar 
+```
+Use set in stead of export on Windows cmd. 
+
+
+## 3. Run from the sources
+
+### Prerequisites:
+
+* Java 11
+* Maven > 3.2.1
+* Your favorite IDE
+* Git, or Git support in your IDE
+
+Open a command shell/window:
+
+```Shell
+git clone git@github.com:WebGoat/WebGoat.git
+```
+
+Now let's start by compiling the project.
+
+```Shell
+cd WebGoat
+git checkout <<branch_name>>
+mvn clean install
+```
+
+Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
+
+```Shell
+mvn -pl webgoat-server spring-boot:run
+```
+... you should be running webgoat on localhost:8080/WebGoat momentarily
+
+
+To change IP address add the following variable to WebGoat/webgoat-container/src/main/resources/application.properties file
+
+```
+server.address=x.x.x.x
+```
+
+## 4. Run with custom menu
+
+For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting environment variables.
+
+For instance running as a jar on a Linux/MacOS it will look like:
+```Shell
+export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
+export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
+java -jar webgoat-server/target/webgoat-server-v8.2.0-SNAPSHOT.jar
+```
+Or in a docker run it would (once this version is pushed into docker hub) look like:
+```Shell
+docker run -d -p 80:8888 -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/goatandwolf
+```

README.md

@@ -1,118 +0,0 @@
-# WebGoat 8: A deliberately insecure Web Application
-
-[![Build](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml)
-[![java-jdk](https://img.shields.io/badge/java%20jdk-17-green.svg)](https://jdk.java.net/)
-[![OWASP Labs](https://img.shields.io/badge/OWASP-Lab%20project-f7b73c.svg)](https://owasp.org/projects/)
-[![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
-[![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[![Discussions](https://img.shields.io/github/discussions/WebGoat/WebGoat)](https://github.com/WebGoat/WebGoat/discussions)
-
-# Introduction
-
-WebGoat is a deliberately insecure web application maintained by [OWASP](http://www.owasp.org/) designed to teach web
-application security lessons.
-
-This program is a demonstration of common server-side application flaws. The
-exercises are intended to be used by people to learn about application security and
-penetration testing techniques.
-
-**WARNING 1:** *While running this program your machine will be extremely
-vulnerable to attack. You should disconnect from the Internet while using
-this program.*  WebGoat's default configuration binds to localhost to minimize
-the exposure.
-
-**WARNING 2:** *This program is for educational purposes only. If you attempt
-these techniques without authorization, you are very likely to get caught. If
-you are caught engaging in unauthorized hacking, most companies will fire you.
-Claiming that you were doing security research will not work as that is the
-first thing that all hackers claim.*
-
-# Installation instructions:
-
-For more details check [the Contribution guide](/CONTRIBUTING.md)
-
-## 1. Run using Docker
-
-Every release is also published on [DockerHub](https://hub.docker.com/r/webgoat/webgoat).
-
-The easiest way to start WebGoat as a Docker container is to use the all-in-one docker container. This is a docker image that has WebGoat and WebWolf running inside.
-
-```shell
-
-docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amsterdam webgoat/webgoat
-```
-
-**Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
-
-
-## 2. Standalone
-
-Download the latest WebGoat and WebWolf release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
-
-```shell
-java -Dfile.encoding=UTF-8 -jar webgoat-8.2.3.jar 
-```
-
-Click the link in the log to start WebGoat.
-
-## 3. Run from the sources
-
-### Prerequisites:
-
-* Java 17
-* Your favorite IDE
-* Git, or Git support in your IDE
-
-Open a command shell/window:
-
-```Shell
-git clone git@github.com:WebGoat/WebGoat.git
-```
-
-Now let's start by compiling the project.
-
-```Shell
-cd WebGoat
-git checkout <<branch_name>>
-# On Linux/Mac:
-./mvnw clean install 
-
-# On Windows:
-./mvnw.cmd clean install
-
-# Using docker or podman, you can than build the container locally
-docker build -f Dockerfile . -t webgoat/webgoat
-```
-
-Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
-
-```Shell
-# On Linux/Mac:
-./mvnw spring-boot:run
-# On Windows:
-./mvnw.cmd spring-boot:run
-
-```
-... you should be running WebGoat on localhost:8080/WebGoat momentarily
-
-
-To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties file`:
-
-```
-server.address=x.x.x.x
-```
-
-## 4. Run with custom menu
-
-For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting certain environment variables.
-
-For instance running as a jar on a Linux/macOS it will look like this:
-```Shell
-export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
-export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
-java -jar target/webgoat-8.2.3-SNAPSHOT.jar
-
-Or in a docker run it would (once this version is pushed into docker hub) look like this:
-```Shell
-docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
-```

RELEASE_NOTES.md

@@ -1,84 +1,5 @@
 # WebGoat release notes 
 
-## Unreleased
-
-### New functionality
-
-- New year's resolution: major refactoring of WebGoat to simplify the setup and improve building times.
-- Move away from multi-project setup:
-  - This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
-  - No longer add Maven dependencies in several places
-  - H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure the correct database connection.
-- More explicit paths in html files to reference `adoc` files, less magic.
-- Integrate WebWolf in WebGoat, the setup was way too complicated and needed configuration which could lead to mistakes and a not working application. This also simplifies the Docker configuration as there is only 1 Docker image.
-- Add WebWolf button in WebGoat
-- Move all lessons into `src/main/resources` 
-- WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease the user experience. 
-- WebGoat logs URL after startup: `Please browse to http://127.0.0.1:8080/WebGoat to get started...`
-- Simplify `Dockerfile` as we no longer need a script to start everything
-- Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
-- Added `Initializable` interface for a lesson, an assignment can implement this interface to set it up for a specific user and to reset the assignment back to its original state when a reset lesson occurs. See `BlindSendFileAssignment` for an example.
-- Integration tests now use the same user. This saves a lot of time as before every test used a different user which triggered the Flyway migration to set up the database schema for the user. This migration took a lot of time.
-
-## Version 8.2.2
-
-### New functionality
-
-- Docker image now supports nginx when browsing to http://localhost a landing page is shown. 
-
-### Bug fixes
-
-- [#1039 jwt-7-Code review](https://github.com/WebGoat/WebGoat/issues/1039)
-- [#1031 SQL Injection (intro) 5: Data Control Language (DCL) the wiki's solution is not correct](https://github.com/WebGoat/WebGoat/issues/1031)
-- [#1027 Webgoat 8.2.1 Vulnerable_Components_12 Shows internal server error](https://github.com/WebGoat/WebGoat/issues/1027)
-
-
-## Version 8.2.1
-
-### New functionality
-
-- New Docker image for arm64 architecture is now available (for Apple M1)
-
-
-## Version 8.2.0
-
-### New functionality
-
-- Add new zip slip lesson (part of path traversal)
-- SQL lessons are now separate for each user, database are now per user and no longer shared across users
-- Moved to Java 15 & Spring Boot 2.4 & moved to JUnit 5
-
-### Bug fixes
-
-- [#974 SQL injection Intro 5 not solvable](https://github.com/WebGoat/WebGoat/issues/974)
-- [#962 SQL-Lesson 5 (Advanced) Solvable with wrong anwser](https://github.com/WebGoat/WebGoat/issues/962)
-- [#961 SQl-Injection lesson 4 not deleting created row](https://github.com/WebGoat/WebGoat/issues/961)
-- [#949 Challenge: Admin password reset always solvable](https://github.com/WebGoat/WebGoat/issues/949)
-- [#923 - Upgrade to Java 15](https://github.com/WebGoat/WebGoat/issues/923)
-- [#922 - Vulnerable components lesson](https://github.com/WebGoat/WebGoat/issues/922)
-- [#891 - Update the OWASP website with the new all-in-one Docker container](https://github.com/WebGoat/WebGoat/issues/891)
-- [#844 - Suggestion: Update navigation](https://github.com/WebGoat/WebGoat/issues/844)
-- [#843 - Bypass front-end restrictions: Field restrictions - confusing text in form](https://github.com/WebGoat/WebGoat/issues/843)
-- [#841 - XSS - Reflected XSS confusing instruction and success messages](https://github.com/WebGoat/WebGoat/issues/841)
-- [#839 - SQL Injection (mitigation) Order by clause confusing](https://github.com/WebGoat/WebGoat/issues/839)
-- [#838 - SQL mitigation (filtering) can only be passed by updating table](https://github.com/WebGoat/WebGoat/issues/838)
-
-## Contributors
-
-Special thanks to the following contributors providing us with a pull request:
-
-- nicholas-quirk
-- VijoPlays
-- aolle
-- trollingHeifer
-- maximmasiutin
-- toshihue
-- avivmu
-- KellyMarchewa 
-- NatasG
-- gabe-sky
-
-
 ## Version 8.1.0
 
 ### New functionality

buildspec.yml

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

config/dependency-check/project-suppression.xml

@@ -1,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-compose-local.yml

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

docker-compose-postgres.yml

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

docker-compose.yml

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

docker/.gitignore

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

docker/Dockerfile

@@ -0,0 +1,32 @@
+FROM openjdk:11.0.1-jre-slim-stretch
+
+ARG webgoat_version=v8.2.0-SNAPSHOT
+ENV webgoat_version_env=${webgoat_version}
+
+RUN apt-get update && apt-get install 
+RUN useradd --home-dir /home/webgoat --create-home -U webgoat
+RUN cd /home/webgoat/; 
+RUN chgrp -R 0 /home/webgoat
+RUN chmod -R g=u /home/webgoat
+RUN apt-get -y install apt-utils nginx
+
+USER webgoat
+
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY index.html /usr/share/nginx/html/
+COPY webgoat-server-${webgoat_version}.jar /home/webgoat/webgoat.jar
+COPY webwolf-${webgoat_version}.jar /home/webgoat/webwolf.jar
+COPY start.sh /home/webgoat
+
+EXPOSE 8080
+EXPOSE 9090
+
+ENV WEBGOAT_PORT 8080
+ENV WEBGOAT_SSLENABLED false
+
+ENV GOATURL https://127.0.0.1:$WEBGOAT_PORT
+ENV WOLFURL http://127.0.0.1:9090
+
+
+WORKDIR /home/webgoat
+ENTRYPOINT /bin/bash /home/webgoat/start.sh $webgoat_version_env

docker/Readme.md

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

docker/index.html

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

docker/nginx.conf

@@ -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.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+       
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.8</version>
+            <executions>
+                <execution>
+                    <phase>install</phase>
+                    <configuration>
+                        <target>
+                            <copy file="../webgoat-server/target/webgoat-server-${project.version}.jar" tofile="webgoat-server-${project.version}.jar"/>
+							<copy file="../webwolf/target/webwolf-${project.version}.jar" tofile="webwolf-${project.version}.jar"/>
+                        </target>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+			</plugin>
+        </plugins>
+    </build>
+
+</project>

docker/start.sh

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

docs/README.md

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

goat-with-reverseproxy.yaml

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

mvn-debug

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

platformQuickStarts/AWS/README.md

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

platformQuickStarts/AWS/codepipelinebuild/01_IAM_codebuild.json

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

platformQuickStarts/AWS/codepipelinebuild/01_IAM_codepipeline.json

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

platformQuickStarts/AWS/codepipelinebuild/01_codepiplinebuild.yml

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

platformQuickStarts/AWS/codepipelinebuild/README.md

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

platformQuickStarts/GCP/GKE-Docker/README.md

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

platformQuickStarts/GCP/GKE-Docker/deploy.cfg

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

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

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

platformQuickStarts/GCP/GKE-Docker/webgoat_deployment_noDNSnoTLS.yml

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

platformQuickStarts/GCP/README.md

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

platformQuickStarts/README.md

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

pom.xml

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

scripts/build-all.sh

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

scripts/build_docker.sh

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

scripts/clean-run-docker-compose.sh

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

scripts/deploy-webgoat.sh

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

scripts/run-docker-compose.sh

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

scripts/start.sh

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

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

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

src/it/java/org/owasp/webgoat/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/LabelAndHintTest.java

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

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

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

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

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

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

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

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

@@ -1,70 +0,0 @@
-package org.owasp.webgoat.container;
-
-import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
-import org.springframework.jdbc.datasource.ConnectionProxy;
-
-import javax.sql.DataSource;
-import java.io.PrintWriter;
-import java.lang.reflect.Proxy;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
-import java.util.logging.Logger;
-
-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/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 org.asciidoctor.ast.ContentNode;
-import org.asciidoctor.extension.InlineMacroProcessor;
-
-import java.util.Map;
-
-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 org.asciidoctor.ast.ContentNode;
-import org.asciidoctor.extension.InlineMacroProcessor;
-import org.owasp.webgoat.container.users.WebGoatUser;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import java.util.Map;
-
-public class UsernameMacro extends InlineMacroProcessor {
-
-    public UsernameMacro(String macroName) {
-        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,26 +0,0 @@
-package org.owasp.webgoat.container.asciidoc;
-
-import org.asciidoctor.ast.ContentNode;
-import org.asciidoctor.extension.InlineMacroProcessor;
-
-import java.util.Map;
-
-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 org.asciidoctor.ast.ContentNode;
-import org.asciidoctor.extension.InlineMacroProcessor;
-
-import java.util.Map;
-
-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/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/LessonConnectionInvocationHandler.java

@@ -1,39 +0,0 @@
-package org.owasp.webgoat.container.lessons;
-
-import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.users.WebGoatUser;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.sql.Connection;
-
-/**
- * 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/LessonScanner.java

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

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

@@ -1,19 +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/LessonProgressService.java

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

src/main/java/org/owasp/webgoat/container/service/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/lessons/challenges/challenge1/ImageServlet.java

@@ -1,36 +0,0 @@
-package org.owasp.webgoat.lessons.challenges.challenge1;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServlet;
-import java.io.IOException;
-import java.security.SecureRandom;
-
-import static org.springframework.web.bind.annotation.RequestMethod.GET;
-import static org.springframework.web.bind.annotation.RequestMethod.POST;
-
-@RestController
-public class ImageServlet extends HttpServlet {
-	
-	private static final long serialVersionUID = 9132775506936676850L;
-	static final public int PINCODE = new SecureRandom().nextInt(10000);
-
-    @RequestMapping(method = {GET, POST}, value = "/challenge/logo", produces = MediaType.IMAGE_PNG_VALUE)
-    @ResponseBody
-	public byte[] logo() throws IOException {
-		byte[] in = new ClassPathResource("lessons/challenges/images/webgoat2.png").getInputStream().readAllBytes();
-		
-		String pincode = String.format("%04d", PINCODE);
-		
-		in[81216]=(byte) pincode.charAt(0);
-		in[81217]=(byte) pincode.charAt(1);
-		in[81218]=(byte) pincode.charAt(2);
-		in[81219]=(byte) pincode.charAt(3);
-
-        return in;
-	}
-}

src/main/java/org/owasp/webgoat/lessons/hijacksession/HijackSession.java

@@ -1,48 +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 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source
- * ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.lessons.hijacksession;
-
-import org.owasp.webgoat.container.lessons.Category;
-import org.owasp.webgoat.container.lessons.Lesson;
-import org.springframework.stereotype.Component;
-
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
-@Component
-public class HijackSession extends Lesson {
-
-    @Override
-    public Category getDefaultCategory() {
-        return Category.A1;
-    }
-
-    @Override
-    public String getTitle() {
-        return "hijacksession.title";
-    }
-}

src/main/java/org/owasp/webgoat/lessons/hijacksession/HijackSessionAssignment.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/
- *
- * Copyright (c) 2002 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.lessons.hijacksession;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-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.lessons.hijacksession.cas.Authentication;
-import org.owasp.webgoat.lessons.hijacksession.cas.HijackSessionAuthenticationProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
-@RestController
-@AssignmentHints({
-    "hijacksession.hints.1",
-    "hijacksession.hints.2",
-    "hijacksession.hints.3",
-    "hijacksession.hints.4",
-    "hijacksession.hints.5"
-})
-public class HijackSessionAssignment extends AssignmentEndpoint {
-
-    private static final String COOKIE_NAME = "hijack_cookie";
-
-    @Autowired
-    HijackSessionAuthenticationProvider provider;
-
-    @PostMapping(path = "/HijackSession/login")
-    @ResponseBody
-    public AttackResult login(
-        @RequestParam String username,
-        @RequestParam String password,
-        @CookieValue(value = COOKIE_NAME, required = false) String cookieValue,
-        HttpServletResponse response) {
-
-        Authentication authentication;
-        if (StringUtils.isEmpty(cookieValue)) {
-            authentication = provider.authenticate(Authentication.builder().name(username).credentials(password).build());
-            setCookie(response, authentication.getId());
-        } else {
-            authentication = provider.authenticate(Authentication.builder().id(cookieValue).build());
-        }
-
-        if (authentication.isAuthenticated()) {
-            return success(this).build();
-        }
-
-        return failed(this).build();
-    }
-
-    private void setCookie(HttpServletResponse response, String cookieValue) {
-        Cookie cookie = new Cookie(COOKIE_NAME, cookieValue);
-        cookie.setPath("/WebGoat");
-        cookie.setSecure(true);
-        response.addCookie(cookie);
-    }
-
-}

src/main/java/org/owasp/webgoat/lessons/hijacksession/cas/Authentication.java

@@ -1,67 +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 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source
- * ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.lessons.hijacksession.cas;
-
-import java.security.Principal;
-
-import lombok.Builder;
-import lombok.Getter;
-import lombok.ToString;
-
-/**
- *
- * @author Angel Olle Blazquez
- *
- */
-
-@Getter
-@ToString
-public class Authentication implements Principal {
-
-    private boolean authenticated = false;
-    private String name;
-    private Object credentials;
-    private String id;
-
-    @Builder
-    public Authentication(String name, Object credentials, String id) {
-        this.name = name;
-        this.credentials = credentials;
-        this.id = id;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    protected void setAuthenticated(boolean authenticated) {
-        this.authenticated = authenticated;
-    }
-
-    protected void setId(String id) {
-        this.id = id;
-    }
-
-}

src/main/java/org/owasp/webgoat/lessons/hijacksession/cas/AuthenticationProvider.java

@@ -1,39 +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 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source
- * ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.lessons.hijacksession.cas;
-
-import java.security.Principal;
-
-/**
- *
- * @author Angel Olle Blazquez
- *
- */
-
-@FunctionalInterface
-public interface AuthenticationProvider<T extends Principal> {
-
-    T authenticate(T t);
-
-}

src/main/java/org/owasp/webgoat/lessons/hijacksession/cas/HijackSessionAuthenticationProvider.java

@@ -1,100 +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 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source
- * ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.lessons.hijacksession.cas;
-
-import java.time.Instant;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.function.DoublePredicate;
-import java.util.function.Supplier;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.annotation.ApplicationScope;
-
-/**
- *
- * @author Angel Olle Blazquez
- *
- */
-
-// weak id value and mechanism
-
-@ApplicationScope
-@Component
-public class HijackSessionAuthenticationProvider implements AuthenticationProvider<Authentication> {
-
-    private Queue<String> sessions = new LinkedList<>();
-    private static long id = new Random().nextLong() & Long.MAX_VALUE;
-    protected static final int MAX_SESSIONS = 50;
-
-    private static final DoublePredicate PROBABILITY_DOUBLE_PREDICATE = pr -> pr < 0.75;
-    private static final Supplier<String> GENERATE_SESSION_ID = () -> ++id + "-" + Instant.now().toEpochMilli();
-    public static final Supplier<Authentication> AUTHENTICATION_SUPPLIER = () -> Authentication
-        .builder()
-        .id(GENERATE_SESSION_ID.get())
-        .build();
-
-    @Override
-    public Authentication authenticate(Authentication authentication) {
-        if (authentication == null) {
-            return AUTHENTICATION_SUPPLIER.get();
-        }
-
-        if (StringUtils.isNotEmpty(authentication.getId()) && sessions.contains(authentication.getId())) {
-            authentication.setAuthenticated(true);
-            return authentication;
-        }
-
-        if (StringUtils.isEmpty(authentication.getId())) {
-            authentication.setId(GENERATE_SESSION_ID.get());
-        }
-
-        authorizedUserAutoLogin();
-
-        return authentication;
-    }
-
-    protected void authorizedUserAutoLogin() {
-        if (!PROBABILITY_DOUBLE_PREDICATE.test(ThreadLocalRandom.current().nextDouble())) {
-            Authentication authentication = AUTHENTICATION_SUPPLIER.get();
-            authentication.setAuthenticated(true);
-            addSession(authentication.getId());
-        }
-    }
-
-    protected boolean addSession(String sessionId) {
-        if (sessions.size() >= MAX_SESSIONS) {
-            sessions.remove();
-        }
-        return sessions.add(sessionId);
-    }
-
-    protected int getSessionsSize() {
-        return sessions.size();
-    }
-
-}

src/main/java/org/owasp/webgoat/lessons/logging/LogBleedingTask.java

@@ -1,66 +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.lessons.logging;
-
-import org.apache.logging.log4j.util.Strings;
-import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
-import org.owasp.webgoat.container.assignments.AttackResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.PostConstruct;
-import java.util.Base64;
-
-import java.nio.charset.StandardCharsets;
-import java.util.UUID;
-
-@RestController
-public class LogBleedingTask extends AssignmentEndpoint {
-
-    Logger log = LoggerFactory.getLogger(this.getClass().getName());
-    private String password;
-
-    @PostConstruct
-    public void generatePassword(){
-        password = UUID.randomUUID().toString();
-        log.info("Password for admin: {}", Base64.getEncoder().encodeToString(password.getBytes(StandardCharsets.UTF_8)));
-    }
-
-    @PostMapping("/LogSpoofing/log-bleeding")
-    @ResponseBody
-    public AttackResult completed(@RequestParam String username, @RequestParam String password) {
-        if (Strings.isEmpty(username) || Strings.isEmpty(password)) {
-            return failed(this).output("Please provide username (Admin) and password").build();
-        }
-
-        if (username.equals("Admin") && password.equals(this.password)) {
-            return success(this).build();
-        }
-
-        return failed(this).build();
-    }
-}

src/main/java/org/owasp/webgoat/lessons/logging/LogSpoofingTask.java

@@ -1,51 +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.lessons.logging;
-
-import org.apache.logging.log4j.util.Strings;
-import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
-import org.owasp.webgoat.container.assignments.AttackResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class LogSpoofingTask extends AssignmentEndpoint {
-
-    @PostMapping("/LogSpoofing/log-spoofing")
-    @ResponseBody
-    public AttackResult completed(@RequestParam String username, @RequestParam String password) {
-        if (Strings.isEmpty(username)) {
-            return failed(this).output(username).build();
-        }
-        username = username.replace("\n", "<br/>");
-        if (username.contains("<p>") || username.contains("<div>")) {
-            return failed(this).output("Try to think of something simple ").build();
-        }
-        if (username.indexOf("<br/>") < username.indexOf("admin")) {
-            return success(this).output(username).build();
-        }
-        return failed(this).output(username).build();
-    }
-}

src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingAccessControlUserRepository.java

@@ -1,45 +0,0 @@
-package org.owasp.webgoat.lessons.missing_ac;
-
-import org.owasp.webgoat.container.LessonDataSource;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-@Component
-public class MissingAccessControlUserRepository {
-
-    private final NamedParameterJdbcTemplate jdbcTemplate;
-    private final RowMapper<User> mapper = (rs, rowNum) -> new User(rs.getString("username"), rs.getString("password"), rs.getBoolean("admin"));
-
-    public MissingAccessControlUserRepository(LessonDataSource lessonDataSource) {
-        this.jdbcTemplate = new NamedParameterJdbcTemplate(lessonDataSource);
-    }
-
-    public List<User> findAllUsers() {
-        return jdbcTemplate.query("select username, password, admin from access_control_users", mapper);
-    }
-
-    public User findByUsername(String username) {
-        var users = jdbcTemplate.query("select username, password, admin from access_control_users where username=:username",
-                new MapSqlParameterSource().addValue("username", username),
-                mapper);
-        if (CollectionUtils.isEmpty(users)) {
-            return null;
-        }
-        return users.get(0);
-    }
-
-    public User save(User user) {
-        jdbcTemplate.update("INSERT INTO access_control_users(username, password, admin) VALUES(:username,:password,:admin)",
-                new MapSqlParameterSource()
-                        .addValue("username", user.getUsername())
-                        .addValue("password", user.getPassword())
-                        .addValue("admin", user.isAdmin()));
-        return user;
-    }
-
-}

src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACUsers.java

@@ -1,103 +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.lessons.missing_ac;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.session.WebSession;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_SIMPLE;
-
-/**
- * Created by jason on 1/5/17.
- */
-@Controller
-@AllArgsConstructor
-@Slf4j
-public class MissingFunctionACUsers {
-
-    private final MissingAccessControlUserRepository userRepository;
-    private final WebSession webSession;
-
-    @GetMapping(path = {"access-control/users"})
-    public ModelAndView listUsers() {
-
-        ModelAndView model = new ModelAndView();
-        model.setViewName("list_users");
-        List<User> allUsers = userRepository.findAllUsers();
-        model.addObject("numUsers", allUsers.size());
-        //add display user objects in place of direct users
-        List<DisplayUser> displayUsers = new ArrayList<>();
-        for (User user : allUsers) {
-            displayUsers.add(new DisplayUser(user, PASSWORD_SALT_SIMPLE));
-        }
-        model.addObject("allUsers", displayUsers);
-
-        return model;
-    }
-
-    @GetMapping(path = {"access-control/users"}, consumes = "application/json")
-    @ResponseBody
-    public ResponseEntity<List<DisplayUser>> usersService() {
-        return ResponseEntity.ok(userRepository.findAllUsers().stream().map(user -> new DisplayUser(user, PASSWORD_SALT_SIMPLE)).collect(Collectors.toList()));
-    }
-
-    @GetMapping(path = {"access-control/users-admin-fix"}, consumes = "application/json")
-    @ResponseBody
-    public ResponseEntity<List<DisplayUser>> usersFixed() {
-        var currentUser = userRepository.findByUsername(webSession.getUserName());
-        if (currentUser != null && currentUser.isAdmin()) {
-            return ResponseEntity.ok(userRepository.findAllUsers().stream().map(user -> new DisplayUser(user, PASSWORD_SALT_ADMIN)).collect(Collectors.toList()));
-        }
-        return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
-    }
-
-    @PostMapping(path = {"access-control/users", "access-control/users-admin-fix"}, consumes = "application/json", produces = "application/json")
-    @ResponseBody
-    public User addUser(@RequestBody User newUser) {
-        try {
-            userRepository.save(newUser);
-            return newUser;
-        } catch (Exception ex) {
-            log.error("Error creating new User", ex);
-            return null;
-        }
-
-        //@RequestMapping(path = {"user/{username}","/"}, method = RequestMethod.DELETE, consumes = "application/json", produces = "application/json")
-        //TODO implement delete method with id param and authorization
-
-    }
-}

src/main/java/org/owasp/webgoat/lessons/missing_ac/MissingFunctionACYourHashAdmin.java

@@ -1,60 +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.lessons.missing_ac;
-
-import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
-import org.owasp.webgoat.container.assignments.AssignmentHints;
-import org.owasp.webgoat.container.assignments.AttackResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import static org.owasp.webgoat.lessons.missing_ac.MissingFunctionAC.PASSWORD_SALT_ADMIN;
-
-@RestController
-@AssignmentHints({"access-control.hash.hint6", "access-control.hash.hint7",
-        "access-control.hash.hint8", "access-control.hash.hint9", "access-control.hash.hint10", "access-control.hash.hint11", "access-control.hash.hint12"})
-public class MissingFunctionACYourHashAdmin extends AssignmentEndpoint {
-
-    private final MissingAccessControlUserRepository userRepository;
-
-    public MissingFunctionACYourHashAdmin(MissingAccessControlUserRepository userRepository) {
-        this.userRepository = userRepository;
-    }
-
-    @PostMapping(path = "/access-control/user-hash-fix", produces = {"application/json"})
-    @ResponseBody
-    public AttackResult admin(String userHash) {
-        //current user should be in the DB
-        //if not admin then return 403
-
-        var user = userRepository.findByUsername("Jerry");
-        var displayUser = new DisplayUser(user, PASSWORD_SALT_ADMIN);
-        if (userHash.equals(displayUser.getUserHash())) {
-            return success(this).feedback("access-control.hash.success").build();
-        } else {
-            return failed(this).feedback("access-control.hash.close").build();
-        }
-    }
-
-}

src/main/java/org/owasp/webgoat/lessons/missing_ac/User.java

@@ -1,15 +0,0 @@
-package org.owasp.webgoat.lessons.missing_ac;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class User {
-
-    private String username;
-    private String password;
-    private boolean admin;
-}

src/main/java/org/owasp/webgoat/lessons/path_traversal/ProfileZipSlip.java

@@ -1,90 +0,0 @@
-package org.owasp.webgoat.lessons.path_traversal;
-
-import lombok.SneakyThrows;
-import org.owasp.webgoat.container.assignments.AssignmentHints;
-import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.container.session.WebSession;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import static org.springframework.http.MediaType.ALL_VALUE;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
-@RestController
-@AssignmentHints({"path-traversal-zip-slip.hint1", "path-traversal-zip-slip.hint2", "path-traversal-zip-slip.hint3", "path-traversal-zip-slip.hint4"})
-public class ProfileZipSlip extends ProfileUploadBase {
-
-    public ProfileZipSlip(@Value("${webgoat.server.directory}") String webGoatHomeDirectory, WebSession webSession) {
-        super(webGoatHomeDirectory, webSession);
-    }
-
-    @PostMapping(value = "/PathTraversal/zip-slip", consumes = ALL_VALUE, produces = APPLICATION_JSON_VALUE)
-    @ResponseBody
-    public AttackResult uploadFileHandler(@RequestParam("uploadedFileZipSlip") MultipartFile file) {
-        if (!file.getOriginalFilename().toLowerCase().endsWith(".zip")) {
-            return failed(this).feedback("path-traversal-zip-slip.no-zip").build();
-        } else {
-            return processZipUpload(file);
-        }
-    }
-
-    @SneakyThrows
-    private AttackResult processZipUpload(MultipartFile file) {
-        var tmpZipDirectory = Files.createTempDirectory(getWebSession().getUserName());
-        var uploadDirectory = new File(getWebGoatHomeDirectory(), "/PathTraversal/" + getWebSession().getUserName());
-        var currentImage = getProfilePictureAsBase64();
-
-        Files.createDirectories(uploadDirectory.toPath());
-
-        try {
-            var uploadedZipFile = tmpZipDirectory.resolve(file.getOriginalFilename());
-            FileCopyUtils.copy(file.getBytes(), uploadedZipFile.toFile());
-
-            ZipFile zip = new ZipFile(uploadedZipFile.toFile());
-            Enumeration<? extends ZipEntry> entries = zip.entries();
-            while (entries.hasMoreElements()) {
-                ZipEntry e = entries.nextElement();
-                File f = new File(tmpZipDirectory.toFile(), e.getName());
-                InputStream is = zip.getInputStream(e);
-                Files.copy(is, f.toPath(), StandardCopyOption.REPLACE_EXISTING);
-            }
-
-            return isSolved(currentImage, getProfilePictureAsBase64());
-        } catch (IOException e) {
-            return failed(this).output(e.getMessage()).build();
-        }
-    }
-
-    private AttackResult isSolved(byte[] currentImage, byte[] newImage) {
-        if (Arrays.equals(currentImage, newImage)) {
-            return failed(this).output("path-traversal-zip-slip.extracted").build();
-        }
-        return success(this).output("path-traversal-zip-slip.extracted").build();
-    }
-
-    @GetMapping("/PathTraversal/zip-slip/")
-    @ResponseBody
-    public ResponseEntity<?> getProfilePicture() {
-        return super.getProfilePicture();
-    }
-
-    @GetMapping("/PathTraversal/zip-slip/profile-image/{username}")
-    @ResponseBody
-    public ResponseEntity<?> getProfilePicture(@PathVariable("username") String username) {
-        return ResponseEntity.notFound().build();
-    }
-
-}

src/main/java/org/owasp/webgoat/lessons/spoofcookie/SpoofCookieAssignment.java

@@ -1,121 +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 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.lessons.spoofcookie;
-
-import java.util.Map;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
-import org.owasp.webgoat.container.assignments.AttackResult;
-import org.owasp.webgoat.lessons.spoofcookie.encoders.EncDec;
-import org.springframework.web.bind.UnsatisfiedServletRequestParameterException;
-import org.springframework.web.bind.annotation.CookieValue;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
-@RestController
-public class SpoofCookieAssignment extends AssignmentEndpoint {
-
-    private static final String COOKIE_NAME = "spoof_auth";
-    private static final String COOKIE_INFO = "Cookie details for user %s:<br />" + COOKIE_NAME + "=%s";
-    private static final String ATTACK_USERNAME = "tom";
-
-    private static final Map<String, String> users = Map.of(
-        "webgoat", "webgoat",
-        "admin", "admin",
-        ATTACK_USERNAME, "apasswordfortom");
-
-    @PostMapping(path = "/SpoofCookie/login")
-    @ResponseBody
-    @ExceptionHandler(UnsatisfiedServletRequestParameterException.class)
-    public AttackResult login(
-        @RequestParam String username,
-        @RequestParam String password,
-        @CookieValue(value = COOKIE_NAME, required = false) String cookieValue,
-        HttpServletResponse response) {
-
-        if (StringUtils.isEmpty(cookieValue)) {
-            return credentialsLoginFlow(username, password, response);
-        } else {
-            return cookieLoginFlow(cookieValue);
-        }
-    }
-
-    @GetMapping(path = "/SpoofCookie/cleanup")
-    public void cleanup(HttpServletResponse response) {
-        Cookie cookie = new Cookie(COOKIE_NAME, "");
-        cookie.setMaxAge(0);
-        response.addCookie(cookie);
-    }
-
-    private AttackResult credentialsLoginFlow(String username, String password, HttpServletResponse response) {
-        String lowerCasedUsername = username.toLowerCase();
-        if (ATTACK_USERNAME.equals(lowerCasedUsername) && users.get(lowerCasedUsername).equals(password)) {
-            return informationMessage(this).feedback("spoofcookie.cheating").build();
-        }
-
-        String authPassword = users.getOrDefault(lowerCasedUsername, "");
-        if (!authPassword.isBlank() && authPassword.equals(password)) {
-            String newCookieValue = EncDec.encode(lowerCasedUsername);
-            Cookie newCookie = new Cookie(COOKIE_NAME, newCookieValue);
-            newCookie.setPath("/WebGoat");
-            newCookie.setSecure(true);
-            response.addCookie(newCookie);
-            return informationMessage(this).feedback("spoofcookie.login").output(String.format(COOKIE_INFO, lowerCasedUsername, newCookie.getValue())).build();
-        }
-
-        return informationMessage(this).feedback("spoofcookie.wrong-login").build();
-    }
-
-    private AttackResult cookieLoginFlow(String cookieValue) {
-        String cookieUsername;
-        try {
-            cookieUsername = EncDec.decode(cookieValue).toLowerCase();
-        } catch (Exception e) {
-            // for providing some instructive guidance, we won't return 4xx error here
-            return failed(this).output(e.getMessage()).build();
-        }
-        if (users.containsKey(cookieUsername)) {
-            if (cookieUsername.equals(ATTACK_USERNAME)) {
-                return success(this).build();
-            }
-            return failed(this).feedback("spoofcookie.cookie-login").output(String.format(COOKIE_INFO, cookieUsername, cookieValue)).build();
-        }
-
-        return failed(this).feedback("spoofcookie.wrong-cookie").build();
-    }
-
-}

src/main/java/org/owasp/webgoat/lessons/spoofcookie/encoders/EncDec.java

@@ -1,98 +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 - 2021 Bruce Mayhew
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if
- * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Getting Source ==============
- *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
- */
-
-package org.owasp.webgoat.lessons.spoofcookie.encoders;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-
-import org.apache.commons.lang3.RandomStringUtils;
-import org.springframework.security.crypto.codec.Hex;
-
-/***
- *
- * @author Angel Olle Blazquez
- *
- */
-
-public class EncDec {
-
-    // PoC: weak encoding method
-
-    private static final String SALT = RandomStringUtils.randomAlphabetic(10);
-
-    private EncDec() {
-
-    }
-
-    public static String encode(final String value) {
-        if (value == null) {
-            return null;
-        }
-
-        String encoded = value.toLowerCase() + SALT;
-        encoded = revert(encoded);
-        encoded = hexEncode(encoded);
-        return base64Encode(encoded);
-    }
-
-    public static String decode(final String encodedValue) throws IllegalArgumentException {
-        if (encodedValue == null) {
-            return null;
-        }
-
-        String decoded = base64Decode(encodedValue);
-        decoded = hexDecode(decoded);
-        decoded = revert(decoded);
-        return decoded.substring(0, decoded.length() - SALT.length());
-    }
-
-    private static String revert(final String value) {
-        return new StringBuilder(value)
-            .reverse()
-            .toString();
-    }
-
-    private static String hexEncode(final String value) {
-        char[] encoded = Hex.encode(value.getBytes(StandardCharsets.UTF_8));
-        return new String(encoded);
-    }
-
-    private static String hexDecode(final String value) {
-        byte[] decoded = Hex.decode(value);
-        return new String(decoded);
-    }
-
-    private static String base64Encode(final String value) {
-        return Base64
-            .getEncoder()
-            .encodeToString(value.getBytes());
-    }
-
-    private static String base64Decode(final String value) {
-        byte[] decoded = Base64
-            .getDecoder()
-            .decode(value.getBytes());
-        return new String(decoded);
-    }
-
-}

src/main/java/org/owasp/webgoat/server/ParentConfig.java

@@ -1,10 +0,0 @@
-package org.owasp.webgoat.server;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan("org.owasp.webgoat.server")
-public class ParentConfig {
-
-}

src/main/java/org/owasp/webgoat/server/StartWebGoat.java

@@ -1,82 +0,0 @@
-/*
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- * <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.server;
-
-import lombok.extern.slf4j.Slf4j;
-import org.owasp.webgoat.container.WebGoat;
-import org.owasp.webgoat.webwolf.WebWolf;
-import org.springframework.boot.Banner;
-import org.springframework.boot.WebApplicationType;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.util.SocketUtils;
-
-import java.lang.reflect.Method;
-
-import static java.util.Optional.of;
-import static java.util.Optional.ofNullable;
-
-@Slf4j
-public class StartWebGoat {
-
-    public static final String WEBGOAT_PORT = "webgoat.port";
-    public static final String WEBWOLF_PORT = "webwolf.port";
-
-    private static final int MAX_PORT = 9999;
-
-    public static void main(String[] args) {
-        setEnvironmentVariableForPort(WEBGOAT_PORT, "8080");
-        setEnvironmentVariableForPort(WEBWOLF_PORT, "9090");
-
-        new SpringApplicationBuilder().parent(ParentConfig.class)
-                .web(WebApplicationType.NONE).bannerMode(Banner.Mode.OFF)
-                .child(WebGoat.class)
-                .web(WebApplicationType.SERVLET)
-                .sibling(WebWolf.class).bannerMode(Banner.Mode.OFF)
-                .web(WebApplicationType.SERVLET)
-                .run(args);
-    }
-
-    private static void setEnvironmentVariableForPort(String name, String defaultValue) {
-        ofNullable(System.getProperty(name))
-                .or(() -> of(defaultValue))
-                .map(Integer::parseInt)
-                .map(port -> findPort(port))
-                .ifPresent(port -> System.setProperty(name, port));
-    }
-
-    public static String findPort(int port) {
-        try {
-            if (port == MAX_PORT) {
-                log.error("No free port found from 8080 - {}", MAX_PORT);
-                return "" + port;
-            }
-            return "" + SocketUtils.findAvailableTcpPort(port, port);
-        } catch (IllegalStateException var4) {
-            return findPort(port + 1);
-        }
-    }
-
-}

src/main/java/org/owasp/webgoat/server/StartupMessage.java

@@ -1,33 +0,0 @@
-package org.owasp.webgoat.server;
-
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.ContextStoppedEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-@Component
-@Slf4j
-@NoArgsConstructor
-public class StartupMessage {
-
-    private String port;
-    private String address;
-
-    @EventListener
-    void onStartup(ApplicationReadyEvent event) {
-        if (StringUtils.hasText(port) && !StringUtils.hasText(System.getProperty("running.in.docker"))) {
-            log.info("Please browse to http://{}:{}/WebGoat to get started...", address, port);
-        }
-        if (event.getApplicationContext().getApplicationName().contains("WebGoat")) {
-            port = event.getApplicationContext().getEnvironment().getProperty("server.port");
-            address = event.getApplicationContext().getEnvironment().getProperty("server.address");
-        }
-    }
-
-    @EventListener
-    void onShutdown(ContextStoppedEvent event) {
-    }
-}

src/main/java/org/owasp/webgoat/webwolf/WebWolf.java

@@ -1,44 +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.webwolf;
-
-import org.owasp.webgoat.webwolf.requests.WebWolfTraceRepository;
-import org.springframework.boot.actuate.trace.http.HttpTraceRepository;
-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;
-
-@Configuration
-@ComponentScan("org.owasp.webgoat.webwolf")
-@PropertySource("classpath:application-webwolf.properties")
-@EnableAutoConfiguration
-public class WebWolf {
-
-    @Bean
-    public HttpTraceRepository traceRepository() {
-        return new WebWolfTraceRepository();
-    }
-
-}

src/main/resources/banner.txt

@@ -1,6 +0,0 @@
-    __          __       _        _____                   _
-    \ \        / /      | |      / ____|                 | |
-     \ \  /\  / /  ___  | |__   | |  __    ___     __ _  | |_
-      \ \/  \/ /  / _ \ | '_ \  | | |_ |  / _ \   / _' | | __|
-       \  /\  /  |  __/ | |_) | | |__| | | (_) | | (_| | | |_
-        \/  \/    \___| |_.__/   \_____|  \___/   \__,_|  \__|

src/main/resources/lessons/auth_bypass/documentation/2fa-bypass.adoc

@@ -1,15 +0,0 @@
-
-== 2FA Password Reset
-
-An excellent example of authentication bypass is a recent (2016) example (https://henryhoggard.co.uk/blog/Paypal-2FA-Bypass). He could not receive an SMS with a code, so he opted for
-an alternative method, which involved security questions.  Using a proxy, removed the parameters entirely and won.
-
-image::images/paypal-2fa-bypass.png[Paypal 2FA bypass,1397,645,style="lesson-image"]
-
-
-=== The Scenario
-
-You reset your password, but do it from a location or device that your provider does not recognize. So you need to answer the security questions you set up.  The other issue is
-Those security questions are also stored on another device (not with you), and you don't remember them.
-
-You have already provided your username/email and opted for the alternative verification method.

src/main/resources/lessons/auth_bypass/documentation/bypass-intro.adoc

@@ -1,15 +0,0 @@
-== Authentication Bypasses
-
-Authentication Bypasses happen in many ways but usually take advantage of some flaw in the configuration or logic. Tampering to achieve the right conditions.
-
-=== Hidden inputs
-
-The simplest form is a reliance on a hidden input in the web page/DOM.
-
-=== Removing Parameters
-
-Sometimes, if an attacker doesn't know the correct value of a parameter, they may remove it from the submission altogether to see what happens.
-
-=== Forced Browsing
-
-If an area of a site is not appropriately protected by configuration, that area of the site may be accessed by guessing/brute-forcing.

src/main/resources/lessons/bypass_restrictions/documentation/BypassRestrictions_Intro.adoc

@@ -1,10 +0,0 @@
-== Concept
-
-Users have a great degree of control over the web application's front-end.
-They can alter HTML code, sometimes also scripts. Applications that require a certain input format should also validate on the server-side.
-
-== Goals
-
-* The user should have a basic knowledge of HTML
-* The user should be able to tamper with a request before sending (with proxy or other tools)
-* The user will be able to tamper with field restrictions and bypass client-side validation

src/main/resources/lessons/challenges/html/Challenge.html

@@ -1,9 +0,0 @@
-    <!DOCTYPE html>
-
-<html xmlns:th="http://www.thymeleaf.org">
-
-<div class="lesson-page-wrapper">
-    <div class="adoc-content" th:replace="doc:lessons/challenges/documentation/Challenge_introduction.adoc"></div>
-</div>
-
-</html>

src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_Assignment_Network.adoc

@@ -1,6 +0,0 @@
-== Try It! Working with the Network tab
-
-In this assignment, you need to find a specific HTTP request and read a randomized number.
-To start, click the first button. This will generate an HTTP request. Try to find the specific HTTP request.
-The request should contain a field: `networkNum:`
-Copy the number displayed afterward into the input field below and click on the check button.

src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_console.adoc

@@ -1,17 +0,0 @@
-== The Console tab
-
-In the console tab, you can see anything that a loaded JavaScript file may have printed out.
-Do not worry if you see something in red. While that is an error, it has probably resolved itself.
-Through the console tab, it is also possible for you to run your line of JavaScript code.
-
-Start by clearing the console using the shortcut `CTRL+L.`
-
-To run your JavaScript, click inside of the console and write something like:
-`console.log("Hello WebGoat!");` Hit enter. `Hello WebGoat` should now appear in your console.
-The console also allows you to do some basic arithmetic. If you type, for example, `1+3` and hit
-enter, the console should display 4.
-
-Note: You may see an `undefined` in the console. You can safely  ignore this statement,
-it only means that the JavaScript function you have called did not return anything, therefore `undefined.`
-
-image::images/ChromeDev_Console_Ex.jpg[DeveloperToolsConsoleExample,500,500,style="lesson-image"]

src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_elements.adoc

@@ -1,22 +0,0 @@
-== The Elements Tab
-
-The elements tab allows you to look at the HTML and CSS code used to define and style the website.
-
-=== HTML source
-
-If you hover over one line, you can see that a part of the website turns blue. That means that
-this particular HTML line defines this section of the website.
-The elements tab allows you to make changes to every single HTML element. For example, if you click inside
-a paragraph (<p>...</p>) Tag,  you can edit the content of the website. If you have made your changes and then click enter
-Chrome will update the website to show your edits. You can also change the HTML Tag used,
-the classes and id's a tag has, and much more.
-
-image::images/ChromeDev_Elements.jpg[DeveloperToolsElements,500,350,style="lesson-image"]
-
-=== CSS source
-
-You can find information about the CSS used to style the
-website under the HTML source. Like the HTML, you can also edit the CSS and, therefore, adjust the website's styling.
-You can edit specific values or turn off individual styling.
-
-image::images/ChromeDev_Elements_CSS.jpg[DeveloperToolsElementsCSS,500,350,style="lesson-image"]

src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_intro.adoc

@@ -1,19 +0,0 @@
-== Google Chrome Developer Tools
-
-To complete certain assignments, you sometimes may have to look at the JavaScript
-source code or run a JavaScript command on your own.
-To do that, Google Chrome has a set of tools that allow you to do that and much more.
-While these tools are not specific to Google Chrome, almost every modern browser has a bunch
-of its own. Our introduction will focus on the ones found in Google Chrome.
-You can, however still use the browser of your choice, like Firefox or Safari, although some steps of this tutorial
-maybe different for you.
-
-Keep in mind that the following tutorial is not there to teach everything about these tools.
-This tutorial will only focus on the essential knowledge to complete specific assignments.
-Also, if you are already familiar with these tools, you can safely skip these lessons.
-
-To get started: *open the developer tools*. There are multiple ways to open them:
-
-1. Right-click anywhere in the browser window and select the option _"Inspect"_.
-2. Go to the browser menu (three dots in the top right corner), then go to _"More tools"_ and select the option _"Developer tools"_.
-3. Use the keyboard shortcut _Ctrl + Shift + I_

src/main/resources/lessons/chrome_dev_tools/documentation/ChromeDevTools_sources.adoc

@@ -1,16 +0,0 @@
-== The Sources tab
-
-In the sources tab, you can check out the file system and view all the HTML, CSS, and JavaScript files used to
-create the website. Click on a file to view its contents.
-
-image::images/ChromeDev_Sources.jpg[DeveloperToolsSources,400,500,style="lesson-image"]
-
-== The Network tab
-
-In the Network tab, you can view HTTP requests and responses the website has performed.
-Just click on it if you want more detailed information on a particular request.
-The "Timeline" above the blue dots represents when these requests and responses have been performed.
-You can also see the Requests done in a specific time frame simply by clicking and dragging on the timeline. The window
-below will only show the requests and responses done in that time frame.
-
-image::images/ChromeDev_Network.jpg[DeveloperToolsNetwork,400,500,style="lesson-image"]

src/main/resources/lessons/cia/documentation/CIA_confidentiality.adoc

@@ -1,25 +0,0 @@
-== Confidentiality
-
-Confidentiality is "the property that information is not made available or disclosed to unauthorized individuals, entities, or processes." In other words, confidentiality requires that unauthorized users should not be able to access sensitive resources. Confidentiality must be balanced with availability; authorized persons must still access the resources they have been granted permissions for.
-
-Although confidentiality is similar to "privacy," these two words are not interchangeable. Instead, confidentiality is a component of privacy; confidentiality is implemented to protect resources from unauthorized entities.
-
-{nbsp} +
-
-=== Examples that compromise confidentiality:
-
-** a hacker gets access to the password database of a company
-** a sensitive email is sent to the incorrect individual
-** a hacker reads sensitive information by intercepting and eavesdropping on an information transfer
-
-{nbsp} +
-
-=== Examples of methods ensuring confidentiality
-
-** data encryption
-** properly implemented authentication and access control
-*** securely stored passwords
-*** multi-factor authentication (MFA)
-*** biometric verification
-** minimizing the number of places/times the information appears
-** physical security controls such as properly secured server rooms