WIP

Bumps [actions/cache](https://github.com/actions/cache) from v2 to v2.1.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...26968a09c0ea4f3e233fdddbafd1166051a095f6)

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

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -0,0 +1,41 @@
+name: "Build"
+on:
+  push:
+    branches: [ '*' ]
+    tags-ignore:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        java: [11, 15]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+          architecture: x64
+      - name: Cache Maven packages
+        uses: actions/cache@v2.1.4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build with Maven
+        run: mvn clean install
+
+  notify-slack:
+    if: github.event_name == 'push' && (success() || failure())
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Slack workflow notification"
+        uses: Gamesight/slack-workflow-status@master
+        with:
+          repo_token: ${{secrets.GITHUB_TOKEN}}
+          slack_webhook_url: ${{secrets.SLACK_WEBHOOK_URL}}

.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

@@ -0,0 +1,128 @@
+name: "Release Pipeline"
+on:
+  push:
+    tags:
+      - v*
+jobs:
+#  release:
+#    name: Release WebGoat
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#
+#      - name: "Get tag name"
+#        id: tag
+#        uses: dawidd6/action-get-tag@v1
+#
+#      - name: Set up JDK 11
+#        uses: actions/setup-java@v1
+#        with:
+#          java-version: 11
+#          architecture: x64
+#
+#      - name: Cache Maven packages
+#        uses: actions/cache@v2.1.4
+#        with:
+#          path: ~/.m2
+#          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+#          restore-keys: ${{ runner.os }}-m2
+#
+#      - name: "Set labels for ${{ github.ref }}"
+#        run: |
+#          echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
+#          WEBGOAT_MAVEN_VERSION=${{ steps.tag.outputs.tag }}
+#          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_MAVEN_VERSION:1}" >> $GITHUB_ENV
+#      - name: Build with Maven
+#        run: |
+#          mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
+#          mvn clean install -DskipTests
+#
+#      - name: "Create release"
+#        uses: softprops/action-gh-release@v1
+#        with:
+#          draft: false
+#          files: |
+#            webgoat-server/target/webgoat-server-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+#            webwolf/target/webwolf-${{ env.WEBGOAT_MAVEN_VERSION }}.jar
+#          body: |
+#            ## Version ${{ steps.tag.outputs.tag }}
+#
+#            ### New functionality
+#
+#            - test
+#
+#            ### 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:
+#
+#            - Person 1
+#            - Person 2
+#
+#            And everyone who provided feedback through Github.
+#
+#
+#            Team WebGoat
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#
+#      - name: "Set up QEMU"
+#        uses: docker/setup-qemu-action@v1
+#
+#      - name: "Set up Docker Buildx"
+#        uses: docker/setup-buildx-action@v1
+#
+#      - name: "Login to dockerhub"
+#        uses: docker/login-action@v1
+#        with:
+#          username: ${{ secrets.DOCKERHUB_USERNAME }}
+#          password: ${{ secrets.DOCKERHUB_TOKEN }}
+#
+#      - name: "Build and push"
+#        uses: docker/build-push-action@v2
+#        with:
+#          context: ./docker
+#          file: docker/Dockerfile
+#          push: false #todo enable
+#          platforms: linux/amd64
+#          tags: |
+#            webgoat/goatandwolf:${{ env.WEBGOAT_TAG_VERSION }}
+#            webgoat/goatandwolf:latest
+#          build-args: |
+#            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
+#
+#      - name: "Image digest"
+#        run: echo ${{ steps.docker_build.outputs.digest }}
+  new_version:
+    name: Update development version
+#    needs: [ release ]
+    runs-on: ubuntu-latest
+    environment:
+      name: release
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: develop
+          token: ${{ env.WEBGOAT_DEPLOYER_TOKEN }}
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          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
+        run: |
+          git config user.name webgoat-github
+          git config user.email owasp.webgoat@gmail.com
+          find . -name 'pom.xml' | xargs git add
+          git commit -m "Updating to the new development version"
+          git push

.github/workflows/welcome.yml

@@ -0,0 +1,13 @@
+name: Welcome
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+      - 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!'

.gitignore

@@ -14,7 +14,9 @@
 /.settings/org.eclipse.wst.validation.prefs
 /.externalToolBuilders/
 .project
-/target
+*/target/*
+*.pmd
+mongo-data/*
 .classpath
 .idea/
 .settings/
@@ -29,9 +31,26 @@ src/main/webapp/plugin_lessons/*.jar
 src/main/webapp/users/*.props
 classes/*
 *.iml
+pom.xml.versionsBackup
 
 /*.iml
 .extract/*
 UserDatabase.mv.db
 webgoat-container/src/main/webapp/users/guest.org.owasp.webgoat.plugin.*.props
 webgoat-container/src/main/webapp/plugin_lessons/dist-*.pom
+webgoat-lessons/**/target
+**/*.jar
+**/.DS_Store
+webgoat-server/mongo-data/*
+webgoat-lessons/vulnerable-components/dependency-reduced-pom.xml
+**/.sts4-cache/*
+**/.vscode/*
+**/.factorypath
+/.sonatype
+**/bin/*
+webgoat.lck
+webgoat.log
+webgoat.properties
+webgoat.script
+TestClass.class
+**/*.flattened-pom.xml

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.5";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

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

.travis.yml

@@ -1,59 +0,0 @@
-language: java
-jdk:
-  - oraclejdk7
-  - oraclejdk8
-install: "/bin/true"
-script:
-  - mvn clean install -q
-  - git clone -b develop https://github.com/WebGoat/WebGoat-Lessons.git
-  - mvn -file ./WebGoat-Lessons/pom.xml clean package -q
-  - cp -fa ./WebGoat-Lessons/target/plugins/*.jar ./webgoat-container/src/main/webapp/plugin_lessons/
-  # Start the container this will make sure we do not see the debug logging of the Tomcat 7 Maven plugin
-  # which seems to always be set to DEBUG this will fail the build because we generate too much logging
-  - nohup bash -c "java -jar ./webgoat-standalone/target/webgoat-standalone-7.1-SNAPSHOT-exec.jar --port 8888 2>&1 &"
-  - if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn "-Dbuild.number=$TRAVIS_BUILD_NUMBER" -q clean install failsafe:integration-test; else mvn -q failsafe:integration-test; fi
-cache:
-  directories:
-  - $HOME/.m2
-before_deploy:
-  - export WEBGOAT_CONTAINTER_TARGET_DIR=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-container/target
-  - export WEBGOAT_STANDALONE_TARGET_DIR=$HOME/build/$TRAVIS_REPO_SLUG/webgoat-standalone/target
-  - export WEBGOAT_ARTIFACTS_FOLDER=$HOME/build/$TRAVIS_REPO_SLUG/Deployable_Artifacts/
-  - mkdir $WEBGOAT_ARTIFACTS_FOLDER
-  - cp -fa $WEBGOAT_CONTAINTER_TARGET_DIR/* $WEBGOAT_ARTIFACTS_FOLDER/
-  - cp -fa $WEBGOAT_STANDALONE_TARGET_DIR/* $WEBGOAT_ARTIFACTS_FOLDER/
-  - echo "Contents of artifcts folder:"
-  - ls $WEBGOAT_ARTIFACTS_FOLDER
-deploy:
-  provider: s3
-  access_key_id: AKIAJQLKPGHXRH2AH5QA
-  secret_access_key:
-    secure: 45+SwWlPFujD9FOOFLA9Lz0CaePVrn/SEsAhAn0Ve9sYpI0VsijZNymh6D29t93jBXgZoGhu/v0QJkcAA/71fQM+nGMBJjB5wmVFJ1c2A4k7tfWCVbBRI0aHGpJu12j+7BLuSfPCmCAFQGoVo7dWzfqeODe5j9Qpe9fsiQVnrKI=
-  bucket: webgoat-war
-  skip_cleanup: true
-  acl: public_read
-  local_dir: "$WEBGOAT_ARTIFACTS_FOLDER"
-  on:
-    repo: WebGoat/WebGoat
-    branch: develop
-    jdk: oraclejdk8
-after_success:
-  - mvn versioneye:update -q
-  - mvn cobertura:cobertura coveralls:report -q
-notifications:
-  slack:
-    secure: S9VFew5NSE8WDzYD1VDBUULKKT0fzgblQACznwQ85699b2yeX9TX58N3RZvRS1JVagVP1wu2xOrwN2g+AWx4Ro3UBZD5XG86uTJWpCLD4cRWHBoGMH2TfvI7/IzsWmgxH4MBxFRvZr/eEhlVAux+N9H4EoEdS4CKsJXEqV37PlA=
-env:
-  global:
-   - secure: "ZLZKz6lGt8YZ+NhkZPBAlI235+lEmu37Tcf+yTwh5yXuHAlnvvF6hPui7rANA/stbYGOIqIdhGOXbdrwyTU4Pvg78VwJOwsa9RtHJfou3pg4Ud9i0/dEeVl8aakmg2HDaWYGcFox8X1ViVc5UWjuBLztfJKQUEx0buJoWdMSf2E="
-addons:
-  sauce_connect: true
-  coverity_scan:
-    project:
-      name: "WebGoat/WebGoat"
-      description: "Coverity Scan from Travis CI Build Automation"
-    notification_email: doug.morato@owasp.org
-    build_command_prepend: "mvn clean"
-    build_command: "mvn -DskipTests=true install"
-    branch_pattern: coverity_scan
-

COPYRIGHT.txt

@@ -0,0 +1,19 @@
+This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
+
+Copyright (c) 2002 - $today.year 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.

CREATE_RELEASE.MD

@@ -0,0 +1,35 @@
+## Release WebGoat
+
+
+### Version numbers
+
+For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
+ and 8.0.0.M3 in the `pom.xml`. When we create the final release we remove the milestone release and use 
+ `v8.0.0` in the `pom.xml`
+ 
+### Release notes:
+Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of 
+committers.
+
+At the moment we use Gitflow, for a release you create a new release branch and take the following steps:
+
+```
+git checkout develop
+git flow release start <version>
+mvn versions:set <<version>  
+git commit -am "New release, updating pom.xml" 
+git flow release publish
+
+<<Make changes if necessary>>
+
+git flow release finish <version>
+git push origin develop
+git push origin master
+git push --tags
+```
+
+Now Travis takes over and will create the release in Github and on Docker Hub.
+
+NOTE: the `mvn versions:set` command above is just there to make sure the master branch contains the latest version
+
+

LICENSE.txt

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

README.MD

@@ -1,17 +1,13 @@
-# WebGoat: A deliberately insecure Web Application
+# 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=master&service=github)](https://coveralls.io/github/WebGoat/WebGoat?branch=master)
+[![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)
-[![Dependency Status](https://www.versioneye.com/user/projects/562da95ae346d7000e0369aa/badge.svg?style=flat)](https://www.versioneye.com/user/projects/562da95ae346d7000e0369aa)
-[![OWASP Labs](https://img.shields.io/badge/owasp-labs-orange.svg)](https://www.owasp.org/index.php/OWASP_Project_Inventory#tab=Labs_Projects)
+[![OWASP Labs](https://img.shields.io/badge/owasp-lab%20project-f7b73c.svg)](https://www.owasp.org/index.php/OWASP_Project_Inventory#tab=Labs_Projects)
+[![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
+[![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-# Important Information
-
-### The WebGoat Lesson Server, is currently **UNDER MAJOR DEVELOMENT**.
-As of February 1st 2016, the version "7.0.1" is considered the first **STABLE** version of a major architecture and UI changes.
-
-#### Older/Legacy version of WebGoat an be found at: [WebGoat-Legacy](https://github.com/WebGoat/WebGoat-Legacy)
+# Introduction
 
 WebGoat is a deliberately insecure web application maintained by [OWASP](http://www.owasp.org/) designed to teach web
 application security lessons.
@@ -20,19 +16,8 @@ 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.
 
-* [Home Page](http://webgoat.github.io)
-* [OWASP Project Home Page](http://www.owasp.org/index.php/Category:OWASP_WebGoat_Project)
-* [Source Code](https://github.com/WebGoat/WebGoat)
-* [Easy-Run Download](https://s3.amazonaws.com/webgoat-war/webgoat-container-7.0.1-war-exec.jar)
-* [Wiki](https://github.com/WebGoat/WebGoat/wiki)
-* [FAQ (old info):](http://code.google.com/p/webgoat/wiki/FAQ)
-* [Project Leader - Direct to Bruce Mayhew](mailto:webgoat@owasp.org)
-* [Mailing List - WebGoat Community - For most questions](mailto:owasp-webgoat@lists.owasp.org)
-* [Artifacts generated from Continuous Integration](http://webgoat-war.s3-website-us-east-1.amazonaws.com/)
-* [Output from our Travis.CI Build server](https://travis-ci.org/WebGoat/WebGoat)
-
 **WARNING 1:** *While running this program your machine will be extremely
-vulnerable to attack. You should to disconnect from the Internet while using
+vulnerable to attack. You should disconnect from the Internet while using
 this program.*  WebGoat's default configuration binds to localhost to minimize
 the exposure.
 
@@ -42,171 +27,120 @@ 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.*
 
-# Easy Run ( For non-developers )
+# Installation Instructions:
 
-Every successful build of the WebGoat Lessons Container and the WebGoat Lessons in our Continuous Integration Server
-creates an "Easy Run" Executable JAR file, which contains the WebGoat Lessons Server, the lessons and a embedded Tomcat server.
+## 1. Run using Docker
 
-You can check for the "Last Modified" date of our "Easy Run" jar file [HERE](http://webgoat-war.s3-website-us-east-1.amazonaws.com/)
+Every release is also published on [DockerHub]((https://hub.docker.com/r/webgoat/webgoat-8.0/)).
 
-The "Easy Run" JAR file offers a no hassle approach to testing and running WebGoat. Follow these instructions if you
-wish to simply try/test/run the current development version of WebGoat
+### Using docker run
 
-### Prerequisites:
-* Java VM 1.8
+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.
 
-## Standalone
+```shell
+docker run -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf
+```
 
-#### 1. Download the easy run executable jar file which contains all the lessons and a embedded Tomcat server:
+WebGoat will be located at: http://127.0.0.1:8080/WebGoat
+WebWolf will be located at: http://127.0.0.1:9090/WebWolf
 
-https://s3.amazonaws.com/webgoat-war/webgoat-standalone-7.1-SNAPSHOT-exec.jar
+**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.
 
-#### 2. Run it using java:
+### Using docker stack deploy
 
-Open a command shell/window, browse to where you downloaded the easy run jar and type:
+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-standalone-7.0.1-exec.jar [-p | --p <port>] [-a | --address <address>]
+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]
 ```
 
-Using the `--help` option will show the allowed command line arguments.
-
-#### 3. Browse to the url shown in the console and happy hacking !
-
-## Vagrant
-
-To run WebGoat with Vagrant you must first have Vagrant and Virtualbox installed.
-
-```shell
-   $ cd WebGoat/webgoat-images/vagrant-users
-   $ vagrant up
+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 
 ```
-
-Once you see the message 'Browse to http://localhost:9999/WebGoat and happy hacking! you can open a
-browser.
+Use set in stead of export on Windows cmd. 
 
 
-# For Developers
-
-## Vagrant
-
-For an easy development experience you can use Vagrant. Note you should have Vagrant and Virtualbox installed on your system.
-
-```shell
-   $ cd WebGoat/webgoat-images/vagrant-developers
-   $ vagrant up
-```
-
-Once the provisioning is complete login to the Virtualbox with username vagrant and password vagrant.
-The source code will be available in the home directory.
-
-## Set up manual
-
-Follow these instructions if you wish to run Webgoat and modify the source code as well.
+## 3. Run from the sources
 
 ### Prerequisites:
 
-* Java 1.8
-* Maven > 2.0.9
-* Your favorite IDE, with Maven awareness: Netbeans/IntelliJ/Eclipse with m2e installed.
+* Java 11
+* Maven > 3.2.1
+* Your favorite IDE
 * Git, or Git support in your IDE
 
-## The Easy Way: Developer Edition run using Linux or Mac
-The __webgoat_developer_bootstrap.sh__ script will clone the necessary repositories, call the maven goals in order
-launch Tomcat listening on localhost:8080
+Open a command shell/window:
 
 ```Shell
-mkdir WebGoat-Workspace
-cd WebGoat-Workspace
-curl -o webgoat_developer_bootstrap.sh https://raw.githubusercontent.com/WebGoat/WebGoat/master/webgoat_developer_bootstrap.sh
-./webgoat_developer_bootstrap.sh
+git clone git@github.com:WebGoat/WebGoat.git
 ```
 
-## The Manual Way: Developer Edition!
-
-#### Cloning the Lesson Server and the Lessons project:
-
-Open a command shell/window, navigate to where you wish to download the source and type:
-
-```Shell
-git clone https://github.com/WebGoat/WebGoat.git
-git clone https://github.com/WebGoat/WebGoat-Lessons.git
-```
-
-#### Now let's start by compiling the WebGoat Lessons server.
+Now let's start by compiling the project.
 
 ```Shell
 cd WebGoat
-git checkout develop
-mvn clean compile install
-cd ..
+git checkout <<branch_name>>
+mvn clean install
 ```
 
-#### Before you can run the project, we need to compile the lessons and copy them over:
-**If you don't run this step, you will not have any Lessons to work with!**
+Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
 
 ```Shell
-cd WebGoat-Lessons
-git checkout develop
-mvn package
-(linux)   cp target/plugins/*.jar ../WebGoat/webgoat-container/src/main/webapp/plugin_lessons/
-(windows) xcopy "target\plugins\*.jar" "..\WebGoat\webgoat-container\src\main\webapp\plugin_lessons\"
-cd ..
+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
 ```
 
-#### Now we are ready to run the project. There are 3 options you can choose from to run the project:
+## 4. Run with custom menu
 
-Then you can run the project with one of the steps below (From the WebGoat folder not WebGoat-Lessons):
-
-#### Option #1: Using the Maven-Tomcat Plugin
-The __maven tomcat7:run-war__ goal runs the project in an embedded tomcat:
+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
-cd WebGoat
-mvn -pl webgoat-container tomcat7:run-war
+export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
+export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
+java -jar webgoat-server/target/webgoat-server-v8.2.0-SNAPSHOT.jar
 ```
-
-Browse to [http://localhost:8080/WebGoat](http://localhost:8080/WebGoat) and happy hacking !
-
-#### Option #2: Java executable JAR
-The __maven package__ goal generates an executable .jar file:
-
+Or in a docker run it would (once this version is pushed into docker hub) look like:
 ```Shell
-cd WebGoat
-mvn package
-cd webgoat-standalone/target
-java -jar webgoat-standalone-7.1-SNAPSHOT-exec.jar [-p | --p <port>] [-a | --address <address>]
+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
 ```
-
-Browse to url shown in the console and happy hacking !
-
-#### Option #3: Deploy the WebGoat WAR file in your local Tomcat or other Application Server:
-The __maven package__ goal generates a .war file that can deployed into an Application Server, such as Tomcat
-
-```Shell
-cd WebGoat
-mvn package
-cp webgoat-container/target/webgoat-container-7.1-SNAPSHOT.war <your_tomcat_directory>/webapps/
-```
-
-Browse to [http://localhost:8080/WebGoat](http://localhost:8080/WebGoat) and happy hacking !
-
-# Debugging and Troubleshooting
-
-## Reloading plugins and lessons
-
-If you want to __reload all the plugin and lessons__, open a new browser tab and visit the following url:
-
-[http://localhost:8080/WebGoat/service/reloadplugins.mvc](http://localhost:8080/WebGoat/service/reloadplugins.mvc)
-
-After the plugin reload is complete, _reloading a message_ will appear and you can refresh the __main WebGoat browser tab__.
-
-## Debugging label properties
-
-To be able to see which labels are loaded through a property file, open a new browser tab and visit the following url:
-
-[http://localhost:8080/WebGoat/service/debug/labels.mvc](http://localhost:8080/WebGoat/service/debug/labels.mvc)
-
-Switch back to the main WebGoat broswer tab and __reload the main WebGoat browser tab__.
-
-After the reload is complete, all labels which where loaded from a property file will be __marked green__.

RELEASE_NOTES.md

@@ -0,0 +1,50 @@
+# WebGoat release notes 
+
+## Version 8.1.0
+
+### New functionality
+
+- Added new lessons for cryptography and path-traversal
+- Extra content added to the XXE lesson
+- Explanation of the assignments will be part of WebGoat, in this release we added detailed descriptions on how to solve the XXE lesson. In the upcoming releases new explanations will be added. If you want to contribute please create a pull request on Github.
+- Docker improvements + docker stack for complete container with nginx 
+- Included JWT token decoding and generation, since jwt.io does not support None anymore 
+
+### Bug fixes
+
+- [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
+- [#811 -  Flag submission fails](https://github.com/WebGoat/WebGoat/issues/811)
+- [#810 - Scoreboard for challenges shows csrf users](https://github.com/WebGoat/WebGoat/issues/810)
+- [#788 - strange copy in constructor](https://github.com/WebGoat/WebGoat/issues/788) 
+- [#760 - Execution of standalone jar fails (Flyway migration step](https://github.com/WebGoat/WebGoat/issues/760)
+- [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766)
+- [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708)
+- [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719)
+ - [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
+ - [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
+ - [#716 -  On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
+ - [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
+ - [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
+ 
+ ## Contributors
+ 
+Special thanks to the following contributors providing us with a pull request:
+
+- Satoshi SAKAO
+- Philippe Lafoucrière
+- Cotonne
+- Tiago Mussi
+- thegoodcrumpets
+- Atharva Vaidya
+- torleif
+- August Detlefsen
+- Choe Hyeong Jin
+
+And everyone who provided feedback through Github.
+
+
+Team WebGoat
+
+
+
+

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
+

catalina.policy

@@ -1,3 +0,0 @@
-grant {
-  permission java.security.AllPermission;
-};

config/checkstyle/checkstyle.xml

@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<!--
+    Checkstyle configuration that checks the Google coding conventions from Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html.
+
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.sf.net (or in your downloaded distribution).
+
+    To completely disable a check, just comment it out or delete it from the file.
+
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ -->
+
+<module name="Checker">
+    <property name="charset" value="UTF-8"/>
+
+    <property name="severity" value="error"/>
+
+    <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+
+    <module name="SuppressionFilter">
+        <property name="file" value="${suppressionsLocation}" default="target/checkstyle-suppressions.xml"/>
+    </module>
+    <module name="TreeWalker">
+        <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+            <property name="maximum" value="0"/>
+            <property name="format" value="org\.junit\.Assert\.assert"/>
+            <property name="message"
+                      value="Please use AssertJ imports."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module
+                name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
+            <property name="regexp" value="true"/>
+            <property name="illegalPkgs"
+                      value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|io|pool2).*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*"/>
+            <property name="illegalClasses"
+                      value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.slf4j\.LoggerFactory, ^reactor\.core\.support\.Assert, ^com\.google\.common\.collect\.Maps, ^com\.google\.common\.collect\.Sets, ^com\.google\.common\.collect\.Lists"/>
+        </module>
+        <module
+                name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+            <property name="maximum" value="0"/>
+            <property name="format"
+                      value="assertThatExceptionOfType\((NullPointerException|IllegalArgumentException|IOException|IllegalStateException)\.class\)"/>
+            <property name="message"
+                      value="Please use specialized AssertJ assertThat*Exception method."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module
+                name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+            <property name="maximum" value="0"/>
+            <property name="format"
+                      value="@SneakyThrows"/>
+            <property name="message"
+                      value="Please use a unchecked exceptions instead of @SneakyThrows gives compiler warnings"/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format"
+                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message"
+                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="OneTopLevelClass">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="NoLineWrap"/>
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <message key="ws.notFollowed"
+                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
+            <property name="id" value="SeparatorWrapEllipsis"/>
+            <property name="tokens" value="ELLIPSIS"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
+            <property name="id" value="SeparatorWrapArrayDeclarator"/>
+            <property name="tokens" value="ARRAY_DECLARATOR"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapMethodRef"/>
+            <property name="tokens" value="METHOD_REF"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z_][a-z0-9_]*)*$"/>
+            <message key="name.invalidPattern"
+                     value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+            <message key="name.invalidPattern"
+                     value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+                     value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9_]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="CatchParameterName">
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LocalVariableName">
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+            <message key="name.invalidPattern"
+                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="InterfaceTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="4"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="VariableDeclarationUsageDistance"/>
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="false"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###STATIC"/>
+        </module>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+        <module name="ParenPad"/>
+        <module name="OperatorWrap">
+            <property name="option" value="NL"/>
+            <property name="tokens"
+                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationMostCases"/>
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="id" value="AnnotationLocationVariables"/>
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="SummaryJavadoc">
+            <property name="forbiddenSummaryFragments"
+                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="JavadocParagraph">
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,ENUM_DEF,METHOD_DEF,ANNOTATION_FIELD_DEF"/>
+            <property name="scope" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="minLineCount" value="2"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="allowThrowsTagsForSubclasses" value="true"/>
+            <property name="severity" value="warning"/>
+        </module>
+        <module name="MethodName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+                     value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SingleLineJavadoc">
+            <property name="ignoreInlineTags" value="false"/>
+        </module>
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="expected"/>
+        </module>
+        <module name="CommentsIndentation"/>
+    </module>
+</module>

config/checkstyle/suppressions.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+    <suppress files="MD5.java" checks="[a-zA-Z0-9]*" />
+    <suppress files="VulnerableComponentsLesson.java" checks="[a-zA-Z0-9]*" />
+    <suppress files="ContentTypeAssignment.java" checks="IllegalImportCheck" />
+    <suppress files="SimpleXXE.java" checks="IllegalImportCheck" />
+    <suppress files="HtmlTamperingTask.java" checks="ParameterName" />
+</suppressions>

config/dependency-check/project-suppression.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+    <suppress base="true">
+        <notes><![CDATA[
+        This suppresses false positives identified on spring framework.
+        ]]></notes>
+        <cpe>cpe:/a:pivotal_software:spring_framework</cpe>
+        <cve>CVE-2020-5398</cve>
+    </suppress>
+    <suppress base="true">
+        <notes><![CDATA[
+        This suppresses false positives identified on spring framework.
+        ]]></notes>
+        <cpe>cpe:/a:redhat:undertow</cpe>
+        <cve>CVE-2019-14888</cve>
+    </suppress>
+    <suppress base="true">
+        <notes><![CDATA[
+        This suppresses false positives identified on spring framework.
+        ]]></notes>
+        <cpe>cpe:/a:pivotal_software:spring_security</cpe>
+        <cve>CVE-2018-1258</cve>
+    </suppress>
+    <suppress base="true">
+        <cpe>cpe:/a:jruby:jruby</cpe>
+        <cve>CVE-2018-1000613</cve>
+        <cve>CVE-2018-1000180</cve>
+        <cve>CVE-2017-18640</cve>
+        <cve>CVE-2011-4838</cve>
+    </suppress>
+    <suppress base="true"><!-- vulnerable components lesson -->
+        <cpe>cpe:/a:xstream_project:xstream</cpe>
+        <cve>CVE-2017-7957</cve>
+        <cve>CVE-2016-3674</cve>
+        <cve>CVE-2020-26217</cve>
+        <cve>CVE-2020-26258</cve>
+    </suppress>
+    <suppress base="true"><!-- webgoat-server -->
+        <cpe>cpe:/a:postgresql:postgresql</cpe>
+        <cve>CVE-2018-10936</cve>
+    </suppress>
+</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>${revision}</version>
+    </parent>
+
+    <dependencies>
+       
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.8</version>
+            <executions>
+                <execution>
+                    <phase>install</phase>
+                    <configuration>
+                        <target>
+                            <copy file="../webgoat-server/target/webgoat-server-${project.version}.jar" tofile="webgoat-server-${project.version}.jar"/>
+							<copy file="../webwolf/target/webwolf-${project.version}.jar" tofile="webwolf-${project.version}.jar"/>
+                        </target>
+                    </configuration>
+                    <goals>
+                        <goal>run</goal>
+                    </goals>
+                </execution>
+            </executions>
+			</plugin>
+        </plugins>
+    </build>
+
+</project>

docker/start.sh

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

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

docs/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="refresh" content="0;url=https://owasp.org/www-project-webgoat/" />
+  <link rel="canonical" href="https://owasp.org/www-project-webgoat/" />
+</head>
+<body>
+<h1>
+  The page been moved to <a href="https://owasp.org/www-project-webgoat/">https://owasp.org/www-project-webgoat/</a>
+</h1>
+</body>
+</html>

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

mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+        
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

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

@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.owasp.webgoat</groupId>
     <artifactId>webgoat-parent</artifactId>
     <packaging>pom</packaging>
-    <version>7.1</version>
+    <version>${revision}</version>
 
     <name>WebGoat Parent Pom</name>
     <description>Parent Pom for the WebGoat Project. A deliberately insecure Web Application</description>
@@ -14,9 +15,15 @@
 
     <organization>
         <name>OWASP</name>
-        <url>https://webgoat.github.io/</url>
+        <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>
@@ -35,29 +42,34 @@
         <developer>
             <id>nbaars</id>
             <name>Nanne Baars</name>
-            <email>nbaars@xebia.com</email>
+            <email>nanne.baars@owasp.org</email>
             <organizationUrl>https://github.com/nbaars</organizationUrl>
             <timezone>Europe/Amsterdam</timezone>
         </developer>
         <developer>
             <id>misfir3</id>
-            <name />
-            <email />
+            <name>Jason White</name>
+            <email>jason.white@owasp.org</email>
+        </developer>
+        <developer>
+            <id>zubcevic</id>
+            <name>René Zubcevic</name>
+            <email>rene.zubcevic@owasp.org</email>
         </developer>
         <developer>
             <id>jwayman</id>
             <name>Jeff Wayman</name>
-            <email />
+            <email/>
         </developer>
         <developer>
             <id>dcowden</id>
             <name>Dave Cowden</name>
-            <email />
+            <email/>
         </developer>
         <developer>
             <id>lawson89</id>
             <name>Richard Lawson</name>
-            <email />
+            <email/>
         </developer>
         <developer>
             <id>dougmorato</id>
@@ -86,8 +98,8 @@
         <url>https://github.com/WebGoat/WebGoat</url>
         <connection>scm:git:git@github.com:WebGoat/WebGoat.git</connection>
         <developerConnection>scm:git:git@github.com:WebGoat/WebGoat.git</developerConnection>
-      <tag>7.1</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <issueManagement>
         <system>Github Issues</system>
@@ -103,232 +115,178 @@
         <!-- Use UTF-8 Encoding -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
         <!-- This build number will be ubdated by Travis-CI -->
         <build.number>build</build.number>
 
         <!-- Shared properties with plugins and version numbers across submodules-->
         <activation.version>1.1.1</activation.version>
-        <axis-ant.version>1.4</axis-ant.version>
-        <axis-jaxrpc.version>1.4</axis-jaxrpc.version>
-        <axis-saaj.version>1.4</axis-saaj.version>
-        <axis.version>1.4</axis.version>
-        <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
-        <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
         <commons-collections.version>3.2.1</commons-collections.version>
-        <commons-digester.version>2.1</commons-digester.version>
-        <commons-discovery.version>0.5</commons-discovery.version>
-        <commons-fileupload.version>1.3.1</commons-fileupload.version>
-        <commons-io.version>2.4</commons-io.version>
         <commons-lang3.version>3.4</commons-lang3.version>
-        <commons-logging.version>1.2</commons-logging.version>
-        <coveralls-maven-plugin.version>4.0.0</coveralls-maven-plugin.version>
-        <ecs.version>1.4.2</ecs.version>
-        <guava.version>18.0</guava.version>
-        <h2.version>1.4.190</h2.version>
-        <hsqldb.version>1.8.0.10</hsqldb.version>
-        <j2h.version>1.3.1</j2h.version>
-        <jackson-core.version>2.6.3</jackson-core.version>
-        <jackson-databind.version>2.6.3</jackson-databind.version>
-        <javaee-api.version>6.0</javaee-api.version>
-        <javax.transaction-api.version>1.2</javax.transaction-api.version>
-        <jcl-over-slf4j.version>1.7.12</jcl-over-slf4j.version>
-        <jstl.version>1.2</jstl.version>
-        <jtds.version>1.3.1</jtds.version>
-        <junit.version>4.12</junit.version>
-        <log4j.version>1.2.17</log4j.version>
-        <mail-api.version>1.5.4</mail-api.version>
-        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
-        <maven-failsafe-plugin.version>2.19</maven-failsafe-plugin.version>
-        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-        <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
-        <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
-        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
-        <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
-        <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.7</nexus-staging-maven-plugin.version>
-        <org.springframework.version>3.2.4.RELEASE</org.springframework.version>
-        <sauce_junit.version>2.1.20</sauce_junit.version>
-        <selenium-java.version>2.48.2</selenium-java.version>
-        <slf4j-api.version>1.7.12</slf4j-api.version>
-        <slf4j-log4j12.version>1.7.12</slf4j-log4j12.version>
-        <spring.security.version>3.2.4.RELEASE</spring.security.version>
-        <standard.version>1.1.2</standard.version>
-        <tiles.version>3.0.5</tiles.version>
-        <tomcat-catalina.version>7.0.65</tomcat-catalina.version>
-        <tomcat7-maven-plugin.version>2.3-SNAPSHOT</tomcat7-maven-plugin.version>
-        <versioneye-maven-plugin.version>3.5.1</versioneye-maven-plugin.version>
-        <wsdl4j.version>1.6.3</wsdl4j.version>
+        <commons-io.version>2.6</commons-io.version>
+        <guava.version>30.1-jre</guava.version>
+        <lombok.version>1.18.4</lombok.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
+        <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
+        <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+        <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+        <revision>8.2.0-SNAPSHOT</revision>
     </properties>
 
     <modules>
         <module>webgoat-container</module>
-        <module>webgoat-standalone</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>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
+    <dependencies>
+	    <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>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>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache.snapshots</id>
-            <url>http://repository.apache.org/snapshots/</url>
-            <!-- The releases element here is due to an issue in Maven 2.0 that will be
-                 fixed in future releases. This should be able to be disabled altogether. -->
-            <releases>
-                <updatePolicy>daily</updatePolicy>
-            </releases>
-            <snapshots>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.2.5</version>
+                <configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <consoleOutput>true</consoleOutput>
+                    <failsOnError>true</failsOnError>
+                    <configLocation>config/checkstyle/checkstyle.xml</configLocation>
+                    <suppressionsLocation>config/checkstyle/suppressions.xml</suppressionsLocation>
+                    <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.14.0</version>
+                <configuration>
+                    <targetJdk>11</targetJdk>
+                    <failurePriority>1</failurePriority><!-- 5 means fail even on the lowest priority, 0 means never fail -->
+                    <rulesets>
+                        <!--suppress UnresolvedMavenProperty -->
+                        <ruleset>${maven.multiModuleProjectDirectory}/config/pmd/pmd-ruleset.xml</ruleset>
+                    </rulesets>
+                    <failOnViolation>true</failOnViolation>
+                    <printFailingErrors>true</printFailingErrors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <profiles>
         <profile>
-            <id>release</id>
-			<dependencies>
-                <dependency>
-                    <groupId>org.owasp.webgoat.lesson</groupId>
-                    <artifactId>dist</artifactId>
-                    <version>1.0</version>
-                    <type>zip</type>
-                    <scope>provided</scope>
-                    <classifier>plugins</classifier>
-                </dependency>
-            </dependencies>
+            <id>owasp</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
             <build>
                 <plugins>
-				    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unpack-lesson</id>
-                                <goals>
-                                    <goal>unpack-dependencies</goal>
-                                </goals>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <outputDirectory>${project.basedir}/webgoat-container/src/main/webapp/plugin_lessons</outputDirectory>
-                                    <includeArtifactIds>dist</includeArtifactIds>
-                                    <includes>*.jar</includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>${nexus-staging-maven-plugin.version}</version>
-                        <extensions>true</extensions>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                        <version>5.3.2</version>
                         <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                            <failBuildOnCVSS>7</failBuildOnCVSS>
+                            <skipProvidedScope>true</skipProvidedScope>
+                            <skipRuntimeScope>true</skipRuntimeScope>
+                            <suppressionFiles>
+                                <!--suppress UnresolvedMavenProperty -->
+                                <suppressionFile>
+                                    ${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml
+                                </suppressionFile>
+                            </suppressionFiles>
                         </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>${maven-source-plugin.version}</version>
                         <executions>
                             <execution>
-                                <id>attach-sources</id>
                                 <goals>
-                                    <goal>jar-no-fork</goal>
+                                    <goal>check</goal>
                                 </goals>
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>${maven-javadoc-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>${maven-gpg-plugin.version}</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <configuration>
-                                    <keyname>WebGoat</keyname>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
     </profiles>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>${maven-release-plugin.version}</version>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <releaseProfiles>release</releaseProfiles>
-                    <tagNameFormat>@{project.version}</tagNameFormat>
-                    <goals>deploy</goals>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.eluder.coveralls</groupId>
-                <artifactId>coveralls-maven-plugin</artifactId>
-                <version>${coveralls-maven-plugin.version}</version>
-                <configuration>
-                    <repoToken />
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>${cobertura-maven-plugin.version}</version>
-                <configuration>
-                    <check />
-                    <format>xml</format>
-                    <maxmem>256m</maxmem>
-                    <!-- aggregated reports for multi-module projects -->
-                    <aggregate>true</aggregate>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.versioneye</groupId>
-                <artifactId>versioneye-maven-plugin</artifactId>
-                <version>${versioneye-maven-plugin.version}</version>
-                <configuration>
-                    <apiKey>a1e4a9da4ed34ee44cab</apiKey>
-                    <projectId>562da95be346d7000e0369ac</projectId>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
 
 </project>

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
+
+

webgoat-container/pom.xml

@@ -1,504 +1,131 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
-
+<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">
     <name>webgoat-container</name>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>webgoat-container</artifactId>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
     <parent>
         <groupId>org.owasp.webgoat</groupId>
         <artifactId>webgoat-parent</artifactId>
-        <version>7.1</version>
+        <version>${revision}</version>
     </parent>
 
-    <profiles>
-        <profile>
-            <id>run-integration-tests</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>run-integration</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <version>2.3-SNAPSHOT</version>
-                        <configuration>
-                            <server>local_tomcat</server>
-                            <url>http://localhost:8080/manager</url>
-                            <path>/WebGoat</path>
-                            <attachArtifactClassifier>exec</attachArtifactClassifier>
-                            <contextReloadable>true</contextReloadable>
-                            <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                            <contextFile>${project.basedir}/src/main/webapp/WEB-INF/context.xml</contextFile>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.owasp.webgoat</groupId>
-                                <artifactId>webgoat-container</artifactId>
-                                <version>${project.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>tomcat-run</id>
-                                <goals>
-                                    <goal>exec-war-only</goal>
-                                </goals>
-                                <phase>package</phase>
-                            </execution>
-                            <execution>
-                                <id>tomcat-startup</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>run-war-only</goal>
-                                </goals>
-                                <configuration>
-                                    <port>8888</port>
-                                    <fork>true</fork>
-                                </configuration>
-                            </execution>
-                            <!-- At post-integration-test phase, stop the embedded Tomcat server. -->
-                            <execution>
-                                <id>tomcat-shutdown</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>shutdown</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${maven-failsafe-plugin.version}</version>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <log4j.configuration>file:${project.basedir}/src/test/resources/log4j-silent.properties</log4j.configuration>
-                            </systemPropertyVariables>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/java</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <encoding>ISO-8859-1</encoding>
+                    <forkCount>0</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <argLine>
+                        --illegal-access=permit
+                    </argLine>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>create-jar</id>
-                        <phase>compile</phase>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>test-jar</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>${maven-war-plugin.version}</version>
-                <configuration>
-                    <!--  archiving the classes breaks the admin screen loads in course.java
-                          the legacy lesson loader does not look in jar files for lessons  -->
-                    <archiveClasses>false</archiveClasses>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                        <manifestEntries>
-                            <Specification-Title>${project.name}</Specification-Title>
-                            <Specification-Version>${project.version}</Specification-Version>
-                            <Implementation-Version>${build.number}</Implementation-Version>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>${build-helper-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/webgoat-container-${project.version}.jar</file>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-                <version>2.3-SNAPSHOT</version>
-                <configuration>
-                    <server>local_tomcat</server>
-                    <url>http://localhost:8080/manager/text</url>
-                    <path>/WebGoat</path>
-                    <attachArtifactClassifier>exec</attachArtifactClassifier>
-                    <contextReloadable>true</contextReloadable>
-                    <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                    <contextFile>${project.basedir}/src/main/webapp/WEB-INF/context.xml</contextFile>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.owasp.webgoat</groupId>
-                        <artifactId>webgoat-container</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>tomcat-run</id>
-                        <goals>
-                            <goal>exec-war-only</goal>
-                        </goals>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <excludes>
-                        <exclude>**/*IT.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <!--<plugin>-->
-                <!--<groupId>com.github.webdriverextensions</groupId>-->
-                <!--<artifactId>webdriverextensions-maven-plugin</artifactId>-->
-                <!--<version>3.0.2</version>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<goals>-->
-                            <!--<goal>install-drivers</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-                <!--<configuration>-->
-                    <!--<drivers>-->
-                        <!--<driver>-->
-                            <!--<name>chromedriver</name>-->
-                            <!--<platform>windows</platform>-->
-                            <!--<bit>64</bit>-->
-                        <!--</driver>-->
-                    <!--</drivers>-->
-                    <!--<keepDownloadedWebdrivers>true</keepDownloadedWebdrivers>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
         </plugins>
     </build>
 
     <dependencies>
+        <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>javax.activation</groupId>
             <artifactId>activation</artifactId>
             <version>${activation.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>${axis.version}</version>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-saaj</artifactId>
-            <version>${axis-saaj.version}</version>
+            <groupId>org.asciidoctor</groupId>
+            <artifactId>asciidoctorj</artifactId>
+            <version>1.5.8.1</version>
         </dependency>
         <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-jaxrpc</artifactId>
-            <version>${axis-jaxrpc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-ant</artifactId>
-            <version>${axis-ant.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HikariCP</artifactId>
+                    <groupId>com.zaxxer</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons-collections.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>${commons-digester.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons-logging.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${jcl-over-slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-            <version>${commons-discovery.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
-            <version>${mail-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>hsqldb</groupId>
+            <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>${hsqldb.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>${wsdl4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>java2html</groupId>
-            <artifactId>j2h</artifactId>
-            <version>${j2h.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ecs</groupId>
-            <artifactId>ecs</artifactId>
-            <version>${ecs.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>javax.transaction-api</artifactId>
-            <version>${javax.transaction-api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.jtds</groupId>
-            <artifactId>jtds</artifactId>
-            <version>${jtds.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina</artifactId>
-            <version>${tomcat-catalina.version}</version>
-            <scope>provided</scope>
         </dependency>
 
-
-        <!-- ************* spring MVC and related dependencies ************** -->
-
-        <!-- servlet API -->
-        <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>${javaee-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${org.springframework.version}</version>
-        </dependency>
-
-        <!-- Jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
-        </dependency>
-
-        <!-- Spring MVC framework -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework.version}</version>
-            <type>jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-
-        <!-- Apache Commons Upload -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>${commons-fileupload.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-
-        <!-- JSTL -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>${jstl.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>${standard.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>${log4j.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.jms</groupId>
-                    <artifactId>jms</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jdmk</groupId>
-                    <artifactId>jmxtools</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jmx</groupId>
-                    <artifactId>jmxri</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-core</artifactId>
-            <version>${tiles.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j-log4j12.version}</version>
-            <type>jar</type>
-        </dependency>
         <!-- ************* END spring MVC and related dependencies ************** -->
         <!-- ************* START: Dependencies for Unit and Integration Testing ************** -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <type>jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>${selenium-java.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.saucelabs</groupId>
-            <artifactId>sauce_junit</artifactId>
-            <version>${sauce_junit.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>com.github.webdriverextensions</groupId>-->
-            <!--<artifactId>webdriverextensions</artifactId>-->
-            <!--<version>2.8.0</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <!-- <version>4.1.3.RELEASE</version>-->
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+
         <!-- ************* END: Dependencies for Unit and Integration Testing ************** -->
         <!-- ************* END: <dependencies> ************** -->
     </dependencies>
 
 </project>
+

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

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

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

@@ -0,0 +1,125 @@
+
+/**
+ * ************************************************************************************************
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ * <p>
+ *
+ * @author WebGoat
+ * @version $Id: $Id
+ * @since December 12, 2015
+ */
+
+package org.owasp.webgoat;
+
+import lombok.extern.slf4j.Slf4j;
+import org.asciidoctor.Asciidoctor;
+import org.asciidoctor.extension.JavaExtensionRegistry;
+import org.owasp.webgoat.asciidoc.*;
+import org.owasp.webgoat.i18n.Language;
+import org.thymeleaf.IEngineConfiguration;
+import org.thymeleaf.templateresolver.FileTemplateResolver;
+import org.thymeleaf.templateresource.ITemplateResource;
+import org.thymeleaf.templateresource.StringTemplateResource;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import static org.asciidoctor.Asciidoctor.Factory.create;
+
+/**
+ * Thymeleaf resolver for AsciiDoc used in the lesson, can be used as follows inside a lesson file:
+ * <p>
+ * <code>
+ * <div th:replace="doc:AccessControlMatrix_plan.adoc"></div>
+ * </code>
+ */
+@Slf4j
+public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
+
+    private static final Asciidoctor asciidoctor = create();
+    private static final String PREFIX = "doc:";
+    private final Language language;
+
+    public AsciiDoctorTemplateResolver(Language language) {
+        this.language = language;
+        setResolvablePatterns(Set.of(PREFIX + "*"));
+    }
+
+    @Override
+    protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+        var templateName = resourceName.substring(PREFIX.length());
+        try (InputStream is = readInputStreamOrFallbackToEnglish(templateName, language)) {
+            if (is == null) {
+                log.warn("Resource name: {} not found, did you add the adoc file?", templateName);
+                return new StringTemplateResource("");
+            } else {
+                JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
+                extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
+                extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
+                extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class);
+                extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class);
+                extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class);
+
+                StringWriter writer = new StringWriter();
+                asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
+                return new StringTemplateResource(writer.getBuffer().toString());
+            }
+        } catch (IOException e) {
+            //no html yet
+            return new StringTemplateResource("");
+        }
+    }
+
+    /**
+     * The resource name is for example HttpBasics_content1.adoc. This is always located in the following directory:
+     * <code>plugin/HttpBasics/lessonPlans/en/HttpBasics_content1.adoc</code>
+     */
+    private String computeResourceName(String resourceName, String language) {
+        return String.format("lessonPlans/%s/%s", language, resourceName);
+    }
+
+    private InputStream readInputStreamOrFallbackToEnglish(String resourceName, Language language) {
+        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(computeResourceName(resourceName, language.getLocale().getLanguage()));
+        if (is == null) {
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(computeResourceName(resourceName, "en"));
+        }
+        return is;
+    }
+
+    private Map<String, Object> createAttributes() {
+        Map<String, Object> attributes = new HashMap<>();
+        attributes.put("source-highlighter", "coderay");
+        attributes.put("backend", "xhtml");
+        attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);
+
+        Map<String, Object> options = new HashMap<>();
+        options.put("attributes", attributes);
+
+        return options;
+    }
+}

webgoat-container/src/main/java/org/owasp/webgoat/Catcher.java

@@ -1,120 +0,0 @@
-
-package org.owasp.webgoat;
-
-import java.io.IOException;
-import java.util.Enumeration;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.owasp.webgoat.lessons.AbstractLesson;
-import org.owasp.webgoat.session.Course;
-import org.owasp.webgoat.session.WebSession;
-
-
-/**
- *************************************************************************************************
- *
- *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 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.
- *
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @since March 13, 2007
- * @version $Id: $Id
- */
-public class Catcher extends HammerHead
-{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7441856110845727651L;
-
-	/**
-	 * Description of the Field
-	 */
-	public final static String START_SOURCE_SKIP = "START_OMIT_SOURCE";
-
-	/** Constant <code>END_SOURCE_SKIP="END_OMIT_SOURCE"</code> */
-	public final static String END_SOURCE_SKIP = "END_OMIT_SOURCE";
-
-	/** Constant <code>PROPERTY="PROPERTY"</code> */
-	public static final String PROPERTY = "PROPERTY";
-
-	/** Constant <code>EMPTY_STRING=""</code> */
-	public static final String EMPTY_STRING = "";
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * Description of the Method
-	 * @exception IOException
-	 *                Description of the Exception
-	 * @exception ServletException
-	 *                Description of the Exception
-	 */
-	public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
-	{
-		try
-		{
-			// System.out.println( "Entering doPost: " );
-			// System.out.println( " - request " + request);
-			// System.out.println( " - principle: " + request.getUserPrincipal() );
-			// setCacheHeaders(response, 0);
-			WebSession session = (WebSession) request.getSession(true).getAttribute(WebSession.SESSION);
-			session.update(request, response, this.getServletName()); // FIXME: Too much in this
-			// call.
-
-			int scr = session.getCurrentScreen();
-			Course course = session.getCourse();
-			AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE);
-
-			log(request, lesson.getClass().getName() + " | " + session.getParser().toString());
-
-			String property = new String(session.getParser().getStringParameter(PROPERTY, EMPTY_STRING));
-
-			// if the PROPERTY parameter is available - write all the parameters to the
-			// property file. No other control parameters are supported at this time.
-			if (!property.equals(EMPTY_STRING))
-			{
-				Enumeration<String> e = session.getParser().getParameterNames();
-
-				while (e.hasMoreElements())
-				{
-					String name = (String) e.nextElement();
-					String value = session.getParser().getParameterValues(name)[0];
-					lesson.getLessonTracker(session).getLessonProperties().setProperty(name, value);
-				}
-			}
-			lesson.getLessonTracker(session).store(session, lesson);
-
-			// BDM MC
-// WEB-173 - removed for testing, as plugin architecture would not allow this
-//			if ( request.getParameter("Deleter") != null ){org.owasp.webgoat.lessons.BlindScript.StaticDeleter();}
-
-		} catch (Throwable t)
-		{
-			t.printStackTrace();
-			log("ERROR: " + t);
-		}
-	}
-}

webgoat-container/src/main/java/org/owasp/webgoat/DatabaseInitialization.java

@@ -0,0 +1,50 @@
+package org.owasp.webgoat;
+
+import org.flywaydb.core.Flyway;
+import org.owasp.webgoat.service.RestartLessonService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+
+import javax.sql.DataSource;
+import java.util.Map;
+
+/**
+ * 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.
+ */
+@Configuration
+public class DatabaseInitialization {
+
+    private final DataSource dataSource;
+    private String driverClassName;
+
+    public DatabaseInitialization(DataSource dataSource,
+                                  @Value("${spring.datasource.driver-class-name}") String driverClassName) {
+        this.dataSource = dataSource;
+        this.driverClassName = driverClassName;
+    }
+
+    @Bean(initMethod = "migrate")
+    public Flyway flyWayContainer() {
+        return Flyway
+                .configure()
+                .configuration(Map.of("driver", driverClassName))
+                .dataSource(dataSource)
+                .schemas("container")
+                .locations("db/container")
+                .load();
+    }
+
+    @Bean(initMethod = "migrate")
+    @DependsOn("flyWayContainer")
+    public Flyway flywayLessons() {
+        return Flyway
+                .configure()
+                .configuration(Map.of("driver", driverClassName))
+                .dataSource(dataSource)
+                .load();
+    }
+}

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

@@ -1,442 +1,61 @@
 package org.owasp.webgoat;
 
-import org.owasp.webgoat.lessons.AbstractLesson;
-import org.owasp.webgoat.lessons.WelcomeScreen;
-import org.owasp.webgoat.lessons.admin.WelcomeAdminScreen;
+import lombok.AllArgsConstructor;
 import org.owasp.webgoat.session.Course;
-import org.owasp.webgoat.session.ErrorScreen;
-import org.owasp.webgoat.session.Screen;
-import org.owasp.webgoat.session.UserTracker;
-import org.owasp.webgoat.session.WebSession;
-import org.owasp.webgoat.session.WebgoatContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
 
 /**
  * *************************************************************************************************
- *
- *
+ * <p>
+ * <p>
  * This file is part of WebGoat, an Open Web Application Security Project
  * utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- *
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- *
+ * <p>
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- *
+ * <p>
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
  * Getting Source ==============
- *
+ * <p>
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
  * for free software projects.
  *
- * @author Jeff Williams <a href="http://www.aspectsecurity.com">Aspect
- * Security</a>
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @since October 28, 2003
+ * @author Jeff Williams
+ * @author Bruce Mayhew
+ * @author Nanne Baars
  * @version $Id: $Id
+ * @since October 28, 2003
  */
-public class HammerHead extends HttpServlet {
-
-    final Logger logger = LoggerFactory.getLogger(HammerHead.class);
+@Controller
+@AllArgsConstructor
+public class HammerHead {
 
+    private final Course course;
 
     /**
-     *
+     * Entry point for WebGoat, redirects to the first lesson found within the course.
      */
-    private static final long serialVersionUID = 645640331343188020L;
-
-    /**
-     * Description of the Field
-     */
-    protected static SimpleDateFormat httpDateFormat;
-
-    /**
-     * Set the session timeout to be 2 days
-     */
-    private final static int sessionTimeoutSeconds = 60 * 60 * 24 * 2;
-
-    // private final static int sessionTimeoutSeconds = 1;
-    /**
-     * Properties file path
-     */
-    public static String propertiesPath = null;
-
-    /**
-     * provides convenience methods for getting setup information from the
-     * ServletContext
-     */
-    private WebgoatContext webgoatContext = null;
-
-    /**
-     * {@inheritDoc}
-     *
-     * Description of the Method
-     * @exception IOException Description of the Exception
-     * @exception ServletException Description of the Exception
-     */
-    @Override
-    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        doPost(request, response);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Description of the Method
-     * @exception IOException Description of the Exception
-     * @exception ServletException Description of the Exception
-     */
-    @Override
-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        Screen screen = null;
-
-        WebSession mySession = null;
-        try {
-            logger.debug("Entering doPost");
-            logger.debug("request: " + request);
-            logger.debug("principle: " + request.getUserPrincipal());
-            // setCacheHeaders(response, 0);
-            ServletContext context = getServletContext();
-
-            // FIXME: If a response is written by updateSession(), do not
-            // call makeScreen() and writeScreen()
-            mySession = updateSession(request, response, context);
-            
-            if (response.isCommitted()) {
-                logger.debug("Response already committed, exiting");
-                return;
-            }
-            
-            if ("true".equals(request.getParameter("start")) || request.getQueryString() == null) {
-                logger.warn("Redirecting to first lesson");
-                response.sendRedirect("start.mvc" + mySession.getCourse().getFirstLesson().getLink());
-                return;
-            }
-
-            // Note: For the lesson to track the status, we need to update
-            // the lesson tracker object
-            // from the screen.createContent() method. The create content is
-            // the only point
-            // where the lesson "knows" what has happened. To track it at a
-            // latter point would
-            // require the lesson to have memory.
-            screen = makeScreen(mySession);
-            // This calls the lesson's
-            // handleRequest()
-            if (response.isCommitted()) {
-                return;
-            }
-
-            // perform lesson-specific tracking activities
-            if (screen instanceof AbstractLesson) {
-                AbstractLesson lesson = (AbstractLesson) screen;
-
-                // we do not count the initial display of the lesson screen as a visit
-                if ("GET".equals(request.getMethod())) {
-                    String uri = request.getRequestURI() + "?" + request.getQueryString();
-                    if (!uri.endsWith(lesson.getLink())) {
-                        screen.getLessonTracker(mySession).incrementNumVisits();
-                    }
-                } else if ("POST".equals(request.getMethod())
-                        && mySession.getPreviousScreen() == mySession.getCurrentScreen()) {
-                    screen.getLessonTracker(mySession).incrementNumVisits();
-                }
-            }
-
-            // log the access to this screen for this user
-            UserTracker userTracker = UserTracker.instance();
-            userTracker.update(mySession, screen);
-            log(request, screen.getClass().getName() + " | " + mySession.getParser().toString());
-
-            // Redirect the request to our View servlet
-            String userAgent = request.getHeader("user-agent");
-            String clientBrowser = "Not known!";
-            if (userAgent != null) {
-                clientBrowser = userAgent;
-            }
-            request.setAttribute("client.browser", clientBrowser);
-            // removed - this is being done in updateSession call
-            //request.getSession().setAttribute(WebSession.SESSION, mySession);
-            // not sure why this is being set in the session?
-            //request.getSession().setAttribute(WebSession.COURSE, mySession.getCourse());
-            String viewPage = getViewPage(mySession);
-            logger.debug("Forwarding to view: " + viewPage);
-            logger.debug("Screen: " + screen);
-            request.getRequestDispatcher(viewPage).forward(request, response);
-        } catch (Throwable t) {
-            logger.error("Error handling request", t); screen = new ErrorScreen(mySession, t);
-        } finally {
-            try {
-                if (screen instanceof ErrorScreen) {
-                    this.writeScreen(mySession, screen, response);
-                }
-            } catch (Throwable thr) {
-                logger.error("Could not write error screen", thr);
-            }
-            WebSession.returnConnection(mySession);
-            logger.debug("Leaving doPost: ");
-        }
-    }
-
-    private String getViewPage(WebSession webSession) {
-        // now always display the lesson content
-        String page = "/lesson_content.jsp";
-        //page = "/main.jsp";
-        return page;
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param date Description of the Parameter
-     * @return RFC 1123 http date format
-     */
-    protected static String formatHttpDate(Date date) {
-        synchronized (httpDateFormat) {
-            return httpDateFormat.format(date);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Return information about this servlet
-     */
-    @Override
-    public String getServletInfo() {
-        return "WebGoat is sponsored by Aspect Security.";
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Return properties path
-     */
-    @Override
-    public void init() throws ServletException {
-        logger.info("Initializing main webgoat servlet");
-        httpDateFormat = new SimpleDateFormat("EEE, dd MMM yyyyy HH:mm:ss z", Locale.US);
-        httpDateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
-        propertiesPath = getServletContext().getRealPath("/WEB-INF/webgoat.properties");
-        webgoatContext = new WebgoatContext(this);
-        URL runningStandalone = Thread.currentThread().getContextClassLoader().getResource("standalone.properties");
-        if (runningStandalone == null) {
-            logger.info("Browse to http://localhost:8080/WebGoat and happy hacking!");
-        }
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param request Description of the Parameter
-     * @param message Description of the Parameter
-     */
-    public void log(HttpServletRequest request, String message) {
-        String output = new Date() + " | " + request.getRemoteHost() + ":" + request.getRemoteAddr() + " | " + message;
-        log(output);
-        logger.debug(output);
-    }
-
-    /*
-     * public List getLessons(Category category, String role) { Course course =
-     * mySession.getCourse(); // May need to clone the List before returning it. //return new
-     * ArrayList(course.getLessons(category, role)); return course.getLessons(category, role); }
-     */
-    /**
-     * Description of the Method
-     *
-     * @param s Description of the Parameter
-     * @return Description of the Return Value
-     */
-    protected Screen makeScreen(WebSession s) {
-        Screen screen = null;
-        int scr = s.getCurrentScreen();
-        Course course = s.getCourse();
-
-        if (s.isUser() || s.isChallenge()) {
-            if (scr == WebSession.WELCOME) {
-                screen = new WelcomeScreen(s);
-            } else {
-                AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson.USER_ROLE);
-                if (lesson == null && s.isHackedAdmin()) {
-                    // If admin was hacked, let the user see some of the
-                    // admin screens
-                    lesson = course.getLesson(s, scr, AbstractLesson.HACKED_ADMIN_ROLE);
-                }
-
-                if (lesson != null) {
-                    screen = lesson;
-
-                    // We need to do some bookkeeping for the hackable admin
-                    // interface.
-                    // This is the only place we can tell if the user
-                    // successfully hacked the hackable
-                    // admin and has actually accessed an admin screen. You
-                    // need BOTH pieces of information
-                    // in order to satisfy the remote admin lesson.
-                    s.setHasHackableAdmin(screen.getRole());
-
-                    lesson.handleRequest(s);
-                    s.setCurrentMenu(lesson.getCategory().getRanking());
-                } else {
-                    screen = new ErrorScreen(s, "Invalid screen requested.  Try: http://localhost/WebGoat/attack");
-                }
-            }
-        } else if (s.isAdmin()) {
-            if (scr == WebSession.WELCOME) {
-                screen = new WelcomeAdminScreen(s);
-            } else {
-                // Admin can see all roles.
-                // FIXME: should be able to pass a list of roles.
-                AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson.ADMIN_ROLE);
-                if (lesson == null) {
-                    lesson = course.getLesson(s, scr, AbstractLesson.HACKED_ADMIN_ROLE);
-                }
-                if (lesson == null) {
-                    lesson = course.getLesson(s, scr, AbstractLesson.USER_ROLE);
-                }
-
-                if (lesson != null) {
-                    screen = lesson;
-
-                    // We need to do some bookkeeping for the hackable admin
-                    // interface.
-                    // This is the only place we can tell if the user
-                    // successfully hacked the hackable
-                    // admin and has actually accessed an admin screen. You
-                    // need BOTH pieces of information
-                    // in order to satisfy the remote admin lesson.
-                    s.setHasHackableAdmin(screen.getRole());
-
-                    lesson.handleRequest(s);
-                    s.setCurrentMenu(lesson.getCategory().getRanking());
-                } else {
-                    screen = new ErrorScreen(s,
-                            "Invalid screen requested.  Try Setting Admin to false or Try: http://localhost/WebGoat/attack");
-                }
-            }
-        }
-
-        return (screen);
-    }
-
-    /**
-     * This method sets the required expiration headers in the response for a
-     * given RunData object. This method attempts to set all relevant headers,
-     * both for HTTP 1.0 and HTTP 1.1.
-     *
-     * @param response The new cacheHeaders value
-     * @param expiry The new cacheHeaders value
-     */
-    protected static void setCacheHeaders(HttpServletResponse response, int expiry) {
-        if (expiry == 0) {
-            response.setHeader("Pragma", "no-cache");
-            response.setHeader("Cache-Control", "no-cache");
-            response.setHeader("Expires", formatHttpDate(new Date()));
-        } else {
-            Date expiryDate = new Date(System.currentTimeMillis() + expiry);
-            response.setHeader("Expires", formatHttpDate(expiryDate));
-        }
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param request Description of the Parameter
-     * @param response Description of the Parameter
-     * @param context Description of the Parameter
-     * @return Description of the Return Value
-     * @throws java.io.IOException if any.
-     */
-    protected WebSession updateSession(HttpServletRequest request, HttpServletResponse response, ServletContext context)
-            throws IOException {
-        HttpSession hs;
-        // session should already be created by spring security
-        hs = request.getSession(false);
-
-        logger.debug("HH Entering Session_id: " + hs.getId());
-        // dumpSession( hs );
-        // Get our session object out of the HTTP session
-        WebSession session = null;
-        Object o = hs.getAttribute(WebSession.SESSION);
-
-        if ((o != null) && o instanceof WebSession) {
-            session = (WebSession) o;
-            hs.setAttribute(WebSession.COURSE, session.getCourse());
-        } else {
-            // Create new custom session and save it in the HTTP session
-            logger.warn("HH Creating new WebSession");
-            session = new WebSession(webgoatContext, context);
-            // Ensure splash screen shows on any restart
-            // rlawson - removed this since we show splash screen at login now
-            //hs.removeAttribute(WELCOMED);
-            hs.setAttribute(WebSession.SESSION, session);
-            // reset timeout
-            hs.setMaxInactiveInterval(sessionTimeoutSeconds);
-        }
-
-        session.update(request, response, this.getServletName());
-        // update last attack request info (cookies, parms)
-        // this is so the REST services can have access to them via the session 
-        session.updateLastAttackRequestInfo(request);
-
-        // to authenticate
-        logger.debug("HH Leaving Session_id: " + hs.getId());
-        //dumpSession( hs );
-        return (session);
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param s Description of the Parameter
-     * @param screen a {@link org.owasp.webgoat.session.Screen} object.
-     * @param screen a {@link org.owasp.webgoat.session.Screen} object.
-     * @param response Description of the Parameter
-     * @exception IOException Description of the Exception
-     * @throws java.io.IOException if any.
-     */
-    protected void writeScreen(WebSession s, Screen screen, HttpServletResponse response) throws IOException {
-        response.setContentType("text/html");
-
-        PrintWriter out = response.getWriter();
-
-        if (s == null) {
-            screen = new ErrorScreen(s, "Page to display was null");
-        }
-
-        // set the content-length of the response.
-        // Trying to avoid chunked-encoding. (Aspect required)
-        response.setContentLength(screen.getContentLength());
-        response.setHeader("Content-Length", screen.getContentLength() + "");
-
-        screen.output(out);
-        out.flush();
-        out.close();
+    @RequestMapping(path = "/attack", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView attack(Authentication authentication, HttpServletRequest request, HttpServletResponse response) {
+        return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink());
     }
 }

webgoat-container/src/main/java/org/owasp/webgoat/LessonSource.java

@@ -1,191 +0,0 @@
-package org.owasp.webgoat;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.owasp.webgoat.lessons.AbstractLesson;
-import org.owasp.webgoat.session.Course;
-import org.owasp.webgoat.session.WebSession;
-
-/**
- * *************************************************************************************************
- *
- *
- * This file is part of WebGoat, an Open Web Application Security Project
- * utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 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.
- *
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @since October 28, 2003
- * @version $Id: $Id
- */
-public class LessonSource extends HammerHead {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 2588430536196446145L;
-
-    /**
-     * Description of the Field
-     */
-    public final static String START_SOURCE_SKIP = "START_OMIT_SOURCE";
-
-    /** Constant <code>END_SOURCE_SKIP="END_OMIT_SOURCE"</code> */
-    public final static String END_SOURCE_SKIP = "END_OMIT_SOURCE";
-
-    /**
-     * {@inheritDoc}
-     *
-     * Description of the Method
-     * @exception IOException Description of the Exception
-     * @exception ServletException Description of the Exception
-     */
-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
-        String source = null;
-
-        try {
-			// System.out.println( "Entering doPost: " );
-            // System.out.println( " - request " + request);
-            // System.out.println( " - principle: " + request.getUserPrincipal()
-            // );
-            // setCacheHeaders(response, 0);
-            WebSession session = (WebSession) request.getSession(true).getAttribute(WebSession.SESSION);
-            // FIXME: Too much in this call.
-            session.update(request, response, this.getServletName());
-
-            boolean showSolution = session.getParser().getBooleanParameter("solution", false);
-            boolean showSource = session.getParser().getBooleanParameter("source", false);
-            if (showSolution) {
-
-                // Get the Java solution of the lesson.
-                source = getSolution(session);
-
-                int scr = session.getCurrentScreen();
-                Course course = session.getCourse();
-                AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE);
-                lesson.getLessonTracker(session).setViewedSolution(true);
-
-            } else if (showSource) {
-
-                // Get the Java source of the lesson. FIXME: Not needed
-                source = getSource(session);
-
-                int scr = session.getCurrentScreen();
-                Course course = session.getCourse();
-                AbstractLesson lesson = course.getLesson(session, scr, AbstractLesson.USER_ROLE);
-                lesson.getLessonTracker(session).setViewedSource(true);
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-            log("ERROR: " + t);
-        } finally {
-            try {
-                this.writeSource(source, response);
-            } catch (Throwable thr) {
-                thr.printStackTrace();
-                log(request, "Could not write error screen: " + thr.getMessage());
-            }
-            // System.out.println( "Leaving doPost: " );
-
-        }
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param s Description of the Parameter
-     * @return Description of the Return Value
-     */
-    protected String getSource(WebSession s) {
-
-        String source = null;
-        int scr = s.getCurrentScreen();
-        Course course = s.getCourse();
-
-        if (s.isUser() || s.isChallenge()) {
-
-            AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson.USER_ROLE);
-
-            if (lesson != null) {
-                source = lesson.getSource(s);
-            }
-        }
-        if (source == null) {
-            return "Source code is not available. Contact "
-                    + s.getWebgoatContext().getFeedbackAddressHTML();
-        }
-        return (source.replaceAll("(?s)" + START_SOURCE_SKIP + ".*" + END_SOURCE_SKIP,
-                "Code Section Deliberately Omitted"));
-    }
-
-    /**
-     * <p>getSolution.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link java.lang.String} object.
-     */
-    protected String getSolution(WebSession s) {
-
-        String source = null;
-        int scr = s.getCurrentScreen();
-        Course course = s.getCourse();
-
-        if (s.isUser() || s.isChallenge()) {
-
-            AbstractLesson lesson = course.getLesson(s, scr, AbstractLesson.USER_ROLE);
-
-            if (lesson != null) {
-                source = lesson.getSolution(s);
-            }
-        }
-        if (source == null) {
-            return "Solution  is not available. Contact "
-                    + s.getWebgoatContext().getFeedbackAddressHTML();
-        }
-        return (source);
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param s Description of the Parameter
-     * @param response Description of the Parameter
-     * @exception IOException Description of the Exception
-     * @throws java.io.IOException if any.
-     */
-    protected void writeSource(String s, HttpServletResponse response) throws IOException {
-        response.setContentType("text/html");
-
-        PrintWriter out = response.getWriter();
-
-        if (s == null) {
-            s = new String();
-        }
-
-        out.print(s);
-        out.close();
-    }
-}

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

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

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

@@ -0,0 +1,168 @@
+/**
+ * ************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ *
+ * @author WebGoat
+ * @version $Id: $Id
+ * @since October 28, 2003
+ */
+
+package org.owasp.webgoat;
+
+import org.owasp.webgoat.i18n.Language;
+import org.owasp.webgoat.i18n.Messages;
+import org.owasp.webgoat.i18n.PluginMessages;
+import org.owasp.webgoat.session.LabelDebugger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+import org.thymeleaf.TemplateEngine;
+import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.spring5.view.ThymeleafViewResolver;
+import org.thymeleaf.templatemode.TemplateMode;
+import org.thymeleaf.templateresolver.ITemplateResolver;
+
+import java.util.Set;
+
+/**
+ * Configuration for Spring MVC
+ */
+@Configuration
+public class MvcConfiguration implements WebMvcConfigurer {
+	
+	private static final String UTF8 = "UTF-8";
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/login").setViewName("login");
+        registry.addViewController("/lesson_content").setViewName("lesson_content");
+        registry.addViewController("/start.mvc").setViewName("main_new");
+        registry.addViewController("/scoreboard").setViewName("scoreboard");
+        //registry.addViewController("/list_users").setViewName("list_users");
+    }
+
+    @Bean
+    public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) {
+        ThymeleafViewResolver resolver = new ThymeleafViewResolver();
+        resolver.setTemplateEngine(thymeleafTemplateEngine);
+        resolver.setCharacterEncoding("UTF-8");
+        return resolver;
+    }
+
+    @Bean
+    public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
+        SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
+        resolver.setPrefix("classpath:/templates/");
+        resolver.setSuffix(".html");
+        resolver.setTemplateMode(TemplateMode.HTML);
+        resolver.setOrder(2);
+        resolver.setCacheable(false);
+        resolver.setCharacterEncoding(UTF8);
+        resolver.setApplicationContext(applicationContext);
+        return resolver;
+    }
+
+    @Bean
+    public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
+        LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
+        resolver.setOrder(0);
+        resolver.setCacheable(false);
+        resolver.setCharacterEncoding(UTF8);
+        return resolver;
+    }
+
+    @Bean
+    public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(Language language) {
+        AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(language);
+        resolver.setCacheable(false);
+        resolver.setOrder(1);
+        resolver.setCharacterEncoding(UTF8);
+        return resolver;
+    }
+
+    @Bean
+    public SpringTemplateEngine thymeleafTemplateEngine(ITemplateResolver springThymeleafTemplateResolver,
+                                                        LessonTemplateResolver lessonTemplateResolver,
+                                                        AsciiDoctorTemplateResolver asciiDoctorTemplateResolver) {
+        SpringTemplateEngine engine = new SpringTemplateEngine();
+        engine.setEnableSpringELCompiler(true);
+        engine.addDialect(new SpringSecurityDialect());
+        engine.setTemplateResolvers(
+                Set.of(lessonTemplateResolver, asciiDoctorTemplateResolver, springThymeleafTemplateResolver));
+        return engine;
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/images/**").addResourceLocations("classpath:/images/");
+        registry.addResourceHandler("/lesson_js/**").addResourceLocations("classpath:/js/");
+        registry.addResourceHandler("/lesson_css/**").addResourceLocations("classpath:/css/");
+        registry.addResourceHandler("/video/**").addResourceLocations("classpath:/video/");
+    }
+
+    @Bean
+    public PluginMessages pluginMessages(Messages messages, Language language) {
+        PluginMessages pluginMessages = new PluginMessages(messages, language);
+        pluginMessages.setDefaultEncoding("UTF-8");
+        pluginMessages.setBasenames("i18n/WebGoatLabels");
+        pluginMessages.setFallbackToSystemLocale(false);
+        return pluginMessages;
+    }
+
+    @Bean
+    public Language language(LocaleResolver localeResolver) {
+        return new Language(localeResolver);
+    }
+
+    @Bean
+    public Messages messageSource(Language language) {
+        Messages messages = new Messages(language);
+        messages.setDefaultEncoding("UTF-8");
+        messages.setBasename("classpath:i18n/messages");
+        messages.setFallbackToSystemLocale(false);
+        return messages;
+    }
+
+    @Bean
+    public LocaleResolver localeResolver() {
+        SessionLocaleResolver slr = new SessionLocaleResolver();
+        return slr;
+    }
+    
+    @Bean
+    public LabelDebugger labelDebugger() {
+        return new LabelDebugger();
+    }
+
+}

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

@@ -1,21 +1,11 @@
-package org.owasp.webgoat.plugins;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.StaleElementReferenceException;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.FluentWait;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 /**
  * ************************************************************************************************
+ * <p>
+ * <p>
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
  * <p>
- * Copyright (c) 2002 - 20014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
  * <p>
  * This program is free software; you can redistribute it and/or modify it under the terms of the
  * GNU General Public License as published by the Free Software Foundation; either version 2 of the
@@ -33,25 +23,47 @@ import static java.util.concurrent.TimeUnit.SECONDS;
  * <p>
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
  * projects.
- * <p>
  *
  * @author WebGoat
  * @version $Id: $Id
- * @since September 22, 2016
+ * @since October 28, 2003
  */
-public class TestUtils {
 
-    public static void assertTitlePresent(WebDriver webDriver, String title) {
-        FluentWait<WebDriver> wait = new WebDriverWait(webDriver, 15); // wait for a maximum of 15 seconds
-        wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("lesson-title"), title));
+package org.owasp.webgoat;
+
+import org.owasp.webgoat.session.UserSessionData;
+import org.owasp.webgoat.session.WebSession;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.File;
+
+@Configuration
+public class WebGoat {
+
+    @Bean(name = "pluginTargetDirectory")
+    public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
+        return new File(webgoatHome);
     }
 
-    public static  FluentWait createDefaultWait(WebDriver webDriver) {
-        return new FluentWait(webDriver)
-                .withTimeout(10, SECONDS)
-                .pollingEvery(2, SECONDS)
-                .ignoring(NoSuchElementException.class)
-                .ignoring(StaleElementReferenceException.class);
+    @Bean
+    @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
+    public WebSession webSession() {
+        return new WebSession();
+    }
 
+    @Bean
+    @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
+    public UserSessionData userSessionData() {
+        return new UserSessionData("test", "data");
+    }
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
     }
 }

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

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

webgoat-container/src/main/java/org/owasp/webgoat/application/Application.java

@@ -1,107 +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.application;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * Singleton which is created on context startup
- *
- * @author rlawson
- * @version $Id: $Id
- */
-public class Application {
-
-    private static final Application INSTANCE = new Application();
-
-    private Application() {
-
-    }
-
-    /**
-     * <p>getInstance.</p>
-     *
-     * @return a {@link org.owasp.webgoat.application.Application} object.
-     */
-    public static final Application getInstance() {
-        return INSTANCE;
-    }
-
-    private String version = "SNAPSHOT";
-    private String build = "local";
-    private String name = "WebGoat";
-
-    /**
-     * <p>Getter for the field <code>version</code>.</p>
-     *
-     * @return the version
-     */
-    public String getVersion() {
-        return version;
-    }
-
-    /**
-     * <p>Setter for the field <code>version</code>.</p>
-     *
-     * @param version the version to set
-     */
-    public void setVersion(String version) {
-        if (StringUtils.isNotBlank(version)) {
-            this.version = version;
-        }
-    }
-
-    /**
-     * <p>Getter for the field <code>build</code>.</p>
-     *
-     * @return the build
-     */
-    public String getBuild() {
-        return build;
-    }
-
-    /**
-     * <p>Setter for the field <code>build</code>.</p>
-     *
-     * @param build the build to set
-     */
-    public void setBuild(String build) {
-        if (StringUtils.isNotBlank(build)) {
-            this.build = build;
-        }
-    }
-
-    /**
-     * <p>Getter for the field <code>name</code>.</p>
-     *
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <p>Setter for the field <code>name</code>.</p>
-     *
-     * @param name the name to set
-     */
-    public void setName(String name) {
-        if (StringUtils.isNotBlank(name)) {
-            this.name = name;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this).
-                append("name", name).
-                append("version", version).
-                append("build", build).
-                toString();
-    }
-}

webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java

@@ -1,123 +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.application;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Paths;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Enumeration;
-import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRegistration;
-
-import org.owasp.webgoat.HammerHead;
-import org.owasp.webgoat.lessons.LessonServletMapping;
-import org.owasp.webgoat.plugins.PluginsLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-
-/**
- * Web application lifecycle listener.
- *
- * @author rlawson
- * @version $Id: $Id
- */
-public class WebGoatServletListener implements ServletContextListener {
-
-    private static final Logger logger = LoggerFactory.getLogger(HammerHead.class);
-
-    /** {@inheritDoc} */
-    @Override
-    public void contextInitialized(ServletContextEvent sce) {
-        ServletContext context = sce.getServletContext();
-        context.log("WebGoat is starting");
-        setApplicationVariables(context);
-        context.log("Adding extra mappings for lessions");
-
-        loadPlugins(sce);
-        loadServlets(sce);
-    }
-
-    private void loadServlets(ServletContextEvent sce) {
-        final ServletContext servletContext = sce.getServletContext();
-        ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(
-                false);
-        provider.addIncludeFilter(new AnnotationTypeFilter(LessonServletMapping.class));
-        Set<BeanDefinition> candidateComponents = provider.findCandidateComponents("org.owasp.webgoat");
-        try {
-            for (BeanDefinition beanDefinition : candidateComponents) {
-                Class controllerClass = Class.forName(beanDefinition.getBeanClassName());
-                LessonServletMapping pathAnnotation = (LessonServletMapping) controllerClass.getAnnotation(LessonServletMapping.class);
-                final ServletRegistration.Dynamic dynamic = servletContext.addServlet(controllerClass.getSimpleName(), controllerClass);
-                dynamic.addMapping(pathAnnotation.path());
-            }
-        } catch (Exception e) {
-            logger.error("Error", e);
-        }
-    }
-
-    private void loadPlugins(ServletContextEvent sce) {
-        String pluginPath = sce.getServletContext().getRealPath("plugin_lessons");
-        String targetPath = sce.getServletContext().getRealPath("plugin_extracted");
-        new PluginsLoader(Paths.get(pluginPath), Paths.get(targetPath)).loadPlugins();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void contextDestroyed(ServletContextEvent sce) {
-        ServletContext context = sce.getServletContext();
-        context.log("WebGoat is stopping");
-
-        // Unregister JDBC drivers in this context's ClassLoader:
-        // Get the webapp's ClassLoader
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        // Loop through all drivers
-        Enumeration<Driver> drivers = DriverManager.getDrivers();
-        while (drivers.hasMoreElements()) {
-            java.sql.Driver driver = drivers.nextElement();
-            if (driver.getClass().getClassLoader() == cl) {
-                // This driver was registered by the webapp's ClassLoader, so deregister it:
-                try {
-                    context.log("Unregister JDBC driver {}");
-                    DriverManager.deregisterDriver(driver);
-                } catch (SQLException ex) {
-                    context.log("Error unregistering JDBC driver {}");
-                }
-            } else {
-                // driver was not registered by the webapp's ClassLoader and may be in use elsewhere
-                context.log("Not unregistering JDBC driver {} as it does not belong to this webapp's ClassLoader");
-            }
-        }
-    }
-
-    private void setApplicationVariables(ServletContext context) {
-        Application app = Application.getInstance();
-        try {
-            InputStream inputStream = context.getResourceAsStream("/META-INF/MANIFEST.MF");
-            Manifest manifest = new Manifest(inputStream);
-            Attributes attr = manifest.getMainAttributes();
-            String name = attr.getValue("Specification-Title");
-            String version = attr.getValue("Specification-Version");
-            String build = attr.getValue("Implementation-Version");
-            app.setName(name);
-            app.setVersion(version);
-            app.setBuild(build);
-        } catch (IOException ioe) {
-            context.log("Error setting application variables", ioe);
-        }
-    }
-}

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

@@ -0,0 +1,25 @@
+package org.owasp.webgoat.asciidoc;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+/**
+ * Make environment available in the asciidoc code (which you cannot inject because it is handled by the framework)
+ */
+@Component
+public class EnvironmentExposure implements ApplicationContextAware {
+
+    private static ApplicationContext context;
+
+    public static Environment getEnv() {
+        return context.getEnvironment();
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        context = applicationContext;
+    }
+}

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

@@ -0,0 +1,18 @@
+package org.owasp.webgoat.asciidoc;
+
+import java.util.Map;
+
+import org.asciidoctor.ast.AbstractBlock;
+import org.asciidoctor.extension.InlineMacroProcessor;
+
+public class OperatingSystemMacro extends InlineMacroProcessor {
+
+    public OperatingSystemMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }
+
+    @Override
+	public String process(AbstractBlock parent, String target, Map<String, Object> attributes) {
+        return System.getProperty("os.name");
+    }
+}

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

@@ -0,0 +1,17 @@
+package org.owasp.webgoat.asciidoc;
+
+import org.asciidoctor.ast.AbstractBlock;
+import org.asciidoctor.extension.InlineMacroProcessor;
+import java.util.Map;
+
+public class WebGoatTmpDirMacro extends InlineMacroProcessor {
+
+    public WebGoatTmpDirMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }
+
+    @Override
+	public String process(AbstractBlock parent, String target, Map<String, Object> attributes) {
+        return EnvironmentExposure.getEnv().getProperty("webgoat.server.directory");
+    }
+}

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

@@ -0,0 +1,17 @@
+package org.owasp.webgoat.asciidoc;
+
+import org.asciidoctor.ast.AbstractBlock;
+import org.asciidoctor.extension.InlineMacroProcessor;
+import java.util.Map;
+
+public class WebGoatVersionMacro extends InlineMacroProcessor {
+
+    public WebGoatVersionMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }
+
+    @Override
+	public String process(AbstractBlock parent, String target, Map<String, Object> attributes) {
+        return EnvironmentExposure.getEnv().getProperty("webgoat.build.version");
+    }
+}

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

@@ -0,0 +1,62 @@
+package org.owasp.webgoat.asciidoc;
+
+import org.asciidoctor.ast.AbstractBlock;
+import org.asciidoctor.extension.InlineMacroProcessor;
+import org.springframework.core.env.Environment;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * Usage in asciidoc:
+ * <p>
+ * webWolfLink:here[] will display a href with here as text
+ * webWolfLink:landing[noLink] will display the complete url, for example: http://WW_HOST:WW_PORT/landing
+ */
+public class WebWolfMacro extends InlineMacroProcessor {
+
+    public WebWolfMacro(String macroName, Map<String, Object> config) {
+        super(macroName, config);
+    }
+
+    @Override
+	public String process(AbstractBlock parent, String target, Map<String, Object> attributes) {
+        Environment env = EnvironmentExposure.getEnv();
+        String hostname = determineHost(env.getProperty("webwolf.host"), env.getProperty("webwolf.port"));
+
+        if (displayCompleteLinkNoFormatting(attributes)) {
+            return hostname + (hostname.endsWith("/") ? "" : "/") + target;
+        }
+        return "<a href=\"" + hostname + "\" target=\"_blank\">" + target + "</a>";
+    }
+
+    private boolean displayCompleteLinkNoFormatting(Map<String, Object> attributes) {
+        return attributes.values().stream().filter(a -> a.equals("noLink")).findFirst().isPresent();
+    }
+
+    /**
+     * Determine the host from the hostname and ports that were used. 
+     * The purpose is to make it possible to use the application behind a reverse proxy. For instance in the docker
+     * compose/stack version with webgoat webwolf and nginx proxy. 
+     * You do not have to use the indicated hostname, but if you do, you should define two hosts aliases
+     * 127.0.0.1 www.webgoat.local www.webwolf.local
+     */
+    private String determineHost(String host, String port) {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+        host = request.getHeader("Host");
+        int semicolonIndex = host.indexOf(":");
+        if (semicolonIndex==-1 || host.endsWith(":80")) {
+        	host = host.replace(":80", "").replace("www.webgoat.local", "www.webwolf.local");
+        } else {
+        	host = host.substring(0, semicolonIndex);
+        	host = host.concat(":").concat(port);
+        }
+        return "http://" + host + (includeWebWolfContext() ? "/WebWolf" : "");
+    }
+
+    protected boolean includeWebWolfContext() {
+        return true;
+    }
+}

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

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

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

@@ -0,0 +1,86 @@
+/*
+ * 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.assignments;
+
+import lombok.Getter;
+import org.owasp.webgoat.i18n.PluginMessages;
+import org.owasp.webgoat.session.UserSessionData;
+import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.users.UserTrackerRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public abstract class AssignmentEndpoint {
+
+    @Autowired
+    private WebSession webSession;
+    @Autowired
+    private UserSessionData userSessionData;
+    @Getter
+    @Autowired
+    private PluginMessages messages;
+
+    protected WebSession getWebSession() {
+        return webSession;
+    }
+
+    protected UserSessionData getUserSessionData() {
+        return userSessionData;
+    }
+
+    /**
+     * Convenience method for create a successful result:
+     * <p>
+     * - Assignment is set to solved
+     * - Feedback message is set to 'assignment.solved'
+     * <p>
+     * Of course you can overwrite these values in a specific lesson
+     *
+     * @return a builder for creating a result from a lesson
+     * @param assignment
+     */
+    protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
+        return AttackResult.builder(messages).lessonCompleted(true).attemptWasMade().feedback("assignment.solved").assignment(assignment);
+    }
+
+    /**
+     * Convenience method for create a failed result:
+     * <p>
+     * - Assignment is set to not solved
+     * - Feedback message is set to 'assignment.not.solved'
+     * <p>
+     * Of course you can overwrite these values in a specific lesson
+     *
+     * @return a builder for creating a result from a lesson
+     * @param assignment
+     */
+    protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
+        return AttackResult.builder(messages).lessonCompleted(false).attemptWasMade().feedback("assignment.not.solved").assignment(assignment);
+    }
+
+    protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
+        return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,123 @@
+/*
+ * 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.assignments;
+
+import lombok.Getter;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.owasp.webgoat.i18n.PluginMessages;
+
+public class AttackResult {
+
+
+    public static class AttackResultBuilder {
+
+        private boolean lessonCompleted;
+        private PluginMessages messages;
+        private Object[] feedbackArgs;
+        private String feedbackResourceBundleKey;
+        private String output;
+        private Object[] outputArgs;
+        private AssignmentEndpoint assignment;
+        private boolean attemptWasMade = false;
+
+        public AttackResultBuilder(PluginMessages messages) {
+            this.messages = messages;
+        }
+
+        public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
+            this.lessonCompleted = lessonCompleted;
+            this.feedbackResourceBundleKey = "lesson.completed";
+            return this;
+        }
+
+        public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
+            this.lessonCompleted = lessonCompleted;
+            this.feedbackResourceBundleKey = resourceBundleKey;
+            return this;
+        }
+
+        public AttackResultBuilder feedbackArgs(Object... args) {
+            this.feedbackArgs = args;
+            return this;
+        }
+
+        public AttackResultBuilder feedback(String resourceBundleKey) {
+            this.feedbackResourceBundleKey = resourceBundleKey;
+            return this;
+        }
+
+        public AttackResultBuilder output(String output) {
+            this.output = output;
+            return this;
+        }
+
+        public AttackResultBuilder outputArgs(Object... args) {
+            this.outputArgs = args;
+            return this;
+        }
+
+        public AttackResultBuilder attemptWasMade() {
+            this.attemptWasMade = true;
+            return this;
+        }
+
+        public AttackResult build() {
+            return new AttackResult(lessonCompleted, messages.getMessage(feedbackResourceBundleKey, feedbackArgs), messages.getMessage(output, output, outputArgs), assignment.getClass().getSimpleName(), attemptWasMade);
+        }
+
+        public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
+            this.assignment = assignment;
+            return this;
+        }
+    }
+
+    @Getter
+    private boolean lessonCompleted;
+    @Getter
+    private String feedback;
+    @Getter
+    private String output;
+    @Getter
+    private final String assignment;
+    @Getter
+    private boolean attemptWasMade;
+
+    public AttackResult(boolean lessonCompleted, String feedback, String output, String assignment, boolean attemptWasMade) {
+        this.lessonCompleted = lessonCompleted;
+        this.feedback = StringEscapeUtils.escapeJson(feedback);
+        this.output = StringEscapeUtils.escapeJson(output);
+        this.assignment = assignment;
+        this.attemptWasMade = attemptWasMade;
+    }
+
+    public static AttackResultBuilder builder(PluginMessages messages) {
+        return new AttackResultBuilder(messages);
+    }
+
+    public boolean assignmentSolved() {
+        return lessonCompleted;
+    }
+}

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

@@ -0,0 +1,74 @@
+/*
+ * 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.assignments;
+
+import org.owasp.webgoat.session.WebSession;
+import org.owasp.webgoat.users.UserTracker;
+import org.owasp.webgoat.users.UserTrackerRepository;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+@RestControllerAdvice
+public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
+
+    private UserTrackerRepository userTrackerRepository;
+    private WebSession webSession;
+
+    public LessonTrackerInterceptor(UserTrackerRepository userTrackerRepository, WebSession webSession) {
+        this.userTrackerRepository = userTrackerRepository;
+        this.webSession = webSession;
+    }
+
+    @Override
+    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
+        return true;
+    }
+
+    @Override
+    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
+        if (o != null && o instanceof AttackResult) {
+            trackProgress((AttackResult) o);
+        }
+        return o;
+    }
+
+
+    protected AttackResult trackProgress(AttackResult attackResult) {
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        if (userTracker == null) {
+            userTracker = new UserTracker(webSession.getUserName());
+        }
+        if (attackResult.assignmentSolved()) {
+            userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
+        } else {
+            userTracker.assignmentFailed(webSession.getCurrentLesson());
+        }
+        userTrackerRepository.saveAndFlush(userTracker);
+        return attackResult;
+    }
+}

webgoat-container/src/main/java/org/owasp/webgoat/controller/About.java

@@ -1,59 +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.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * <p>About class.</p>
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Controller
-public class About {
-    
-    final Logger logger = LoggerFactory.getLogger(About.class);
-    private static final String WELCOMED = "welcomed";
-    
-    /**
-     * <p>welcome.</p>
-     *
-     * @param request a {@link javax.servlet.http.HttpServletRequest} object.
-     * @param error a {@link java.lang.String} object.
-     * @param logout a {@link java.lang.String} object.
-     * @return a {@link org.springframework.web.servlet.ModelAndView} object.
-     */
-    @RequestMapping(value = "about.mvc", method = RequestMethod.GET)
-    public ModelAndView welcome(HttpServletRequest request,
-            @RequestParam(value = "error", required = false) String error,
-            @RequestParam(value = "logout", required = false) String logout) {
-
-        // set the welcome attribute
-        // this is so the attack servlet does not also 
-        // send them to the welcome page
-        HttpSession session = request.getSession();
-        if (session.getAttribute(WELCOMED) == null) {
-            session.setAttribute(WELCOMED, "true");
-        }
-        
-        //go ahead and send them to webgoat (skip the welcome page)
-        ModelAndView model = new ModelAndView();
-        //model.setViewName("welcome");
-        //model.setViewName("main_new");
-        model.setViewName("about");
-        return model;
-    }
-    
-}

webgoat-container/src/main/java/org/owasp/webgoat/controller/Login.java

@@ -1,48 +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.controller;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * <p>Login class.</p>
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Controller
-public class Login {
-
-    /**
-     * <p>login.</p>
-     *
-     * @param error a {@link java.lang.String} object.
-     * @param logout a {@link java.lang.String} object.
-     * @return a {@link org.springframework.web.servlet.ModelAndView} object.
-     */
-    @RequestMapping(value = "login.mvc", method = RequestMethod.GET)
-    public ModelAndView login(
-            @RequestParam(value = "error", required = false) String error,
-            @RequestParam(value = "logout", required = false) String logout) {
-
-        ModelAndView model = new ModelAndView();
-        if (error != null) {
-            model.addObject("error", "Invalid username and password!");
-        }
-
-        if (logout != null) {
-            model.addObject("msg", "You've been logged out successfully.");
-        }
-        model.setViewName("login");
-
-        return model;
-
-    }
-}

webgoat-container/src/main/java/org/owasp/webgoat/controller/Logout.java

@@ -1,54 +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.controller;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * <p>Logout class.</p>
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Controller
-public class Logout {
-
-    final Logger logger = LoggerFactory.getLogger(Logout.class);
-
-    /**
-     * <p>logout.</p>
-     *
-     * @param error a {@link java.lang.String} object.
-     * @param logout a {@link java.lang.String} object.
-     * @return a {@link org.springframework.web.servlet.ModelAndView} object.
-     */
-    @RequestMapping(value = "logout.mvc", method = RequestMethod.GET)
-    public ModelAndView logout(
-            @RequestParam(value = "error", required = false) String error,
-            @RequestParam(value = "logout", required = false) String logout) {
-        
-        logger.info("Logging user out");
-
-        ModelAndView model = new ModelAndView();
-        if (error != null) {
-            model.addObject("error", "Invalid username and password!");
-        }
-
-        if (logout != null) {
-            model.addObject("msg", "You've been logged out successfully.");
-        }
-        model.setViewName("logout");
-
-        return model;
-
-    }
-}

webgoat-container/src/main/java/org/owasp/webgoat/controller/Start.java

@@ -1,113 +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.controller;
-
-import java.util.Collection;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.apache.commons.lang3.StringUtils;
-import org.owasp.webgoat.application.Application;
-import org.owasp.webgoat.session.WebSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * <p>Start class.</p>
- *
- * @author rlawson
- * @version $Id: $Id
- */
-@Controller
-public class Start {
-
-    final Logger logger = LoggerFactory.getLogger(Start.class);
-
-    private static final String WELCOMED = "welcomed";
-
-    @Autowired
-    private ServletContext servletContext;
-
-    /**
-     * <p>start.</p>
-     *
-     * @param request a {@link javax.servlet.http.HttpServletRequest} object.
-     * @param error a {@link java.lang.String} object.
-     * @param logout a {@link java.lang.String} object.
-     * @return a {@link org.springframework.web.servlet.ModelAndView} object.
-     */
-    @RequestMapping(value = "start.mvc", method = {RequestMethod.GET, RequestMethod.POST})
-    public ModelAndView start(HttpServletRequest request,
-            @RequestParam(value = "error", required = false) String error,
-            @RequestParam(value = "logout", required = false) String logout) {
-
-        ModelAndView model = new ModelAndView();
-        // make sure session is set up correctly
-        // if not redirect user to login
-        if (checkWebSession(request.getSession()) == false) {
-            model.setViewName("redirect:/login.mvc");
-            return model;
-        }
-        String role = getRole();
-        String user = request.getUserPrincipal().getName();
-        model.addObject("role", role);
-        model.addObject("user", user);
-
-        String contactEmail = servletContext.getInitParameter("email");
-        model.addObject("contactEmail", contactEmail);
-        String emailList = servletContext.getInitParameter("emaillist");
-        model.addObject("emailList", emailList);
-
-        Application app = Application.getInstance();
-        logger.info("Setting application properties: " + app);
-        model.addObject("version", app.getVersion());
-        model.addObject("build", app.getBuild());
-
-        // if everything ok then go to webgoat UI
-        model.setViewName("main_new");
-        return model;
-    }
-
-    private String getRole() {
-        Collection<GrantedAuthority> authorities = (Collection<GrantedAuthority>) SecurityContextHolder.getContext().getAuthentication().getAuthorities();
-        String role = "N/A";
-        for (GrantedAuthority authority : authorities) {
-            authority.getAuthority();
-            role = authority.getAuthority();
-            role = StringUtils.lowerCase(role);
-            role = StringUtils.remove(role, "role_");
-            break;
-        }
-        return role;
-    }
-
-    /**
-     * <p>checkWebSession.</p>
-     *
-     * @param session a {@link javax.servlet.http.HttpSession} object.
-     * @return a boolean.
-     */
-    public boolean checkWebSession(HttpSession session) {
-        Object o = session.getAttribute(WebSession.SESSION);
-        if (o == null) {
-            logger.error("No valid WebSession object found, has session timed out? [" + session.getId() + "]");
-            return false;
-        }
-        if (!(o instanceof WebSession)) {
-            logger.error("Invalid WebSession object found, this is probably a bug! [" + o.getClass() + " | " + session.getId() + "]");
-            return false;
-        }
-        return true;
-    }
-}

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

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

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

@@ -1,20 +1,44 @@
-/*
- * 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.
+/**
+ *************************************************************************************************
+ *
+ *
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ *
+ * Copyright (c) 2002 - 2014 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.
+ *
+ * @author WebGoat
+ * @since October 28, 2003
+ * @version $Id: $Id
  */
+
 package org.owasp.webgoat.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 /**
  * <p>Welcome class.</p>
  *
@@ -24,21 +48,16 @@ import org.springframework.web.servlet.ModelAndView;
 @Controller
 public class Welcome {
 
-    final Logger logger = LoggerFactory.getLogger(Welcome.class);
     private static final String WELCOMED = "welcomed";
     
     /**
      * <p>welcome.</p>
      *
      * @param request a {@link javax.servlet.http.HttpServletRequest} object.
-     * @param error a {@link java.lang.String} object.
-     * @param logout a {@link java.lang.String} object.
      * @return a {@link org.springframework.web.servlet.ModelAndView} object.
      */
-    @RequestMapping(value = "welcome.mvc", method = RequestMethod.GET)
-    public ModelAndView welcome(HttpServletRequest request,
-            @RequestParam(value = "error", required = false) String error,
-            @RequestParam(value = "logout", required = false) String logout) {
+    @RequestMapping(path = {"welcome.mvc", "/"}, method = RequestMethod.GET)
+    public ModelAndView welcome(HttpServletRequest request) {
 
         // set the welcome attribute
         // this is so the attack servlet does not also 

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

@@ -1,59 +1,51 @@
-
-package org.owasp.webgoat.session;
-
-/**
- *************************************************************************************************
- *
- *
+/*
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- *
+ * <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.
- *
- * @author Jeff Williams <a href="http://www.aspectsecurity.com">Aspect Security</a>
- * @version $Id: $Id
+ * <p>
  */
-public class ParameterNotFoundException extends Exception
-{
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3286112913299408382L;
+package org.owasp.webgoat.i18n;
 
-	/**
-	 * Constructs a new ParameterNotFoundException with no detail message.
-	 */
-	public ParameterNotFoundException()
-	{
-		super();
-	}
+import lombok.AllArgsConstructor;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.servlet.LocaleResolver;
+
+import java.util.Locale;
+
+/**
+ * Wrapper around the LocaleResolver from Spring so we do not need to bother with passing the HttpRequest object
+ * when asking for a Locale.
+ *
+ * @author nbaars
+ * @date 2/7/17
+ */
+@AllArgsConstructor
+public class Language {
+
+    private final LocaleResolver localeResolver;
+
+    public Locale getLocale() {
+        return localeResolver.resolveLocale(((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
+    }
 
-	/**
-	 * Constructs a new ParameterNotFoundException with the specified detail message.
-	 *
-	 * @param s
-	 *            the detail message
-	 */
-	public ParameterNotFoundException(String s)
-	{
-		super(s);
-	}
 }

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

@@ -1,59 +1,60 @@
-/***************************************************************************************************
- * 
- * 
+/*
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- * 
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- * 
+ * <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.lessons.model;
+
+package org.owasp.webgoat.i18n;
+
+import lombok.AllArgsConstructor;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+
+import java.util.Properties;
 
 /**
- * Model component for the Http Basics lesson.  Using a model
- * for that simple lesson is architectural overkill.  We do it anyway
- * for illustrative purposes - to demonstrate the pattern that we will
- * use for more complex lessons.
+ * <p>ExposedReloadableResourceMessageBundleSource class.</p>
+ * Extends the reloadable message source with a way to get all messages
  *
- * @version $Id: $Id
- * @author dm
+ * @author zupzup
  */
-public class HttpBasicsModel {
+@AllArgsConstructor
+public class Messages extends ReloadableResourceBundleMessageSource {
 
-    private String personName;
+    private final Language language;
 
     /**
-     * <p>Getter for the field <code>personName</code>.</p>
+     * Gets all messages for presented Locale.
      *
-     * @return a {@link java.lang.String} object.
+     * @return all messages
      */
-    public String getPersonName() {
-        return personName;
+    public Properties getMessages() {
+        return getMergedProperties(language.getLocale()).getProperties();
     }
 
-    /**
-     * <p>Setter for the field <code>personName</code>.</p>
-     *
-     * @param personName a {@link java.lang.String} object.
-     */
-    public void setPersonName(String personName) {
-        this.personName = personName;
+    public String getMessage(String code, Object... args) {
+        return getMessage(code, args, language.getLocale());
+    }
+
+    public String getMessage(String code, String defaultValue, Object... args) {
+        return super.getMessage(code, args, defaultValue, language.getLocale());
     }
 }

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

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

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

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

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

@@ -1,220 +1,89 @@
 package org.owasp.webgoat.lessons;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import lombok.Getter;
 
 /**
  * *************************************************************************************************
- *
- *
+ * <p>
+ * <p>
  * This file is part of WebGoat, an Open Web Application Security Project
  * utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- *
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- *
+ * <p>
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- *
+ * <p>
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
  * Getting Source ==============
- *
+ * <p>
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
  * for free software projects.
  *
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @since October 28, 2003
  * @version $Id: $Id
+ * @since October 28, 2003
  */
-public class Category implements Comparable {
+public enum Category {
 
-    /** Constant <code>INTRODUCTION</code> */
-    public final static Category INTRODUCTION = new Category("Introduction", new Integer(5));
+    INTRODUCTION("Introduction", 5),
+    GENERAL("General", 100),
     
-    /** Constant <code>GENERAL</code> */
-    public final static Category GENERAL = new Category("General", new Integer(100));
+    INJECTION("(A1) Injection", 300),
+    AUTHENTICATION("(A2) Broken Authentication", 302),
+    INSECURE_COMMUNICATION("(A3) Sensitive Data Exposure", 303),
+    XXE("(A4) XML External Entities (XXE)", 304),
+    ACCESS_CONTROL("(A5) Broken Access Control", 305),
     
-    /** Constant <code>ACCESS_CONTROL</code> */
-    public final static Category ACCESS_CONTROL = new Category("Access Control Flaws", new Integer(200));
+    XSS("(A7) Cross-Site Scripting (XSS)", 307),
+    INSECURE_DESERIALIZATION("(A8) Insecure Deserialization", 308),
+    VULNERABLE_COMPONENTS("(A9) Vulnerable Components", 309),
     
-    /** Constant <code>AJAX_SECURITY</code> */
-    public final static Category AJAX_SECURITY = new Category("AJAX Security", new Integer(400));
+    REQUEST_FORGERIES("(A8:2013) Request Forgeries", 318),
 
-    /** Constant <code>AUTHENTICATION</code> */
-    public final static Category AUTHENTICATION = new Category("Authentication Flaws", new Integer(500));
     
-    /** Constant <code>BUFFER_OVERFLOW</code> */
-    public final static Category BUFFER_OVERFLOW = new Category("Buffer Overflows", new Integer(600));
+    REQ_FORGERIES("Request Forgeries", 450),
     
-    /** Constant <code>CODE_QUALITY</code> */
-    public final static Category CODE_QUALITY = new Category("Code Quality", new Integer(700));
+    INSECURE_CONFIGURATION("Insecure Configuration", 600),
+    INSECURE_STORAGE("Insecure Storage", 800),
     
-    /** Constant <code>CONCURRENCY</code> */
-    public final static Category CONCURRENCY = new Category("Concurrency", new Integer(800));
     
-    /** Constant <code>XSS</code> */
-    public final static Category XSS = new Category("Cross-Site Scripting (XSS)", new Integer(900));
-
-    /** Constant <code>ERROR_HANDLING</code> */
-    public final static Category ERROR_HANDLING = new Category("Improper Error Handling", new Integer(1000));
-
-    /** Constant <code>INJECTION</code> */
-    public final static Category INJECTION = new Category("Injection Flaws", new Integer(1100));
-
-    /** Constant <code>DOS</code> */
-    public final static Category DOS = new Category("Denial of Service", new Integer(1200));
-
-    /** Constant <code>INSECURE_COMMUNICATION</code> */
-    public final static Category INSECURE_COMMUNICATION = new Category("Insecure Communication", new Integer(1300));
-
-    /** Constant <code>INSECURE_CONFIGURATION</code> */
-    public final static Category INSECURE_CONFIGURATION = new Category("Insecure Configuration", new Integer(1400));
-
-    /** Constant <code>INSECURE_STORAGE</code> */
-    public final static Category INSECURE_STORAGE = new Category("Insecure Storage", new Integer(1500));
-
-    /** Constant <code>MALICIOUS_EXECUTION</code> */
-    public final static Category MALICIOUS_EXECUTION = new Category("Malicious Execution", new Integer(1600));
-
-    /** Constant <code>PARAMETER_TAMPERING</code> */
-    public final static Category PARAMETER_TAMPERING = new Category("Parameter Tampering", new Integer(1700));
-
-    /** Constant <code>SESSION_MANAGEMENT</code> */
-    public final static Category SESSION_MANAGEMENT = new Category("Session Management Flaws", new Integer(1800));
-
-    /** Constant <code>WEB_SERVICES</code> */
-    public final static Category WEB_SERVICES = new Category("Web Services", new Integer(1900));
-
-    /** Constant <code>ADMIN_FUNCTIONS</code> */
-    public final static Category ADMIN_FUNCTIONS = new Category("Admin Functions", new Integer(2000));
-
-    /** Constant <code>CHALLENGE</code> */
-    public final static Category CHALLENGE = new Category("Challenge", new Integer(3000));
-
-    private static final List<Category> categories = new ArrayList<Category>();
-
-    private String category;
+    AJAX_SECURITY("AJAX Security", 1000),
+    BUFFER_OVERFLOW("Buffer Overflows", 1100),
+    CODE_QUALITY("Code Quality", 1200),
+    CONCURRENCY("Concurrency", 1300),
+    ERROR_HANDLING("Improper Error Handling", 1400),
+    DOS("Denial of Service", 1500),
+    MALICIOUS_EXECUTION("Malicious Execution", 1600),
+    CLIENT_SIDE("Client side", 1700),
+    SESSION_MANAGEMENT("Session Management Flaws", 1800),
+    WEB_SERVICES("Web Services", 1900),
+    ADMIN_FUNCTIONS("Admin Functions", 2000),
+    CHALLENGE("Challenges", 3000);
 
+    @Getter
+    private String name;
+    @Getter
     private Integer ranking;
 
-    static {
-        categories.add(INTRODUCTION);
-        categories.add(PARAMETER_TAMPERING);
-        categories.add(ACCESS_CONTROL);
-        categories.add(AUTHENTICATION);
-        categories.add(SESSION_MANAGEMENT);
-        categories.add(XSS);
-        categories.add(BUFFER_OVERFLOW);
-        categories.add(INJECTION);
-        categories.add(MALICIOUS_EXECUTION);
-        categories.add(ERROR_HANDLING);
-        categories.add(INSECURE_STORAGE);
-        categories.add(DOS);
-        categories.add(INSECURE_CONFIGURATION);
-        categories.add(WEB_SERVICES);
-        categories.add(AJAX_SECURITY);
-        categories.add(ADMIN_FUNCTIONS);
-        categories.add(GENERAL);
-        categories.add(CODE_QUALITY);
-        categories.add(CONCURRENCY);
-        categories.add(INSECURE_COMMUNICATION);
-        categories.add(CHALLENGE);
-    }
-
-    /**
-     * <p>addCategory.</p>
-     *
-     * @param c a {@link org.owasp.webgoat.lessons.Category} object.
-     */
-    public static synchronized void addCategory(Category c) {
-        categories.add(c);
-    }
-
-    /**
-     * <p>Getter for the field <code>category</code>.</p>
-     *
-     * @param name a {@link java.lang.String} object.
-     * @return a {@link org.owasp.webgoat.lessons.Category} object.
-     */
-    public static synchronized Category getCategory(String name) {
-        Iterator<Category> it = categories.iterator();
-        while (it.hasNext()) {
-            Category c = it.next();
-            if (c.getName().equals(name)) {
-                return c;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * <p>Constructor for Category.</p>
-     *
-     * @param category a {@link java.lang.String} object.
-     * @param ranking a {@link java.lang.Integer} object.
-     */
-    public Category(String category, Integer ranking) {
-        this.category = category;
+    Category(String name, Integer ranking) {
+        this.name = name;
         this.ranking = ranking;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public int compareTo(Object obj) {
-        int value = 1;
-
-        if (obj instanceof Category) {
-            value = this.getRanking().compareTo(((Category) obj).getRanking());
-        }
-
-        return value;
-    }
-
     /**
-     * <p>Getter for the field <code>ranking</code>.</p>
-     *
-     * @return a {@link java.lang.Integer} object.
+     * {@inheritDoc}
      */
-    public Integer getRanking() {
-        return ranking;
-    }
-
-    /**
-     * <p>Setter for the field <code>ranking</code>.</p>
-     *
-     * @param ranking a {@link java.lang.Integer} object.
-     * @return a {@link java.lang.Integer} object.
-     */
-    public Integer setRanking(Integer ranking) {
-        return this.ranking = ranking;
-    }
-
-    /**
-     * <p>getName.</p>
-     *
-     * @return a {@link java.lang.String} object.
-     */
-    public String getName() {
-        return category;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean equals(Object obj) {
-        return (obj instanceof Category) && getName().equals(((Category) obj).getName());
-    }
-
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         return getName();

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

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

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

@@ -1,14 +1,10 @@
-
-package org.owasp.webgoat.session;
-
-/**
- *************************************************************************************************
+/***************************************************************************************************
  * 
  * 
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
  * 
- * Copyright (c) 2002 - 20014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 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
@@ -27,15 +23,21 @@ package org.owasp.webgoat.session;
  * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
  * projects.
  * 
- * @version $Id: $Id
- * @author dm
  */
-public class UnauthenticatedException extends Exception
-{
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 97865025446819061L;
+package org.owasp.webgoat.lessons;
 
+import lombok.Value;
+
+/**
+ * <p>Hint class.</p>
+ *
+ * @author rlawson
+ * @version $Id: $Id
+ */
+@Value
+public class Hint {
+
+    private String hint;
+    private String assignmentPath;
 }

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

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

webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java

@@ -1,279 +0,0 @@
-package org.owasp.webgoat.lessons;
-
-import com.google.common.base.Joiner;
-import org.apache.commons.io.IOUtils;
-import org.apache.ecs.Element;
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
-import org.apache.ecs.html.Center;
-import org.apache.ecs.html.H3;
-import org.apache.ecs.html.P;
-import org.apache.ecs.html.PRE;
-import org.apache.ecs.html.TD;
-import org.apache.ecs.html.TR;
-import org.apache.ecs.html.Table;
-import org.owasp.webgoat.session.WebSession;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *************************************************************************************************
- *
- *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 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.
- *
- * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
- * @since October 28, 2003
- * @version $Id: $Id
- */
-public abstract class LessonAdapter extends AbstractLesson {
-
-    /**
-     * {@inheritDoc}
-     *
-     * Description of the Method
-     */
-    protected Element createContent(WebSession s) {
-        // Mark this lesson as completed.
-        makeSuccess(s);
-
-        ElementContainer ec = new ElementContainer();
-
-        ec.addElement(new Center().addElement(new H3().addElement(new StringElement(
-                "Detailed Lesson Creation Instructions."))));
-        ec.addElement(new P());
-        ec
-                .addElement(new StringElement(
-                        "Lesson are simple to create and very little coding is required. &nbsp;&nbsp;"
-                                + "In fact, most lessons can be created by following the easy to use instructions by going to the WebGoat wiki page&nbsp;"
-                                + "<A HREF=https://github.com/WebGoat/WebGoat/wiki>WebGoat Wiki Page</A>&nbsp;&nbsp;"
-                                + "If you would prefer, send your lesson ideas to&nbsp;"
-                                + getWebgoatContext().getFeedbackAddressHTML())
-                                + " Note: you will need to register at "
-                                + "the following link to use the feedback tool:&nbsp;"
-                                + "<A HREF=https://lists.owasp.org/mailman/listinfo/owasp-webgoat>List Registration</A>&nbsp;&nbsp;"
-                                + "Finally, OWASP has a slack channel. You can register at the following link:&nbsp;"
-                                + "<A HREF=https://owasp.slack.com/>OWASP Slack Channel</A>");
-        
-        try (InputStream is = Thread.currentThread().getContextClassLoader()
-                .getResourceAsStream("New Lesson Instructions.txt")) {
-            if (is != null) {
-                PRE pre = new PRE();
-                pre.addElement(Joiner.on("\n").join(IOUtils.readLines(is)));
-                ec.addElement(pre);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return (ec);
-    }
-
-    /**
-     * Gets the category attribute of the LessonAdapter object. The default
-     * category is "General" Only override this method if you wish to create a
-     * new category or if you wish this lesson to reside within a category other
-     * the "General"
-     *
-     * @return The category value
-     */
-    protected Category getDefaultCategory() {
-        return Category.GENERAL;
-    }
-
-    /**
-     * <p>getDefaultHidden.</p>
-     *
-     * @return a boolean.
-     */
-    protected boolean getDefaultHidden() {
-        return false;
-    }
-
-    /**
-     * Initiates lesson restart functionality. Lessons should override this for
-     * lesson specific actions
-     */
-    public void restartLesson() {
-        // Do Nothing - called when restart lesson is pressed. Each lesson can do something
-    }
-        
-    private final static Integer DEFAULT_RANKING = new Integer(1000);
-
-    /**
-     * <p>getDefaultRanking.</p>
-     *
-     * @return a {@link java.lang.Integer} object.
-     */
-    protected Integer getDefaultRanking() {
-        return DEFAULT_RANKING;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Gets the hintCount attribute of the LessonAdapter object
-     */
-    public int getHintCount(WebSession s) {
-        return getHints(s).size();
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Fill in a minor hint that will help people who basically get it, but are
-     * stuck on somthing silly. Hints will be returned to the user in the order
-     * they appear below. The user must click on the "next hint" button before
-     * the hint will be displayed.
-     */
-    protected List<String> getHints(WebSession s) {
-        List<String> hints = new ArrayList<String>();
-        hints.add("There are no hints defined.");
-        return hints;
-    }
-
-    /**
-     * provide a default submitMethod of lesson does not implement
-     *
-     * @return a {@link java.lang.String} object.
-     */
-    public String getSubmitMethod() {
-        return "GET";
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Gets the instructions attribute of the LessonAdapter object. Instructions
-     * will rendered as html and will appear below the control area and above
-     * the actual lesson area. Instructions should provide the user with the
-     * general setup and goal of the lesson.
-     */
-    public String getInstructions(WebSession s) {
-        StringBuffer buff = new StringBuffer();
-        String lang = s.getCurrrentLanguage();
-        try {
-            String fileName = getLessonPlanFileName(lang);
-            if (fileName != null) {
-                BufferedReader in = new BufferedReader(new FileReader(fileName));
-                String line = null;
-                boolean startAppending = false;
-                while ((line = in.readLine()) != null) {
-                    if (line.indexOf("<!-- Start Instructions -->") != -1) {
-                        startAppending = true;
-                        continue;
-                    }
-                    if (line.indexOf("<!-- Stop Instructions -->") != -1) {
-                        startAppending = false;
-                        continue;
-                    }
-                    if (startAppending) {
-                        buff.append(line + "\n");
-                    }
-                }
-            }
-        } catch (Exception e) {
-        }
-
-        return buff.toString();
-
-    }
-
-    /**
-     * Fill in a descriptive title for this lesson. The title of the lesson.
-     * This will appear above the control area at the top of the page. This
-     * field will be rendered as html.
-     *
-     * @return The title value
-     */
-    public String getTitle() {
-        return "Untitled Lesson " + getScreenId();
-    }
-
-    /** {@inheritDoc} */
-    public String getCurrentAction(WebSession s) {
-        return s.getLessonSession(this).getCurrentLessonScreen();
-    }
-
-    /** {@inheritDoc} */
-    public void setCurrentAction(WebSession s, String lessonScreen) {
-        s.getLessonSession(this).setCurrentLessonScreen(lessonScreen);
-    }
-
-    /**
-     * <p>getSessionAttribute.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @param key a {@link java.lang.String} object.
-     * @return a {@link java.lang.Object} object.
-     */
-    public Object getSessionAttribute(WebSession s, String key) {
-        return s.getRequest().getSession().getAttribute(key);
-    }
-
-    /**
-     * <p>setSessionAttribute.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @param key a {@link java.lang.String} object.
-     * @param value a {@link java.lang.Object} object.
-     */
-    public void setSessionAttribute(WebSession s, String key, Object value) {
-        s.getRequest().getSession().setAttribute(key, value);
-    }
-
-    /**
-     * Description of the Method
-     *
-     * @param s Description of the Parameter
-     * @return Description of the Return Value
-     */
-    protected Element makeSuccess(WebSession s) {
-        getLessonTracker(s).setCompleted(true);
-
-        //s.setMessage(getLabelManager().get("LessonCompleted"));
-
-        return (null);
-    }
-
-    /**
-     * Gets the credits attribute of the AbstractLesson object
-     *
-     * @return The credits value
-     * @param text a {@link java.lang.String} object.
-     * @param e a {@link org.apache.ecs.Element} object.
-     */
-    protected Element getCustomCredits(String text, Element e) {
-        Table t = new Table().setCellSpacing(0).setCellPadding(0).setBorder(0).setWidth("90%").setAlign("RIGHT");
-        TR tr = new TR();
-        tr.addElement(new TD(text).setVAlign("MIDDLE").setAlign("RIGHT").setWidth("100%"));
-        tr.addElement(new TD(e).setVAlign("MIDDLE").setAlign("RIGHT"));
-        t.addElement(tr);
-        return t;
-    }
-
-}

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

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

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

@@ -1,33 +1,33 @@
 /**
  * *************************************************************************************************
- *
- *
+ * <p>
+ * <p>
  * This file is part of WebGoat, an Open Web Application Security Project
  * utility. For details, please see http://www.owasp.org/
- *
- * Copyright (c) 2002 - 20014 Bruce Mayhew
- *
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version.
- *
+ * <p>
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- *
+ * <p>
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
  * Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ * <p>
  * Getting Source ==============
- *
+ * <p>
  * Source for this application is maintained at
  * https://github.com/WebGoat/WebGoat, a repository for free software projects.
- *
  */
-package org.owasp.webgoat.lessons.model;
+
+package org.owasp.webgoat.lessons;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,8 +45,7 @@ public class LessonMenuItem {
     private List<LessonMenuItem> children = new ArrayList<LessonMenuItem>();
     private boolean complete;
     private String link;
-//    private boolean showSource = true;
-//    private boolean showHints = true;
+    private int ranking;
 
     /**
      * <p>Getter for the field <code>name</code>.</p>
@@ -105,13 +104,12 @@ public class LessonMenuItem {
     /**
      * <p>addChild.</p>
      *
-     * @param child a {@link org.owasp.webgoat.lessons.model.LessonMenuItem} object.
+     * @param child a {@link LessonMenuItem} object.
      */
     public void addChild(LessonMenuItem child) {
         children.add(child);
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         StringBuilder bldr = new StringBuilder();
@@ -156,6 +154,13 @@ public class LessonMenuItem {
         this.link = link;
     }
 
+    public void setRanking(int ranking) {
+        this.ranking = ranking;
+    }
+
+    public int getRanking() {
+        return this.ranking;
+    }
 
 
 }

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

@@ -4,7 +4,7 @@
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
  * 
- * Copyright (c) 2002 - 20014 Bruce Mayhew
+ * Copyright (c) 2002 - 2014 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
@@ -25,7 +25,7 @@
  * 
  */
 
-package org.owasp.webgoat.lessons.model;
+package org.owasp.webgoat.lessons;
 
 /**
  * <p>LessonMenuItemType class.</p>

webgoat-container/src/main/java/org/owasp/webgoat/lessons/RandomLessonAdapter.java

@@ -1,143 +0,0 @@
-
-package org.owasp.webgoat.lessons;
-
-import org.owasp.webgoat.session.CreateDB;
-import org.owasp.webgoat.session.DatabaseUtilities;
-import org.owasp.webgoat.session.LessonTracker;
-import org.owasp.webgoat.session.RandomLessonTracker;
-import org.owasp.webgoat.session.WebSession;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-
-/**
- * <p>Abstract RandomLessonAdapter class.</p>
- *
- * @version $Id: $Id
- * @author dm
- */
-public abstract class RandomLessonAdapter extends LessonAdapter
-{
-
-    /**
-     * <p>getStages.</p>
-     *
-     * @return an array of {@link java.lang.String} objects.
-     */
-    public abstract String[] getStages();
-
-    /**
-     * <p>setStage.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @param stage a {@link java.lang.String} object.
-     * @param stage a {@link java.lang.String} object.
-     */
-    public void setStage(WebSession s, String stage)
-    {
-        getLessonTracker(s).setStage(stage);
-        try
-        {
-            Connection connection = DatabaseUtilities.getConnection(s);
-
-            CreateDB db = new CreateDB();
-            db.makeDB(connection);
-            System.out.println("Successfully refreshed the database.");
-
-        } catch (SQLException sqle)
-        {
-            System.out.println("Error refreshing the database!");
-            sqle.printStackTrace();
-        }
-    }
-
-    /**
-     * <p>getStage.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link java.lang.String} object.
-     */
-    public String getStage(WebSession s)
-    {
-        return getLessonTracker(s).getStage();
-    }
-
-    /**
-     * <p>setStageComplete.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @param stage a {@link java.lang.String} object.
-     * @param stage a {@link java.lang.String} object.
-     */
-    public void setStageComplete(WebSession s, String stage)
-    {
-        RandomLessonTracker lt = getLessonTracker(s);
-        lt.setStageComplete(stage, true);
-        if (lt.getCompleted())
-        {
-            //s.setMessage("Congratulations, you have completed this lab");
-        }
-        else
-        {
-            s.setMessage("You have completed Stage " + (lt.getStageNumber(stage) + 1) + ": " + stage + ".");
-            if (!stage.equals(lt.getStage()))
-                s.setMessage(" Welcome to Stage " + (lt.getStageNumber(lt.getStage()) + 1) + ": " + lt.getStage());
-        }
-        try
-        {
-            Connection connection = DatabaseUtilities.getConnection(s);
-
-            CreateDB db = new CreateDB();
-            db.makeDB(connection);
-            System.out.println("Successfully refreshed the database.");
-
-        } catch (SQLException sqle)
-        {
-            System.out.println("Error refreshing the database!");
-            sqle.printStackTrace();
-        }
-    }
-
-    /**
-     * <p>isStageComplete.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @param stage a {@link java.lang.String} object.
-     * @param stage a {@link java.lang.String} object.
-     * @return a boolean.
-     */
-    public boolean isStageComplete(WebSession s, String stage)
-    {
-        return getLessonTracker(s).hasCompleted(stage);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public RandomLessonTracker getLessonTracker(WebSession s)
-    {
-        return (RandomLessonTracker) super.getLessonTracker(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public RandomLessonTracker getLessonTracker(WebSession s, AbstractLesson lesson)
-    {
-        return (RandomLessonTracker) super.getLessonTracker(s, lesson);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public RandomLessonTracker getLessonTracker(WebSession s, String userNameOverride)
-    {
-        return (RandomLessonTracker) super.getLessonTracker(s, userNameOverride);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public LessonTracker createLessonTracker()
-    {
-        return new RandomLessonTracker(getStages());
-    }
-
-}

webgoat-container/src/main/java/org/owasp/webgoat/lessons/SequentialLessonAdapter.java

@@ -1,214 +0,0 @@
-
-package org.owasp.webgoat.lessons;
-
-import org.apache.ecs.Element;
-import org.apache.ecs.ElementContainer;
-import org.apache.ecs.StringElement;
-import org.owasp.webgoat.session.LessonTracker;
-import org.owasp.webgoat.session.SequentialLessonTracker;
-import org.owasp.webgoat.session.WebSession;
-
-
-/**
- * <p>Abstract SequentialLessonAdapter class.</p>
- *
- * @version $Id: $Id
- * @author dm
- */
-public abstract class SequentialLessonAdapter extends LessonAdapter
-{
-
-    /**
-     * <p>setStage.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @param stage a int.
-     * @param stage a int.
-     */
-    public void setStage(WebSession s, int stage)
-    {
-        // System.out.println("Changed to stage " + stage);
-        getLessonTracker(s).setStage(stage);
-    }
-
-    /*
-     * By default returns 1 stage. (non-Javadoc)
-     */
-    /**
-     * <p>getStageCount.</p>
-     *
-     * @return a int.
-     */
-    public int getStageCount()
-    {
-        return 1;
-    }
-
-    /**
-     * <p>getStage.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a int.
-     */
-    public int getStage(WebSession s)
-    {
-        int stage = getLessonTracker(s).getStage();
-
-        // System.out.println("In stage " + stage);
-        return stage;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public SequentialLessonTracker getLessonTracker(WebSession s)
-    {
-        return (SequentialLessonTracker) super.getLessonTracker(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public SequentialLessonTracker getLessonTracker(WebSession s, AbstractLesson lesson)
-    {
-        return (SequentialLessonTracker) super.getLessonTracker(s, lesson);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public SequentialLessonTracker getLessonTracker(WebSession s, String userNameOverride)
-    {
-        return (SequentialLessonTracker) super.getLessonTracker(s, userNameOverride);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public LessonTracker createLessonTracker()
-    {
-        return new SequentialLessonTracker();
-    }
-
-    /**
-     * <p>createStagedContent.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link org.apache.ecs.Element} object.
-     */
-    protected Element createStagedContent(WebSession s)
-    {
-        try
-        {
-            int stage = getLessonTracker(s).getStage();
-            // int stage = Integer.parseInt(
-            // getLessonTracker(s).getLessonProperties().getProperty(WebSession.STAGE,"1"));
-
-            switch (stage)
-            {
-                case 1:
-                    return (doStage1(s));
-                case 2:
-                    return (doStage2(s));
-                case 3:
-                    return (doStage3(s));
-                case 4:
-                    return (doStage4(s));
-                case 5:
-                    return (doStage5(s));
-                case 6:
-                    return (doStage6(s));
-                default:
-                    throw new Exception("Invalid stage");
-            }
-        } catch (Exception e)
-        {
-            s.setMessage("Error generating " + this.getClass().getName());
-            // System.out.println(e);
-            e.printStackTrace();
-        }
-
-        return (new StringElement(""));
-    }
-
-    /**
-     * <p>doStage1.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link org.apache.ecs.Element} object.
-     * @throws java.lang.Exception if any.
-     */
-    protected Element doStage1(WebSession s) throws Exception
-    {
-        ElementContainer ec = new ElementContainer();
-        ec.addElement("Stage 1 Stub");
-        return ec;
-    }
-
-    /**
-     * <p>doStage2.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link org.apache.ecs.Element} object.
-     * @throws java.lang.Exception if any.
-     */
-    protected Element doStage2(WebSession s) throws Exception
-    {
-        ElementContainer ec = new ElementContainer();
-        ec.addElement("Stage 2 Stub");
-        return ec;
-    }
-
-    /**
-     * <p>doStage3.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link org.apache.ecs.Element} object.
-     * @throws java.lang.Exception if any.
-     */
-    protected Element doStage3(WebSession s) throws Exception
-    {
-        ElementContainer ec = new ElementContainer();
-        ec.addElement("Stage 3 Stub");
-        return ec;
-    }
-
-    /**
-     * <p>doStage4.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link org.apache.ecs.Element} object.
-     * @throws java.lang.Exception if any.
-     */
-    protected Element doStage4(WebSession s) throws Exception
-    {
-        ElementContainer ec = new ElementContainer();
-        ec.addElement("Stage 4 Stub");
-        return ec;
-    }
-
-    /**
-     * <p>doStage5.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link org.apache.ecs.Element} object.
-     * @throws java.lang.Exception if any.
-     */
-    protected Element doStage5(WebSession s) throws Exception
-    {
-        ElementContainer ec = new ElementContainer();
-        ec.addElement("Stage 5 Stub");
-        return ec;
-    }
-
-    /**
-     * <p>doStage6.</p>
-     *
-     * @param s a {@link org.owasp.webgoat.session.WebSession} object.
-     * @return a {@link org.apache.ecs.Element} object.
-     * @throws java.lang.Exception if any.
-     */
-    protected Element doStage6(WebSession s) throws Exception
-    {
-        ElementContainer ec = new ElementContainer();
-        ec.addElement("Stage 6 Stub");
-        return ec;
-    }
-
-}