Apply formatting

This will make sure we have a consistent style across our project and the PRs are only concerned with actual changes and no longer about style.

.github/stale.yml

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

.github/workflows/build.yml

@@ -47,6 +47,8 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2-
+      - name: Check code formatting
+        run: mvn --no-transfer-progress spotless:check
       - name: Build with Maven
         run: mvn --no-transfer-progress package
 
@@ -68,5 +70,8 @@ jobs:
               path: ~/.m2
               key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
               restore-keys: ubuntu-latest-m2-
+        - name: Check code formatting
+          #Fail fast
+          run: mvn --no-transfer-progress spotless:check
         - name: Test with Maven
           run: mvn --no-transfer-progress verify

CONTRIBUTING.md

@@ -1,4 +1,5 @@
 # Contributing
+
 [![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors)
 ![GitHub issues by-label "help wanted"](https://img.shields.io/github/issues/WebGoat/WebGoat/help%20wanted.svg)
 ![GitHub issues by-label "good first issue"](https://img.shields.io/github/issues/WebGoat/WebGoat/good%20first%20issue.svg)
@@ -24,7 +25,7 @@ There are a couple of ways on how you can contribute to the project:
 Your PR is valuable to us, and to make sure we can integrate it smoothly, we have a few items for you to consider. In short:
 The minimum requirements for code contributions are:
 
-1. The code _must_ be compliant with the configured Checkstyle and PMD rules.
+1. The code _must_ be compliant with the configured Java Google Formatter, Checkstyle and PMD rules.
 2. All new and changed code _should_ have a corresponding unit and/or integration test.
 3. New and changed lessons _must_ have a corresponding integration test.
 4. [Status checks](https://docs.github.com/en/github/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) should pass for your last commit.
@@ -38,7 +39,6 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
 * If you are making spelling corrections in the docs, don't modify other files.
 * If you are adding new functions don't '*cleanup*' unrelated functions. That cleanup belongs in another pull request.
 
-
 ### Write a good commit message
 
 * Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
@@ -69,12 +69,19 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
    ```
 
    See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
+
 5. Choose what to work on, based on any of the outstanding [issues](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues").
+
 6. Create a branch so that you can cleanly work on the chosen issue: `git checkout -b FixingIssue66`
+
 7. Open your favorite editor and start making modifications. We recommend using the [IntelliJ Idea](https://www.jetbrains.com/idea/).
+
 8. After your modifications are done, push them to your forked repository. This can be done by executing the command `git add MYFILE` for every file you have modified, followed by `git commit -m 'your commit message here'` to commit the modifications and `git push` to push your modifications to GitHub.
+
 9. Create a Pull Request (PR) by going to your fork, <https://github.com/Your_Github_Handle/WebGoat> and click on the "New Pull Request" button. The target branch should typically be the Master branch. When submitting a PR, be sure to follow the checklist that is provided in the PR template. The checklist itself will be filled out by the reviewer.
+
 10. Your PR will be reviewed and comments may be given. In order to process a comment, simply make modifications to the same branch as before and push them to your repository. GitHub will automatically detect these changes and add them to your existing PR.
+
 11. When starting on a new PR in the future, make sure to always keep your local repo up to date:
 
     ```bash

CREATE_RELEASE.md

@@ -1,6 +1,5 @@
 ## Release WebGoat
 
-
 ### Version numbers
 
 For WebGoat we use milestone releases first before we release the official version, we use `v8.0.0.M3` while tagging
@@ -8,6 +7,7 @@ For WebGoat we use milestone releases first before we release the official versi
 `v8.0.0` in the `pom.xml`
 
 ### Release notes:
+
 Update the release notes with the correct version. Use `git shortlog -s -n --since "SEP 31 2019"` for the list of
 committers.
 
@@ -30,5 +30,3 @@ git push --tags
 Now Travis takes over and will create the release in Github and on Docker Hub.
 
 NOTE: the `mvn versions:set` command above is just there to make sure the master branch contains the latest version
-
-

README.md

@@ -44,7 +44,6 @@ docker run -it -p 127.0.0.1:8080:8080 -p 127.0.0.1:9090:9090 -e TZ=Europe/Amster
 
 **Important**: *Choose the correct timezone, so that the docker container and your host are in the same timezone. As it is important for the validity of JWT tokens used in certain exercises.*
 
-
 ## 2. Standalone
 
 Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
@@ -93,11 +92,11 @@ Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
 ./mvnw.cmd spring-boot:run
 
 ```
+
 ... you should be running WebGoat on http://localhost:8080/WebGoat momentarily.
 
 Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed.
 
-
 To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file:
 
 ```
@@ -109,6 +108,7 @@ server.address=x.x.x.x
 For specialist only. There is a way to set up WebGoat with a personalized menu. You can leave out some menu categories or individual lessons by setting certain environment variables.
 
 For instance running as a jar on a Linux/macOS it will look like this:
+
 ```Shell
 export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
 export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations"
@@ -120,3 +120,4 @@ Or in a docker run it would (once this version is pushed into docker hub) look l
 ```Shell
 docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
 ```
+

RELEASE_NOTES.md

@@ -6,9 +6,9 @@
 
 - New year's resolution: major refactoring of WebGoat to simplify the setup and improve building times.
 - Move away from multi-project setup:
-  - This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
+  * This has a huge performance benefit when building the application. Build time locally is now `Total time:  42.469 s` (depends on your local machine of course)
-  - No longer add Maven dependencies in several places
+  * No longer add Maven dependencies in several places
-  - H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure the correct database connection.
+  * H2 no longer needs to run as separate process, which solves the issue of WebWolf sharing and needing to configure the correct database connection.
 - More explicit paths in html files to reference `adoc` files, less magic.
 - Integrate WebWolf in WebGoat, the setup was way too complicated and needed configuration which could lead to mistakes and a not working application. This also simplifies the Docker configuration as there is only 1 Docker image.
 - Add WebWolf button in WebGoat
@@ -43,14 +43,12 @@
 - [#1031 SQL Injection (intro) 5: Data Control Language (DCL) the wiki's solution is not correct](https://github.com/WebGoat/WebGoat/issues/1031)
 - [#1027 Webgoat 8.2.1 Vulnerable_Components_12 Shows internal server error](https://github.com/WebGoat/WebGoat/issues/1027)
 
-
 ## Version 8.2.1
 
 ### New functionality
 
 - New Docker image for arm64 architecture is now available (for Apple M1)
 
-
 ## Version 8.2.0
 
 ### New functionality
@@ -89,7 +87,6 @@ Special thanks to the following contributors providing us with a pull request:
 - NatasG
 - gabe-sky
 
-
 ## Version 8.1.0
 
 ### New functionality
@@ -132,9 +129,5 @@ Special thanks to the following contributors providing us with a pull request:
 
 And everyone who provided feedback through Github.
 
-
 Team WebGoat
 
-
-
-

docs/README.md

@@ -2,4 +2,3 @@
 
 Old GitHub page which now redirects to OWASP website.
 
-

pom.xml

@@ -1,23 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
-    <groupId>org.owasp.webgoat</groupId>
-    <artifactId>webgoat</artifactId>
-    <packaging>jar</packaging>
-    <version>8.2.3-SNAPSHOT</version>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>2.7.1</version>
   </parent>
+  <groupId>org.owasp.webgoat</groupId>
+  <artifactId>webgoat</artifactId>
+  <version>8.2.3-SNAPSHOT</version>
+  <packaging>jar</packaging>
 
   <name>WebGoat</name>
   <description>WebGoat, a deliberately insecure Web Application</description>
-    <inceptionYear>2006</inceptionYear>
   <url>https://github.com/WebGoat/WebGoat</url>
+  <inceptionYear>2006</inceptionYear>
   <organization>
     <name>OWASP</name>
     <url>https://github.com/WebGoat/WebGoat/</url>
@@ -61,17 +60,17 @@
     <developer>
       <id>jwayman</id>
       <name>Jeff Wayman</name>
-            <email/>
+      <email></email>
     </developer>
     <developer>
       <id>dcowden</id>
       <name>Dave Cowden</name>
-            <email/>
+      <email></email>
     </developer>
     <developer>
       <id>lawson89</id>
       <name>Richard Lawson</name>
-            <email/>
+      <email></email>
     </developer>
     <developer>
       <id>dougmorato</id>
@@ -97,10 +96,10 @@
   </mailingLists>
 
   <scm>
-        <url>https://github.com/WebGoat/WebGoat</url>
     <connection>scm:git:git@github.com:WebGoat/WebGoat.git</connection>
     <developerConnection>scm:git:git@github.com:WebGoat/WebGoat.git</developerConnection>
     <tag>HEAD</tag>
+    <url>https://github.com/WebGoat/WebGoat</url>
   </scm>
 
   <issueManagement>
@@ -109,41 +108,43 @@
   </issueManagement>
 
   <properties>
-        <!-- Use UTF-8 Encoding -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <java.version>17</java.version>
-        <webgoat.port>8080</webgoat.port>
-        <webwolf.port>9090</webwolf.port>
 
     <!-- Shared properties with plugins and version numbers across submodules-->
     <asciidoctorj.version>2.5.3</asciidoctorj.version>
     <bootstrap.version>3.3.7</bootstrap.version>
-        <cglib.version>2.2</cglib.version> <!-- do not update necessary for lesson -->
+    <cglib.version>2.2</cglib.version>
+    <!-- do not update necessary for lesson -->
     <checkstyle.version>3.1.2</checkstyle.version>
     <commons-collections.version>3.2.1</commons-collections.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
     <commons-io.version>2.6</commons-io.version>
+    <commons-lang3.version>3.12.0</commons-lang3.version>
     <commons-text.version>1.9</commons-text.version>
     <guava.version>30.1-jre</guava.version>
+    <java.version>17</java.version>
     <jjwt.version>0.9.1</jjwt.version>
     <jose4j.version>0.7.6</jose4j.version>
-        <jsoup.version>1.14.3</jsoup.version>
     <jquery.version>3.5.1</jquery.version>
+    <jsoup.version>1.14.3</jsoup.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
     <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
     <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
     <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <pmd.version>3.15.0</pmd.version>
+    <!-- Use UTF-8 Encoding -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
     <webdriver.version>4.3.1</webdriver.version>
+    <webgoat.port>8080</webgoat.port>
+    <webwolf.port>9090</webwolf.port>
     <wiremock.version>2.27.2</wiremock.version>
     <xml-resolver.version>1.2</xml-resolver.version>
-        <xstream.version>1.4.5</xstream.version> <!-- do not update necessary for lesson -->
+    <xstream.version>1.4.5</xstream.version>
+    <!-- do not update necessary for lesson -->
     <zxcvbn.version>1.5.2</zxcvbn.version>
   </properties>
 
@@ -250,133 +251,6 @@
     </dependencies>
   </dependencyManagement>
 
-    <profiles>
-        <profile>
-            <id>local-server</id>
-        </profile>
-        <profile>
-            <id>start-server</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>reserve-container-port</id>
-                                <goals>
-                                    <goal>reserve-network-port</goal>
-                                </goals>
-                                <phase>process-resources</phase>
-                                <configuration>
-                                    <portNames>
-                                        <portName>webgoat.port</portName>
-                                        <portName>webwolf.port</portName>
-                                        <portName>jmxPort</portName>
-                                    </portNames>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.bazaarvoice.maven.plugins</groupId>
-                        <artifactId>process-exec-maven-plugin</artifactId>
-                        <version>0.9</version>
-                        <executions>
-                            <execution>
-                                <id>start-jar</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                                <configuration>
-                                    <workingDir>${project.build.directory}</workingDir>
-                                    <arguments>
-                                        <argument>java</argument>
-                                        <argument>-jar</argument>
-                                        <argument>-Dlogging.pattern.console=</argument>
-                                        <argument>-Dspring.main.banner-mode=off</argument>
-                                        <argument>-Dspring.datasource.url=jdbc:hsqldb:file:${java.io.tmpdir}/webgoat
-                                        </argument>
-                                        <argument>-Dwebgoat.port=${webgoat.port}</argument>
-                                        <argument>-Dwebwolf.port=${webwolf.port}</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.base/java.lang=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.base/java.util=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.base/java.lang.reflect=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.base/java.text=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.desktop/java.beans=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.desktop/java.awt.font=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.base/java.io=ALL-UNNAMED</argument>
-                                        <argument>--add-opens</argument>
-                                        <argument>java.base/java.util=ALL-UNNAMED</argument>
-                                        <argument>
-                                            ${project.build.directory}/webgoat-${project.version}.jar
-                                        </argument>
-                                    </arguments>
-                                    <waitForInterrupt>false</waitForInterrupt>
-                                    <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/</healthcheckUrl>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>stop-jar-process</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop-all</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>owasp</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.owasp</groupId>
-                        <artifactId>dependency-check-maven</artifactId>
-                        <version>6.5.1</version>
-                        <configuration>
-                            <failBuildOnCVSS>7</failBuildOnCVSS>
-                            <skipProvidedScope>false</skipProvidedScope>
-                            <skipRuntimeScope>false</skipRuntimeScope>
-                            <suppressionFiles>
-                                <!--suppress UnresolvedMavenProperty -->
-                                <suppressionFile>
-                                    ${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml
-                                </suppressionFile>
-                            </suppressionFiles>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-
   <dependencies>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -521,18 +395,30 @@
     </dependency>
   </dependencies>
 
+  <repositories>
+    <repository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <url>https://repo.maven.apache.org/maven2</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>central</id>
+      <url>https://repo.maven.apache.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
+
   <build>
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
         <configuration>
           <excludeDevtools>true</excludeDevtools>
           <executable>true</executable>
@@ -545,6 +431,13 @@
             </dependency>
           </requiresUnpack>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -552,10 +445,10 @@
         <executions>
           <execution>
             <id>add-integration-test-source-as-test-sources</id>
-                        <phase>generate-test-sources</phase>
             <goals>
               <goal>add-test-source</goal>
             </goals>
+            <phase>generate-test-sources</phase>
             <configuration>
               <sources>
                 <source>src/it/java</source>
@@ -594,9 +487,10 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${maven-surefire-plugin.version}</version>
         <configuration>
-                    <argLine>
+          <argLine>--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                        --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED
-                    </argLine>
+                        --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED</argLine>
           <excludes>
             <exclude>**/*IntegrationTest.java</exclude>
             <exclude>src/it/java</exclude>
@@ -617,6 +511,62 @@
           <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.29.0</version>
+        <configuration>
+          <formats>
+            <format>
+              <includes>
+                <include>.gitignore</include>
+              </includes>
+              <trimTrailingWhitespace></trimTrailingWhitespace>
+              <endWithNewline></endWithNewline>
+              <indent>
+                <tabs>true</tabs>
+                <spacesPerTab>4</spacesPerTab>
+              </indent>
+            </format>
+          </formats>
+          <markdown>
+            <includes>
+              <include>**/*.md</include>
+            </includes>
+            <flexmark></flexmark>
+          </markdown>
+          <java>
+            <removeUnusedImports></removeUnusedImports>
+            <googleJavaFormat>
+              <style>GOOGLE</style>
+              <reflowLongStrings>true</reflowLongStrings>
+            </googleJavaFormat>
+          </java>
+          <pom>
+            <sortPom>
+              <encoding>UTF-8</encoding>
+              <lineSeparator>${line.separator}</lineSeparator>
+              <expandEmptyElements>true</expandEmptyElements>
+              <spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement>
+              <keepBlankLines>true</keepBlankLines>
+              <nrOfIndentSpace>2</nrOfIndentSpace>
+              <indentBlankLines>false</indentBlankLines>
+              <indentSchemaLocation>false</indentSchemaLocation>
+              <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+              <sortProperties>true</sortProperties>
+              <sortModules>true</sortModules>
+              <sortExecutions>true</sortExecutions>
+            </sortPom>
+          </pom>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -624,10 +574,10 @@
         <executions>
           <execution>
             <id>restrict-log4j-versions</id>
-                        <phase>validate</phase>
             <goals>
               <goal>enforce</goal>
             </goals>
+            <phase>validate</phase>
             <configuration>
               <rules>
                 <bannedDependencies>
@@ -652,23 +602,125 @@
     </plugins>
   </build>
 
-    <repositories>
+  <profiles>
-        <repository>
+    <profile>
-            <id>central</id>
+      <id>local-server</id>
-            <url>https://repo.maven.apache.org/maven2</url>
+    </profile>
-            <snapshots>
+    <profile>
-                <enabled>false</enabled>
+      <id>start-server</id>
-            </snapshots>
+      <activation>
-        </repository>
+        <activeByDefault>true</activeByDefault>
-    </repositories>
+      </activation>
-    <pluginRepositories>
+      <build>
-        <pluginRepository>
+        <plugins>
-            <id>central</id>
+          <plugin>
-            <url>https://repo.maven.apache.org/maven2</url>
+            <groupId>org.codehaus.mojo</groupId>
-            <snapshots>
+            <artifactId>build-helper-maven-plugin</artifactId>
-                <enabled>false</enabled>
+            <executions>
-            </snapshots>
+              <execution>
-        </pluginRepository>
+                <id>reserve-container-port</id>
-    </pluginRepositories>
+                <goals>
+                  <goal>reserve-network-port</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <portNames>
+                    <portName>webgoat.port</portName>
+                    <portName>webwolf.port</portName>
+                    <portName>jmxPort</portName>
+                  </portNames>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>com.bazaarvoice.maven.plugins</groupId>
+            <artifactId>process-exec-maven-plugin</artifactId>
+            <version>0.9</version>
+            <executions>
+              <execution>
+                <id>start-jar</id>
+                <goals>
+                  <goal>start</goal>
+                </goals>
+                <phase>pre-integration-test</phase>
+                <configuration>
+                  <workingDir>${project.build.directory}</workingDir>
+                  <arguments>
+                    <argument>java</argument>
+                    <argument>-jar</argument>
+                    <argument>-Dlogging.pattern.console=</argument>
+                    <argument>-Dspring.main.banner-mode=off</argument>
+                    <argument>-Dspring.datasource.url=jdbc:hsqldb:file:${java.io.tmpdir}/webgoat</argument>
+                    <argument>-Dwebgoat.port=${webgoat.port}</argument>
+                    <argument>-Dwebwolf.port=${webwolf.port}</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.base/java.lang=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.base/java.util=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.base/java.lang.reflect=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.base/java.text=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.desktop/java.beans=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.desktop/java.awt.font=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.base/sun.nio.ch=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.base/java.io=ALL-UNNAMED</argument>
+                    <argument>--add-opens</argument>
+                    <argument>java.base/java.util=ALL-UNNAMED</argument>
+                    <argument>${project.build.directory}/webgoat-${project.version}.jar</argument>
+                  </arguments>
+                  <waitForInterrupt>false</waitForInterrupt>
+                  <healthcheckUrl>http://localhost:${webgoat.port}/WebGoat/</healthcheckUrl>
+                </configuration>
+              </execution>
+              <execution>
+                <id>stop-jar-process</id>
+                <goals>
+                  <goal>stop-all</goal>
+                </goals>
+                <phase>post-integration-test</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>owasp</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.owasp</groupId>
+            <artifactId>dependency-check-maven</artifactId>
+            <version>6.5.1</version>
+            <configuration>
+              <failBuildOnCVSS>7</failBuildOnCVSS>
+              <skipProvidedScope>false</skipProvidedScope>
+              <skipRuntimeScope>false</skipRuntimeScope>
+              <suppressionFiles>
+                <!--suppress UnresolvedMavenProperty -->
+                <suppressionFile>${maven.multiModuleProjectDirectory}/config/dependency-check/project-suppression.xml</suppressionFile>
+              </suppressionFiles>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>

robot/README.md

@@ -16,3 +16,4 @@ Then see security settings and allow the file to run
         pip install robotframework-SeleniumLibrary
         pip install webdriver-manager
         robot --variable HEADLESS:"0" --variable ENDPOINT:"http://127.0.0.1:8080/WebGoat" goat.robot
+

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

@@ -1,13 +1,12 @@
 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;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 // TODO move back to lesson
@@ -28,12 +27,18 @@ public class VulnerableTaskHolder implements Serializable {
 
   @Override
   public String toString() {
-		return "VulnerableTaskHolder [taskName=" + taskName + ", taskAction=" + taskAction + ", requestedExecutionTime="
+    return "VulnerableTaskHolder [taskName="
-				+ requestedExecutionTime + "]";
+        + 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 {
@@ -44,8 +49,8 @@ public class VulnerableTaskHolder implements Serializable {
     log.info("restoring task: {}", taskName);
     log.info("restoring time: {}", requestedExecutionTime);
 
-		if (requestedExecutionTime!=null && 
+    if (requestedExecutionTime != null
-				(requestedExecutionTime.isBefore(LocalDateTime.now().minusMinutes(10))
+        && (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());
@@ -58,8 +63,7 @@ public class VulnerableTaskHolder implements Serializable {
       log.info("about to execute: {}", taskAction);
       try {
         Process p = Runtime.getRuntime().exec(taskAction);
-            BufferedReader in = new BufferedReader(
+        BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
-                                new InputStreamReader(p.getInputStream()));
         String line = null;
         while ((line = in.readLine()) != null) {
           log.info(line);
@@ -68,7 +72,5 @@ public class VulnerableTaskHolder implements Serializable {
         log.error("IO Exception", e);
       }
     }
-       
   }
-	
 }

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

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

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

@@ -1,37 +1,47 @@
-
 /**
  * ************************************************************************************************
  * 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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
+ *
  * <p>
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since December 12, 2015
  */
-
 package org.owasp.webgoat.container;
 
+import static org.asciidoctor.Asciidoctor.Factory.create;
+
 import io.undertow.util.Headers;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.asciidoctor.Asciidoctor;
 import org.asciidoctor.extension.JavaExtensionRegistry;
@@ -46,22 +56,10 @@ import org.thymeleaf.templateresolver.FileTemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import 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>
+ * <p><code>
  * <div th:replace="doc:AccessControlMatrix_plan.adoc"></div>
  * </code>
  */
@@ -81,7 +79,13 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
   }
 
   @Override
-    protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+  protected ITemplateResource computeTemplateResource(
+      IEngineConfiguration configuration,
+      String ownerTemplate,
+      String template,
+      String resourceName,
+      String characterEncoding,
+      Map<String, Object> templateResolutionAttributes) {
     var templateName = resourceName.substring(PREFIX.length());
     log.debug("template used: {}", templateName);
     try (InputStream is = getInputStream(templateName)) {
@@ -97,14 +101,18 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
       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>");
+      return new StringTemplateResource(
+          "<div>Unable to find documentation for: " + templateName + " </div>");
     }
   }
 
   private InputStream getInputStream(String templateName) throws IOException {
     log.debug("locale: {}", language.getLocale().getLanguage());
-        String computedResourceName = computeResourceName(templateName, language.getLocale().getLanguage());
+    String computedResourceName =
-        if (resourceLoader.getResource("classpath:/" + computedResourceName).isReadable()/*isFile()*/) {
+        computeResourceName(templateName, language.getLocale().getLanguage());
+    if (resourceLoader
+        .getResource("classpath:/" + computedResourceName)
+        .isReadable() /*isFile()*/) {
       log.debug("localized file exists");
       return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream();
     } else {
@@ -112,6 +120,7 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
       return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
     }
   }
+
   private String computeResourceName(String resourceName, String language) {
     String computedResourceName;
     if (language.equals("en")) {
@@ -120,7 +129,9 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
       computedResourceName = resourceName.replace(".adoc", "_".concat(language).concat(".adoc"));
     }
     log.debug("computed local file name: {}", computedResourceName);
-        log.debug("file exists: {}",resourceLoader.getResource("classpath:/"+computedResourceName).isReadable());
+    log.debug(
+        "file exists: {}",
+        resourceLoader.getResource("classpath:/" + computedResourceName).isReadable());
     return computedResourceName;
   }
 
@@ -138,9 +149,12 @@ public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
   }
 
   private String determineLanguage() {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+    HttpServletRequest request =
+        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
 
-        Locale browserLocale = (Locale) request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
+    Locale browserLocale =
+        (Locale)
+            request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
     if (null != browserLocale) {
       log.debug("browser locale {}", browserLocale);
       return browserLocale.getLanguage();

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

@@ -1,5 +1,8 @@
 package org.owasp.webgoat.container;
 
+import java.util.Map;
+import java.util.function.Function;
+import javax.sql.DataSource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
@@ -11,10 +14,6 @@ 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
@@ -35,14 +34,14 @@ public class DatabaseConfiguration {
   }
 
   /**
-     * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users and 1 for lesson
+   * Define 2 Flyway instances, 1 for WebGoat itself which it uses for internal storage like users
-     * specific tables we use. This way we clean the data in the lesson database quite easily see {@link RestartLessonService#restartLesson()}
+   * and 1 for lesson specific tables we use. This way we clean the data in the lesson database
-     * for how we clean the lesson related tables.
+   * quite easily see {@link RestartLessonService#restartLesson()} for how we clean the lesson
+   * related tables.
    */
   @Bean(initMethod = "migrate")
   public Flyway flyWayContainer() {
-        return Flyway
+    return Flyway.configure()
-                .configure()
         .configuration(Map.of("driver", properties.getDriverClassName()))
         .dataSource(dataSource())
         .schemas("container")
@@ -52,8 +51,8 @@ public class DatabaseConfiguration {
 
   @Bean
   public Function<String, Flyway> flywayLessons(LessonDataSource lessonDataSource) {
-        return schema -> Flyway
+    return schema ->
-                .configure()
+        Flyway.configure()
             .configuration(Map.of("driver", properties.getDriverClassName()))
             .schemas(schema)
             .dataSource(lessonDataSource)

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

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

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

@@ -1,15 +1,14 @@
 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;
+import javax.sql.DataSource;
+import org.owasp.webgoat.container.lessons.LessonConnectionInvocationHandler;
+import org.springframework.jdbc.datasource.ConnectionProxy;
 
 public class LessonDataSource implements DataSource {
 
@@ -22,7 +21,8 @@ public class LessonDataSource implements DataSource {
   @Override
   public Connection getConnection() throws SQLException {
     var targetConnection = originalDataSource.getConnection();
-        return (Connection) Proxy.newProxyInstance(
+    return (Connection)
+        Proxy.newProxyInstance(
             ConnectionProxy.class.getClassLoader(),
             new Class[] {ConnectionProxy.class},
             new LessonConnectionInvocationHandler(targetConnection));

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

@@ -1,36 +1,41 @@
 /**
  * ************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
-
 package org.owasp.webgoat.container;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.IEngineConfiguration;
@@ -38,20 +43,13 @@ 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:
+ * Dynamically resolve a lesson. In the html file this can be invoked as: <code>
- *
- * <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
+ * <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 {
@@ -66,12 +64,22 @@ public class LessonTemplateResolver extends FileTemplateResolver {
   }
 
   @Override
-    protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+  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();
+        resource =
+            resourceLoader
+                .getResource("classpath:/" + templateName)
+                .getInputStream()
+                .readAllBytes();
       } catch (IOException e) {
         log.error("Unable to find lesson HTML: {}", template);
       }

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

@@ -1,36 +1,40 @@
 /**
  * ************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
-
 package org.owasp.webgoat.container;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Set;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.i18n.Language;
@@ -62,14 +66,7 @@ import org.thymeleaf.templateresolver.ITemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
 import org.thymeleaf.templateresource.StringTemplateResource;
 
-import java.io.IOException;
+/** Configuration for Spring MVC */
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Configuration for Spring MVC
- */
 @Configuration
 @RequiredArgsConstructor
 @Slf4j
@@ -98,15 +95,24 @@ public class MvcConfiguration implements WebMvcConfigurer {
   /**
    * Responsible for loading lesson templates based on Thymeleaf, for example:
    *
-     * <div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
+   * <p><div th:include="/lessons/spoofcookie/templates/spoofcookieform.html" id="content"></div>
    */
   @Bean
   public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
-        var resolver = new FileTemplateResolver() {
+    var resolver =
+        new FileTemplateResolver() {
           @Override
-            protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) {
+          protected ITemplateResource computeTemplateResource(
-               try (var is = resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
+              IEngineConfiguration configuration,
-                    return new StringTemplateResource(new String(is.readAllBytes(), StandardCharsets.UTF_8));
+              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;
             }
@@ -116,9 +122,7 @@ public class MvcConfiguration implements WebMvcConfigurer {
     return resolver;
   }
 
-    /**
+  /** Loads all normal WebGoat specific Thymeleaf templates */
-     * Loads all normal WebGoat specific Thymeleaf templates
-     */
   @Bean
   public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
     SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
@@ -131,9 +135,7 @@ public class MvcConfiguration implements WebMvcConfigurer {
     return resolver;
   }
 
-    /**
+  /** Loads the html for the complete lesson, see lesson_content.html */
-     * Loads the html for the complete lesson, see lesson_content.html
-     */
   @Bean
   public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) {
     LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
@@ -143,13 +145,13 @@ public class MvcConfiguration implements WebMvcConfigurer {
     return resolver;
   }
 
-    /**
+  /** Loads the lesson asciidoc. */
-     * Loads the lesson asciidoc.
-     */
   @Bean
-    public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) {
+  public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(
+      Language language, ResourceLoader resourceLoader) {
     log.debug("template locale {}", language);
-        AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(language, resourceLoader);
+    AsciiDoctorTemplateResolver resolver =
+        new AsciiDoctorTemplateResolver(language, resourceLoader);
     resolver.setCacheable(false);
     resolver.setOrder(1);
     resolver.setCharacterEncoding(UTF8);
@@ -157,7 +159,8 @@ public class MvcConfiguration implements WebMvcConfigurer {
   }
 
   @Bean
-    public SpringTemplateEngine thymeleafTemplateEngine(ITemplateResolver springThymeleafTemplateResolver,
+  public SpringTemplateEngine thymeleafTemplateEngine(
+      ITemplateResolver springThymeleafTemplateResolver,
       LessonTemplateResolver lessonTemplateResolver,
       AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
       ITemplateResolver lessonThymeleafTemplateResolver) {
@@ -165,7 +168,11 @@ public class MvcConfiguration implements WebMvcConfigurer {
     engine.setEnableSpringELCompiler(true);
     engine.addDialect(new SpringSecurityDialect());
     engine.setTemplateResolvers(
-                Set.of(lessonTemplateResolver, asciiDoctorTemplateResolver, lessonThymeleafTemplateResolver, springThymeleafTemplateResolver));
+        Set.of(
+            lessonTemplateResolver,
+            asciiDoctorTemplateResolver,
+            lessonThymeleafTemplateResolver,
+            springThymeleafTemplateResolver));
     return engine;
   }
 
@@ -173,22 +180,40 @@ public class MvcConfiguration implements WebMvcConfigurer {
   public void addResourceHandlers(ResourceHandlerRegistry registry) {
     // WebGoat internal
     registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/");
-        registry.addResourceHandler("/js/**")
+    registry.addResourceHandler("/js/**").addResourceLocations("classpath:/webgoat/static/js/");
-                .addResourceLocations("classpath:/webgoat/static/js/");
+    registry
-        registry.addResourceHandler("/plugins/**").addResourceLocations("classpath:/webgoat/static/plugins/");
+        .addResourceHandler("/plugins/**")
-        registry.addResourceHandler("/fonts/**").addResourceLocations("classpath:/webgoat/static/fonts/");
+        .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
-        registry.addResourceHandler("/lesson_js/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/js/").toArray(String[]::new));
+        .addResourceHandler("/images/**")
-        registry.addResourceHandler("/lesson_css/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/css/").toArray(String[]::new));
+        .addResourceLocations(
-        registry.addResourceHandler("/lesson_templates/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/templates/").toArray(String[]::new));
+            lessonScanner.applyPattern("classpath:/lessons/%s/images/").toArray(String[]::new));
-        registry.addResourceHandler("/video/**").addResourceLocations(lessonScanner.applyPattern("classpath:/lessons/%s/video/").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,
+  public PluginMessages pluginMessages(
-                                         ResourcePatternResolver resourcePatternResolver) {
+      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
     PluginMessages pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
     pluginMessages.setDefaultEncoding("UTF-8");
     pluginMessages.setBasenames("i18n/WebGoatLabels");
@@ -232,5 +257,4 @@ public class MvcConfiguration implements WebMvcConfigurer {
   public LabelDebugger labelDebugger() {
     return new LabelDebugger();
   }
-
 }

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

@@ -1,36 +1,37 @@
 /**
  * ************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
-
 package org.owasp.webgoat.container;
 
+import java.io.File;
 import org.owasp.webgoat.container.session.UserSessionData;
 import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.beans.factory.annotation.Value;
@@ -43,8 +44,6 @@ 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")

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

@@ -2,36 +2,35 @@
  * ************************************************************************************************
  * 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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * 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.i18n.Language;
 import org.owasp.webgoat.container.users.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -44,11 +43,8 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
-/**
+/** Security configuration for WebGoat. */
- * Security configuration for WebGoat.
- */
 @Configuration
 @AllArgsConstructor
 @EnableWebSecurity
@@ -58,19 +54,29 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
   @Override
   protected void configure(HttpSecurity http) throws Exception {
-        ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security = http
+    ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry security =
-                .authorizeRequests()
+        http.authorizeRequests()
-                .antMatchers("/css/**", "/images/**", "/js/**", "fonts/**", "/plugins/**", "/registration", "/register.mvc", "/actuator/**").permitAll()
+            .antMatchers(
-                .anyRequest().authenticated();
+                "/css/**",
-        security.and()
+                "/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()
+    security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
-                .logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
     security.and().csrf().disable();
 
     http.headers().cacheControl().disable();

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

@@ -7,7 +7,8 @@ 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)
+ * Make environment available in the asciidoc code (which you cannot inject because it is handled by
+ * the framework)
  */
 @Component
 public class EnvironmentExposure implements ApplicationContextAware {

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

@@ -1,10 +1,9 @@
 package org.owasp.webgoat.container.asciidoc;
 
+import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
-import java.util.Map;
-
 public class OperatingSystemMacro extends InlineMacroProcessor {
 
   public OperatingSystemMacro(String macroName) {
@@ -19,7 +18,8 @@ public class OperatingSystemMacro extends InlineMacroProcessor {
   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
+    // see
+    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
     return createPhraseNode(contentNode, "quoted", osName);
   }
 }

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

@@ -1,12 +1,11 @@
 package org.owasp.webgoat.container.asciidoc;
 
+import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import java.util.Map;
-
 public class UsernameMacro extends InlineMacroProcessor {
 
   public UsernameMacro(String macroName) {
@@ -25,7 +24,8 @@ public class UsernameMacro extends InlineMacroProcessor {
       username = webGoatUser.getUsername();
     }
 
-        //see https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
+    // see
+    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
     return createPhraseNode(contentNode, "quoted", username);
   }
 }

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

@@ -1,10 +1,9 @@
 package org.owasp.webgoat.container.asciidoc;
 
+import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
-import java.util.Map;
-
 public class WebGoatTmpDirMacro extends InlineMacroProcessor {
 
   public WebGoatTmpDirMacro(String macroName) {
@@ -19,8 +18,8 @@ public class WebGoatTmpDirMacro extends InlineMacroProcessor {
   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
+    // see
+    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
     return createPhraseNode(contentNode, "quoted", env);
-
   }
 }

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

@@ -1,10 +1,9 @@
 package org.owasp.webgoat.container.asciidoc;
 
+import java.util.Map;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 
-import java.util.Map;
-
 public class WebGoatVersionMacro extends InlineMacroProcessor {
 
   public WebGoatVersionMacro(String macroName) {
@@ -19,7 +18,8 @@ public class WebGoatVersionMacro extends InlineMacroProcessor {
   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
+    // see
+    // https://discuss.asciidoctor.org/How-to-create-inline-macro-producing-HTML-In-AsciidoctorJ-td8313.html for why quoted is used
     return createPhraseNode(contentNode, "quoted", webgoatVersion);
   }
 }

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

@@ -1,18 +1,17 @@
 package org.owasp.webgoat.container.asciidoc;
 
+import java.util.HashMap;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
 import org.asciidoctor.ast.ContentNode;
 import org.asciidoctor.extension.InlineMacroProcessor;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-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
+ * <p>webWolfLink:here[] will display a href with here as text
  */
 public class WebWolfMacro extends InlineMacroProcessor {
 
@@ -48,14 +47,15 @@ public class WebWolfMacro extends InlineMacroProcessor {
   }
 
   /**
-     * Determine the host from the hostname and ports that were used.
+   * Determine the host from the hostname and ports that were used. The purpose is to make it
-     * The purpose is to make it possible to use the application behind a reverse proxy. For instance in the docker
+   * possible to use the application behind a reverse proxy. For instance in the docker
-     * compose/stack version with webgoat webwolf and nginx proxy.
+   * compose/stack version with webgoat webwolf and nginx proxy. You do not have to use the
-     * You do not have to use the indicated hostname, but if you do, you should define two hosts aliases
+   * indicated hostname, but if you do, you should define two hosts aliases 127.0.0.1
-     * 127.0.0.1 www.webgoat.local www.webwolf.local
+   * www.webgoat.local www.webwolf.local
    */
   private String determineHost(String port) {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+    HttpServletRequest request =
+        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
     String host = request.getHeader("Host");
     int semicolonIndex = host.indexOf(":");
     if (semicolonIndex == -1 || host.endsWith(":80")) {

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

@@ -4,9 +4,9 @@ import java.util.Map;
 
 /**
  * Usage in asciidoc:
- * <p>
+ *
- * webWolfLink:here[] will display a href with here as text
+ * <p>webWolfLink:here[] will display a href with here as text webWolfLink:landing[noLink] will
- * webWolfLink:landing[noLink] will display the complete url, for example: http://WW_HOST:WW_PORT/landing
+ * display the complete url, for example: http://WW_HOST:WW_PORT/landing
  */
 public class WebWolfRootMacro extends WebWolfMacro {
 

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

@@ -35,13 +35,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 public abstract class AssignmentEndpoint implements Initializeable {
 
-    @Autowired
+  @Autowired private WebSession webSession;
-    private WebSession webSession;
+  @Autowired private UserSessionData userSessionData;
-    @Autowired
+  @Getter @Autowired private PluginMessages messages;
-    private UserSessionData userSessionData;
-    @Getter
-    @Autowired
-    private PluginMessages messages;
 
   protected WebSession getWebSession() {
     return webSession;
@@ -53,32 +49,38 @@ public abstract class AssignmentEndpoint implements Initializeable {
 
   /**
    * Convenience method for create a successful result:
-     * <p>
+   *
-     * - Assignment is set to solved
+   * <p>- Assignment is set to solved - Feedback message is set to 'assignment.solved'
-     * - Feedback message is set to 'assignment.solved'
+   *
-     * <p>
+   * <p>Of course you can overwrite these values in a specific lesson
-     * 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);
+    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
+   * <p>- Assignment is set to not solved - Feedback message is set to 'assignment.not.solved'
-     * - Feedback message is set to 'assignment.not.solved'
+   *
-     * <p>
+   * <p>Of course you can overwrite these values in a specific lesson
-     * 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);
+    return AttackResult.builder(messages)
+        .lessonCompleted(false)
+        .attemptWasMade()
+        .feedback("assignment.not.solved")
+        .assignment(assignment);
   }
 
   protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
@@ -86,6 +88,5 @@ public abstract class AssignmentEndpoint implements Initializeable {
   }
 
   @Override
-    public void initialize(WebGoatUser user) {
+  public void initialize(WebGoatUser user) {}
-    }
 }

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

@@ -5,9 +5,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
+/** Created by nbaars on 1/14/17. */
- * Created by nbaars on 1/14/17.
- */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentHints {

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

@@ -1,15 +1,12 @@
 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;
+import org.springframework.web.bind.annotation.RequestMethod;
 
-/**
+/** Created by nbaars on 1/14/17. */
- * Created by nbaars on 1/14/17.
- */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AssignmentPath {

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

@@ -25,14 +25,13 @@
 
 package org.owasp.webgoat.container.assignments;
 
+import static org.apache.commons.text.StringEscapeUtils.escapeJson;
+
 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;
@@ -86,7 +85,12 @@ public class AttackResult {
     }
 
     public AttackResult build() {
-            return new AttackResult(lessonCompleted, messages.getMessage(feedbackResourceBundleKey, feedbackArgs), messages.getMessage(output, output, outputArgs), assignment.getClass().getSimpleName(), attemptWasMade);
+      return new AttackResult(
+          lessonCompleted,
+          messages.getMessage(feedbackResourceBundleKey, feedbackArgs),
+          messages.getMessage(output, output, outputArgs),
+          assignment.getClass().getSimpleName(),
+          attemptWasMade);
     }
 
     public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
@@ -95,18 +99,18 @@ public class AttackResult {
     }
   }
 
-    @Getter
+  @Getter private boolean lessonCompleted;
-    private boolean lessonCompleted;
+  @Getter private String feedback;
-    @Getter
+  @Getter private String output;
-    private String feedback;
+  @Getter private final String assignment;
-    @Getter
+  @Getter private boolean attemptWasMade;
-    private String output;
-    @Getter
-    private final String assignment;
-    @Getter
-    private boolean attemptWasMade;
 
-    public AttackResult(boolean lessonCompleted, String feedback, String output, String assignment, 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);

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

@@ -39,25 +39,32 @@ public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
   private UserTrackerRepository userTrackerRepository;
   private WebSession webSession;
 
-    public LessonTrackerInterceptor(UserTrackerRepository userTrackerRepository, WebSession webSession) {
+  public LessonTrackerInterceptor(
+      UserTrackerRepository userTrackerRepository, WebSession webSession) {
     this.userTrackerRepository = userTrackerRepository;
     this.webSession = webSession;
   }
 
   @Override
-    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
+  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) {
+  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) {

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

@@ -1,36 +1,37 @@
 /**
  * ************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author WebGoat
  * @version $Id: $Id
  * @since October 28, 2003
  */
-
 package org.owasp.webgoat.container.controller;
 
+import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.session.Course;
 import org.owasp.webgoat.container.session.WebSession;
 import org.springframework.stereotype.Controller;
@@ -38,9 +39,6 @@ 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 {
 
@@ -53,11 +51,13 @@ public class StartLesson {
   }
 
   /**
-     * <p>start.</p>
+   * start.
    *
    * @return a {@link ModelAndView} object.
    */
-    @RequestMapping(path = "startlesson.mvc", method = {RequestMethod.GET, RequestMethod.POST})
+  @RequestMapping(
+      path = "startlesson.mvc",
+      method = {RequestMethod.GET, RequestMethod.POST})
   public ModelAndView start() {
     var model = new ModelAndView();
 
@@ -68,22 +68,23 @@ public class StartLesson {
     return model;
   }
 
-    @RequestMapping(value = {"*.lesson"}, produces = "text/html")
+  @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()
+    course.getLessons().stream()
-                .stream()
         .filter(l -> l.getId().equals(lessonName))
         .findFirst()
-                .ifPresent(lesson -> {
+        .ifPresent(
+            lesson -> {
               ws.setCurrentLesson(lesson);
               model.addObject("lesson", lesson);
             });
 
     return model;
   }
-
 }

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

@@ -1,45 +1,42 @@
 /**
  * ************************************************************************************************
  *
- *
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * 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
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * <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.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with this program; if
+ * <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.
  *
- * Getting Source ==============
+ * <p>Getting Source ==============
  *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author WebGoat
  * @since October 28, 2003
  * @version $Id: $Id
  */
-
 package org.owasp.webgoat.container.controller;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 /**
- * <p>Welcome class.</p>
+ * Welcome class.
  *
  * @author rlawson
  * @version $Id: $Id
@@ -50,7 +47,7 @@ public class Welcome {
   private static final String WELCOMED = "welcomed";
 
   /**
-     * <p>welcome.</p>
+   * welcome.
    *
    * @param request a {@link javax.servlet.http.HttpServletRequest} object.
    * @return a {@link org.springframework.web.servlet.ModelAndView} object.
@@ -71,5 +68,4 @@ public class Welcome {
     model.setViewName("forward:/attack?start=true");
     return model;
   }
-    
 }

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

@@ -25,15 +25,15 @@
 
 package org.owasp.webgoat.container.i18n;
 
+import java.util.Locale;
 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
+ * Wrapper around the LocaleResolver from Spring so we do not need to bother with passing the
- * when asking for a Locale.
+ * HttpRequest object when asking for a Locale.
  *
  * @author nbaars
  * @date 2/7/17
@@ -44,6 +44,7 @@ public class Language {
   private final LocaleResolver localeResolver;
 
   public Locale getLocale() {
-        return localeResolver.resolveLocale(((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
+    return localeResolver.resolveLocale(
+        ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
   }
 }

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

@@ -25,14 +25,13 @@
 
 package org.owasp.webgoat.container.i18n;
 
+import java.util.Properties;
 import lombok.AllArgsConstructor;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 
-import java.util.Properties;
-
 /**
- * <p>ExposedReloadableResourceMessageBundleSource class.</p>
+ * ExposedReloadableResourceMessageBundleSource class. Extends the reloadable message source with a
- * Extends the reloadable message source with a way to get all messages
+ * way to get all messages
  *
  * @author zupzup
  */

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

@@ -25,11 +25,10 @@
 
 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;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.core.io.support.ResourcePatternResolver;
 
 /**
  * Message resource bundle for plugins.
@@ -43,8 +42,8 @@ public class PluginMessages extends ReloadableResourceBundleMessageSource {
   private final Language language;
   private final ResourcePatternResolver resourcePatternResolver;
 
-
+  public PluginMessages(
-    public PluginMessages(Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
+      Messages messages, Language language, ResourcePatternResolver resourcePatternResolver) {
     this.language = language;
     this.setParentMessageSource(messages);
     this.setBasename("WebGoatLabels");
@@ -57,8 +56,9 @@ public class PluginMessages extends ReloadableResourceBundleMessageSource {
     long lastModified = System.currentTimeMillis();
 
     try {
-            var resources = resourcePatternResolver.getResources("classpath:/lessons/**/i18n" +
+      var resources =
-                    "/WebGoatLabels" + PROPERTIES_SUFFIX);
+          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);
@@ -71,7 +71,6 @@ public class PluginMessages extends ReloadableResourceBundleMessageSource {
     return new PropertiesHolder(properties, lastModified);
   }
 
-
   public Properties getMessages() {
     return getMergedProperties(language.getLocale()).getProperties();
   }

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

@@ -1,34 +1,34 @@
 package org.owasp.webgoat.container.lessons;
 
-import lombok.*;
-
-import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
+import javax.persistence.*;
+import lombok.*;
 
 /**
  * ************************************************************************************************
  * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
  * please see http://www.owasp.org/
- * <p>
+ *
- * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
+ *
  * <p>
  *
  * @author nbaars
@@ -43,11 +43,11 @@ public class Assignment {
   @Id
   @GeneratedValue(strategy = GenerationType.AUTO)
   private Long id;
+
   private String name;
   private String path;
 
-    @Transient
+  @Transient private List<String> hints;
-    private List<String> hints;
 
   private Assignment() {
     // Hibernate
@@ -59,11 +59,14 @@ public class Assignment {
 
   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");
+      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

@@ -4,30 +4,29 @@ import lombok.Getter;
 
 /**
  * *************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * utility. For details, please see http://www.owasp.org/
+ * please see http://www.owasp.org/
- * <p>
+ *
- * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- * <p>
+ *
- * This program is free software; you can redistribute it and/or modify it under
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * the terms of the GNU General Public License as published by the Free Software
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * Foundation; either version 2 of the License, or (at your option) any later
+ * License, or (at your option) any later version.
- * version.
+ *
- * <p>
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * This program is distributed in the hope that it will be useful, but WITHOUT
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * GNU General Public License for more details.
- * 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
- * <p>
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * You should have received a copy of the GNU General Public License along with
+ * 02111-1307, USA.
- * 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>
+ *
- * Getting Source ==============
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * <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>
@@ -35,7 +34,6 @@ import lombok.Getter;
  * @since October 28, 2003
  */
 public enum Category {
-
   INTRODUCTION("Introduction", 5),
   GENERAL("General", 100),
 
@@ -54,19 +52,15 @@ public enum Category {
 
   CHALLENGE("Challenges", 3000);
 
-    @Getter
+  @Getter private String name;
-    private String name;
+  @Getter private Integer ranking;
-    @Getter
-    private Integer ranking;
 
   Category(String name, Integer ranking) {
     this.name = name;
     this.ranking = ranking;
   }
 
-    /**
+  /** {@inheritDoc} */
-     * {@inheritDoc}
-     */
   @Override
   public String toString() {
     return getName();

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

@@ -22,6 +22,11 @@
 
 package org.owasp.webgoat.container.lessons;
 
+import static java.util.stream.Collectors.groupingBy;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
@@ -36,13 +41,6 @@ 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 {
@@ -54,7 +52,8 @@ public class CourseConfiguration {
   public CourseConfiguration(List<Lesson> lessons, List<AssignmentEndpoint> assignments) {
     this.lessons = lessons;
     this.assignments = assignments;
-        assignmentsByPackage = this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
+    assignmentsByPackage =
+        this.assignments.stream().collect(groupingBy(a -> a.getClass().getPackageName()));
   }
 
   @Bean
@@ -70,7 +69,10 @@ public class CourseConfiguration {
       return new ArrayList<>();
     }
     return endpoints.stream()
-                .map(e -> new Assignment(e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
+        .map(
+            e ->
+                new Assignment(
+                    e.getClass().getSimpleName(), getPath(e.getClass()), getHints(e.getClass())))
         .toList();
   }
 
@@ -83,8 +85,11 @@ public class CourseConfiguration {
         }
       }
     }
-        throw new IllegalStateException("Assignment endpoint: " + e + " has no mapping like @GetMapping/@PostMapping etc," +
+    throw new IllegalStateException(
-                "with return type 'AttackResult' or 'ResponseEntity<AttackResult>' please consider adding one");
+        "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) {
@@ -93,22 +98,34 @@ public class CourseConfiguration {
     }
     var genericType = m.getGenericReturnType();
     if (genericType instanceof ParameterizedType) {
-            return ((ParameterizedType) m.getGenericReturnType()).getActualTypeArguments()[0] == AttackResult.class;
+      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
+    // 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());
+      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());
+      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());
+      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());
+      paths =
+          ArrayUtils.addAll(
+              m.getAnnotation(PutMapping.class).value(), m.getAnnotation(PutMapping.class).path());
     }
     if (paths == null) {
       return null;

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

@@ -30,7 +30,7 @@ package org.owasp.webgoat.container.lessons;
 import lombok.Value;
 
 /**
- * <p>Hint class.</p>
+ * Hint class.
  *
  * @author rlawson
  * @version $Id: $Id

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

@@ -3,8 +3,8 @@ 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
+ * Interface for initialization of a lesson. It is called when a new user is added to WebGoat and
- * reset a lesson. Make sure to clean beforehand and then re-initialize the lesson.
+ * when a users reset a lesson. Make sure to clean beforehand and then re-initialize the lesson.
  */
 public interface Initializeable {
 

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

@@ -22,11 +22,10 @@
 
 package org.owasp.webgoat.container.lessons;
 
+import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 @Getter
 @Setter
 public abstract class Lesson {
@@ -35,16 +34,13 @@ public abstract class Lesson {
   private Integer id = null;
   private List<Assignment> assignments;
 
-    /**
+  /** Constructor for the Lesson object */
-     * Constructor for the Lesson object
-     */
   protected Lesson() {
     id = ++count;
   }
 
-
   /**
-     * <p>getName.</p>
+   * getName.
    *
    * @return a {@link java.lang.String} object.
    */
@@ -63,7 +59,7 @@ public abstract class Lesson {
   }
 
   /**
-     * <p>getDefaultCategory.</p>
+   * getDefaultCategory.
    *
    * @return a {@link org.owasp.webgoat.container.lessons.Category} object.
    */
@@ -77,15 +73,15 @@ public abstract class Lesson {
   public abstract String getTitle();
 
   /**
-     * <p>Returns the default "path" portion of a lesson's URL.</p>
+   * Returns the default "path" portion of a lesson's URL.
+   *
    * <p>
-     * <p>
+   *
-     * Legacy webgoat lesson links are of the form
+   * <p>Legacy webgoat lesson links are of the form "attack?Screen=Xmenu=Ystage=Z". This method
-     * "attack?Screen=Xmenu=Ystage=Z". This method returns the path portion of
+   * returns the path portion of the url, i.e., "attack" in the string above.
-     * the url, i.e., "attack" in the string above.
+   *
-     * <p>
+   * <p>Newer, Spring-Controller-based classes will override this method to return "*.do"-styled
-     * Newer, Spring-Controller-based classes will override this method to
+   * paths.
-     * return "*.do"-styled paths.
    *
    * @return a {@link java.lang.String} object.
    */
@@ -95,13 +91,11 @@ public abstract class Lesson {
 
   /**
    * Get the link that can be used to request this screen.
-     * <p>
+   *
-     * Rendering the link in the browser may result in Javascript sending
+   * <p>Rendering the link in the browser may result in Javascript sending additional requests to
-     * additional requests to perform necessary actions or to obtain data
+   * perform necessary actions or to obtain data relevant to the lesson or the element of the lesson
-     * relevant to the lesson or the element of the lesson selected by the
+   * selected by the user. Thanks to using the hash mark "#" and Javascript handling the clicks, the
-     * user.  Thanks to using the hash mark "#" and Javascript handling the
+   * user will experience less waiting as the pages do not have to reload entirely.
-     * clicks, the user will experience less waiting as the pages do not have
-     * to reload entirely.
    *
    * @return a {@link java.lang.String} object.
    */
@@ -126,11 +120,5 @@ public abstract class Lesson {
     var packageName = this.getClass().getPackageName();
     // package name is the direct package name below lessons (any subpackage will be removed)
     return packageName.replaceAll("org.owasp.webgoat.lessons.", "").replaceAll("\\..*", "");
-
-
-
   }
-
-
-
 }

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

@@ -1,17 +1,16 @@
 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;
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.users.WebGoatUser;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
- * Handler which sets the correct schema for the currently bounded user. This way users are not seeing each other
+ * Handler which sets the correct schema for the currently bounded user. This way users are not
- * data and we can reset data for just one particular user.
+ * seeing each other data and we can reset data for just one particular user.
  */
 @Slf4j
 public class LessonConnectionInvocationHandler implements InvocationHandler {

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

@@ -4,7 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * <p>LessonInfoModel class.</p>
+ * LessonInfoModel class.
  *
  * @author dm
  * @version $Id: $Id
@@ -17,5 +17,4 @@ public class LessonInfoModel {
   private boolean hasSource;
   private boolean hasSolution;
   private boolean hasPlan;
-
 }

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

@@ -1,39 +1,37 @@
 /**
  * *************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * utility. For details, please see http://www.owasp.org/
+ * please see http://www.owasp.org/
- * <p>
+ *
- * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- * <p>
+ *
- * This program is free software; you can redistribute it and/or modify it under
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * the terms of the GNU General Public License as published by the Free Software
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * Foundation; either version 2 of the License, or (at your option) any later
+ * License, or (at your option) any later version.
- * version.
+ *
- * <p>
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * This program is distributed in the hope that it will be useful, but WITHOUT
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * GNU General Public License for more details.
- * 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
- * <p>
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * You should have received a copy of the GNU General Public License along with
+ * 02111-1307, USA.
- * 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>
+ *
- * Getting Source ==============
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * <p>
+ * for free software projects.
- * 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>
+ * LessonMenuItem class.
  *
  * @author rlawson
  * @version $Id: $Id
@@ -48,7 +46,7 @@ public class LessonMenuItem {
   private int ranking;
 
   /**
-     * <p>Getter for the field <code>name</code>.</p>
+   * Getter for the field <code>name</code>.
    *
    * @return the name
    */
@@ -57,7 +55,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Setter for the field <code>name</code>.</p>
+   * Setter for the field <code>name</code>.
    *
    * @param name the name to set
    */
@@ -66,7 +64,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Getter for the field <code>children</code>.</p>
+   * Getter for the field <code>children</code>.
    *
    * @return the children
    */
@@ -75,7 +73,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Setter for the field <code>children</code>.</p>
+   * Setter for the field <code>children</code>.
    *
    * @param children the children to set
    */
@@ -84,7 +82,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Getter for the field <code>type</code>.</p>
+   * Getter for the field <code>type</code>.
    *
    * @return the type
    */
@@ -93,7 +91,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Setter for the field <code>type</code>.</p>
+   * Setter for the field <code>type</code>.
    *
    * @param type the type to set
    */
@@ -102,7 +100,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>addChild.</p>
+   * addChild.
    *
    * @param child a {@link LessonMenuItem} object.
    */
@@ -119,7 +117,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>isComplete.</p>
+   * isComplete.
    *
    * @return the complete
    */
@@ -128,7 +126,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Setter for the field <code>complete</code>.</p>
+   * Setter for the field <code>complete</code>.
    *
    * @param complete the complete to set
    */
@@ -137,7 +135,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Getter for the field <code>link</code>.</p>
+   * Getter for the field <code>link</code>.
    *
    * @return the link
    */
@@ -146,7 +144,7 @@ public class LessonMenuItem {
   }
 
   /**
-     * <p>Setter for the field <code>link</code>.</p>
+   * Setter for the field <code>link</code>.
    *
    * @param link the link to set
    */
@@ -161,6 +159,4 @@ public class LessonMenuItem {
   public int getRanking() {
     return this.ranking;
   }
-
-
 }

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

@@ -28,7 +28,7 @@
 package org.owasp.webgoat.container.lessons;
 
 /**
- * <p>LessonMenuItemType class.</p>
+ * LessonMenuItemType class.
  *
  * @author rlawson
  * @version $Id: $Id

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

@@ -1,17 +1,14 @@
 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;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
@@ -19,14 +16,14 @@ public class LessonScanner {
 
   private static final Pattern lessonPattern = Pattern.compile("^.*/lessons/([^/]*)/.*$");
 
-    @Getter
+  @Getter private final Set<String> lessons = new HashSet<>();
-    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
+        // 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()) {
@@ -37,7 +34,6 @@ public class LessonScanner {
     } catch (IOException e) {
       log.warn("No lessons found...");
     }
-
   }
 
   public List<String> applyPattern(String pattern) {

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

@@ -15,5 +15,4 @@ public class EnvironmentService {
   public String homeDirectory() {
     return context.getEnvironment().getProperty("webgoat.server.directory");
   }
-
 }

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

@@ -6,6 +6,8 @@
 
 package org.owasp.webgoat.container.service;
 
+import java.util.Collection;
+import java.util.List;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Hint;
 import org.owasp.webgoat.container.lessons.Lesson;
@@ -14,11 +16,8 @@ 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>
+ * HintService class.
  *
  * @author rlawson
  * @version $Id: $Id
@@ -47,10 +46,7 @@ public class HintService {
 
   private List<Hint> createAssignmentHints(Lesson l) {
     if (l != null) {
-            return l.getAssignments().stream()
+      return l.getAssignments().stream().map(this::createHint).flatMap(Collection::stream).toList();
-                    .map(this::createHint)
-                    .flatMap(Collection::stream)
-                    .toList();
     }
     return List.of();
   }

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

@@ -1,34 +1,33 @@
 /**
  * *************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * utility. For details, please see http://www.owasp.org/
+ * please see http://www.owasp.org/
- * <p>
+ *
- * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- * <p>
+ *
- * This program is free software; you can redistribute it and/or modify it under
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * the terms of the GNU General Public License as published by the Free Software
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * Foundation; either version 2 of the License, or (at your option) any later
+ * License, or (at your option) any later version.
- * version.
+ *
- * <p>
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * This program is distributed in the hope that it will be useful, but WITHOUT
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * GNU General Public License for more details.
- * 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
- * <p>
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * You should have received a copy of the GNU General Public License along with
+ * 02111-1307, USA.
- * 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>
+ *
- * Getting Source ==============
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * <p>
+ * for free software projects.
- * Source for this application is maintained at
- * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
-
 package org.owasp.webgoat.container.service;
 
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.session.LabelDebugger;
@@ -40,10 +39,8 @@ 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>
+ * LabelDebugService class.
  *
  * @author nbaars
  * @version $Id: $Id
@@ -65,8 +62,7 @@ public class LabelDebugService {
    * @return a {@link org.springframework.http.ResponseEntity} object.
    */
   @RequestMapping(path = URL_DEBUG_LABELS_MVC, produces = MediaType.APPLICATION_JSON_VALUE)
-    public @ResponseBody
+  public @ResponseBody ResponseEntity<Map<String, Object>> checkDebuggingStatus() {
-    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);
@@ -78,9 +74,12 @@ public class LabelDebugService {
    * @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)
+  @RequestMapping(
-    public @ResponseBody
+      value = URL_DEBUG_LABELS_MVC,
-    ResponseEntity<Map<String, Object>> setDebuggingStatus(@RequestParam("enabled") Boolean enabled) {
+      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);

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

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

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

@@ -8,9 +8,8 @@ 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>
+ * LessonInfoService class.
  *
  * @author dm
  * @version $Id: $Id
@@ -22,15 +21,13 @@ public class LessonInfoService {
   private final WebSession webSession;
 
   /**
-     * <p>getLessonInfo.</p>
+   * getLessonInfo.
    *
    * @return a {@link LessonInfoModel} object.
    */
   @RequestMapping(path = "/service/lessoninfo.mvc", produces = "application/json")
-    public @ResponseBody
+  public @ResponseBody LessonInfoModel getLessonInfo() {
-    LessonInfoModel getLessonInfo() {
     Lesson lesson = webSession.getCurrentLesson();
     return new LessonInfoModel(lesson.getTitle(), false, false, false);
   }
-
 }

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

@@ -1,34 +1,36 @@
 /**
  * *************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * utility. For details, please see http://www.owasp.org/
+ * please see http://www.owasp.org/
- * <p>
+ *
- * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- * <p>
+ *
- * This program is free software; you can redistribute it and/or modify it under
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * the terms of the GNU General Public License as published by the Free Software
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * Foundation; either version 2 of the License, or (at your option) any later
+ * License, or (at your option) any later version.
- * version.
+ *
- * <p>
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * This program is distributed in the hope that it will be useful, but WITHOUT
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * GNU General Public License for more details.
- * 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
- * <p>
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * You should have received a copy of the GNU General Public License along with
+ * 02111-1307, USA.
- * 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>
+ *
- * Getting Source ==============
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * <p>
+ * for free software projects.
- * Source for this application is maintained at
- * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
-
 package org.owasp.webgoat.container.service;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.owasp.webgoat.container.lessons.Assignment;
 import org.owasp.webgoat.container.lessons.Category;
@@ -45,13 +47,8 @@ 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>
+ * LessonMenuService class.
  *
  * @author rlawson
  * @version $Id: $Id
@@ -77,9 +74,7 @@ public class LessonMenuService {
    * @return a {@link java.util.List} object.
    */
   @RequestMapping(path = URL_LESSONMENU_MVC, produces = "application/json")
-    public
+  public @ResponseBody List<LessonMenuItem> showLeftNav() {
-    @ResponseBody
-    List<LessonMenuItem> showLeftNav() {
     List<LessonMenuItem> menu = new ArrayList<>();
     List<Category> categories = course.getCategories();
     UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
@@ -111,7 +106,6 @@ public class LessonMenuService {
       menu.add(categoryItem);
     }
     return menu;
-
   }
 
   private boolean lessonCompleted(Map<Assignment, Boolean> map, Lesson currentLesson) {
@@ -124,7 +118,6 @@ public class LessonMenuService {
           break;
         }
       }
-
     }
     return result;
   }

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

@@ -1,5 +1,6 @@
 package org.owasp.webgoat.container.service;
 
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -10,11 +11,8 @@ 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>
+ * LessonProgressService class.
  *
  * @author webgoat
  */
@@ -26,8 +24,8 @@ public class LessonProgressService {
   private final WebSession webSession;
 
   /**
-     * Endpoint for fetching the complete lesson overview which informs the user about whether all the assignments are solved.
+   * Endpoint for fetching the complete lesson overview which informs the user about whether all the
-     * Used as the last page of the lesson to generate a lesson overview.
+   * assignments are solved. Used as the last page of the lesson to generate a lesson overview.
    *
    * @return list of assignments
    */
@@ -48,12 +46,12 @@ public class LessonProgressService {
 
   @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
+  // 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

@@ -6,9 +6,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-
 /**
- * <p>LessonTitleService class.</p>
+ * LessonTitleService class.
  *
  * @author dm
  * @version $Id: $Id
@@ -28,11 +27,8 @@ public class LessonTitleService {
    * @return a {@link java.lang.String} object.
    */
   @RequestMapping(path = "/service/lessontitle.mvc", produces = "application/html")
-    public
+  public @ResponseBody String showPlan() {
-    @ResponseBody
-    String showPlan() {
     Lesson lesson = webSession.getCurrentLesson();
     return lesson != null ? lesson.getTitle() : "";
   }
-
 }

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

@@ -1,34 +1,34 @@
 /**
  * *************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * utility. For details, please see http://www.owasp.org/
+ * please see http://www.owasp.org/
- * <p>
+ *
- * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- * <p>
+ *
- * This program is free software; you can redistribute it and/or modify it under
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * the terms of the GNU General Public License as published by the Free Software
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * Foundation; either version 2 of the License, or (at your option) any later
+ * License, or (at your option) any later version.
- * version.
+ *
- * <p>
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * This program is distributed in the hope that it will be useful, but WITHOUT
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * GNU General Public License for more details.
- * 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
- * <p>
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * You should have received a copy of the GNU General Public License along with
+ * 02111-1307, USA.
- * 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>
+ *
- * Getting Source ==============
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * <p>
+ * for free software projects.
- * Source for this application is maintained at
- * https://github.com/WebGoat/WebGoat, a repository for free software projects.
  */
-
 package org.owasp.webgoat.container.service;
 
+import java.util.ArrayList;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -43,11 +43,8 @@ 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>
+ * ReportCardService
  *
  * @author nbaars
  * @version $Id: $Id
@@ -62,7 +59,8 @@ public class ReportCardService {
   private final PluginMessages pluginMessages;
 
   /**
-     * Endpoint which generates the report card for the current use to show the stats on the solved lessons
+   * 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

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

@@ -24,6 +24,8 @@
 
 package org.owasp.webgoat.container.service;
 
+import java.util.List;
+import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.flywaydb.core.Flyway;
@@ -37,9 +39,6 @@ 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

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

@@ -1,36 +1,36 @@
 package org.owasp.webgoat.container.session;
 
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 
-import java.util.List;
-
 /**
  * ************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
  * @version $Id: $Id
@@ -66,7 +66,7 @@ public class Course {
   }
 
   /**
-     * <p>Getter for the field <code>lessons</code>.</p>
+   * Getter for the field <code>lessons</code>.
    *
    * @return a {@link java.util.List} object.
    */
@@ -75,7 +75,7 @@ public class Course {
   }
 
   /**
-     * <p>Getter for the field <code>lessons</code>.</p>
+   * Getter for the field <code>lessons</code>.
    *
    * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
    * @return a {@link java.util.List} object.
@@ -93,6 +93,7 @@ public class Course {
   }
 
   public int getTotalOfAssignments() {
-        return this.lessons.stream().reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
+    return this.lessons.stream()
+        .reduce(0, (total, lesson) -> lesson.getAssignments().size() + total, Integer::sum);
   }
 }

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

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

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

@@ -2,15 +2,12 @@ package org.owasp.webgoat.container.session;
 
 import java.util.HashMap;
 
-/**
+/** Created by jason on 1/4/17. */
- * Created by jason on 1/4/17.
- */
 public class UserSessionData {
 
   private HashMap<String, Object> userSessionData = new HashMap<>();
 
-    public UserSessionData() {
+  public UserSessionData() {}
-    }
 
   public UserSessionData(String key, String value) {
     setValue(key, value);
@@ -32,5 +29,4 @@ public class UserSessionData {
       userSessionData.put(key, value);
     }
   }
-
 }

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

@@ -1,34 +1,36 @@
 package org.owasp.webgoat.container.session;
 
+import java.io.Serializable;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.owasp.webgoat.container.users.WebGoatUser;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import java.io.Serializable;
-
 /**
  * *************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details, please see
+ * <p>This file is part of WebGoat, an Open Web Application Security Project utility. For details,
- * http://www.owasp.org/
+ * please see http://www.owasp.org/
- * <p>
+ *
- * Copyright (c) 2002 - 2014 Bruce Mayhew
+ * <p>Copyright (c) 2002 - 2014 Bruce Mayhew
- * <p>
+ *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
+ * <p>This program is free software; you can redistribute it and/or modify it under the terms of the
- * License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
- * version.
+ * 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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * <p>
+ * 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.
+ * <p>You should have received a copy of the GNU General Public License along with this program; if
- * <p>
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * Getting Source ==============
+ * 02111-1307, USA.
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Getting Source ==============
- * projects.
+ *
+ * <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>
@@ -43,11 +45,12 @@ public class WebSession implements Serializable {
   private boolean securityEnabled;
 
   public WebSession() {
-        this.currentUser = (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    this.currentUser =
+        (WebGoatUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
   }
 
   /**
-     * <p> Setter for the field <code>currentScreen</code>. </p>
+   * Setter for the field <code>currentScreen</code>.
    *
    * @param lesson current lesson
    */
@@ -56,7 +59,7 @@ public class WebSession implements Serializable {
   }
 
   /**
-     * <p> getCurrentLesson. </p>
+   * getCurrentLesson.
    *
    * @return a {@link Lesson} object.
    */

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

@@ -1,40 +1,38 @@
-
 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;
-
+import javax.persistence.*;
+import lombok.Getter;
+import org.owasp.webgoat.container.lessons.Assignment;
+import org.owasp.webgoat.container.lessons.Lesson;
 
 /**
  * ************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
  * @version $Id: $Id
@@ -46,16 +44,17 @@ public class LessonTracker {
   @Id
   @GeneratedValue(strategy = GenerationType.AUTO)
   private Long id;
-    @Getter
+
-    private String lessonName;
+  @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;
+  @Getter private int numberOfAttempts = 0;
-    @Version
+  @Version private Integer version;
-    private Integer version;
 
   private LessonTracker() {
     // JPA
@@ -86,16 +85,12 @@ public class LessonTracker {
     return allAssignments.size() == solvedAssignments.size();
   }
 
-    /**
+  /** Increase the number attempts to solve the lesson */
-     * Increase the number attempts to solve the lesson
-     */
   public void incrementAttempts() {
     numberOfAttempts++;
   }
 
-    /**
+  /** Reset the tracker. We do not reset the number of attempts here! */
-     * Reset the tracker. We do not reset the number of attempts here!
-     */
   void reset() {
     solvedAssignments.clear();
   }
@@ -104,10 +99,10 @@ public class LessonTracker {
    * @return list containing all the assignments solved or not
    */
   public Map<Assignment, Boolean> getLessonOverview() {
-        List<Assignment> notSolved = allAssignments.stream()
+    List<Assignment> notSolved =
-                .filter(i -> !solvedAssignments.contains(i))
+        allAssignments.stream().filter(i -> !solvedAssignments.contains(i)).toList();
-                .toList();
+    Map<Assignment, Boolean> overview =
-        Map<Assignment, Boolean> overview = notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
+        notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
     overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
     return overview;
   }

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

@@ -1,5 +1,8 @@
 package org.owasp.webgoat.container.users;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -9,10 +12,6 @@ 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.
@@ -32,7 +31,11 @@ public class RegistrationController {
   }
 
   @PostMapping("/register.mvc")
-    public String registration(@ModelAttribute("userForm") @Valid UserForm userForm, BindingResult bindingResult, HttpServletRequest request) throws ServletException {
+  public String registration(
+      @ModelAttribute("userForm") @Valid UserForm userForm,
+      BindingResult bindingResult,
+      HttpServletRequest request)
+      throws ServletException {
     userValidator.validate(userForm, bindingResult);
 
     if (bindingResult.hasErrors()) {

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

@@ -1,5 +1,8 @@
 package org.owasp.webgoat.container.users;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.owasp.webgoat.container.i18n.PluginMessages;
@@ -8,10 +11,6 @@ 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.
  *
@@ -52,7 +51,17 @@ public class Scoreboard {
   }
 
   private List<String> challengesSolved(UserTracker userTracker) {
-        List<String> challenges = List.of("Challenge1", "Challenge2", "Challenge3", "Challenge4", "Challenge5", "Challenge6", "Challenge7", "Challenge8", "Challenge9");
+    List<String> challenges =
+        List.of(
+            "Challenge1",
+            "Challenge2",
+            "Challenge3",
+            "Challenge4",
+            "Challenge5",
+            "Challenge6",
+            "Challenge7",
+            "Challenge8",
+            "Challenge9");
     return challenges.stream()
         .map(userTracker::getLessonTracker)
         .flatMap(Optional::stream)
@@ -63,7 +72,8 @@ public class Scoreboard {
   }
 
   private String toLessonTitle(String id) {
-        String titleKey = course.getLessons().stream()
+    String titleKey =
+        course.getLessons().stream()
             .filter(l -> l.getId().equals(id))
             .findFirst()
             .map(Lesson::getTitle)

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

@@ -1,11 +1,10 @@
 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;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @author nbaars
@@ -19,12 +18,14 @@ public class UserForm {
   @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;
+  @NotNull private String agree;
 }

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

@@ -1,8 +1,7 @@
 package org.owasp.webgoat.container.users;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-
 import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
 
 /**
  * @author nbaars
@@ -15,5 +14,4 @@ public interface UserRepository extends JpaRepository<WebGoatUser, String> {
   List<WebGoatUser> findAll();
 
   boolean existsByUsername(String username);
-
 }

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

@@ -1,5 +1,7 @@
 package org.owasp.webgoat.container.users;
 
+import java.util.List;
+import java.util.function.Function;
 import lombok.AllArgsConstructor;
 import org.flywaydb.core.Flyway;
 import org.owasp.webgoat.container.lessons.Initializeable;
@@ -8,9 +10,6 @@ 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.
@@ -43,7 +42,8 @@ public class UserService implements UserDetailsService {
     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
+      userTrackerRepository.save(
+          new UserTracker(username)); // if user previously existed it will not get another tracker
       createLessonsForUser(webGoatUser);
     }
   }
@@ -56,5 +56,4 @@ public class UserService implements UserDetailsService {
   public List<WebGoatUser> getAllUsers() {
     return userRepository.findAll();
   }
-
 }

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

@@ -16,6 +16,5 @@ import org.springframework.data.annotation.Id;
 public class UserSession {
 
   private WebGoatUser webGoatUser;
-    @Id
+  @Id private String sessionId;
-    private String sessionId;
 }

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

@@ -1,43 +1,41 @@
-
 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;
-
+import javax.persistence.*;
+import lombok.extern.slf4j.Slf4j;
+import org.owasp.webgoat.container.lessons.Assignment;
+import org.owasp.webgoat.container.lessons.Lesson;
 
 /**
  * ************************************************************************************************
+ *
  * <p>
- * <p>
+ *
- * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * <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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
  *
  * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
  * @version $Id: $Id
@@ -50,8 +48,10 @@ 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<>();
 
@@ -68,8 +68,8 @@ public class UserTracker {
    * @return a lesson tracker created if not already present
    */
   public LessonTracker getLessonTracker(Lesson lesson) {
-        Optional<LessonTracker> lessonTracker = lessonTrackers
+    Optional<LessonTracker> lessonTracker =
-                .stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
+        lessonTrackers.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
     if (!lessonTracker.isPresent()) {
       LessonTracker newLessonTracker = new LessonTracker(lesson);
       lessonTrackers.add(newLessonTracker);
@@ -119,7 +119,8 @@ public class UserTracker {
     int numberOfAssignmentsSolved = 0;
     for (LessonTracker lessonTracker : lessonTrackers) {
       Map<Assignment, Boolean> lessonOverview = lessonTracker.getLessonOverview();
-            numberOfAssignmentsSolved = lessonOverview.values().stream().filter(b -> b).collect(Collectors.counting()).intValue();
+      numberOfAssignmentsSolved =
+          lessonOverview.values().stream().filter(b -> b).collect(Collectors.counting()).intValue();
     }
     return numberOfAssignmentsSolved;
   }

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

@@ -9,5 +9,4 @@ import org.springframework.data.jpa.repository.JpaRepository;
 public interface UserTrackerRepository extends JpaRepository<UserTracker, String> {
 
   UserTracker findByUser(String user);
-
 }

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

@@ -1,17 +1,16 @@
 package org.owasp.webgoat.container.users;
 
+import java.util.Collection;
+import java.util.Collections;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
 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.
@@ -23,15 +22,12 @@ public class WebGoatUser implements UserDetails {
   public static final String ROLE_USER = "WEBGOAT_USER";
   public static final String ROLE_ADMIN = "WEBGOAT_ADMIN";
 
-    @Id
+  @Id private String username;
-    private String username;
   private String password;
   private String role = ROLE_USER;
-    @Transient
+  @Transient private User user;
-    private User user;
 
-    protected WebGoatUser() {
+  protected WebGoatUser() {}
-    }
 
   public WebGoatUser(String username, String password) {
     this(username, password, ROLE_USER);
@@ -44,7 +40,6 @@ public class WebGoatUser implements UserDetails {
     createUser();
   }
 
-
   public void createUser() {
     this.user = new User(username, password, getAuthorities());
   }
@@ -92,7 +87,4 @@ public class WebGoatUser implements UserDetails {
   public int hashCode() {
     return user.hashCode();
   }
-
 }
-
-

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

@@ -25,9 +25,7 @@ package org.owasp.webgoat.lessons.authbypass;
 import java.util.HashMap;
 import java.util.Map;
 
-/**
+/** Created by appsec on 7/18/17. */
- * Created by appsec on 7/18/17.
- */
 public class AccountVerificationHelper {
 
   // simulating database storage of verification credentials
@@ -46,7 +44,8 @@ public class AccountVerificationHelper {
   }
   // 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
+  // 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;
 
@@ -54,15 +53,20 @@ public class AccountVerificationHelper {
       likely = true;
     }
 
-        if ((submittedAnswers.containsKey("secQuestion0") && submittedAnswers.get("secQuestion0").equals(secQuestionStore.get(verifyUserId).get("secQuestion0")))
+    if ((submittedAnswers.containsKey("secQuestion0")
-                && (submittedAnswers.containsKey("secQuestion1") && submittedAnswers.get("secQuestion1").equals(secQuestionStore.get(verifyUserId).get("secQuestion1")))) {
+            && 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?
 
@@ -72,16 +76,21 @@ public class AccountVerificationHelper {
       return false;
     }
 
-        if (submittedQuestions.containsKey("secQuestion0") && !submittedQuestions.get("secQuestion0").equals(secQuestionStore.get(verifyUserId).get("secQuestion0"))) {
+    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"))) {
+    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/authbypass/VerifyAccount.java

@@ -22,6 +22,13 @@
 
 package org.owasp.webgoat.lessons.authbypass;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
@@ -33,30 +40,27 @@ 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;
+/** Created by jason on 1/5/17. */
-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"})
+@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
+  @Autowired private WebSession webSession;
-    private WebSession webSession;
 
-    @Autowired
+  @Autowired UserSessionData userSessionData;
-    UserSessionData userSessionData;
 
-    @PostMapping(path = "/auth-bypass/verify-account", produces = {"application/json"})
+  @PostMapping(
+      path = "/auth-bypass/verify-account",
+      produces = {"application/json"})
   @ResponseBody
-    public AttackResult completed(@RequestParam String userId, @RequestParam String verifyMethod, HttpServletRequest req) throws ServletException, IOException {
+  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)) {
@@ -69,15 +73,10 @@ public class VerifyAccount extends AssignmentEndpoint {
     // else
     if (verificationHelper.verifyAccount(Integer.valueOf(userId), (HashMap) submittedAnswers)) {
       userSessionData.setValue("account-verified-id", userId);
-            return success(this)
+      return success(this).feedback("verify-account.success").build();
-                    .feedback("verify-account.success")
-                    .build();
     } else {
-            return failed(this)
+      return failed(this).feedback("verify-account.failed").build();
-                    .feedback("verify-account.failed")
-                    .build();
     }
-
   }
 
   private HashMap<String, String> parseSecQuestions(HttpServletRequest req) {
@@ -91,5 +90,4 @@ public class VerifyAccount extends AssignmentEndpoint {
     }
     return (HashMap) userAnswers;
   }
-
 }

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

@@ -34,7 +34,12 @@ 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) {
+  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();
     }

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

@@ -34,7 +34,15 @@ 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) {
+  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 ]*$";

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

@@ -22,11 +22,10 @@
 
 package org.owasp.webgoat.lessons.challenges;
 
-import lombok.Builder;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import lombok.Builder;
+import lombok.Data;
 
 /**
  * @author nbaars

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

@@ -22,6 +22,11 @@
 
 package org.owasp.webgoat.lessons.challenges;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.IntStream;
+import javax.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
@@ -37,12 +42,6 @@ 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.
@@ -51,15 +50,12 @@ import java.util.stream.IntStream;
 public class Flag extends AssignmentEndpoint {
 
   public static final Map<Integer, String> FLAGS = new HashMap<>();
-    @Autowired
+  @Autowired private UserTrackerRepository userTrackerRepository;
-    private UserTrackerRepository userTrackerRepository;
+  @Autowired private WebSession webSession;
-    @Autowired
-    private WebSession webSession;
 
   @AllArgsConstructor
   private class FlagPosted {
-        @Getter
+    @Getter private boolean lessonCompleted;
-        private boolean lessonCompleted;
   }
 
   @PostConstruct
@@ -67,12 +63,17 @@ public class Flag extends AssignmentEndpoint {
     IntStream.range(1, 10).forEach(i -> FLAGS.put(i, UUID.randomUUID().toString()));
   }
 
-    @RequestMapping(path = "/challenge/flag", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+  @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()));
+    int challengeNumber =
+        Integer.valueOf(
+            currentChallenge.substring(currentChallenge.length() - 1, currentChallenge.length()));
     String expectedFlag = FLAGS.get(challengeNumber);
     final AttackResult attackResult;
     if (expectedFlag.equals(flag)) {

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

@@ -1,5 +1,8 @@
 package org.owasp.webgoat.lessons.challenges.challenge1;
 
+import static org.owasp.webgoat.lessons.challenges.SolutionConstants.PASSWORD;
+
+import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
 import org.owasp.webgoat.lessons.challenges.Flag;
@@ -9,33 +12,30 @@ 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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
+ *
  * <p>
  *
  * @author WebGoat
@@ -47,9 +47,14 @@ public class Assignment1 extends AssignmentEndpoint {
 
   @PostMapping("/challenge/1")
   @ResponseBody
-    public AttackResult completed(@RequestParam String username, @RequestParam String password, HttpServletRequest request) {
+  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);
+    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) {

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

@@ -1,28 +1,33 @@
 package org.owasp.webgoat.lessons.challenges.challenge1;
 
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
+
+import java.io.IOException;
+import java.security.SecureRandom;
+import javax.servlet.http.HttpServlet;
 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);
+  public static final int PINCODE = new SecureRandom().nextInt(10000);
 
-    @RequestMapping(method = {GET, POST}, value = "/challenge/logo", produces = MediaType.IMAGE_PNG_VALUE)
+  @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();
+    byte[] in =
+        new ClassPathResource("lessons/challenges/images/webgoat2.png")
+            .getInputStream()
+            .readAllBytes();
 
     String pincode = String.format("%04d", PINCODE);
 

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

@@ -22,6 +22,8 @@
 
 package org.owasp.webgoat.lessons.challenges.challenge5;
 
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.LessonDataSource;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
@@ -33,9 +35,6 @@ 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 {
@@ -48,7 +47,8 @@ public class Assignment5 extends AssignmentEndpoint {
 
   @PostMapping("/challenge/5")
   @ResponseBody
-    public AttackResult login(@RequestParam String username_login, @RequestParam String password_login) throws Exception {
+  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();
     }
@@ -56,7 +56,13 @@ public class Assignment5 extends AssignmentEndpoint {
       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 + "'");
+      PreparedStatement statement =
+          connection.prepareStatement(
+              "select password from challenge_users where userid = '"
+                  + username_login
+                  + "' and password = '"
+                  + password_login
+                  + "'");
       ResultSet resultSet = statement.executeQuery();
 
       if (resultSet.next()) {
@@ -67,4 +73,3 @@ public class Assignment5 extends AssignmentEndpoint {
     }
   }
 }
-

src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/Assignment7.java

@@ -1,11 +1,15 @@
 package org.owasp.webgoat.lessons.challenges.challenge7;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.time.LocalDateTime;
+import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
 import org.owasp.webgoat.lessons.challenges.Email;
-import org.owasp.webgoat.lessons.challenges.SolutionConstants;
 import org.owasp.webgoat.lessons.challenges.Flag;
+import org.owasp.webgoat.lessons.challenges.SolutionConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
@@ -21,11 +25,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-import javax.servlet.http.HttpServletRequest;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.time.LocalDateTime;
-
 /**
  * @author nbaars
  * @since 4/8/17.
@@ -34,43 +33,58 @@ import java.time.LocalDateTime;
 @Slf4j
 public class Assignment7 extends AssignmentEndpoint {
 
-    private static final String TEMPLATE = "Hi, you requested a password reset link, please use this "
+  private static final String TEMPLATE =
-            + "<a target='_blank' href='%s:8080/WebGoat/challenge/7/reset-password/%s'>link</a> to reset your password."
+      "Hi, you requested a password reset link, please use this <a target='_blank'"
-            + "\n \n\n"
+          + " href='%s:8080/WebGoat/challenge/7/reset-password/%s'>link</a> to reset your"
-            + "If you did not request this password change you can ignore this message."
+          + " password.\n"
-            + "\n"
-            + "If you have any comments or questions, please do not hesitate to reach us at support@webgoat-cloud.org"
           + " \n\n"
-            + "Kind regards, \nTeam WebGoat";
+          + "If you did not request this password change you can ignore this message.\n"
+          + "If you have any comments or questions, please do not hesitate to reach us at"
+          + " support@webgoat-cloud.org\n\n"
+          + "Kind regards, \n"
+          + "Team WebGoat";
+
+  @Autowired private RestTemplate restTemplate;
 
-    @Autowired
-    private RestTemplate restTemplate;
   @Value("${webwolf.mail.url}")
   private String webWolfMailURL;
 
   @GetMapping("/challenge/7/reset-password/{link}")
   public ResponseEntity<String> resetPassword(@PathVariable(value = "link") String link) {
     if (link.equals(SolutionConstants.ADMIN_PASSWORD_LINK)) {
-            return ResponseEntity.accepted().body("<h1>Success!!</h1>"
+      return ResponseEntity.accepted()
+          .body(
+              "<h1>Success!!</h1>"
                   + "<img src='/WebGoat/images/hi-five-cat.jpg'>"
-                    + "<br/><br/>Here is your flag: " + "<b>" + Flag.FLAGS.get(7) + "</b>");
+                  + "<br/><br/>Here is your flag: "
+                  + "<b>"
+                  + Flag.FLAGS.get(7)
+                  + "</b>");
     }
-        return ResponseEntity.status(HttpStatus.I_AM_A_TEAPOT).body("That is not the reset link for admin");
+    return ResponseEntity.status(HttpStatus.I_AM_A_TEAPOT)
+        .body("That is not the reset link for admin");
   }
 
   @PostMapping("/challenge/7")
   @ResponseBody
-    public AttackResult sendPasswordResetLink(@RequestParam String email, HttpServletRequest request) throws URISyntaxException {
+  public AttackResult sendPasswordResetLink(@RequestParam String email, HttpServletRequest request)
+      throws URISyntaxException {
     if (StringUtils.hasText(email)) {
       String username = email.substring(0, email.indexOf("@"));
       if (StringUtils.hasText(username)) {
         URI uri = new URI(request.getRequestURL().toString());
-                Email mail = Email.builder()
+        Email mail =
+            Email.builder()
                 .title("Your password reset link for challenge 7")
-                        .contents(String.format(TEMPLATE, uri.getScheme() + "://" + uri.getHost(), new PasswordResetLink().createPasswordReset(username, "webgoat")))
+                .contents(
+                    String.format(
+                        TEMPLATE,
+                        uri.getScheme() + "://" + uri.getHost(),
+                        new PasswordResetLink().createPasswordReset(username, "webgoat")))
                 .sender("password-reset@webgoat-cloud.net")
                 .recipient(username)
-                        .time(LocalDateTime.now()).build();
+                .time(LocalDateTime.now())
+                .build();
         restTemplate.postForEntity(webWolfMailURL, mail, Object.class);
       }
     }
@@ -83,4 +97,3 @@ public class Assignment7 extends AssignmentEndpoint {
     return new ClassPathResource("challenge7/git.zip");
   }
 }
-

src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/MD5.java

@@ -7,21 +7,17 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
 /**
- * MD5 hash generator.
+ * MD5 hash generator. More information about this class is available from <a target="_top" href=
- * More information about this class is available from <a target="_top" href=
  * "http://ostermiller.org/utils/MD5.html">ostermiller.org</a>.
- * <p>
+ *
- * This class takes as input a message of arbitrary length and produces
+ * <p>This class takes as input a message of arbitrary length and produces as output a 128-bit
- * as output a 128-bit "fingerprint" or "message digest" of the input.
+ * "fingerprint" or "message digest" of the input. It is conjectured that it is computationally
- * It is conjectured that it is computationally infeasible to produce
+ * infeasible to produce two messages having the same message digest, or to produce any message
- * two messages having the same message digest, or to produce any
+ * having a given pre-specified target message digest. The MD5 algorithm is intended for digital
- * message having a given pre-specified target message digest. The MD5
+ * signature applications, where a large file must be "compressed" in a secure manner before being
- * algorithm is intended for digital signature applications, where a
+ * encrypted with a private (secret) key under a public-key cryptosystem such as RSA.
- * large file must be "compressed" in a secure manner before being
+ *
- * encrypted with a private (secret) key under a public-key cryptosystem
+ * <p>For more information see RFC1321.
- * such as RSA.
- * <p>
- * For more information see RFC1321.
  *
  * @author Santeri Paavolainen http://santtu.iki.fi/md5/
  * @author Stephen Ostermiller http://ostermiller.org/contact.pl?regarding=Java+Utilities
@@ -39,8 +35,7 @@ public class MD5 {
   }
 
   /**
-     * Command line program that will take files as arguments
+   * Command line program that will take files as arguments and output the MD5 sum for each file.
-     * and output the MD5 sum for each file.
    *
    * @param args command line arguments
    * @since ostermillerutils 1.00.00
@@ -188,8 +183,7 @@ public class MD5 {
   }
 
   /**
-     * Gets the MD5 hash of the given String.
+   * Gets the MD5 hash of the given String. The string is converted to bytes using the current
-     * The string is converted to bytes using the current
    * platform's default character encoding.
    *
    * @param s String for which an MD5 hash is desired.
@@ -203,8 +197,7 @@ public class MD5 {
   }
 
   /**
-     * Gets the MD5 hash of the given String.
+   * Gets the MD5 hash of the given String. The string is converted to bytes using the current
-     * The string is converted to bytes using the current
    * platform's default character encoding.
    *
    * @param s String for which an MD5 hash is desired.
@@ -217,7 +210,6 @@ public class MD5 {
     return md5.getHashString();
   }
 
-
   /**
    * Gets the MD5 hash of the given String.
    *
@@ -248,7 +240,6 @@ public class MD5 {
     return md5.getHashString();
   }
 
-
   /**
    * Reset the MD5 sum to its initial state.
    *
@@ -272,13 +263,11 @@ public class MD5 {
 
   /**
    * Update this hash with the given data.
-     * <p>
+   *
-     * A state may be passed into this method so that we can add padding
+   * <p>A state may be passed into this method so that we can add padding and finalize a md5 hash
-     * and finalize a md5 hash without limiting our ability to update
+   * without limiting our ability to update more data later.
-     * more data later.
+   *
-     * <p>
+   * <p>If length bytes are not available to be hashed, as many bytes as possible will be hashed.
-     * If length bytes are not available to be hashed, as many bytes as
-     * possible will be hashed.
    *
    * @param state Which state is updated.
    * @param buffer Array of bytes to be hashed.
@@ -325,9 +314,8 @@ public class MD5 {
 
   /**
    * Update this hash with the given data.
-     * <p>
+   *
-     * If length bytes are not available to be hashed, as many bytes as
+   * <p>If length bytes are not available to be hashed, as many bytes as possible will be hashed.
-     * possible will be hashed.
    *
    * @param buffer Array of bytes to be hashed.
    * @param offset Offset to buffer array.
@@ -340,9 +328,8 @@ public class MD5 {
 
   /**
    * Update this hash with the given data.
-     * <p>
+   *
-     * If length bytes are not available to be hashed, as many bytes as
+   * <p>If length bytes are not available to be hashed, as many bytes as possible will be hashed.
-     * possible will be hashed.
    *
    * @param buffer Array of bytes to be hashed.
    * @param length number of bytes to hash.
@@ -375,9 +362,8 @@ public class MD5 {
   }
 
   /**
-     * Update this hash with a String.
+   * Update this hash with a String. The string is converted to bytes using the current platform's
-     * The string is converted to bytes using the current
+   * default character encoding.
-     * platform's default character encoding.
    *
    * @param s String to be hashed.
    * @since ostermillerutils 1.00.00
@@ -399,17 +385,15 @@ public class MD5 {
   }
 
   /**
-     * The current state from which the hash sum
+   * The current state from which the hash sum can be computed or updated.
-     * can be computed or updated.
    *
    * @since ostermillerutils 1.00.00
    */
   private MD5State workingState = new MD5State();
 
   /**
-     * Cached copy of the final MD5 hash sum.  This is created when
+   * Cached copy of the final MD5 hash sum. This is created when the hash is requested and it is
-     * the hash is requested and it is invalidated when the hash
+   * invalidated when the hash is updated.
-     * is updated.
    *
    * @since ostermillerutils 1.00.00
    */
@@ -423,25 +407,79 @@ public class MD5 {
   private int[] decodeBuffer = new int[16];
 
   /**
-     * 64 bytes of padding that can be added if the length
+   * 64 bytes of padding that can be added if the length is not divisible by 64.
-     * is not divisible by 64.
    *
    * @since ostermillerutils 1.00.00
    */
   private static final byte padding[] = {
-            (byte) 0x80, 0, 0, 0, 0, 0, 0, 0,
+    (byte) 0x80,
-            0, 0, 0, 0, 0, 0, 0, 0,
+    0,
-            0, 0, 0, 0, 0, 0, 0, 0,
+    0,
-            0, 0, 0, 0, 0, 0, 0, 0,
+    0,
-            0, 0, 0, 0, 0, 0, 0, 0,
+    0,
-            0, 0, 0, 0, 0, 0, 0, 0,
+    0,
-            0, 0, 0, 0, 0, 0, 0, 0,
+    0,
-            0, 0, 0, 0, 0, 0, 0, 0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
   };
 
   /**
-     * Contains internal state of the MD5 class.
+   * Contains internal state of the MD5 class. Passes MD5 test suite as defined in RFC1321.
-     * Passes MD5 test suite as defined in RFC1321.
    *
    * @since ostermillerutils 1.00.00
    */
@@ -507,10 +545,8 @@ public class MD5 {
     }
   }
 
-
   /**
-     * Turns array of bytes into string representing each byte as
+   * Turns array of bytes into string representing each byte as a two digit unsigned hex number.
-     * a two digit unsigned hex number.
    *
    * @param hash Array of bytes to convert to hex-string
    * @return Generated hex string
@@ -594,12 +630,11 @@ public class MD5 {
   private int[] decode(byte buffer[], int len, int offset) {
     int i, j;
     for (i = j = 0; j < len; i++, j += 4) {
-            decodeBuffer[i] = (
+      decodeBuffer[i] =
-                    (buffer[j + offset] & 0xff)) |
+          ((buffer[j + offset] & 0xff))
-                    (((buffer[j + 1 + offset] & 0xff)) << 8) |
+              | (((buffer[j + 1 + offset] & 0xff)) << 8)
-                    (((buffer[j + 2 + offset] & 0xff)) << 16) |
+              | (((buffer[j + 2 + offset] & 0xff)) << 16)
-                    (((buffer[j + 3 + offset] & 0xff)) << 24
+              | (((buffer[j + 3 + offset] & 0xff)) << 24);
-                    );
     }
     return decodeBuffer;
   }

src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/PasswordResetLink.java

@@ -38,6 +38,8 @@ public class PasswordResetLink {
     String username = args[0];
     String key = args[1];
     System.out.println("Generation password reset link for " + username);
-        System.out.println("Created password reset link: " + new PasswordResetLink().createPasswordReset(username, key));
+    System.out.println(
+        "Created password reset link: "
+            + new PasswordResetLink().createPasswordReset(username, key));
   }
 }

src/main/java/org/owasp/webgoat/lessons/challenges/challenge8/Assignment8.java

@@ -1,5 +1,9 @@
 package org.owasp.webgoat.lessons.challenges.challenge8;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
@@ -11,11 +15,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 /**
  * @author nbaars
  * @since 4/8/17.
@@ -36,27 +35,36 @@ public class Assignment8 extends AssignmentEndpoint {
 
   @GetMapping(value = "/challenge/8/vote/{stars}", produces = MediaType.APPLICATION_JSON_VALUE)
   @ResponseBody
-    public ResponseEntity<?> vote(@PathVariable(value = "stars") int nrOfStars, HttpServletRequest request) {
+  public ResponseEntity<?> vote(
+      @PathVariable(value = "stars") int nrOfStars, HttpServletRequest request) {
     // Simple implementation of VERB Based Authentication
     String msg = "";
     if (request.getMethod().equals("GET")) {
-            var json = Map.of("error", true, "message", "Sorry but you need to login first in order to vote");
+      var json =
+          Map.of("error", true, "message", "Sorry but you need to login first in order to vote");
       return ResponseEntity.status(200).body(json);
     }
     Integer allVotesForStar = votes.getOrDefault(nrOfStars, 0);
     votes.put(nrOfStars, allVotesForStar + 1);
-        return ResponseEntity.ok().header("X-Flag", "Thanks for voting, your flag is: " + Flag.FLAGS.get(8)).build();
+    return ResponseEntity.ok()
+        .header("X-Flag", "Thanks for voting, your flag is: " + Flag.FLAGS.get(8))
+        .build();
   }
 
   @GetMapping("/challenge/8/votes/")
   public ResponseEntity<?> getVotes() {
-        return ResponseEntity.ok(votes.entrySet().stream().collect(Collectors.toMap(e -> "" + e.getKey(), e -> e.getValue())));
+    return ResponseEntity.ok(
+        votes.entrySet().stream()
+            .collect(Collectors.toMap(e -> "" + e.getKey(), e -> e.getValue())));
   }
 
   @GetMapping("/challenge/8/votes/average")
   public ResponseEntity<Map<String, Integer>> average() {
     int totalNumberOfVotes = votes.values().stream().mapToInt(i -> i.intValue()).sum();
-        int categories = votes.entrySet().stream().mapToInt(e -> e.getKey() * e.getValue()).reduce(0, (a, b) -> a + b);
+    int categories =
+        votes.entrySet().stream()
+            .mapToInt(e -> e.getKey() * e.getValue())
+            .reduce(0, (a, b) -> a + b);
     var json = Map.of("average", (int) Math.ceil((double) categories / totalNumberOfVotes));
     return ResponseEntity.ok(json);
   }
@@ -66,4 +74,3 @@ public class Assignment8 extends AssignmentEndpoint {
     throw new IllegalStateException("Should never be called, challenge specific method");
   }
 }
-

src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkLesson.java

@@ -32,8 +32,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Assignment where the user has to look through an HTTP Request
+ * Assignment where the user has to look through an HTTP Request using the Developer Tools and find
- * using the Developer Tools and find a specific number.
+ * a specific number.
  *
  * @author TMelzer
  * @since 30.11.18
@@ -42,7 +42,9 @@ import org.springframework.web.bind.annotation.RestController;
 @AssignmentHints({"networkHint1", "networkHint2"})
 public class NetworkLesson extends AssignmentEndpoint {
 
-    @PostMapping(value = "/ChromeDevTools/network", params = {"network_num", "number"})
+  @PostMapping(
+      value = "/ChromeDevTools/network",
+      params = {"network_num", "number"})
   @ResponseBody
   public AttackResult completed(@RequestParam String network_num, @RequestParam String number) {
     if (network_num.equals(number)) {

src/main/java/org/owasp/webgoat/lessons/cia/CIAQuiz.java

@@ -16,10 +16,16 @@ public class CIAQuiz extends AssignmentEndpoint {
 
   @PostMapping("/cia/quiz")
   @ResponseBody
-    public AttackResult completed(@RequestParam String[] question_0_solution, @RequestParam String[] question_1_solution, @RequestParam String[] question_2_solution, @RequestParam String[] question_3_solution) {
+  public AttackResult completed(
+      @RequestParam String[] question_0_solution,
+      @RequestParam String[] question_1_solution,
+      @RequestParam String[] question_2_solution,
+      @RequestParam String[] question_3_solution) {
     int correctAnswers = 0;
 
-        String[] givenAnswers = {question_0_solution[0], question_1_solution[0], question_2_solution[0], question_3_solution[0]};
+    String[] givenAnswers = {
+      question_0_solution[0], question_1_solution[0], question_2_solution[0], question_3_solution[0]
+    };
 
     for (int i = 0; i < solutions.length; i++) {
       if (givenAnswers[i].contains(solutions[i])) {
@@ -44,5 +50,4 @@ public class CIAQuiz extends AssignmentEndpoint {
   public boolean[] getResults() {
     return this.guesses;
   }
-
 }

src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFiltering.java

@@ -8,25 +8,26 @@ import org.springframework.stereotype.Component;
  * ************************************************************************************************
  * 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>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
+ * <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
+ * <p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * General Public License for more details.
+ * 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
+ * <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>Getting Source ==============
- * <p>
+ *
- * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * <p>Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository
- * projects.
+ * for free software projects.
+ *
  * <p>
  *
  * @author WebGoat

src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringAssignment.java

@@ -31,14 +31,19 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@AssignmentHints({"ClientSideFilteringHint1", "ClientSideFilteringHint2", "ClientSideFilteringHint3", "ClientSideFilteringHint4"})
+@AssignmentHints({
+  "ClientSideFilteringHint1",
+  "ClientSideFilteringHint2",
+  "ClientSideFilteringHint3",
+  "ClientSideFilteringHint4"
+})
 public class ClientSideFilteringAssignment extends AssignmentEndpoint {
 
   @PostMapping("/clientSideFiltering/attack1")
   @ResponseBody
   public AttackResult completed(@RequestParam String answer) {
     return "450000".equals(answer)
-                ? success(this).feedback("assignment.solved").build() :
+        ? success(this).feedback("assignment.solved").build()
-                failed(this).feedback("ClientSideFiltering.incorrect").build();
+        : failed(this).feedback("ClientSideFiltering.incorrect").build();
   }
 }

src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ClientSideFilteringFreeAssignment.java

@@ -35,7 +35,11 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 4/6/17.
  */
 @RestController
-@AssignmentHints({"client.side.filtering.free.hint1", "client.side.filtering.free.hint2", "client.side.filtering.free.hint3"})
+@AssignmentHints({
+  "client.side.filtering.free.hint1",
+  "client.side.filtering.free.hint2",
+  "client.side.filtering.free.hint3"
+})
 public class ClientSideFilteringFreeAssignment extends AssignmentEndpoint {
 
   public static final String SUPER_COUPON_CODE = "get_it_for_free";

src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/Salaries.java

@@ -22,6 +22,20 @@
 
 package org.owasp.webgoat.lessons.clientsidefiltering;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.PostConstruct;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
@@ -33,21 +47,6 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
-import javax.annotation.PostConstruct;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @RestController
 @Slf4j
 public class Salaries {
@@ -63,7 +62,9 @@ public class Salaries {
       targetDirectory.mkdir();
     }
     try {
-            FileCopyUtils.copy(classPathResource.getInputStream(), new FileOutputStream(new File(targetDirectory, "employees.xml")));
+      FileCopyUtils.copy(
+          classPathResource.getInputStream(),
+          new FileOutputStream(new File(targetDirectory, "employees.xml")));
     } catch (IOException e) {
       throw new RuntimeException(e);
     }

src/main/java/org/owasp/webgoat/lessons/clientsidefiltering/ShopEndpoint.java

@@ -23,18 +23,16 @@
 package org.owasp.webgoat.lessons.clientsidefiltering;
 
 import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Optional;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Optional;
-
 /**
  * @author nbaars
  * @since 4/6/17.
@@ -46,8 +44,7 @@ public class ShopEndpoint {
   @AllArgsConstructor
   private class CheckoutCodes {
 
-        @Getter
+    @Getter private List<CheckoutCode> codes;
-        private List<CheckoutCode> codes;
 
     public Optional<CheckoutCode> get(String code) {
       return codes.stream().filter(c -> c.getCode().equals(code)).findFirst();

src/main/java/org/owasp/webgoat/lessons/cryptography/CryptoUtil.java

@@ -1,8 +1,5 @@
 package org.owasp.webgoat.lessons.cryptography;
 
-import lombok.extern.slf4j.Slf4j;
-
-import javax.xml.bind.DatatypeConverter;
 import java.math.BigInteger;
 import java.nio.charset.Charset;
 import java.security.InvalidAlgorithmParameterException;
@@ -19,20 +16,26 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.RSAKeyGenParameterSpec;
 import java.util.Base64;
+import javax.xml.bind.DatatypeConverter;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class CryptoUtil {
 
-	private static final BigInteger[] FERMAT_PRIMES = 
+  private static final BigInteger[] FERMAT_PRIMES = {
-		{	BigInteger.valueOf(3), 
+    BigInteger.valueOf(3),
     BigInteger.valueOf(5),
     BigInteger.valueOf(17),
     BigInteger.valueOf(257),
-			BigInteger.valueOf(65537) };
+    BigInteger.valueOf(65537)
+  };
 
-	public static KeyPair generateKeyPair() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+  public static KeyPair generateKeyPair()
+      throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
     KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
-		RSAKeyGenParameterSpec kpgSpec = new RSAKeyGenParameterSpec(2048, FERMAT_PRIMES[new SecureRandom().nextInt(FERMAT_PRIMES.length)]);
+    RSAKeyGenParameterSpec kpgSpec =
+        new RSAKeyGenParameterSpec(
+            2048, FERMAT_PRIMES[new SecureRandom().nextInt(FERMAT_PRIMES.length)]);
     keyPairGenerator.initialize(kpgSpec);
     // keyPairGenerator.initialize(2048);
     return keyPairGenerator.generateKeyPair();
@@ -40,7 +43,12 @@ public class CryptoUtil {
 
   public static String getPrivateKeyInPEM(KeyPair keyPair) {
     String encodedString = "-----BEGIN PRIVATE KEY-----\n";
-        encodedString = encodedString+new String(Base64.getEncoder().encode(keyPair.getPrivate().getEncoded()),Charset.forName("UTF-8"))+"\n";
+    encodedString =
+        encodedString
+            + new String(
+                Base64.getEncoder().encode(keyPair.getPrivate().getEncoded()),
+                Charset.forName("UTF-8"))
+            + "\n";
     encodedString = encodedString + "-----END PRIVATE KEY-----\n";
     return encodedString;
   }
@@ -68,16 +76,15 @@ public class CryptoUtil {
     return signature;
   }
 
-    public static boolean verifyMessage(String message, String base64EncSignature,
+  public static boolean verifyMessage(
-			PublicKey publicKey) {
+      String message, String base64EncSignature, PublicKey publicKey) {
 
     log.debug("start verifyMessage");
     boolean result = false;
 
     try {
 
-			base64EncSignature = base64EncSignature.replace("\r", "").replace("\n", "")
+      base64EncSignature = base64EncSignature.replace("\r", "").replace("\n", "").replace(" ", "");
-					.replace(" ", "");
       // get raw signature from base64 encrypted string in header
       byte[] decodedSignature = Base64.getDecoder().decode(base64EncSignature);
 
@@ -113,23 +120,24 @@ public class CryptoUtil {
       if (modulus.length() == 512) {
         modulus = "00".concat(modulus);
       }
-			result = result && (DatatypeConverter.printHexBinary(rsaPubKey.getModulus().toByteArray()).equals(modulus.toUpperCase()));
+      result =
+          result
+              && (DatatypeConverter.printHexBinary(rsaPubKey.getModulus().toByteArray())
+                  .equals(modulus.toUpperCase()));
     }
     return result;
-
   }
 
-	public static PrivateKey getPrivateKeyFromPEM(String privateKeyPem) throws NoSuchAlgorithmException, InvalidKeySpecException {
+  public static PrivateKey getPrivateKeyFromPEM(String privateKeyPem)
+      throws NoSuchAlgorithmException, InvalidKeySpecException {
     privateKeyPem = privateKeyPem.replace("-----BEGIN PRIVATE KEY-----", "");
     privateKeyPem = privateKeyPem.replace("-----END PRIVATE KEY-----", "");
     privateKeyPem = privateKeyPem.replace("\n", "").replace("\r", "");
 
-
     byte[] decoded = Base64.getDecoder().decode(privateKeyPem);
 
     PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(decoded);
     KeyFactory kf = KeyFactory.getInstance("RSA");
     return kf.generatePrivate(spec);
   }
-
 }

src/main/java/org/owasp/webgoat/lessons/cryptography/Cryptography.java

@@ -37,5 +37,4 @@ public class Cryptography extends Lesson {
   public String getTitle() {
     return "6.crypto.title"; // first lesson in general
   }
-
 }

src/main/java/org/owasp/webgoat/lessons/cryptography/EncodingAssignment.java

@@ -22,6 +22,9 @@
 
 package org.owasp.webgoat.lessons.cryptography;
 
+import java.util.Base64;
+import java.util.Random;
+import javax.servlet.http.HttpServletRequest;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AttackResult;
 import org.springframework.http.MediaType;
@@ -31,10 +34,6 @@ 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 java.util.Base64;
-import java.util.Random;
-
 @RestController
 public class EncodingAssignment extends AssignmentEndpoint {
 
@@ -49,7 +48,8 @@ public class EncodingAssignment extends AssignmentEndpoint {
     String basicAuth = (String) request.getSession().getAttribute("basicAuth");
     String username = request.getUserPrincipal().getName();
     if (basicAuth == null) {
-			String password = HashingAssignment.SECRETS[new Random().nextInt(HashingAssignment.SECRETS.length)];
+      String password =
+          HashingAssignment.SECRETS[new Random().nextInt(HashingAssignment.SECRETS.length)];
       basicAuth = getBasicAuth(username, password);
       request.getSession().setAttribute("basicAuth", basicAuth);
     }
@@ -58,14 +58,16 @@ public class EncodingAssignment extends AssignmentEndpoint {
 
   @PostMapping("/crypto/encoding/basic-auth")
   @ResponseBody
-    public AttackResult completed(HttpServletRequest request, @RequestParam String answer_user, @RequestParam String answer_pwd) {
+  public AttackResult completed(
+      HttpServletRequest request,
+      @RequestParam String answer_user,
+      @RequestParam String answer_pwd) {
     String basicAuth = (String) request.getSession().getAttribute("basicAuth");
-    	if (basicAuth !=null && answer_user!=null && answer_pwd !=null 
+    if (basicAuth != null
-        		&& basicAuth.equals(getBasicAuth(answer_user,answer_pwd))) 
+        && answer_user != null
-        {
+        && answer_pwd != null
-            return success(this)
+        && basicAuth.equals(getBasicAuth(answer_user, answer_pwd))) {
-                .feedback("crypto-encoding.success")
+      return success(this).feedback("crypto-encoding.success").build();
-                .build();
     } else {
       return failed(this).feedback("crypto-encoding.empty").build();
     }

src/main/java/org/owasp/webgoat/lessons/cryptography/HashingAssignment.java

@@ -22,6 +22,11 @@
 
 package org.owasp.webgoat.lessons.cryptography;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Random;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.bind.DatatypeConverter;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
@@ -32,12 +37,6 @@ 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 javax.xml.bind.DatatypeConverter;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Random;
-
 @RestController
 @AssignmentHints({"crypto-hashing.hints.1", "crypto-hashing.hints.2"})
 public class HashingAssignment extends AssignmentEndpoint {
@@ -56,8 +55,7 @@ public class HashingAssignment extends AssignmentEndpoint {
       MessageDigest md = MessageDigest.getInstance("MD5");
       md.update(secret.getBytes());
       byte[] digest = md.digest();
-		    md5Hash = DatatypeConverter
+      md5Hash = DatatypeConverter.printHexBinary(digest).toUpperCase();
-		      .printHexBinary(digest).toUpperCase();
       request.getSession().setAttribute("md5Hash", md5Hash);
       request.getSession().setAttribute("md5Secret", secret);
     }
@@ -80,19 +78,18 @@ public class HashingAssignment extends AssignmentEndpoint {
 
   @PostMapping("/crypto/hashing")
   @ResponseBody
-    public AttackResult completed(HttpServletRequest request, @RequestParam String answer_pwd1, @RequestParam String answer_pwd2) {
+  public AttackResult completed(
+      HttpServletRequest request,
+      @RequestParam String answer_pwd1,
+      @RequestParam String answer_pwd2) {
 
     String md5Secret = (String) request.getSession().getAttribute("md5Secret");
     String sha256Secret = (String) request.getSession().getAttribute("sha256Secret");
 
     if (answer_pwd1 != null && answer_pwd2 != null) {
-        	if (answer_pwd1.equals(md5Secret)
+      if (answer_pwd1.equals(md5Secret) && answer_pwd2.equals(sha256Secret)) {
-        		&& answer_pwd2.equals(sha256Secret)) {
+        return success(this).feedback("crypto-hashing.success").build();
-        		return success(this)
+      } else if (answer_pwd1.equals(md5Secret) || answer_pwd2.equals(sha256Secret)) {
-        				.feedback("crypto-hashing.success")
-        				.build();
-        	} else if (answer_pwd1.equals(md5Secret)
-            		|| answer_pwd2.equals(sha256Secret)) {
         return failed(this).feedback("crypto-hashing.oneok").build();
       }
     }
@@ -103,8 +100,6 @@ public class HashingAssignment extends AssignmentEndpoint {
     MessageDigest md = MessageDigest.getInstance(algorithm);
     md.update(secret.getBytes());
     byte[] digest = md.digest();
-	    return DatatypeConverter
+    return DatatypeConverter.printHexBinary(digest).toUpperCase();
-	      .printHexBinary(digest).toUpperCase();
   }
-    
 }

src/main/java/org/owasp/webgoat/lessons/cryptography/SecureDefaultsAssignment.java

@@ -22,6 +22,7 @@
 
 package org.owasp.webgoat.lessons.cryptography;
 
+import java.security.NoSuchAlgorithmException;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
 import org.owasp.webgoat.container.assignments.AttackResult;
@@ -30,20 +31,25 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.security.NoSuchAlgorithmException;
-
 @RestController
-@AssignmentHints({"crypto-secure-defaults.hints.1", "crypto-secure-defaults.hints.2", "crypto-secure-defaults.hints.3"})
+@AssignmentHints({
+  "crypto-secure-defaults.hints.1",
+  "crypto-secure-defaults.hints.2",
+  "crypto-secure-defaults.hints.3"
+})
 public class SecureDefaultsAssignment extends AssignmentEndpoint {
 
   @PostMapping("/crypto/secure/defaults")
   @ResponseBody
-    public AttackResult completed(@RequestParam String secretFileName,  @RequestParam String secretText) throws NoSuchAlgorithmException {
+  public AttackResult completed(
+      @RequestParam String secretFileName, @RequestParam String secretText)
+      throws NoSuchAlgorithmException {
     if (secretFileName != null && secretFileName.equals("default_secret")) {
-        	if (secretText!=null && HashingAssignment.getHash(secretText, "SHA-256").equalsIgnoreCase("34de66e5caf2cb69ff2bebdc1f3091ecf6296852446c718e38ebfa60e4aa75d2")) {
+      if (secretText != null
-        		return success(this)
+          && HashingAssignment.getHash(secretText, "SHA-256")
-        				.feedback("crypto-secure-defaults.success")
+              .equalsIgnoreCase(
-        				.build();
+                  "34de66e5caf2cb69ff2bebdc1f3091ecf6296852446c718e38ebfa60e4aa75d2")) {
+        return success(this).feedback("crypto-secure-defaults.success").build();
       } else {
         return failed(this).feedback("crypto-secure-defaults.messagenotok").build();
       }

src/main/java/org/owasp/webgoat/lessons/cryptography/SigningAssignment.java

@@ -22,6 +22,12 @@
 
 package org.owasp.webgoat.lessons.cryptography;
 
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPair;
+import java.security.NoSuchAlgorithmException;
+import java.security.interfaces.RSAPublicKey;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.bind.DatatypeConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
 import org.owasp.webgoat.container.assignments.AssignmentHints;
@@ -33,21 +39,20 @@ 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 javax.xml.bind.DatatypeConverter;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.RSAPublicKey;
-
 @RestController
-@AssignmentHints({"crypto-signing.hints.1","crypto-signing.hints.2", "crypto-signing.hints.3", "crypto-signing.hints.4"})
+@AssignmentHints({
+  "crypto-signing.hints.1",
+  "crypto-signing.hints.2",
+  "crypto-signing.hints.3",
+  "crypto-signing.hints.4"
+})
 @Slf4j
 public class SigningAssignment extends AssignmentEndpoint {
 
   @RequestMapping(path = "/crypto/signing/getprivate", produces = MediaType.TEXT_HTML_VALUE)
   @ResponseBody
-    public String getPrivateKey(HttpServletRequest request) throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
+  public String getPrivateKey(HttpServletRequest request)
+      throws NoSuchAlgorithmException, InvalidAlgorithmParameterException {
 
     String privateKey = (String) request.getSession().getAttribute("privateKeyString");
     if (privateKey == null) {
@@ -61,15 +66,18 @@ public class SigningAssignment extends AssignmentEndpoint {
 
   @PostMapping("/crypto/signing/verify")
   @ResponseBody
-    public AttackResult completed(HttpServletRequest request, @RequestParam String modulus, @RequestParam String signature) {
+  public AttackResult completed(
+      HttpServletRequest request, @RequestParam String modulus, @RequestParam String signature) {
 
-		String tempModulus = modulus;/* used to validate the modulus of the public key but might need to be corrected */
+    String tempModulus =
+        modulus; /* used to validate the modulus of the public key but might need to be corrected */
     KeyPair keyPair = (KeyPair) request.getSession().getAttribute("keyPair");
     RSAPublicKey rsaPubKey = (RSAPublicKey) keyPair.getPublic();
     if (tempModulus.length() == 512) {
       tempModulus = "00".concat(tempModulus);
     }
-		if (!DatatypeConverter.printHexBinary(rsaPubKey.getModulus().toByteArray()).equals(tempModulus.toUpperCase())) {
+    if (!DatatypeConverter.printHexBinary(rsaPubKey.getModulus().toByteArray())
+        .equals(tempModulus.toUpperCase())) {
       log.warn("modulus {} incorrect", modulus);
       return failed(this).feedback("crypto-signing.modulusnotok").build();
     }
@@ -80,7 +88,5 @@ public class SigningAssignment extends AssignmentEndpoint {
       log.warn("signature incorrect");
       return failed(this).feedback("crypto-signing.notok").build();
     }
-       
   }
-    
 }

src/main/java/org/owasp/webgoat/lessons/cryptography/XOREncodingAssignment.java

@@ -38,9 +38,7 @@ public class XOREncodingAssignment extends AssignmentEndpoint {
   @ResponseBody
   public AttackResult completed(@RequestParam String answer_pwd1) {
     if (answer_pwd1 != null && answer_pwd1.equals("databasepassword")) {
-        	return success(this)
+      return success(this).feedback("crypto-encoding-xor.success").build();
-        				.feedback("crypto-encoding-xor.success")
-        				.build();
     }
     return failed(this).feedback("crypto-encoding-xor.empty").build();
   }

src/main/java/org/owasp/webgoat/lessons/csrf/CSRF.java

@@ -26,9 +26,7 @@ import org.owasp.webgoat.container.lessons.Category;
 import org.owasp.webgoat.container.lessons.Lesson;
 import org.springframework.stereotype.Component;
 
-/**
+/** Created by jason on 9/29/17. */
- * Created by jason on 9/29/17.
- */
 @Component
 public class CSRF extends Lesson {
   @Override
@@ -37,5 +35,7 @@ public class CSRF extends Lesson {
   }
 
   @Override
-    public String getTitle() { return "csrf.title"; }
+  public String getTitle() {
+    return "csrf.title";
+  }
 }

src/main/java/org/owasp/webgoat/lessons/csrf/CSRFConfirmFlag1.java

@@ -31,18 +31,16 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
+/** Created by jason on 9/29/17. */
- * Created by jason on 9/29/17.
- */
-
 @RestController
 @AssignmentHints({"csrf-get.hint1", "csrf-get.hint2", "csrf-get.hint3", "csrf-get.hint4"})
 public class CSRFConfirmFlag1 extends AssignmentEndpoint {
 
-    @Autowired
+  @Autowired UserSessionData userSessionData;
-    UserSessionData userSessionData;
 
-    @PostMapping(path = "/csrf/confirm-flag-1", produces = {"application/json"})
+  @PostMapping(
+      path = "/csrf/confirm-flag-1",
+      produces = {"application/json"})
   @ResponseBody
   public AttackResult completed(String confirmFlagVal) {
     Object userSessionDataStr = userSessionData.getValue("csrf-get-success");