dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply formatting

Browse Source 
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.
This commit is contained in:
Nanne Baars 2023-01-04 08:07:23 +01:00 committed by GitHub
parent b03777d39b
commit d2a1546dff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
336 changed files with 13921 additions and 12688 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/stale.yml vendored
View File

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

5
.github/workflows/build.yml vendored
View File

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

37
CONTRIBUTING.md
View File

@ -1,4 +1,5 @@
# Contributing # Contributing
[![GitHub contributors](https://img.shields.io/github/contributors/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/graphs/contributors) [![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 "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) ![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: 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: 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. 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. 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. 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,14 +39,13 @@ 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 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. * If you are adding new functions don't '*cleanup*' unrelated functions. That cleanup belongs in another pull request.
### Write a good commit message ### 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) * Explain why you make the changes. [More infos about a good commit message.](https://betterprogramming.pub/stop-writing-bad-commit-messages-8df79517177d)
* If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message. * If you fix an issue with your commit, please close the issue by [adding one of the keywords and the issue number](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) to your commit message.
For example: `Fix #545` or `Closes #10` For example: `Fix #545` or `Closes #10`
## How to set up your Contributor Environment ## How to set up your Contributor Environment
@ -54,27 +54,34 @@ Pull requests should be as small/atomic as possible. Large, wide-sweeping change
3. Clone your own repository to your host computer so that you can make modifications. If you followed the GitHub tutorial from step 2, you have already done this. 3. Clone your own repository to your host computer so that you can make modifications. If you followed the GitHub tutorial from step 2, you have already done this.
4. Go to the newly cloned directory "WebGoat" and add the remote upstream repository: 4. Go to the newly cloned directory "WebGoat" and add the remote upstream repository:
```bash ```bash
$ git remote -v $ git remote -v
origin git@github.com:<your Github handle>/WebGoat.git (fetch) origin git@github.com:<your Github handle>/WebGoat.git (fetch)
origin git@github.com:<your Github handle>/WebGoat.git (push) origin git@github.com:<your Github handle>/WebGoat.git (push)
$ git remote add upstream git@github.com:WebGoat/WebGoat.git $ git remote add upstream git@github.com:WebGoat/WebGoat.git
$ git remote -v $ git remote -v
origin git@github.com:<your Github handle>/WebGoat.git (fetch) origin git@github.com:<your Github handle>/WebGoat.git (fetch)
origin git@github.com:<your Github handle>/WebGoat.git (push) origin git@github.com:<your Github handle>/WebGoat.git (push)
upstream git@github.com:OWASP/WebGoat.git (fetch) upstream git@github.com:OWASP/WebGoat.git (fetch)
upstream git@github.com:OWASP/WebGoat.git (push) upstream git@github.com:OWASP/WebGoat.git (push)
``` ```
See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
See also the GitHub documentation on "[Configuring a remote for a fork](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork "Configuring a remote for a fork")".
5. Choose what to work on, based on any of the outstanding [issues](https://github.com/WebGoat/WebGoat/issues "WebGoat Issues"). 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` 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/). 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. 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. 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. 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: 11. When starting on a new PR in the future, make sure to always keep your local repo up to date:
```bash ```bash

14
CREATE_RELEASE.md
View File

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

2
PULL_REQUEST_TEMPLATE.md
View File

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

9
README.md
View File

@ -44,13 +44,12 @@ 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.* **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 ## 2. Standalone
Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases) Download the latest WebGoat release from [https://github.com/WebGoat/WebGoat/releases](https://github.com/WebGoat/WebGoat/releases)
```shell ```shell
java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-8.2.3.jar java -Dfile.encoding=UTF-8 -Dwebgoat.port=8080 -Dwebwolf.port=9090 -jar webgoat-8.2.3.jar
``` ```
Click the link in the log to start WebGoat. Click the link in the log to start WebGoat.
@ -75,7 +74,7 @@ Now let's start by compiling the project.
cd WebGoat cd WebGoat
git checkout <<branch_name>> git checkout <<branch_name>>
# On Linux/Mac: # On Linux/Mac:
./mvnw clean install ./mvnw clean install
# On Windows: # On Windows:
./mvnw.cmd clean install ./mvnw.cmd clean install
@ -93,11 +92,11 @@ Now we are ready to run the project. WebGoat 8.x is using Spring-Boot.
./mvnw.cmd spring-boot:run ./mvnw.cmd spring-boot:run
``` ```
... you should be running WebGoat on http://localhost:8080/WebGoat momentarily. ... you should be running WebGoat on http://localhost:8080/WebGoat momentarily.
Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed. Note: The above link will redirect you to login page if you are not logged in. LogIn/Create account to proceed.
To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file: To change the IP address add the following variable to the `WebGoat/webgoat-container/src/main/resources/application.properties` file:
``` ```
@ -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 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: For instance running as a jar on a Linux/macOS it will look like this:
```Shell ```Shell
export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" export EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE"
export EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" 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 ```Shell
docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat docker run -d -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam -e EXCLUDE_CATEGORIES="CLIENT_SIDE,GENERAL,CHALLENGE" -e EXCLUDE_LESSONS="SqlInjectionAdvanced,SqlInjectionMitigations" webgoat/webgoat
``` ```

2
README_I18N.md
View File

@ -22,7 +22,7 @@ The following steps are required when you want to add a new language
4. Add a welcome page to the introduction lesson 4. Add a welcome page to the introduction lesson
1. Copy Introduction_.adoc to Introduction_es.adoc (if in this case you want to add Spanish) 1. Copy Introduction_.adoc to Introduction_es.adoc (if in this case you want to add Spanish)
2. Add a highlighted section that explains that most parts of WebGoat will still be in English and invite people to translate parts where it would be valuable 2. Add a highlighted section that explains that most parts of WebGoat will still be in English and invite people to translate parts where it would be valuable
5. Translate the main labels 5. Translate the main labels
1. Copy messages.properties to messages_es.properties (if in this case you want to add Spanish) 1. Copy messages.properties to messages_es.properties (if in this case you want to add Spanish)
2. Translate the label values 2. Translate the label values
6. Optionally translate lessons by 6. Optionally translate lessons by

45
RELEASE_NOTES.md
View File

@ -1,4 +1,4 @@
# WebGoat release notes # WebGoat release notes
## Unreleased ## Unreleased
@ -6,14 +6,14 @@
- New year's resolution: major refactoring of WebGoat to simplify the setup and improve building times. - New year's resolution: major refactoring of WebGoat to simplify the setup and improve building times.
- Move away from multi-project setup: - 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. - 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. - 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 - Add WebWolf button in WebGoat
- Move all lessons into `src/main/resources` - Move all lessons into `src/main/resources`
- WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease the user experience. - WebGoat selects a port dynamically when starting. It will still start of port 8080 it will try another port to ease the user experience.
- WebGoat logs URL after startup: `Please browse to http://127.0.0.1:8080/WebGoat to get started...` - WebGoat logs URL after startup: `Please browse to http://127.0.0.1:8080/WebGoat to get started...`
- Simplify `Dockerfile` as we no longer need a script to start everything - Simplify `Dockerfile` as we no longer need a script to start everything
- Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build. - Maven build now start WebGoat jar with Maven plugin to make sure we run against the latest build.
@ -35,7 +35,7 @@
### New functionality ### New functionality
- Docker image now supports nginx when browsing to http://localhost a landing page is shown. - Docker image now supports nginx when browsing to http://localhost a landing page is shown.
### Bug fixes ### Bug fixes
@ -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) - [#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) - [#1027 Webgoat 8.2.1 Vulnerable_Components_12 Shows internal server error](https://github.com/WebGoat/WebGoat/issues/1027)
## Version 8.2.1 ## Version 8.2.1
### New functionality ### New functionality
- New Docker image for arm64 architecture is now available (for Apple M1) - New Docker image for arm64 architecture is now available (for Apple M1)
## Version 8.2.0 ## Version 8.2.0
### New functionality ### New functionality
@ -85,11 +83,10 @@ Special thanks to the following contributors providing us with a pull request:
- maximmasiutin - maximmasiutin
- toshihue - toshihue
- avivmu - avivmu
- KellyMarchewa - KellyMarchewa
- NatasG - NatasG
- gabe-sky - gabe-sky
## Version 8.1.0 ## Version 8.1.0
### New functionality ### New functionality
@ -97,27 +94,27 @@ Special thanks to the following contributors providing us with a pull request:
- Added new lessons for cryptography and path-traversal - Added new lessons for cryptography and path-traversal
- Extra content added to the XXE lesson - Extra content added to the XXE lesson
- Explanation of the assignments will be part of WebGoat, in this release we added detailed descriptions on how to solve the XXE lesson. In the upcoming releases new explanations will be added. If you want to contribute please create a pull request on Github. - Explanation of the assignments will be part of WebGoat, in this release we added detailed descriptions on how to solve the XXE lesson. In the upcoming releases new explanations will be added. If you want to contribute please create a pull request on Github.
- Docker improvements + docker stack for complete container with nginx - Docker improvements + docker stack for complete container with nginx
- Included JWT token decoding and generation, since jwt.io does not support None anymore - Included JWT token decoding and generation, since jwt.io does not support None anymore
### Bug fixes ### Bug fixes
- [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743) - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
- [#811 - Flag submission fails](https://github.com/WebGoat/WebGoat/issues/811) - [#811 - Flag submission fails](https://github.com/WebGoat/WebGoat/issues/811)
- [#810 - Scoreboard for challenges shows csrf users](https://github.com/WebGoat/WebGoat/issues/810) - [#810 - Scoreboard for challenges shows csrf users](https://github.com/WebGoat/WebGoat/issues/810)
- [#788 - strange copy in constructor](https://github.com/WebGoat/WebGoat/issues/788) - [#788 - strange copy in constructor](https://github.com/WebGoat/WebGoat/issues/788)
- [#760 - Execution of standalone jar fails (Flyway migration step](https://github.com/WebGoat/WebGoat/issues/760) - [#760 - Execution of standalone jar fails (Flyway migration step](https://github.com/WebGoat/WebGoat/issues/760)
- [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766) - [#766 - Unclear objective of vulnerable components practical assignment](https://github.com/WebGoat/WebGoat/issues/766)
- [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708) - [#708 - Seems like the home directory of WebGoat always use @project.version@](https://github.com/WebGoat/WebGoat/issues/708)
- [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719) - [#719 - WebGoat: 'Contact Us' email link in header is not correctly set](https://github.com/WebGoat/WebGoat/issues/719)
- [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715) - [#715 - Reset lesson doesn't reset the "HTML lesson" => forms stay succesful](https://github.com/WebGoat/WebGoat/issues/715)
- [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725) - [#725 - Vulnerable Components lesson 12 broken due to too new dependency](https://github.com/WebGoat/WebGoat/issues/725)
- [#716 - On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716) - [#716 - On M26 @project.version@ is not "interpreted" #7](https://github.com/WebGoat/WebGoat/issues/716)
- [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721) - [#721 couldn't be able to run CSRF lesson 3: Receive Whitelabel Error Page](https://github.com/WebGoat/WebGoat/issues/721)
- [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724) - [#724 - Dead link in VulnerableComponents lesson 11](https://github.com/WebGoat/WebGoat/issues/724)
## Contributors ## Contributors
Special thanks to the following contributors providing us with a pull request: Special thanks to the following contributors providing us with a pull request:
- Satoshi SAKAO - Satoshi SAKAO
@ -132,9 +129,5 @@ Special thanks to the following contributors providing us with a pull request:
And everyone who provided feedback through Github. And everyone who provided feedback through Github.
Team WebGoat Team WebGoat

1
docs/README.md
View File

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

1360
pom.xml
View File

File diff suppressed because it is too large Load Diff

19
robot/README.md
View File

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

118
src/main/java/org/dummy/insecure/framework/VulnerableTaskHolder.java
View File

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

80
src/main/java/org/owasp/webgoat/container/AjaxAuthenticationEntryPoint.java
View File

@ -1,59 +1,59 @@
/** /**
* ************************************************************************************************* * *************************************************************************************************
*
* <p> * <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. * for free software projects.
*/ */
package org.owasp.webgoat.container; 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.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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 * @author zupzup
*/ */
public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint { public class AjaxAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint {
public AjaxAuthenticationEntryPoint(String loginFormUrl) { public AjaxAuthenticationEntryPoint(String loginFormUrl) {
super(loginFormUrl); super(loginFormUrl);
} }
@Override @Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { public void commence(
if (request.getHeader("x-requested-with") != null) { HttpServletRequest request,
response.sendError(401, authException.getMessage()); HttpServletResponse response,
} else { AuthenticationException authException)
super.commence(request, response, authException); throws IOException, ServletException {
} if (request.getHeader("x-requested-with") != null) {
response.sendError(401, authException.getMessage());
} else {
super.commence(request, response, authException);
} }
}
} }

234
src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.java
View File

@ -1,37 +1,47 @@
/** /**
* ************************************************************************************************ * ************************************************************************************************
* 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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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> * <p>
* *
* @author WebGoat * @author WebGoat
* @version $Id: $Id * @version $Id: $Id
* @since December 12, 2015 * @since December 12, 2015
*/ */
package org.owasp.webgoat.container; package org.owasp.webgoat.container;
import static org.asciidoctor.Asciidoctor.Factory.create;
import io.undertow.util.Headers; 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 lombok.extern.slf4j.Slf4j;
import org.asciidoctor.Asciidoctor; import org.asciidoctor.Asciidoctor;
import org.asciidoctor.extension.JavaExtensionRegistry; import org.asciidoctor.extension.JavaExtensionRegistry;
@ -46,113 +56,117 @@ import org.thymeleaf.templateresolver.FileTemplateResolver;
import org.thymeleaf.templateresource.ITemplateResource; import org.thymeleaf.templateresource.ITemplateResource;
import org.thymeleaf.templateresource.StringTemplateResource; 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: * 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> * <div th:replace="doc:AccessControlMatrix_plan.adoc"></div>
* </code> * </code>
*/ */
@Slf4j @Slf4j
public class AsciiDoctorTemplateResolver extends FileTemplateResolver { public class AsciiDoctorTemplateResolver extends FileTemplateResolver {
private static final Asciidoctor asciidoctor = create(); private static final Asciidoctor asciidoctor = create();
private static final String PREFIX = "doc:"; private static final String PREFIX = "doc:";
private final Language language; private final Language language;
private final ResourceLoader resourceLoader; private final ResourceLoader resourceLoader;
public AsciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) { public AsciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) {
this.resourceLoader = resourceLoader; this.resourceLoader = resourceLoader;
this.language = language; this.language = language;
setResolvablePatterns(Set.of(PREFIX + "*")); setResolvablePatterns(Set.of(PREFIX + "*"));
}
@Override
protected ITemplateResource computeTemplateResource(
IEngineConfiguration configuration,
String ownerTemplate,
String template,
String resourceName,
String characterEncoding,
Map<String, Object> templateResolutionAttributes) {
var templateName = resourceName.substring(PREFIX.length());
log.debug("template used: {}", templateName);
try (InputStream is = getInputStream(templateName)) {
JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry();
extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class);
extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class);
extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class);
extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class);
extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class);
extensionRegistry.inlineMacro("username", UsernameMacro.class);
StringWriter writer = new StringWriter();
asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
return new StringTemplateResource(writer.getBuffer().toString());
} catch (IOException e) {
return new StringTemplateResource(
"<div>Unable to find documentation for: " + templateName + " </div>");
} }
}
@Override private InputStream getInputStream(String templateName) throws IOException {
protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) { log.debug("locale: {}", language.getLocale().getLanguage());
var templateName = resourceName.substring(PREFIX.length()); String computedResourceName =
log.debug("template used: {}", templateName); computeResourceName(templateName, language.getLocale().getLanguage());
try (InputStream is = getInputStream(templateName)) { if (resourceLoader
JavaExtensionRegistry extensionRegistry = asciidoctor.javaExtensionRegistry(); .getResource("classpath:/" + computedResourceName)
extensionRegistry.inlineMacro("webWolfLink", WebWolfMacro.class); .isReadable() /*isFile()*/) {
extensionRegistry.inlineMacro("webWolfRootLink", WebWolfRootMacro.class); log.debug("localized file exists");
extensionRegistry.inlineMacro("webGoatVersion", WebGoatVersionMacro.class); return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream();
extensionRegistry.inlineMacro("webGoatTempDir", WebGoatTmpDirMacro.class); } else {
extensionRegistry.inlineMacro("operatingSystem", OperatingSystemMacro.class); log.debug("using english template");
extensionRegistry.inlineMacro("username", UsernameMacro.class); return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
StringWriter writer = new StringWriter();
asciidoctor.convert(new InputStreamReader(is), writer, createAttributes());
return new StringTemplateResource(writer.getBuffer().toString());
} catch (IOException e) {
return new StringTemplateResource("<div>Unable to find documentation for: " + templateName + " </div>");
}
} }
}
private InputStream getInputStream(String templateName) throws IOException { private String computeResourceName(String resourceName, String language) {
log.debug("locale: {}",language.getLocale().getLanguage()); String computedResourceName;
String computedResourceName = computeResourceName(templateName, language.getLocale().getLanguage()); if (language.equals("en")) {
if (resourceLoader.getResource("classpath:/" + computedResourceName).isReadable()/*isFile()*/) { computedResourceName = resourceName;
log.debug("localized file exists"); } else {
return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream(); computedResourceName = resourceName.replace(".adoc", "_".concat(language).concat(".adoc"));
} else {
log.debug("using english template");
return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
}
} }
private String computeResourceName(String resourceName, String language) { log.debug("computed local file name: {}", computedResourceName);
String computedResourceName; log.debug(
if (language.equals("en")) { "file exists: {}",
computedResourceName = resourceName; resourceLoader.getResource("classpath:/" + computedResourceName).isReadable());
} else { return computedResourceName;
computedResourceName = resourceName.replace(".adoc", "_".concat(language).concat(".adoc")); }
}
log.debug("computed local file name: {}", computedResourceName); private Map<String, Object> createAttributes() {
log.debug("file exists: {}",resourceLoader.getResource("classpath:/"+computedResourceName).isReadable()); Map<String, Object> attributes = new HashMap<>();
return computedResourceName; attributes.put("source-highlighter", "coderay");
} attributes.put("backend", "xhtml");
attributes.put("lang", determineLanguage());
private Map<String, Object> createAttributes() { attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS);
Map<String, Object> attributes = new HashMap<>();
attributes.put("source-highlighter", "coderay"); Map<String, Object> options = new HashMap<>();
attributes.put("backend", "xhtml"); options.put("attributes", attributes);
attributes.put("lang", determineLanguage());
attributes.put("icons", org.asciidoctor.Attributes.FONT_ICONS); return options;
}
Map<String, Object> options = new HashMap<>();
options.put("attributes", attributes); private String determineLanguage() {
HttpServletRequest request =
return options; ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
}
Locale browserLocale =
private String determineLanguage() { (Locale)
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
if (null != browserLocale) {
Locale browserLocale = (Locale) request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME); log.debug("browser locale {}", browserLocale);
if (null != browserLocale) { return browserLocale.getLanguage();
log.debug("browser locale {}", browserLocale); } else {
return browserLocale.getLanguage(); String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING);
} else { if (null != langHeader) {
String langHeader = request.getHeader(Headers.ACCEPT_LANGUAGE_STRING); log.debug("browser locale {}", langHeader);
if (null != langHeader) { return langHeader.substring(0, 2);
log.debug("browser locale {}", langHeader); } else {
return langHeader.substring(0,2); log.debug("browser default english");
} else { return "en";
log.debug("browser default english"); }
return "en";
}
}
} }
}
} }

89
src/main/java/org/owasp/webgoat/container/DatabaseConfiguration.java
View File

@ -1,5 +1,8 @@
package org.owasp.webgoat.container; package org.owasp.webgoat.container;
import java.util.Map;
import java.util.function.Function;
import javax.sql.DataSource;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flywaydb.core.Flyway; import org.flywaydb.core.Flyway;
@ -11,58 +14,54 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.jdbc.datasource.DriverManagerDataSource;
import javax.sql.DataSource;
import java.util.Map;
import java.util.function.Function;
@Configuration @Configuration
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class DatabaseConfiguration { public class DatabaseConfiguration {
private final DataSourceProperties properties; private final DataSourceProperties properties;
private final LessonScanner lessonScanner; private final LessonScanner lessonScanner;
@Bean @Bean
@Primary @Primary
public DataSource dataSource() { public DataSource dataSource() {
DriverManagerDataSource dataSource = new DriverManagerDataSource(); DriverManagerDataSource dataSource = new DriverManagerDataSource();
dataSource.setDriverClassName(properties.getDriverClassName()); dataSource.setDriverClassName(properties.getDriverClassName());
dataSource.setUrl(properties.getUrl()); dataSource.setUrl(properties.getUrl());
dataSource.setUsername(properties.getUsername()); dataSource.setUsername(properties.getUsername());
dataSource.setPassword(properties.getPassword()); dataSource.setPassword(properties.getPassword());
return dataSource; return dataSource;
} }
/** /**
* 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() { @Bean(initMethod = "migrate")
return Flyway public Flyway flyWayContainer() {
.configure() return Flyway.configure()
.configuration(Map.of("driver", properties.getDriverClassName())) .configuration(Map.of("driver", properties.getDriverClassName()))
.dataSource(dataSource()) .dataSource(dataSource())
.schemas("container") .schemas("container")
.locations("db/container") .locations("db/container")
.load(); .load();
} }
@Bean @Bean
public Function<String, Flyway> flywayLessons(LessonDataSource lessonDataSource) { public Function<String, Flyway> flywayLessons(LessonDataSource lessonDataSource) {
return schema -> Flyway return schema ->
.configure() Flyway.configure()
.configuration(Map.of("driver", properties.getDriverClassName())) .configuration(Map.of("driver", properties.getDriverClassName()))
.schemas(schema) .schemas(schema)
.dataSource(lessonDataSource) .dataSource(lessonDataSource)
.locations("lessons") .locations("lessons")
.load(); .load();
} }
@Bean @Bean
public LessonDataSource lessonDataSource() { public LessonDataSource lessonDataSource() {
return new LessonDataSource(dataSource()); return new LessonDataSource(dataSource());
} }
} }

61
src/main/java/org/owasp/webgoat/container/HammerHead.java
View File

@ -9,30 +9,29 @@ import org.springframework.web.servlet.ModelAndView;
/** /**
* ************************************************************************************************* * *************************************************************************************************
*
* <p> * <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. * for free software projects.
* *
* @author Jeff Williams * @author Jeff Williams
@ -45,13 +44,13 @@ import org.springframework.web.servlet.ModelAndView;
@AllArgsConstructor @AllArgsConstructor
public class HammerHead { public class HammerHead {
private final Course course; 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() { public ModelAndView attack() {
return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink()); return new ModelAndView("redirect:" + "start.mvc" + course.getFirstLesson().getLink());
} }
} }

96
src/main/java/org/owasp/webgoat/container/LessonDataSource.java
View File

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

106
src/main/java/org/owasp/webgoat/container/LessonTemplateResolver.java
View File

@ -1,36 +1,41 @@
/** /**
* ************************************************************************************************ * ************************************************************************************************
*
* <p> * <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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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 * @author WebGoat
* @version $Id: $Id * @version $Id: $Id
* @since October 28, 2003 * @since October 28, 2003
*/ */
package org.owasp.webgoat.container; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.thymeleaf.IEngineConfiguration; import org.thymeleaf.IEngineConfiguration;
@ -38,45 +43,48 @@ import org.thymeleaf.templateresolver.FileTemplateResolver;
import org.thymeleaf.templateresource.ITemplateResource; import org.thymeleaf.templateresource.ITemplateResource;
import org.thymeleaf.templateresource.StringTemplateResource; 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> * <div th:case="true" th:replace="lesson:__${lesson.class.simpleName}__"></div>
* </code> * </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 @Slf4j
public class LessonTemplateResolver extends FileTemplateResolver { public class LessonTemplateResolver extends FileTemplateResolver {
private static final String PREFIX = "lesson:"; private static final String PREFIX = "lesson:";
private ResourceLoader resourceLoader; private ResourceLoader resourceLoader;
private Map<String, byte[]> resources = new HashMap<>(); private Map<String, byte[]> resources = new HashMap<>();
public LessonTemplateResolver(ResourceLoader resourceLoader) { public LessonTemplateResolver(ResourceLoader resourceLoader) {
this.resourceLoader = resourceLoader; this.resourceLoader = resourceLoader;
setResolvablePatterns(Set.of(PREFIX + "*")); setResolvablePatterns(Set.of(PREFIX + "*"));
} }
@Override @Override
protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) { protected ITemplateResource computeTemplateResource(
var templateName = resourceName.substring(PREFIX.length()); IEngineConfiguration configuration,
byte[] resource = resources.get(templateName); String ownerTemplate,
if (resource == null) { String template,
try { String resourceName,
resource = resourceLoader.getResource("classpath:/" + templateName).getInputStream().readAllBytes(); String characterEncoding,
} catch (IOException e) { Map<String, Object> templateResolutionAttributes) {
log.error("Unable to find lesson HTML: {}", template); var templateName = resourceName.substring(PREFIX.length());
} byte[] resource = resources.get(templateName);
resources.put(templateName, resource); if (resource == null) {
} try {
return new StringTemplateResource(new String(resource, StandardCharsets.UTF_8)); resource =
resourceLoader
.getResource("classpath:/" + templateName)
.getInputStream()
.readAllBytes();
} catch (IOException e) {
log.error("Unable to find lesson HTML: {}", template);
}
resources.put(templateName, resource);
} }
return new StringTemplateResource(new String(resource, StandardCharsets.UTF_8));
}
} }

354
src/main/java/org/owasp/webgoat/container/MvcConfiguration.java
View File

@ -1,36 +1,40 @@
/** /**
* ************************************************************************************************ * ************************************************************************************************
*
* <p> * <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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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 * @author WebGoat
* @version $Id: $Id * @version $Id: $Id
* @since October 28, 2003 * @since October 28, 2003
*/ */
package org.owasp.webgoat.container; 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.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.owasp.webgoat.container.i18n.Language; import org.owasp.webgoat.container.i18n.Language;
@ -62,175 +66,195 @@ import org.thymeleaf.templateresolver.ITemplateResolver;
import org.thymeleaf.templateresource.ITemplateResource; import org.thymeleaf.templateresource.ITemplateResource;
import org.thymeleaf.templateresource.StringTemplateResource; 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 @Configuration
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
public class MvcConfiguration implements WebMvcConfigurer { public class MvcConfiguration implements WebMvcConfigurer {
private static final String UTF8 = "UTF-8"; private static final String UTF8 = "UTF-8";
private final LessonScanner lessonScanner; private final LessonScanner lessonScanner;
@Override @Override
public void addViewControllers(ViewControllerRegistry registry) { public void addViewControllers(ViewControllerRegistry registry) {
registry.addViewController("/login").setViewName("login"); registry.addViewController("/login").setViewName("login");
registry.addViewController("/lesson_content").setViewName("lesson_content"); registry.addViewController("/lesson_content").setViewName("lesson_content");
registry.addViewController("/start.mvc").setViewName("main_new"); registry.addViewController("/start.mvc").setViewName("main_new");
registry.addViewController("/scoreboard").setViewName("scoreboard"); registry.addViewController("/scoreboard").setViewName("scoreboard");
} }
@Bean @Bean
public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) { public ViewResolver viewResolver(SpringTemplateEngine thymeleafTemplateEngine) {
ThymeleafViewResolver resolver = new ThymeleafViewResolver(); ThymeleafViewResolver resolver = new ThymeleafViewResolver();
resolver.setTemplateEngine(thymeleafTemplateEngine); resolver.setTemplateEngine(thymeleafTemplateEngine);
resolver.setCharacterEncoding(StandardCharsets.UTF_8.displayName()); resolver.setCharacterEncoding(StandardCharsets.UTF_8.displayName());
return resolver; return resolver;
} }
/** /**
* Responsible for loading lesson templates based on Thymeleaf, for example: * 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 @Bean
public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) { public ITemplateResolver lessonThymeleafTemplateResolver(ResourceLoader resourceLoader) {
var resolver = new FileTemplateResolver() { var resolver =
@Override new FileTemplateResolver() {
protected ITemplateResource computeTemplateResource(IEngineConfiguration configuration, String ownerTemplate, String template, String resourceName, String characterEncoding, Map<String, Object> templateResolutionAttributes) { @Override
try (var is = resourceLoader.getResource("classpath:" + resourceName).getInputStream()) { protected ITemplateResource computeTemplateResource(
return new StringTemplateResource(new String(is.readAllBytes(), StandardCharsets.UTF_8)); IEngineConfiguration configuration,
} catch (IOException e) { String ownerTemplate,
return null; String template,
} String resourceName,
String characterEncoding,
Map<String, Object> templateResolutionAttributes) {
try (var is =
resourceLoader.getResource("classpath:" + resourceName).getInputStream()) {
return new StringTemplateResource(
new String(is.readAllBytes(), StandardCharsets.UTF_8));
} catch (IOException e) {
return null;
} }
}
}; };
resolver.setOrder(1); resolver.setOrder(1);
return resolver; return resolver;
} }
/** /** Loads all normal WebGoat specific Thymeleaf templates */
* Loads all normal WebGoat specific Thymeleaf templates @Bean
*/ public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
@Bean SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
public ITemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) { resolver.setPrefix("classpath:/webgoat/templates/");
SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver(); resolver.setSuffix(".html");
resolver.setPrefix("classpath:/webgoat/templates/"); resolver.setTemplateMode(TemplateMode.HTML);
resolver.setSuffix(".html"); resolver.setOrder(2);
resolver.setTemplateMode(TemplateMode.HTML); resolver.setCharacterEncoding(UTF8);
resolver.setOrder(2); resolver.setApplicationContext(applicationContext);
resolver.setCharacterEncoding(UTF8); return resolver;
resolver.setApplicationContext(applicationContext); }
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) {
@Bean LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader);
public LessonTemplateResolver lessonTemplateResolver(ResourceLoader resourceLoader) { resolver.setOrder(0);
LessonTemplateResolver resolver = new LessonTemplateResolver(resourceLoader); resolver.setCacheable(false);
resolver.setOrder(0); resolver.setCharacterEncoding(UTF8);
resolver.setCacheable(false); return resolver;
resolver.setCharacterEncoding(UTF8); }
return resolver;
}
/** /** Loads the lesson asciidoc. */
* Loads the lesson asciidoc. @Bean
*/ public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(
@Bean Language language, ResourceLoader resourceLoader) {
public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver(Language language, ResourceLoader resourceLoader) { log.debug("template locale {}", language);
log.debug("template locale {}", language); AsciiDoctorTemplateResolver resolver =
AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(language, resourceLoader); new AsciiDoctorTemplateResolver(language, resourceLoader);
resolver.setCacheable(false); resolver.setCacheable(false);
resolver.setOrder(1); resolver.setOrder(1);
resolver.setCharacterEncoding(UTF8); resolver.setCharacterEncoding(UTF8);
return resolver; return resolver;
} }
@Bean @Bean
public SpringTemplateEngine thymeleafTemplateEngine(ITemplateResolver springThymeleafTemplateResolver, public SpringTemplateEngine thymeleafTemplateEngine(
LessonTemplateResolver lessonTemplateResolver, ITemplateResolver springThymeleafTemplateResolver,
AsciiDoctorTemplateResolver asciiDoctorTemplateResolver, LessonTemplateResolver lessonTemplateResolver,
ITemplateResolver lessonThymeleafTemplateResolver) { AsciiDoctorTemplateResolver asciiDoctorTemplateResolver,
SpringTemplateEngine engine = new SpringTemplateEngine(); ITemplateResolver lessonThymeleafTemplateResolver) {
engine.setEnableSpringELCompiler(true); SpringTemplateEngine engine = new SpringTemplateEngine();
engine.addDialect(new SpringSecurityDialect()); engine.setEnableSpringELCompiler(true);
engine.setTemplateResolvers( engine.addDialect(new SpringSecurityDialect());
Set.of(lessonTemplateResolver, asciiDoctorTemplateResolver, lessonThymeleafTemplateResolver, springThymeleafTemplateResolver)); engine.setTemplateResolvers(
return engine; Set.of(
} lessonTemplateResolver,
asciiDoctorTemplateResolver,
lessonThymeleafTemplateResolver,
springThymeleafTemplateResolver));
return engine;
}
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
//WebGoat internal // WebGoat internal
registry.addResourceHandler("/css/**").addResourceLocations("classpath:/webgoat/static/css/"); 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 // 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 @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 pluginMessages = new PluginMessages(messages, language, resourcePatternResolver);
pluginMessages.setDefaultEncoding("UTF-8"); pluginMessages.setDefaultEncoding("UTF-8");
pluginMessages.setBasenames("i18n/WebGoatLabels"); pluginMessages.setBasenames("i18n/WebGoatLabels");
pluginMessages.setFallbackToSystemLocale(false); pluginMessages.setFallbackToSystemLocale(false);
return pluginMessages; return pluginMessages;
} }
@Bean @Bean
public Language language(LocaleResolver localeResolver) { public Language language(LocaleResolver localeResolver) {
return new Language(localeResolver); return new Language(localeResolver);
} }
@Bean @Bean
public LocaleResolver localeResolver() { public LocaleResolver localeResolver() {
SessionLocaleResolver localeResolver = new SessionLocaleResolver(); SessionLocaleResolver localeResolver = new SessionLocaleResolver();
return localeResolver; return localeResolver;
} }
@Bean @Bean
public LocaleChangeInterceptor localeChangeInterceptor() { public LocaleChangeInterceptor localeChangeInterceptor() {
LocaleChangeInterceptor lci = new LocaleChangeInterceptor(); LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
lci.setParamName("lang"); lci.setParamName("lang");
return lci; return lci;
} }
@Override @Override
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(localeChangeInterceptor()); registry.addInterceptor(localeChangeInterceptor());
} }
@Bean @Bean
public Messages messageSource(Language language) { public Messages messageSource(Language language) {
Messages messages = new Messages(language); Messages messages = new Messages(language);
messages.setDefaultEncoding("UTF-8"); messages.setDefaultEncoding("UTF-8");
messages.setBasename("classpath:i18n/messages"); messages.setBasename("classpath:i18n/messages");
messages.setFallbackToSystemLocale(false); messages.setFallbackToSystemLocale(false);
return messages; return messages;
} }
@Bean
public LabelDebugger labelDebugger() {
return new LabelDebugger();
}
@Bean
public LabelDebugger labelDebugger() {
return new LabelDebugger();
}
} }

77
src/main/java/org/owasp/webgoat/container/WebGoat.java
View File

@ -1,36 +1,37 @@
/** /**
* ************************************************************************************************ * ************************************************************************************************
*
* <p> * <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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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 * @author WebGoat
* @version $Id: $Id * @version $Id: $Id
* @since October 28, 2003 * @since October 28, 2003
*/ */
package org.owasp.webgoat.container; package org.owasp.webgoat.container;
import java.io.File;
import org.owasp.webgoat.container.session.UserSessionData; import org.owasp.webgoat.container.session.UserSessionData;
import org.owasp.webgoat.container.session.WebSession; import org.owasp.webgoat.container.session.WebSession;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -43,33 +44,31 @@ import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.io.File;
@Configuration @Configuration
@ComponentScan(basePackages = { "org.owasp.webgoat.container", "org.owasp.webgoat.lessons"}) @ComponentScan(basePackages = {"org.owasp.webgoat.container", "org.owasp.webgoat.lessons"})
@PropertySource("classpath:application-webgoat.properties") @PropertySource("classpath:application-webgoat.properties")
@EnableAutoConfiguration @EnableAutoConfiguration
public class WebGoat { public class WebGoat {
@Bean(name = "pluginTargetDirectory") @Bean(name = "pluginTargetDirectory")
public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) { public File pluginTargetDirectory(@Value("${webgoat.user.directory}") final String webgoatHome) {
return new File(webgoatHome); return new File(webgoatHome);
} }
@Bean @Bean
@Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS) @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
public WebSession webSession() { public WebSession webSession() {
return new WebSession(); return new WebSession();
} }
@Bean @Bean
@Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS) @Scope(value = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
public UserSessionData userSessionData() { public UserSessionData userSessionData() {
return new UserSessionData("test", "data"); return new UserSessionData("test", "data");
} }
@Bean @Bean
public RestTemplate restTemplate() { public RestTemplate restTemplate() {
return new RestTemplate(); return new RestTemplate();
} }
} }

126
src/main/java/org/owasp/webgoat/container/WebSecurityConfig.java
View File

@ -2,36 +2,35 @@
* ************************************************************************************************ * ************************************************************************************************
* 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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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> * <p>
* *
* @author WebGoat * @author WebGoat
* @version $Id: $Id * @version $Id: $Id
* @since December 12, 2015 * @since December 12, 2015
*/ */
package org.owasp.webgoat.container; package org.owasp.webgoat.container;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.owasp.webgoat.container.i18n.Language;
import org.owasp.webgoat.container.users.UserService; import org.owasp.webgoat.container.users.UserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -44,59 +43,66 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.password.NoOpPasswordEncoder; import org.springframework.security.crypto.password.NoOpPasswordEncoder;
import org.springframework.web.servlet.i18n.SessionLocaleResolver;
/** /** Security configuration for WebGoat. */
* Security configuration for WebGoat.
*/
@Configuration @Configuration
@AllArgsConstructor @AllArgsConstructor
@EnableWebSecurity @EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter { public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
private final UserService userDetailsService; private final UserService userDetailsService;
@Override @Override
protected void configure(HttpSecurity http) throws Exception { 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/**",
.formLogin() "/js/**",
.loginPage("/login") "fonts/**",
.defaultSuccessUrl("/welcome.mvc", true) "/plugins/**",
.usernameParameter("username") "/registration",
.passwordParameter("password") "/register.mvc",
.permitAll(); "/actuator/**")
security.and() .permitAll()
.logout().deleteCookies("JSESSIONID").invalidateHttpSession(true); .anyRequest()
security.and().csrf().disable(); .authenticated();
security
.and()
.formLogin()
.loginPage("/login")
.defaultSuccessUrl("/welcome.mvc", true)
.usernameParameter("username")
.passwordParameter("password")
.permitAll();
security.and().logout().deleteCookies("JSESSIONID").invalidateHttpSession(true);
security.and().csrf().disable();
http.headers().cacheControl().disable(); http.headers().cacheControl().disable();
http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login")); http.exceptionHandling().authenticationEntryPoint(new AjaxAuthenticationEntryPoint("/login"));
} }
@Autowired @Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
auth.userDetailsService(userDetailsService); auth.userDetailsService(userDetailsService);
} }
@Bean @Bean
@Override @Override
public UserDetailsService userDetailsServiceBean() throws Exception { public UserDetailsService userDetailsServiceBean() throws Exception {
return userDetailsService; return userDetailsService;
} }
@Override @Override
@Bean @Bean
protected AuthenticationManager authenticationManager() throws Exception { protected AuthenticationManager authenticationManager() throws Exception {
return super.authenticationManager(); return super.authenticationManager();
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Bean @Bean
public NoOpPasswordEncoder passwordEncoder() { public NoOpPasswordEncoder passwordEncoder() {
return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance();
} }
} }

12
src/main/java/org/owasp/webgoat/container/WebWolfRedirect.java
View File

@ -10,12 +10,12 @@ import org.springframework.web.servlet.ModelAndView;
@RequiredArgsConstructor @RequiredArgsConstructor
public class WebWolfRedirect { public class WebWolfRedirect {
private final ApplicationContext applicationContext; private final ApplicationContext applicationContext;
@GetMapping("/WebWolf") @GetMapping("/WebWolf")
public ModelAndView openWebWolf() { public ModelAndView openWebWolf() {
var url = applicationContext.getEnvironment().getProperty("webwolf.url"); var url = applicationContext.getEnvironment().getProperty("webwolf.url");
return new ModelAndView("redirect:" + url + "/home"); return new ModelAndView("redirect:" + url + "/home");
} }
} }

19
src/main/java/org/owasp/webgoat/container/asciidoc/EnvironmentExposure.java
View File

@ -7,19 +7,20 @@ import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component; 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 @Component
public class EnvironmentExposure implements ApplicationContextAware { public class EnvironmentExposure implements ApplicationContextAware {
private static ApplicationContext context; private static ApplicationContext context;
public static Environment getEnv() { public static Environment getEnv() {
return context.getEnvironment(); return context.getEnvironment();
} }
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
context = applicationContext; context = applicationContext;
} }
} }

28
src/main/java/org/owasp/webgoat/container/asciidoc/OperatingSystemMacro.java
View File

@ -1,25 +1,25 @@
package org.owasp.webgoat.container.asciidoc; package org.owasp.webgoat.container.asciidoc;
import java.util.Map;
import org.asciidoctor.ast.ContentNode; import org.asciidoctor.ast.ContentNode;
import org.asciidoctor.extension.InlineMacroProcessor; import org.asciidoctor.extension.InlineMacroProcessor;
import java.util.Map;
public class OperatingSystemMacro extends InlineMacroProcessor { public class OperatingSystemMacro extends InlineMacroProcessor {
public OperatingSystemMacro(String macroName) { public OperatingSystemMacro(String macroName) {
super(macroName); super(macroName);
} }
public OperatingSystemMacro(String macroName, Map<String, Object> config) { public OperatingSystemMacro(String macroName, Map<String, Object> config) {
super(macroName, config); super(macroName, config);
} }
@Override @Override
public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) { public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
var osName = System.getProperty("os.name"); 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
return createPhraseNode(contentNode, "quoted", osName); // 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);
}
} }

38
src/main/java/org/owasp/webgoat/container/asciidoc/UsernameMacro.java
View File

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

29
src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatTmpDirMacro.java
View File

@ -1,26 +1,25 @@
package org.owasp.webgoat.container.asciidoc; package org.owasp.webgoat.container.asciidoc;
import java.util.Map;
import org.asciidoctor.ast.ContentNode; import org.asciidoctor.ast.ContentNode;
import org.asciidoctor.extension.InlineMacroProcessor; import org.asciidoctor.extension.InlineMacroProcessor;
import java.util.Map;
public class WebGoatTmpDirMacro extends InlineMacroProcessor { public class WebGoatTmpDirMacro extends InlineMacroProcessor {
public WebGoatTmpDirMacro(String macroName) { public WebGoatTmpDirMacro(String macroName) {
super(macroName); super(macroName);
} }
public WebGoatTmpDirMacro(String macroName, Map<String, Object> config) { public WebGoatTmpDirMacro(String macroName, Map<String, Object> config) {
super(macroName, config); super(macroName, config);
} }
@Override @Override
public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) { public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
var env = EnvironmentExposure.getEnv().getProperty("webgoat.server.directory"); 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
return createPhraseNode(contentNode, "quoted", env); // 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);
} }
} }

28
src/main/java/org/owasp/webgoat/container/asciidoc/WebGoatVersionMacro.java
View File

@ -1,25 +1,25 @@
package org.owasp.webgoat.container.asciidoc; package org.owasp.webgoat.container.asciidoc;
import java.util.Map;
import org.asciidoctor.ast.ContentNode; import org.asciidoctor.ast.ContentNode;
import org.asciidoctor.extension.InlineMacroProcessor; import org.asciidoctor.extension.InlineMacroProcessor;
import java.util.Map;
public class WebGoatVersionMacro extends InlineMacroProcessor { public class WebGoatVersionMacro extends InlineMacroProcessor {
public WebGoatVersionMacro(String macroName) { public WebGoatVersionMacro(String macroName) {
super(macroName); super(macroName);
} }
public WebGoatVersionMacro(String macroName, Map<String, Object> config) { public WebGoatVersionMacro(String macroName, Map<String, Object> config) {
super(macroName, config); super(macroName, config);
} }
@Override @Override
public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) { public Object process(ContentNode contentNode, String target, Map<String, Object> attributes) {
var webgoatVersion = EnvironmentExposure.getEnv().getProperty("webgoat.build.version"); 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
return createPhraseNode(contentNode, "quoted", webgoatVersion); // 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);
}
} }

112
src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfMacro.java
View File

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

26
src/main/java/org/owasp/webgoat/container/asciidoc/WebWolfRootMacro.java
View File

@ -4,22 +4,22 @@ import java.util.Map;
/** /**
* Usage in asciidoc: * 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 { public class WebWolfRootMacro extends WebWolfMacro {
public WebWolfRootMacro(String macroName) { public WebWolfRootMacro(String macroName) {
super(macroName); super(macroName);
} }
public WebWolfRootMacro(String macroName, Map<String, Object> config) { public WebWolfRootMacro(String macroName, Map<String, Object> config) {
super(macroName, config); super(macroName, config);
} }
@Override @Override
protected boolean includeWebWolfContext() { protected boolean includeWebWolfContext() {
return false; return false;
} }
} }

95
src/main/java/org/owasp/webgoat/container/assignments/AssignmentEndpoint.java
View File

@ -35,57 +35,58 @@ import org.springframework.beans.factory.annotation.Autowired;
public abstract class AssignmentEndpoint implements Initializeable { 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() { protected WebSession getWebSession() {
return webSession; return webSession;
} }
protected UserSessionData getUserSessionData() { protected UserSessionData getUserSessionData() {
return userSessionData; return userSessionData;
} }
/** /**
* Convenience method for create a successful result: * 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
* @return a builder for creating a result from a lesson * @param assignment
* @param assignment */
*/ protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) {
protected AttackResult.AttackResultBuilder success(AssignmentEndpoint assignment) { return AttackResult.builder(messages)
return AttackResult.builder(messages).lessonCompleted(true).attemptWasMade().feedback("assignment.solved").assignment(assignment); .lessonCompleted(true)
} .attemptWasMade()
.feedback("assignment.solved")
.assignment(assignment);
}
/** /**
* Convenience method for create a failed result: * 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
* @return a builder for creating a result from a lesson * @param assignment
* @param assignment */
*/ protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) {
protected AttackResult.AttackResultBuilder failed(AssignmentEndpoint assignment) { return AttackResult.builder(messages)
return AttackResult.builder(messages).lessonCompleted(false).attemptWasMade().feedback("assignment.not.solved").assignment(assignment); .lessonCompleted(false)
} .attemptWasMade()
.feedback("assignment.not.solved")
.assignment(assignment);
}
protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) { protected AttackResult.AttackResultBuilder informationMessage(AssignmentEndpoint assignment) {
return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment); return AttackResult.builder(messages).lessonCompleted(false).assignment(assignment);
} }
@Override @Override
public void initialize(WebGoatUser user) { public void initialize(WebGoatUser user) {}
}
} }

6
src/main/java/org/owasp/webgoat/container/assignments/AssignmentHints.java
View File

@ -5,12 +5,10 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
/** /** Created by nbaars on 1/14/17. */
* Created by nbaars on 1/14/17.
*/
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface AssignmentHints { public @interface AssignmentHints {
String[] value() default {}; String[] value() default {};
} }

13
src/main/java/org/owasp/webgoat/container/assignments/AssignmentPath.java
View File

@ -1,22 +1,19 @@
package org.owasp.webgoat.container.assignments; package org.owasp.webgoat.container.assignments;
import org.springframework.web.bind.annotation.RequestMethod;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; 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) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface AssignmentPath { public @interface AssignmentPath {
String[] path() default {}; String[] path() default {};
RequestMethod[] method() default {}; RequestMethod[] method() default {};
String value() default ""; String value() default "";
} }

168
src/main/java/org/owasp/webgoat/container/assignments/AttackResult.java
View File

@ -25,100 +25,104 @@
package org.owasp.webgoat.container.assignments; package org.owasp.webgoat.container.assignments;
import static org.apache.commons.text.StringEscapeUtils.escapeJson;
import lombok.Getter; import lombok.Getter;
import org.owasp.webgoat.container.i18n.PluginMessages; import org.owasp.webgoat.container.i18n.PluginMessages;
import static org.apache.commons.text.StringEscapeUtils.escapeJson;
public class AttackResult { public class AttackResult {
public static class AttackResultBuilder {
public static class AttackResultBuilder {
private boolean lessonCompleted;
private PluginMessages messages;
private Object[] feedbackArgs;
private String feedbackResourceBundleKey;
private String output;
private Object[] outputArgs;
private AssignmentEndpoint assignment;
private boolean attemptWasMade = false;
public AttackResultBuilder(PluginMessages messages) {
this.messages = messages;
}
public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
this.lessonCompleted = lessonCompleted;
this.feedbackResourceBundleKey = "lesson.completed";
return this;
}
public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
this.lessonCompleted = lessonCompleted;
this.feedbackResourceBundleKey = resourceBundleKey;
return this;
}
public AttackResultBuilder feedbackArgs(Object... args) {
this.feedbackArgs = args;
return this;
}
public AttackResultBuilder feedback(String resourceBundleKey) {
this.feedbackResourceBundleKey = resourceBundleKey;
return this;
}
public AttackResultBuilder output(String output) {
this.output = output;
return this;
}
public AttackResultBuilder outputArgs(Object... args) {
this.outputArgs = args;
return this;
}
public AttackResultBuilder attemptWasMade() {
this.attemptWasMade = true;
return this;
}
public AttackResult build() {
return new AttackResult(lessonCompleted, messages.getMessage(feedbackResourceBundleKey, feedbackArgs), messages.getMessage(output, output, outputArgs), assignment.getClass().getSimpleName(), attemptWasMade);
}
public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
this.assignment = assignment;
return this;
}
}
@Getter
private boolean lessonCompleted; private boolean lessonCompleted;
@Getter private PluginMessages messages;
private String feedback; private Object[] feedbackArgs;
@Getter private String feedbackResourceBundleKey;
private String output; private String output;
@Getter private Object[] outputArgs;
private final String assignment; private AssignmentEndpoint assignment;
@Getter private boolean attemptWasMade = false;
private boolean attemptWasMade;
public AttackResult(boolean lessonCompleted, String feedback, String output, String assignment, boolean attemptWasMade) { public AttackResultBuilder(PluginMessages messages) {
this.lessonCompleted = lessonCompleted; this.messages = messages;
this.feedback = escapeJson(feedback);
this.output = escapeJson(output);
this.assignment = assignment;
this.attemptWasMade = attemptWasMade;
} }
public static AttackResultBuilder builder(PluginMessages messages) { public AttackResultBuilder lessonCompleted(boolean lessonCompleted) {
return new AttackResultBuilder(messages); this.lessonCompleted = lessonCompleted;
this.feedbackResourceBundleKey = "lesson.completed";
return this;
} }
public boolean assignmentSolved() { public AttackResultBuilder lessonCompleted(boolean lessonCompleted, String resourceBundleKey) {
return lessonCompleted; this.lessonCompleted = lessonCompleted;
this.feedbackResourceBundleKey = resourceBundleKey;
return this;
} }
public AttackResultBuilder feedbackArgs(Object... args) {
this.feedbackArgs = args;
return this;
}
public AttackResultBuilder feedback(String resourceBundleKey) {
this.feedbackResourceBundleKey = resourceBundleKey;
return this;
}
public AttackResultBuilder output(String output) {
this.output = output;
return this;
}
public AttackResultBuilder outputArgs(Object... args) {
this.outputArgs = args;
return this;
}
public AttackResultBuilder attemptWasMade() {
this.attemptWasMade = true;
return this;
}
public AttackResult build() {
return new AttackResult(
lessonCompleted,
messages.getMessage(feedbackResourceBundleKey, feedbackArgs),
messages.getMessage(output, output, outputArgs),
assignment.getClass().getSimpleName(),
attemptWasMade);
}
public AttackResultBuilder assignment(AssignmentEndpoint assignment) {
this.assignment = assignment;
return this;
}
}
@Getter private boolean lessonCompleted;
@Getter private String feedback;
@Getter private String output;
@Getter private final String assignment;
@Getter private boolean attemptWasMade;
public AttackResult(
boolean lessonCompleted,
String feedback,
String output,
String assignment,
boolean attemptWasMade) {
this.lessonCompleted = lessonCompleted;
this.feedback = escapeJson(feedback);
this.output = escapeJson(output);
this.assignment = assignment;
this.attemptWasMade = attemptWasMade;
}
public static AttackResultBuilder builder(PluginMessages messages) {
return new AttackResultBuilder(messages);
}
public boolean assignmentSolved() {
return lessonCompleted;
}
} }

67
src/main/java/org/owasp/webgoat/container/assignments/LessonTrackerInterceptor.java
View File

@ -36,39 +36,46 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
@RestControllerAdvice @RestControllerAdvice
public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> { public class LessonTrackerInterceptor implements ResponseBodyAdvice<Object> {
private UserTrackerRepository userTrackerRepository; private UserTrackerRepository userTrackerRepository;
private WebSession webSession; private WebSession webSession;
public LessonTrackerInterceptor(UserTrackerRepository userTrackerRepository, WebSession webSession) { public LessonTrackerInterceptor(
this.userTrackerRepository = userTrackerRepository; UserTrackerRepository userTrackerRepository, WebSession webSession) {
this.webSession = webSession; this.userTrackerRepository = userTrackerRepository;
this.webSession = webSession;
}
@Override
public boolean supports(
MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) {
return true;
}
@Override
public Object beforeBodyWrite(
Object o,
MethodParameter methodParameter,
MediaType mediaType,
Class<? extends HttpMessageConverter<?>> aClass,
ServerHttpRequest serverHttpRequest,
ServerHttpResponse serverHttpResponse) {
if (o instanceof AttackResult attackResult) {
trackProgress(attackResult);
} }
return o;
}
@Override protected AttackResult trackProgress(AttackResult attackResult) {
public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> clazz) { UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
return true; if (userTracker == null) {
userTracker = new UserTracker(webSession.getUserName());
} }
if (attackResult.assignmentSolved()) {
@Override userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) { } else {
if (o instanceof AttackResult attackResult) { userTracker.assignmentFailed(webSession.getCurrentLesson());
trackProgress(attackResult);
}
return o;
}
protected AttackResult trackProgress(AttackResult attackResult) {
UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
if (userTracker == null) {
userTracker = new UserTracker(webSession.getUserName());
}
if (attackResult.assignmentSolved()) {
userTracker.assignmentSolved(webSession.getCurrentLesson(), attackResult.getAssignment());
} else {
userTracker.assignmentFailed(webSession.getCurrentLesson());
}
userTrackerRepository.saveAndFlush(userTracker);
return attackResult;
} }
userTrackerRepository.saveAndFlush(userTracker);
return attackResult;
}
} }

113
src/main/java/org/owasp/webgoat/container/controller/StartLesson.java
View File

@ -1,36 +1,37 @@
/** /**
* ************************************************************************************************ * ************************************************************************************************
*
* <p> * <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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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 * @author WebGoat
* @version $Id: $Id * @version $Id: $Id
* @since October 28, 2003 * @since October 28, 2003
*/ */
package org.owasp.webgoat.container.controller; package org.owasp.webgoat.container.controller;
import javax.servlet.http.HttpServletRequest;
import org.owasp.webgoat.container.session.Course; import org.owasp.webgoat.container.session.Course;
import org.owasp.webgoat.container.session.WebSession; import org.owasp.webgoat.container.session.WebSession;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -38,52 +39,52 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@Controller @Controller
public class StartLesson { public class StartLesson {
private final WebSession ws; private final WebSession ws;
private final Course course; private final Course course;
public StartLesson(WebSession ws, Course course) { public StartLesson(WebSession ws, Course course) {
this.ws = ws; this.ws = ws;
this.course = course; this.course = course;
} }
/** /**
* <p>start.</p> * start.
* *
* @return a {@link ModelAndView} object. * @return a {@link ModelAndView} object.
*/ */
@RequestMapping(path = "startlesson.mvc", method = {RequestMethod.GET, RequestMethod.POST}) @RequestMapping(
public ModelAndView start() { path = "startlesson.mvc",
var model = new ModelAndView(); method = {RequestMethod.GET, RequestMethod.POST})
public ModelAndView start() {
var model = new ModelAndView();
model.addObject("course", course); model.addObject("course", course);
model.addObject("lesson", ws.getCurrentLesson()); model.addObject("lesson", ws.getCurrentLesson());
model.setViewName("lesson_content"); model.setViewName("lesson_content");
return model; return model;
} }
@RequestMapping(value = {"*.lesson"}, produces = "text/html") @RequestMapping(
public ModelAndView lessonPage(HttpServletRequest request) { value = {"*.lesson"},
var model = new ModelAndView("lesson_content"); produces = "text/html")
var path = request.getRequestURL().toString(); // we now got /a/b/c/AccessControlMatrix.lesson public ModelAndView lessonPage(HttpServletRequest request) {
var lessonName = path.substring(path.lastIndexOf('/') + 1, path.indexOf(".lesson")); 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))
.filter(l -> l.getId().equals(lessonName)) .findFirst()
.findFirst() .ifPresent(
.ifPresent(lesson -> { lesson -> {
ws.setCurrentLesson(lesson); ws.setCurrentLesson(lesson);
model.addObject("lesson", lesson); model.addObject("lesson", lesson);
}); });
return model;
}
return model;
}
} }

76
src/main/java/org/owasp/webgoat/container/controller/Welcome.java
View File

@ -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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version. * 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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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 * @author WebGoat
* @since October 28, 2003 * @since October 28, 2003
* @version $Id: $Id * @version $Id: $Id
*/ */
package org.owasp.webgoat.container.controller; package org.owasp.webgoat.container.controller;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
/** /**
* <p>Welcome class.</p> * Welcome class.
* *
* @author rlawson * @author rlawson
* @version $Id: $Id * @version $Id: $Id
@ -47,29 +44,28 @@ import javax.servlet.http.HttpSession;
@Controller @Controller
public class Welcome { public class Welcome {
private static final String WELCOMED = "welcomed"; private static final String WELCOMED = "welcomed";
/**
* <p>welcome.</p>
*
* @param request a {@link javax.servlet.http.HttpServletRequest} object.
* @return a {@link org.springframework.web.servlet.ModelAndView} object.
*/
@GetMapping(path = {"welcome.mvc"})
public ModelAndView welcome(HttpServletRequest request) {
// set the welcome attribute /**
// this is so the attack servlet does not also * welcome.
// send them to the welcome page *
HttpSession session = request.getSession(); * @param request a {@link javax.servlet.http.HttpServletRequest} object.
if (session.getAttribute(WELCOMED) == null) { * @return a {@link org.springframework.web.servlet.ModelAndView} object.
session.setAttribute(WELCOMED, "true"); */
} @GetMapping(path = {"welcome.mvc"})
public ModelAndView welcome(HttpServletRequest request) {
//go ahead and send them to webgoat (skip the welcome page)
ModelAndView model = new ModelAndView(); // set the welcome attribute
model.setViewName("forward:/attack?start=true"); // this is so the attack servlet does not also
return model; // send them to the welcome page
HttpSession session = request.getSession();
if (session.getAttribute(WELCOMED) == null) {
session.setAttribute(WELCOMED, "true");
} }
// go ahead and send them to webgoat (skip the welcome page)
ModelAndView model = new ModelAndView();
model.setViewName("forward:/attack?start=true");
return model;
}
} }

15
src/main/java/org/owasp/webgoat/container/i18n/Language.java
View File

@ -25,15 +25,15 @@
package org.owasp.webgoat.container.i18n; package org.owasp.webgoat.container.i18n;
import java.util.Locale;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.servlet.LocaleResolver; 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 * @author nbaars
* @date 2/7/17 * @date 2/7/17
@ -41,9 +41,10 @@ import java.util.Locale;
@AllArgsConstructor @AllArgsConstructor
public class Language { public class Language {
private final LocaleResolver localeResolver; private final LocaleResolver localeResolver;
public Locale getLocale() { public Locale getLocale() {
return localeResolver.resolveLocale(((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest()); return localeResolver.resolveLocale(
} ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest());
}
} }

37
src/main/java/org/owasp/webgoat/container/i18n/Messages.java
View File

@ -25,36 +25,35 @@
package org.owasp.webgoat.container.i18n; package org.owasp.webgoat.container.i18n;
import java.util.Properties;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.context.support.ReloadableResourceBundleMessageSource; 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 * @author zupzup
*/ */
@AllArgsConstructor @AllArgsConstructor
public class Messages extends ReloadableResourceBundleMessageSource { public class Messages extends ReloadableResourceBundleMessageSource {
private final Language language; private final Language language;
/** /**
* Gets all messages for presented Locale. * Gets all messages for presented Locale.
* *
* @return all messages * @return all messages
*/ */
public Properties getMessages() { public Properties getMessages() {
return getMergedProperties(language.getLocale()).getProperties(); return getMergedProperties(language.getLocale()).getProperties();
} }
public String getMessage(String code, Object... args) { public String getMessage(String code, Object... args) {
return getMessage(code, args, language.getLocale()); return getMessage(code, args, language.getLocale());
} }
public String getMessage(String code, String defaultValue, Object... args) { public String getMessage(String code, String defaultValue, Object... args) {
return super.getMessage(code, args, defaultValue, language.getLocale()); return super.getMessage(code, args, defaultValue, language.getLocale());
} }
} }

79
src/main/java/org/owasp/webgoat/container/i18n/PluginMessages.java
View File

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

85
src/main/java/org/owasp/webgoat/container/lessons/Assignment.java
View File

@ -1,34 +1,34 @@
package org.owasp.webgoat.container.lessons; package org.owasp.webgoat.container.lessons;
import lombok.*;
import javax.persistence.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.persistence.*;
import lombok.*;
/** /**
* ************************************************************************************************ * ************************************************************************************************
* 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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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> * <p>
* *
* @author nbaars * @author nbaars
@ -40,30 +40,33 @@ import java.util.List;
@Entity @Entity
public class Assignment { public class Assignment {
@Id @Id
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
private Long id; private Long id;
private String name;
private String path;
@Transient private String name;
private List<String> hints; private String path;
private Assignment() { @Transient private List<String> hints;
//Hibernate
private Assignment() {
// Hibernate
}
public Assignment(String name) {
this(name, name, new ArrayList<>());
}
public Assignment(String name, String path, List<String> hints) {
if (path.equals("") || path.equals("/") || path.equals("/WebGoat/")) {
throw new IllegalStateException(
"The path of assignment '"
+ name
+ "' overrides WebGoat endpoints, please choose a path within the scope of the"
+ " lesson");
} }
this.name = name;
public Assignment(String name) { this.path = path;
this(name, name, new ArrayList<>()); this.hints = hints;
} }
public Assignment(String name, String path, List<String> hints) {
if (path.equals("") || path.equals("/") || path.equals("/WebGoat/")) {
throw new IllegalStateException("The path of assignment '" + name + "' overrides WebGoat endpoints, please choose a path within the scope of the lesson");
}
this.name = name;
this.path = path;
this.hints = hints;
}
} }

100
src/main/java/org/owasp/webgoat/container/lessons/Category.java
View File

@ -4,30 +4,29 @@ import lombok.Getter;
/** /**
* ************************************************************************************************* * *************************************************************************************************
*
* <p> * <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. * for free software projects.
* *
* @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a> * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
@ -35,40 +34,35 @@ import lombok.Getter;
* @since October 28, 2003 * @since October 28, 2003
*/ */
public enum Category { public enum Category {
INTRODUCTION("Introduction", 5),
GENERAL("General", 100),
INTRODUCTION("Introduction", 5), A1("(A1) Broken Access Control", 301),
GENERAL("General", 100), A2("(A2) Cryptographic Failures", 302),
A3("(A3) Injection", 303),
A1("(A1) Broken Access Control", 301),
A2("(A2) Cryptographic Failures", 302),
A3("(A3) Injection", 303),
A5("(A5) Security Misconfiguration", 305), A5("(A5) Security Misconfiguration", 305),
A6("(A6) Vuln & Outdated Components", 306), A6("(A6) Vuln & Outdated Components", 306),
A7("(A7) Identity & Auth Failure", 307), A7("(A7) Identity & Auth Failure", 307),
A8("(A8) Software & Data Integrity", 308), A8("(A8) Software & Data Integrity", 308),
A9("(A9) Security Logging Failures", 309), A9("(A9) Security Logging Failures", 309),
A10("(A10) Server-side Request Forgery", 310), A10("(A10) Server-side Request Forgery", 310),
CLIENT_SIDE("Client side", 1700),
CHALLENGE("Challenges", 3000); CLIENT_SIDE("Client side", 1700),
@Getter CHALLENGE("Challenges", 3000);
private String name;
@Getter
private Integer ranking;
Category(String name, Integer ranking) { @Getter private String name;
this.name = name; @Getter private Integer ranking;
this.ranking = ranking;
}
/** Category(String name, Integer ranking) {
* {@inheritDoc} this.name = name;
*/ this.ranking = ranking;
@Override }
public String toString() {
return getName(); /** {@inheritDoc} */
} @Override
public String toString() {
return getName();
}
} }

157
src/main/java/org/owasp/webgoat/container/lessons/CourseConfiguration.java
View File

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

24
src/main/java/org/owasp/webgoat/container/lessons/Hint.java
View File

@ -1,28 +1,28 @@
/*************************************************************************************************** /***************************************************************************************************
* *
* *
* 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/ * please see http://www.owasp.org/
* *
* Copyright (c) 2002 - 2014 Bruce Mayhew * Copyright (c) 2002 - 2014 Bruce Mayhew
* *
* This program is free software; you can redistribute it and/or modify it under the terms of the * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version. * 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 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License along with this program; if * 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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 02111-1307, USA.
* *
* Getting Source ============== * Getting Source ==============
* *
* Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
* projects. * projects.
* *
*/ */
package org.owasp.webgoat.container.lessons; package org.owasp.webgoat.container.lessons;
@ -30,7 +30,7 @@ package org.owasp.webgoat.container.lessons;
import lombok.Value; import lombok.Value;
/** /**
* <p>Hint class.</p> * Hint class.
* *
* @author rlawson * @author rlawson
* @version $Id: $Id * @version $Id: $Id
@ -38,6 +38,6 @@ import lombok.Value;
@Value @Value
public class Hint { public class Hint {
private String hint; private String hint;
private String assignmentPath; private String assignmentPath;
} }

6
src/main/java/org/owasp/webgoat/container/lessons/Initializeable.java
View File

@ -3,10 +3,10 @@ package org.owasp.webgoat.container.lessons;
import org.owasp.webgoat.container.users.WebGoatUser; 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 { public interface Initializeable {
void initialize(WebGoatUser webGoatUser); void initialize(WebGoatUser webGoatUser);
} }

176
src/main/java/org/owasp/webgoat/container/lessons/Lesson.java
View File

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

45
src/main/java/org/owasp/webgoat/container/lessons/LessonConnectionInvocationHandler.java
View File

@ -1,39 +1,38 @@
package org.owasp.webgoat.container.lessons; 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.InvocationHandler;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.sql.Connection; 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 @Slf4j
public class LessonConnectionInvocationHandler implements InvocationHandler { public class LessonConnectionInvocationHandler implements InvocationHandler {
private final Connection targetConnection; private final Connection targetConnection;
public LessonConnectionInvocationHandler(Connection targetConnection) { public LessonConnectionInvocationHandler(Connection targetConnection) {
this.targetConnection = targetConnection; this.targetConnection = targetConnection;
} }
@Override @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
var authentication = SecurityContextHolder.getContext().getAuthentication(); var authentication = SecurityContextHolder.getContext().getAuthentication();
if (authentication != null && authentication.getPrincipal() instanceof WebGoatUser user) { if (authentication != null && authentication.getPrincipal() instanceof WebGoatUser user) {
try (var statement = targetConnection.createStatement()) { try (var statement = targetConnection.createStatement()) {
statement.execute("SET SCHEMA \"" + user.getUsername() + "\""); statement.execute("SET SCHEMA \"" + user.getUsername() + "\"");
} }
}
try {
return method.invoke(targetConnection, args);
} catch (InvocationTargetException e) {
throw e.getTargetException();
}
} }
try {
return method.invoke(targetConnection, args);
} catch (InvocationTargetException e) {
throw e.getTargetException();
}
}
} }

11
src/main/java/org/owasp/webgoat/container/lessons/LessonInfoModel.java
View File

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

266
src/main/java/org/owasp/webgoat/container/lessons/LessonMenuItem.java
View File

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

26
src/main/java/org/owasp/webgoat/container/lessons/LessonMenuItemType.java
View File

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

52
src/main/java/org/owasp/webgoat/container/lessons/LessonScanner.java
View File

@ -1,46 +1,42 @@
package org.owasp.webgoat.container.lessons; 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.io.IOException;
import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.regex.Pattern; 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 @Component
@Slf4j @Slf4j
public class LessonScanner { public class LessonScanner {
private static final Pattern lessonPattern = Pattern.compile("^.*/lessons/([^/]*)/.*$"); 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) { public LessonScanner(ResourcePatternResolver resourcePatternResolver) {
try { try {
var resources = resourcePatternResolver.getResources("classpath:/lessons/*/*"); var resources = resourcePatternResolver.getResources("classpath:/lessons/*/*");
for (var resource : resources) { 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
var url = resource.getURL(); // the URL
var matcher = lessonPattern.matcher(url.toString()); var url = resource.getURL();
if (matcher.matches()) { var matcher = lessonPattern.matcher(url.toString());
lessons.add(matcher.group(1)); if (matcher.matches()) {
} lessons.add(matcher.group(1));
}
log.debug("Found {} lessons", lessons.size());
} catch (IOException e) {
log.warn("No lessons found...");
} }
}
log.debug("Found {} lessons", lessons.size());
} catch (IOException e) {
log.warn("No lessons found...");
} }
}
public List<String> applyPattern(String pattern) { public List<String> applyPattern(String pattern) {
return lessons.stream().map(lesson -> String.format(pattern, lesson)).toList(); return lessons.stream().map(lesson -> String.format(pattern, lesson)).toList();
} }
} }

11
src/main/java/org/owasp/webgoat/container/service/EnvironmentService.java
View File

@ -9,11 +9,10 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor @RequiredArgsConstructor
public class EnvironmentService { public class EnvironmentService {
private final ApplicationContext context; private final ApplicationContext context;
@GetMapping("/server-directory")
public String homeDirectory() {
return context.getEnvironment().getProperty("webgoat.server.directory");
}
@GetMapping("/server-directory")
public String homeDirectory() {
return context.getEnvironment().getProperty("webgoat.server.directory");
}
} }

58
src/main/java/org/owasp/webgoat/container/service/HintService.java
View File

@ -6,6 +6,8 @@
package org.owasp.webgoat.container.service; 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.Assignment;
import org.owasp.webgoat.container.lessons.Hint; import org.owasp.webgoat.container.lessons.Hint;
import org.owasp.webgoat.container.lessons.Lesson; 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.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Collection;
import java.util.List;
/** /**
* <p>HintService class.</p> * HintService class.
* *
* @author rlawson * @author rlawson
* @version $Id: $Id * @version $Id: $Id
@ -26,36 +25,33 @@ import java.util.List;
@RestController @RestController
public class HintService { public class HintService {
public static final String URL_HINTS_MVC = "/service/hint.mvc"; public static final String URL_HINTS_MVC = "/service/hint.mvc";
private final WebSession webSession; private final WebSession webSession;
public HintService(WebSession webSession) { public HintService(WebSession webSession) {
this.webSession = webSession; this.webSession = webSession;
} }
/** /**
* Returns hints for current lesson * Returns hints for current lesson
* *
* @return a {@link java.util.List} object. * @return a {@link java.util.List} object.
*/ */
@GetMapping(path = URL_HINTS_MVC, produces = "application/json") @GetMapping(path = URL_HINTS_MVC, produces = "application/json")
@ResponseBody @ResponseBody
public List<Hint> getHints() { public List<Hint> getHints() {
Lesson l = webSession.getCurrentLesson(); Lesson l = webSession.getCurrentLesson();
return createAssignmentHints(l); return createAssignmentHints(l);
} }
private List<Hint> createAssignmentHints(Lesson l) { private List<Hint> createAssignmentHints(Lesson l) {
if (l != null) { 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();
} }
return List.of();
}
private List<Hint> createHint(Assignment a) { private List<Hint> createHint(Assignment a) {
return a.getHints().stream().map(h -> new Hint(h, a.getPath())).toList(); return a.getHints().stream().map(h -> new Hint(h, a.getPath())).toList();
} }
} }

129
src/main/java/org/owasp/webgoat/container/service/LabelDebugService.java
View File

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

80
src/main/java/org/owasp/webgoat/container/service/LabelService.java
View File

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

27
src/main/java/org/owasp/webgoat/container/service/LessonInfoService.java
View File

@ -8,9 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
/** /**
* <p>LessonInfoService class.</p> * LessonInfoService class.
* *
* @author dm * @author dm
* @version $Id: $Id * @version $Id: $Id
@ -19,18 +18,16 @@ import org.springframework.web.bind.annotation.RestController;
@AllArgsConstructor @AllArgsConstructor
public class LessonInfoService { public class LessonInfoService {
private final WebSession webSession; private final WebSession webSession;
/**
* <p>getLessonInfo.</p>
*
* @return a {@link LessonInfoModel} object.
*/
@RequestMapping(path = "/service/lessoninfo.mvc", produces = "application/json")
public @ResponseBody
LessonInfoModel getLessonInfo() {
Lesson lesson = webSession.getCurrentLesson();
return new LessonInfoModel(lesson.getTitle(), false, false, false);
}
/**
* getLessonInfo.
*
* @return a {@link LessonInfoModel} object.
*/
@RequestMapping(path = "/service/lessoninfo.mvc", produces = "application/json")
public @ResponseBody LessonInfoModel getLessonInfo() {
Lesson lesson = webSession.getCurrentLesson();
return new LessonInfoModel(lesson.getTitle(), false, false, false);
}
} }

173
src/main/java/org/owasp/webgoat/container/service/LessonMenuService.java
View File

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

64
src/main/java/org/owasp/webgoat/container/service/LessonProgressService.java
View File

@ -1,5 +1,6 @@
package org.owasp.webgoat.container.service; package org.owasp.webgoat.container.service;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; 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.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
/** /**
* <p>LessonProgressService class.</p> * LessonProgressService class.
* *
* @author webgoat * @author webgoat
*/ */
@ -22,38 +20,38 @@ import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
public class LessonProgressService { public class LessonProgressService {
private final UserTrackerRepository userTrackerRepository; private final UserTrackerRepository userTrackerRepository;
private final WebSession webSession; 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 * @return list of assignments
*/ */
@RequestMapping(value = "/service/lessonoverview.mvc", produces = "application/json") @RequestMapping(value = "/service/lessonoverview.mvc", produces = "application/json")
@ResponseBody @ResponseBody
public List<LessonOverview> lessonOverview() { public List<LessonOverview> lessonOverview() {
var userTracker = userTrackerRepository.findByUser(webSession.getUserName()); var userTracker = userTrackerRepository.findByUser(webSession.getUserName());
var currentLesson = webSession.getCurrentLesson(); var currentLesson = webSession.getCurrentLesson();
if (currentLesson != null) { if (currentLesson != null) {
var lessonTracker = userTracker.getLessonTracker(currentLesson); var lessonTracker = userTracker.getLessonTracker(currentLesson);
return lessonTracker.getLessonOverview().entrySet().stream() return lessonTracker.getLessonOverview().entrySet().stream()
.map(entry -> new LessonOverview(entry.getKey(), entry.getValue())) .map(entry -> new LessonOverview(entry.getKey(), entry.getValue()))
.toList(); .toList();
}
return List.of();
} }
return List.of();
}
@AllArgsConstructor @AllArgsConstructor
@Getter @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
//so creating intermediate object is the easiest solution // http://stackoverflow.com/questions/11628698/can-we-make-object-as-key-in-map-when-using-json
private static class LessonOverview { // so creating intermediate object is the easiest solution
private static class LessonOverview {
private Assignment assignment; private Assignment assignment;
private Boolean solved; private Boolean solved;
}
}
} }

34
src/main/java/org/owasp/webgoat/container/service/LessonTitleService.java
View File

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

140
src/main/java/org/owasp/webgoat/container/service/ReportCardService.java
View File

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

39
src/main/java/org/owasp/webgoat/container/service/RestartLessonService.java
View File

@ -24,6 +24,8 @@
package org.owasp.webgoat.container.service; package org.owasp.webgoat.container.service;
import java.util.List;
import java.util.function.Function;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flywaydb.core.Flyway; import org.flywaydb.core.Flyway;
@ -37,33 +39,30 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
import java.util.List;
import java.util.function.Function;
@Controller @Controller
@AllArgsConstructor @AllArgsConstructor
@Slf4j @Slf4j
public class RestartLessonService { public class RestartLessonService {
private final WebSession webSession; private final WebSession webSession;
private final UserTrackerRepository userTrackerRepository; private final UserTrackerRepository userTrackerRepository;
private final Function<String, Flyway> flywayLessons; private final Function<String, Flyway> flywayLessons;
private final List<Initializeable> lessonsToInitialize; private final List<Initializeable> lessonsToInitialize;
@RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text") @RequestMapping(path = "/service/restartlesson.mvc", produces = "text/text")
@ResponseStatus(value = HttpStatus.OK) @ResponseStatus(value = HttpStatus.OK)
public void restartLesson() { public void restartLesson() {
Lesson al = webSession.getCurrentLesson(); Lesson al = webSession.getCurrentLesson();
log.debug("Restarting lesson: " + al); log.debug("Restarting lesson: " + al);
UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName()); UserTracker userTracker = userTrackerRepository.findByUser(webSession.getUserName());
userTracker.reset(al); userTracker.reset(al);
userTrackerRepository.save(userTracker); userTrackerRepository.save(userTracker);
var flyway = flywayLessons.apply(webSession.getUserName()); var flyway = flywayLessons.apply(webSession.getUserName());
flyway.clean(); flyway.clean();
flyway.migrate(); flyway.migrate();
lessonsToInitialize.forEach(i -> i.initialize(webSession.getUser())); lessonsToInitialize.forEach(i -> i.initialize(webSession.getUser()));
} }
} }

22
src/main/java/org/owasp/webgoat/container/service/SessionService.java
View File

@ -17,17 +17,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
@RequiredArgsConstructor @RequiredArgsConstructor
public class SessionService { public class SessionService {
private final WebSession webSession; private final WebSession webSession;
private final RestartLessonService restartLessonService; private final RestartLessonService restartLessonService;
private final Messages messages; private final Messages messages;
@RequestMapping(path = "/service/enable-security.mvc", produces = "application/json") @RequestMapping(path = "/service/enable-security.mvc", produces = "application/json")
@ResponseBody @ResponseBody
public String applySecurity() { public String applySecurity() {
webSession.toggleSecurity(); webSession.toggleSecurity();
restartLessonService.restartLesson(); restartLessonService.restartLesson();
var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled"; var msg = webSession.isSecurityEnabled() ? "security.enabled" : "security.disabled";
return messages.getMessage(msg); return messages.getMessage(msg);
} }
} }

135
src/main/java/org/owasp/webgoat/container/session/Course.java
View File

@ -1,36 +1,36 @@
package org.owasp.webgoat.container.session; package org.owasp.webgoat.container.session;
import java.util.List;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.owasp.webgoat.container.lessons.Category; import org.owasp.webgoat.container.lessons.Category;
import org.owasp.webgoat.container.lessons.Lesson; import org.owasp.webgoat.container.lessons.Lesson;
import java.util.List;
/** /**
* ************************************************************************************************ * ************************************************************************************************
*
* <p> * <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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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> * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
* @version $Id: $Id * @version $Id: $Id
@ -39,60 +39,61 @@ import java.util.List;
@Slf4j @Slf4j
public class Course { public class Course {
private List<Lesson> lessons; private List<Lesson> lessons;
public Course(List<Lesson> lessons) { public Course(List<Lesson> lessons) {
this.lessons = lessons; this.lessons = lessons;
} }
/** /**
* Gets the categories attribute of the Course object * Gets the categories attribute of the Course object
* *
* @return The categories value * @return The categories value
*/ */
public List<Category> getCategories() { public List<Category> getCategories() {
return lessons.parallelStream().map(Lesson::getCategory).distinct().sorted().toList(); return lessons.parallelStream().map(Lesson::getCategory).distinct().sorted().toList();
} }
/** /**
* Gets the firstLesson attribute of the Course object * Gets the firstLesson attribute of the Course object
* *
* @return The firstLesson value * @return The firstLesson value
*/ */
public Lesson getFirstLesson() { public Lesson getFirstLesson() {
// Category 0 is the admin function. We want the first real category // Category 0 is the admin function. We want the first real category
// to be returned. This is normally the General category and the Http Basics lesson // to be returned. This is normally the General category and the Http Basics lesson
return getLessons(getCategories().get(0)).get(0); return getLessons(getCategories().get(0)).get(0);
} }
/** /**
* <p>Getter for the field <code>lessons</code>.</p> * Getter for the field <code>lessons</code>.
* *
* @return a {@link java.util.List} object. * @return a {@link java.util.List} object.
*/ */
public List<Lesson> getLessons() { public List<Lesson> getLessons() {
return this.lessons; return this.lessons;
} }
/** /**
* <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. * @param category a {@link org.owasp.webgoat.container.lessons.Category} object.
* @return a {@link java.util.List} object. * @return a {@link java.util.List} object.
*/ */
public List<Lesson> getLessons(Category category) { public List<Lesson> getLessons(Category category) {
return this.lessons.stream().filter(l -> l.getCategory() == category).toList(); return this.lessons.stream().filter(l -> l.getCategory() == category).toList();
} }
public void setLessons(List<Lesson> lessons) { public void setLessons(List<Lesson> lessons) {
this.lessons = lessons; this.lessons = lessons;
} }
public int getTotalOfLessons() { public int getTotalOfLessons() {
return this.lessons.size(); return this.lessons.size();
} }
public int getTotalOfAssignments() { 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);
}
} }

56
src/main/java/org/owasp/webgoat/container/session/LabelDebugger.java
View File

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

46
src/main/java/org/owasp/webgoat/container/session/UserSessionData.java
View File

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

127
src/main/java/org/owasp/webgoat/container/session/WebSession.java
View File

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

163
src/main/java/org/owasp/webgoat/container/users/LessonTracker.java
View File

@ -1,40 +1,38 @@
package org.owasp.webgoat.container.users; 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.*;
import java.util.stream.Collectors; 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>
* <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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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> * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
* @version $Id: $Id * @version $Id: $Id
@ -43,72 +41,69 @@ import java.util.stream.Collectors;
@Entity @Entity
public class LessonTracker { public class LessonTracker {
@Id @Id
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
private Long id; private Long id;
@Getter
private String lessonName;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private final Set<Assignment> solvedAssignments = new HashSet<>();
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private final Set<Assignment> allAssignments = new HashSet<>();
@Getter
private int numberOfAttempts = 0;
@Version
private Integer version;
private LessonTracker() { @Getter private String lessonName;
//JPA
}
public LessonTracker(Lesson lesson) { @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
lessonName = lesson.getId(); private final Set<Assignment> solvedAssignments = new HashSet<>();
allAssignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
}
public Optional<Assignment> getAssignment(String name) { @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
return allAssignments.stream().filter(a -> a.getName().equals(name)).findFirst(); private final Set<Assignment> allAssignments = new HashSet<>();
}
/** @Getter private int numberOfAttempts = 0;
* Mark an assignment as solved @Version private Integer version;
*
* @param solvedAssignment the assignment which the user solved
*/
public void assignmentSolved(String solvedAssignment) {
getAssignment(solvedAssignment).ifPresent(solvedAssignments::add);
}
/** private LessonTracker() {
* @return did they user solved all solvedAssignments for the lesson? // JPA
*/ }
public boolean isLessonSolved() {
return allAssignments.size() == solvedAssignments.size();
}
/** public LessonTracker(Lesson lesson) {
* Increase the number attempts to solve the lesson lessonName = lesson.getId();
*/ allAssignments.addAll(lesson.getAssignments() == null ? List.of() : lesson.getAssignments());
public void incrementAttempts() { }
numberOfAttempts++;
}
/** public Optional<Assignment> getAssignment(String name) {
* Reset the tracker. We do not reset the number of attempts here! return allAssignments.stream().filter(a -> a.getName().equals(name)).findFirst();
*/ }
void reset() {
solvedAssignments.clear();
}
/** /**
* @return list containing all the assignments solved or not * Mark an assignment as solved
*/ *
public Map<Assignment, Boolean> getLessonOverview() { * @param solvedAssignment the assignment which the user solved
List<Assignment> notSolved = allAssignments.stream() */
.filter(i -> !solvedAssignments.contains(i)) public void assignmentSolved(String solvedAssignment) {
.toList(); getAssignment(solvedAssignment).ifPresent(solvedAssignments::add);
Map<Assignment, Boolean> overview = notSolved.stream().collect(Collectors.toMap(a -> a, b -> false)); }
overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
return overview; /**
} * @return did they user solved all solvedAssignments for the lesson?
*/
public boolean isLessonSolved() {
return allAssignments.size() == solvedAssignments.size();
}
/** Increase the number attempts to solve the lesson */
public void incrementAttempts() {
numberOfAttempts++;
}
/** Reset the tracker. We do not reset the number of attempts here! */
void reset() {
solvedAssignments.clear();
}
/**
* @return list containing all the assignments solved or not
*/
public Map<Assignment, Boolean> getLessonOverview() {
List<Assignment> notSolved =
allAssignments.stream().filter(i -> !solvedAssignments.contains(i)).toList();
Map<Assignment, Boolean> overview =
notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
return overview;
}
} }

47
src/main/java/org/owasp/webgoat/container/users/RegistrationController.java
View File

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

104
src/main/java/org/owasp/webgoat/container/users/Scoreboard.java
View File

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

31
src/main/java/org/owasp/webgoat/container/users/UserForm.java
View File

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

10
src/main/java/org/owasp/webgoat/container/users/UserRepository.java
View File

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

67
src/main/java/org/owasp/webgoat/container/users/UserService.java
View File

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

5
src/main/java/org/owasp/webgoat/container/users/UserSession.java
View File

@ -15,7 +15,6 @@ import org.springframework.data.annotation.Id;
@NoArgsConstructor(access = AccessLevel.PROTECTED) @NoArgsConstructor(access = AccessLevel.PROTECTED)
public class UserSession { public class UserSession {
private WebGoatUser webGoatUser; private WebGoatUser webGoatUser;
@Id @Id private String sessionId;
private String sessionId;
} }

179
src/main/java/org/owasp/webgoat/container/users/UserTracker.java
View File

@ -1,43 +1,41 @@
package org.owasp.webgoat.container.users; 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.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; 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>
* <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/ * 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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> * @author Bruce Mayhew <a href="http://code.google.com/p/webgoat">WebGoat</a>
* @version $Id: $Id * @version $Id: $Id
@ -47,80 +45,83 @@ import java.util.stream.Collectors;
@Entity @Entity
public class UserTracker { public class UserTracker {
@Id @Id
@GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.AUTO)
private Long id; private Long id;
@Column(name = "username")
private String user;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private Set<LessonTracker> lessonTrackers = new HashSet<>();
private UserTracker() {} @Column(name = "username")
private String user;
public UserTracker(final String user) { @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
this.user = user; private Set<LessonTracker> lessonTrackers = new HashSet<>();
private UserTracker() {}
public UserTracker(final String user) {
this.user = user;
}
/**
* Returns an existing lesson tracker or create a new one based on the lesson
*
* @param lesson the lesson
* @return a lesson tracker created if not already present
*/
public LessonTracker getLessonTracker(Lesson lesson) {
Optional<LessonTracker> lessonTracker =
lessonTrackers.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst();
if (!lessonTracker.isPresent()) {
LessonTracker newLessonTracker = new LessonTracker(lesson);
lessonTrackers.add(newLessonTracker);
return newLessonTracker;
} else {
return lessonTracker.get();
} }
}
/** /**
* Returns an existing lesson tracker or create a new one based on the lesson * Query method for finding a specific lesson tracker based on id
* *
* @param lesson the lesson * @param id the id of the lesson
* @return a lesson tracker created if not already present * @return optional due to the fact we can only create a lesson tracker based on a lesson
*/ */
public LessonTracker getLessonTracker(Lesson lesson) { public Optional<LessonTracker> getLessonTracker(String id) {
Optional<LessonTracker> lessonTracker = lessonTrackers return lessonTrackers.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
.stream().filter(l -> l.getLessonName().equals(lesson.getId())).findFirst(); }
if (!lessonTracker.isPresent()) {
LessonTracker newLessonTracker = new LessonTracker(lesson);
lessonTrackers.add(newLessonTracker);
return newLessonTracker;
} else {
return lessonTracker.get();
}
}
/** public void assignmentSolved(Lesson lesson, String assignmentName) {
* Query method for finding a specific lesson tracker based on id LessonTracker lessonTracker = getLessonTracker(lesson);
* lessonTracker.incrementAttempts();
* @param id the id of the lesson lessonTracker.assignmentSolved(assignmentName);
* @return optional due to the fact we can only create a lesson tracker based on a lesson }
*/
public Optional<LessonTracker> getLessonTracker(String id) {
return lessonTrackers.stream().filter(l -> l.getLessonName().equals(id)).findFirst();
}
public void assignmentSolved(Lesson lesson, String assignmentName) { public void assignmentFailed(Lesson lesson) {
LessonTracker lessonTracker = getLessonTracker(lesson); LessonTracker lessonTracker = getLessonTracker(lesson);
lessonTracker.incrementAttempts(); lessonTracker.incrementAttempts();
lessonTracker.assignmentSolved(assignmentName); }
}
public void assignmentFailed(Lesson lesson) { public void reset(Lesson al) {
LessonTracker lessonTracker = getLessonTracker(lesson); LessonTracker lessonTracker = getLessonTracker(al);
lessonTracker.incrementAttempts(); lessonTracker.reset();
} }
public void reset(Lesson al) { public int numberOfLessonsSolved() {
LessonTracker lessonTracker = getLessonTracker(al); int numberOfLessonsSolved = 0;
lessonTracker.reset(); for (LessonTracker lessonTracker : lessonTrackers) {
if (lessonTracker.isLessonSolved()) {
numberOfLessonsSolved = numberOfLessonsSolved + 1;
}
} }
return numberOfLessonsSolved;
}
public int numberOfLessonsSolved() { public int numberOfAssignmentsSolved() {
int numberOfLessonsSolved = 0; int numberOfAssignmentsSolved = 0;
for (LessonTracker lessonTracker : lessonTrackers) { for (LessonTracker lessonTracker : lessonTrackers) {
if (lessonTracker.isLessonSolved()) { Map<Assignment, Boolean> lessonOverview = lessonTracker.getLessonOverview();
numberOfLessonsSolved = numberOfLessonsSolved + 1; numberOfAssignmentsSolved =
} lessonOverview.values().stream().filter(b -> b).collect(Collectors.counting()).intValue();
}
return numberOfLessonsSolved;
}
public int numberOfAssignmentsSolved() {
int numberOfAssignmentsSolved = 0;
for (LessonTracker lessonTracker : lessonTrackers) {
Map<Assignment, Boolean> lessonOverview = lessonTracker.getLessonOverview();
numberOfAssignmentsSolved = lessonOverview.values().stream().filter(b -> b).collect(Collectors.counting()).intValue();
}
return numberOfAssignmentsSolved;
} }
return numberOfAssignmentsSolved;
}
} }

3
src/main/java/org/owasp/webgoat/container/users/UserTrackerRepository.java
View File

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

30
src/main/java/org/owasp/webgoat/container/users/UserValidator.java
View File

@ -13,23 +13,23 @@ import org.springframework.validation.Validator;
@AllArgsConstructor @AllArgsConstructor
public class UserValidator implements Validator { public class UserValidator implements Validator {
private final UserRepository userRepository; private final UserRepository userRepository;
@Override @Override
public boolean supports(Class<?> clazz) { public boolean supports(Class<?> clazz) {
return UserForm.class.equals(clazz); return UserForm.class.equals(clazz);
}
@Override
public void validate(Object o, Errors errors) {
UserForm userForm = (UserForm) o;
if (userRepository.findByUsername(userForm.getUsername()) != null) {
errors.rejectValue("username", "username.duplicate");
} }
@Override if (!userForm.getMatchingPassword().equals(userForm.getPassword())) {
public void validate(Object o, Errors errors) { errors.rejectValue("matchingPassword", "password.diff");
UserForm userForm = (UserForm) o;
if (userRepository.findByUsername(userForm.getUsername()) != null) {
errors.rejectValue("username", "username.duplicate");
}
if (!userForm.getMatchingPassword().equals(userForm.getPassword())) {
errors.rejectValue("matchingPassword", "password.diff");
}
} }
}
} }

124
src/main/java/org/owasp/webgoat/container/users/WebGoatUser.java
View File

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

105
src/main/java/org/owasp/webgoat/lessons/authbypass/AccountVerificationHelper.java
View File

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

16
src/main/java/org/owasp/webgoat/lessons/authbypass/AuthBypass.java
View File

@ -29,13 +29,13 @@ import org.springframework.stereotype.Component;
@Component @Component
public class AuthBypass extends Lesson { public class AuthBypass extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.A7; return Category.A7;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "auth-bypass.title"; return "auth-bypass.title";
} }
} }

98
src/main/java/org/owasp/webgoat/lessons/authbypass/VerifyAccount.java
View File

@ -22,6 +22,13 @@
package org.owasp.webgoat.lessons.authbypass; 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.AssignmentEndpoint;
import org.owasp.webgoat.container.assignments.AssignmentHints; import org.owasp.webgoat.container.assignments.AssignmentHints;
import org.owasp.webgoat.container.assignments.AttackResult; import org.owasp.webgoat.container.assignments.AttackResult;
@ -33,63 +40,54 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; 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 @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 { 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"})
@ResponseBody
public AttackResult completed(@RequestParam String userId, @RequestParam String verifyMethod, HttpServletRequest req) throws ServletException, IOException {
AccountVerificationHelper verificationHelper = new AccountVerificationHelper();
Map<String, String> submittedAnswers = parseSecQuestions(req);
if (verificationHelper.didUserLikelylCheat((HashMap) submittedAnswers)) {
return failed(this)
.feedback("verify-account.cheated")
.output("Yes, you guessed correctly, but see the feedback message")
.build();
}
// else
if (verificationHelper.verifyAccount(Integer.valueOf(userId), (HashMap) submittedAnswers)) {
userSessionData.setValue("account-verified-id", userId);
return success(this)
.feedback("verify-account.success")
.build();
} else {
return failed(this)
.feedback("verify-account.failed")
.build();
}
@PostMapping(
path = "/auth-bypass/verify-account",
produces = {"application/json"})
@ResponseBody
public AttackResult completed(
@RequestParam String userId, @RequestParam String verifyMethod, HttpServletRequest req)
throws ServletException, IOException {
AccountVerificationHelper verificationHelper = new AccountVerificationHelper();
Map<String, String> submittedAnswers = parseSecQuestions(req);
if (verificationHelper.didUserLikelylCheat((HashMap) submittedAnswers)) {
return failed(this)
.feedback("verify-account.cheated")
.output("Yes, you guessed correctly, but see the feedback message")
.build();
} }
private HashMap<String, String> parseSecQuestions(HttpServletRequest req) { // else
Map<String, String> userAnswers = new HashMap<>(); if (verificationHelper.verifyAccount(Integer.valueOf(userId), (HashMap) submittedAnswers)) {
List<String> paramNames = Collections.list(req.getParameterNames()); userSessionData.setValue("account-verified-id", userId);
for (String paramName : paramNames) { return success(this).feedback("verify-account.success").build();
//String paramName = req.getParameterNames().nextElement(); } else {
if (paramName.contains("secQuestion")) { return failed(this).feedback("verify-account.failed").build();
userAnswers.put(paramName, req.getParameter(paramName));
}
}
return (HashMap) userAnswers;
} }
}
private HashMap<String, String> parseSecQuestions(HttpServletRequest req) {
Map<String, String> userAnswers = new HashMap<>();
List<String> paramNames = Collections.list(req.getParameterNames());
for (String paramName : paramNames) {
// String paramName = req.getParameterNames().nextElement();
if (paramName.contains("secQuestion")) {
userAnswers.put(paramName, req.getParameter(paramName));
}
}
return (HashMap) userAnswers;
}
} }

16
src/main/java/org/owasp/webgoat/lessons/bypassrestrictions/BypassRestrictions.java
View File

@ -28,13 +28,13 @@ import org.springframework.stereotype.Component;
@Component @Component
public class BypassRestrictions extends Lesson { public class BypassRestrictions extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.CLIENT_SIDE; return Category.CLIENT_SIDE;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "bypass-restrictions.title"; return "bypass-restrictions.title";
} }
} }

43
src/main/java/org/owasp/webgoat/lessons/bypassrestrictions/BypassRestrictionsFieldRestrictions.java
View File

@ -32,24 +32,29 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
public class BypassRestrictionsFieldRestrictions extends AssignmentEndpoint { public class BypassRestrictionsFieldRestrictions extends AssignmentEndpoint {
@PostMapping("/BypassRestrictions/FieldRestrictions") @PostMapping("/BypassRestrictions/FieldRestrictions")
@ResponseBody @ResponseBody
public AttackResult completed(@RequestParam String select, @RequestParam String radio, @RequestParam String checkbox, @RequestParam String shortInput, @RequestParam String readOnlyInput) { public AttackResult completed(
if (select.equals("option1") || select.equals("option2")) { @RequestParam String select,
return failed(this).build(); @RequestParam String radio,
} @RequestParam String checkbox,
if (radio.equals("option1") || radio.equals("option2")) { @RequestParam String shortInput,
return failed(this).build(); @RequestParam String readOnlyInput) {
} if (select.equals("option1") || select.equals("option2")) {
if (checkbox.equals("on") || checkbox.equals("off")) { return failed(this).build();
return failed(this).build();
}
if (shortInput.length() <= 5) {
return failed(this).build();
}
if ("change".equals(readOnlyInput)) {
return failed(this).build();
}
return success(this).build();
} }
if (radio.equals("option1") || radio.equals("option2")) {
return failed(this).build();
}
if (checkbox.equals("on") || checkbox.equals("off")) {
return failed(this).build();
}
if (shortInput.length() <= 5) {
return failed(this).build();
}
if ("change".equals(readOnlyInput)) {
return failed(this).build();
}
return success(this).build();
}
} }

78
src/main/java/org/owasp/webgoat/lessons/bypassrestrictions/BypassRestrictionsFrontendValidation.java
View File

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

16
src/main/java/org/owasp/webgoat/lessons/challenges/ChallengeIntro.java
View File

@ -9,13 +9,13 @@ import org.owasp.webgoat.container.lessons.Lesson;
*/ */
public class ChallengeIntro extends Lesson { public class ChallengeIntro extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.CHALLENGE; return Category.CHALLENGE;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "challenge0.title"; return "challenge0.title";
} }
} }

15
src/main/java/org/owasp/webgoat/lessons/challenges/Email.java
View File

@ -22,11 +22,10 @@
package org.owasp.webgoat.lessons.challenges; package org.owasp.webgoat.lessons.challenges;
import lombok.Builder;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Builder;
import lombok.Data;
/** /**
* @author nbaars * @author nbaars
@ -36,9 +35,9 @@ import java.time.LocalDateTime;
@Data @Data
public class Email implements Serializable { public class Email implements Serializable {
private LocalDateTime time; private LocalDateTime time;
private String contents; private String contents;
private String sender; private String sender;
private String title; private String title;
private String recipient; private String recipient;
} }

75
src/main/java/org/owasp/webgoat/lessons/challenges/Flag.java
View File

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

8
src/main/java/org/owasp/webgoat/lessons/challenges/SolutionConstants.java
View File

@ -30,8 +30,8 @@ package org.owasp.webgoat.lessons.challenges;
*/ */
public interface SolutionConstants { public interface SolutionConstants {
//TODO should be random generated when starting the server // TODO should be random generated when starting the server
String PASSWORD = "!!webgoat_admin_1234!!"; String PASSWORD = "!!webgoat_admin_1234!!";
String PASSWORD_TOM = "thisisasecretfortomonly"; String PASSWORD_TOM = "thisisasecretfortomonly";
String ADMIN_PASSWORD_LINK = "375afe1104f4a487a73823c50a9292a2"; String ADMIN_PASSWORD_LINK = "375afe1104f4a487a73823c50a9292a2";
} }

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

@ -1,5 +1,8 @@
package org.owasp.webgoat.lessons.challenges.challenge1; 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.AssignmentEndpoint;
import org.owasp.webgoat.container.assignments.AttackResult; import org.owasp.webgoat.container.assignments.AttackResult;
import org.owasp.webgoat.lessons.challenges.Flag; 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.ResponseBody;
import org.springframework.web.bind.annotation.RestController; 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, * This file is part of WebGoat, an Open Web Application Security Project 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 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 * GNU General Public License as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later 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 * <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 * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. * 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> * <p>
* *
* @author WebGoat * @author WebGoat
@ -45,20 +45,25 @@ import static org.owasp.webgoat.lessons.challenges.SolutionConstants.PASSWORD;
@RestController @RestController
public class Assignment1 extends AssignmentEndpoint { public class Assignment1 extends AssignmentEndpoint {
@PostMapping("/challenge/1") @PostMapping("/challenge/1")
@ResponseBody @ResponseBody
public AttackResult completed(@RequestParam String username, @RequestParam String password, HttpServletRequest request) { public AttackResult completed(
boolean ipAddressKnown = true; @RequestParam String username, @RequestParam String password, HttpServletRequest request) {
boolean passwordCorrect = "admin".equals(username) && PASSWORD.replace("1234", String.format("%04d",ImageServlet.PINCODE)).equals(password); boolean ipAddressKnown = true;
if (passwordCorrect && ipAddressKnown) { boolean passwordCorrect =
return success(this).feedback("challenge.solved").feedbackArgs(Flag.FLAGS.get(1)).build(); "admin".equals(username)
} else if (passwordCorrect) { && PASSWORD
return failed(this).feedback("ip.address.unknown").build(); .replace("1234", String.format("%04d", ImageServlet.PINCODE))
} .equals(password);
return failed(this).build(); if (passwordCorrect && ipAddressKnown) {
return success(this).feedback("challenge.solved").feedbackArgs(Flag.FLAGS.get(1)).build();
} else if (passwordCorrect) {
return failed(this).feedback("ip.address.unknown").build();
} }
return failed(this).build();
}
public static boolean containsHeader(HttpServletRequest request) { public static boolean containsHeader(HttpServletRequest request) {
return StringUtils.hasText(request.getHeader("X-Forwarded-For")); return StringUtils.hasText(request.getHeader("X-Forwarded-For"));
} }
} }

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

@ -11,13 +11,13 @@ import org.springframework.stereotype.Component;
@Component @Component
public class Challenge1 extends Lesson { public class Challenge1 extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.CHALLENGE; return Category.CHALLENGE;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "challenge1.title"; return "challenge1.title";
} }
} }

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

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

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

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

16
src/main/java/org/owasp/webgoat/lessons/challenges/challenge5/Challenge5.java
View File

@ -33,13 +33,13 @@ import org.springframework.stereotype.Component;
@Component @Component
public class Challenge5 extends Lesson { public class Challenge5 extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.CHALLENGE; return Category.CHALLENGE;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "challenge5.title"; return "challenge5.title";
} }
} }

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

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

16
src/main/java/org/owasp/webgoat/lessons/challenges/challenge7/Challenge7.java
View File

@ -11,13 +11,13 @@ import org.springframework.stereotype.Component;
@Component @Component
public class Challenge7 extends Lesson { public class Challenge7 extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.CHALLENGE; return Category.CHALLENGE;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "challenge7.title"; return "challenge7.title";
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@ -10,34 +10,36 @@ import java.util.Random;
*/ */
public class PasswordResetLink { public class PasswordResetLink {
public String createPasswordReset(String username, String key) { public String createPasswordReset(String username, String key) {
Random random = new Random(); Random random = new Random();
if (username.equalsIgnoreCase("admin")) { if (username.equalsIgnoreCase("admin")) {
//Admin has a fix reset link // Admin has a fix reset link
random.setSeed(key.length()); random.setSeed(key.length());
}
return scramble(random, scramble(random, scramble(random, MD5.getHashString(username))));
} }
return scramble(random, scramble(random, scramble(random, MD5.getHashString(username))));
}
public static String scramble(Random random, String inputString) { public static String scramble(Random random, String inputString) {
char[] a = inputString.toCharArray(); char[] a = inputString.toCharArray();
for (int i = 0; i < a.length; i++) { for (int i = 0; i < a.length; i++) {
int j = random.nextInt(a.length); int j = random.nextInt(a.length);
char temp = a[i]; char temp = a[i];
a[i] = a[j]; a[i] = a[j];
a[j] = temp; a[j] = temp;
}
return new String(a);
} }
return new String(a);
}
public static void main(String[] args) { public static void main(String[] args) {
if (args == null || args.length != 2) { if (args == null || args.length != 2) {
System.out.println("Need a username and key"); System.out.println("Need a username and key");
System.exit(1); System.exit(1);
}
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));
} }
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));
}
} }

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

@ -1,5 +1,9 @@
package org.owasp.webgoat.lessons.challenges.challenge8; 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 lombok.extern.slf4j.Slf4j;
import org.owasp.webgoat.container.assignments.AssignmentEndpoint; import org.owasp.webgoat.container.assignments.AssignmentEndpoint;
import org.owasp.webgoat.container.assignments.AttackResult; 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.ResponseBody;
import org.springframework.web.bind.annotation.RestController; 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 * @author nbaars
* @since 4/8/17. * @since 4/8/17.
@ -24,46 +23,54 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
public class Assignment8 extends AssignmentEndpoint { public class Assignment8 extends AssignmentEndpoint {
private static final Map<Integer, Integer> votes = new HashMap<>(); private static final Map<Integer, Integer> votes = new HashMap<>();
static { static {
votes.put(1, 400); votes.put(1, 400);
votes.put(2, 120); votes.put(2, 120);
votes.put(3, 140); votes.put(3, 140);
votes.put(4, 150); votes.put(4, 150);
votes.put(5, 300); votes.put(5, 300);
} }
@GetMapping(value = "/challenge/8/vote/{stars}", produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "/challenge/8/vote/{stars}", produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody @ResponseBody
public ResponseEntity<?> vote(@PathVariable(value = "stars") int nrOfStars, HttpServletRequest request) { public ResponseEntity<?> vote(
//Simple implementation of VERB Based Authentication @PathVariable(value = "stars") int nrOfStars, HttpServletRequest request) {
String msg = ""; // Simple implementation of VERB Based Authentication
if (request.getMethod().equals("GET")) { String msg = "";
var json = Map.of("error", true, "message", "Sorry but you need to login first in order to vote"); if (request.getMethod().equals("GET")) {
return ResponseEntity.status(200).body(json); var json =
} Map.of("error", true, "message", "Sorry but you need to login first in order to vote");
Integer allVotesForStar = votes.getOrDefault(nrOfStars, 0); return ResponseEntity.status(200).body(json);
votes.put(nrOfStars, allVotesForStar + 1);
return ResponseEntity.ok().header("X-Flag", "Thanks for voting, your flag is: " + Flag.FLAGS.get(8)).build();
} }
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();
}
@GetMapping("/challenge/8/votes/") @GetMapping("/challenge/8/votes/")
public ResponseEntity<?> getVotes() { 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") @GetMapping("/challenge/8/votes/average")
public ResponseEntity<Map<String, Integer>> average() { public ResponseEntity<Map<String, Integer>> average() {
int totalNumberOfVotes = votes.values().stream().mapToInt(i -> i.intValue()).sum(); 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 =
var json = Map.of("average", (int) Math.ceil((double) categories / totalNumberOfVotes)); votes.entrySet().stream()
return ResponseEntity.ok(json); .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);
}
@GetMapping("/challenge/8/notUsed") @GetMapping("/challenge/8/notUsed")
public AttackResult notUsed() { public AttackResult notUsed() {
throw new IllegalStateException("Should never be called, challenge specific method"); throw new IllegalStateException("Should never be called, challenge specific method");
} }
} }

16
src/main/java/org/owasp/webgoat/lessons/challenges/challenge8/Challenge8.java
View File

@ -11,13 +11,13 @@ import org.springframework.stereotype.Component;
@Component @Component
public class Challenge8 extends Lesson { public class Challenge8 extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.CHALLENGE; return Category.CHALLENGE;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "challenge8.title"; return "challenge8.title";
} }
} }

16
src/main/java/org/owasp/webgoat/lessons/chromedevtools/ChromeDevTools.java
View File

@ -33,13 +33,13 @@ import org.springframework.stereotype.Component;
@Component @Component
public class ChromeDevTools extends Lesson { public class ChromeDevTools extends Lesson {
@Override @Override
public Category getDefaultCategory() { public Category getDefaultCategory() {
return Category.GENERAL; return Category.GENERAL;
} }
@Override @Override
public String getTitle() { public String getTitle() {
return "3.chrome-dev-tools.title";//3rd lesson in General return "3.chrome-dev-tools.title"; // 3rd lesson in General
} }
} }

20
src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkDummy.java
View File

@ -39,16 +39,16 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
public class NetworkDummy extends AssignmentEndpoint { public class NetworkDummy extends AssignmentEndpoint {
@PostMapping("/ChromeDevTools/dummy") @PostMapping("/ChromeDevTools/dummy")
@ResponseBody @ResponseBody
public AttackResult completed(@RequestParam String successMessage) { public AttackResult completed(@RequestParam String successMessage) {
UserSessionData userSessionData = getUserSessionData(); UserSessionData userSessionData = getUserSessionData();
String answer = (String) userSessionData.getValue("randValue"); String answer = (String) userSessionData.getValue("randValue");
if (successMessage != null && successMessage.equals(answer)) { if (successMessage != null && successMessage.equals(answer)) {
return success(this).feedback("xss-dom-message-success").build(); return success(this).feedback("xss-dom-message-success").build();
} else { } else {
return failed(this).feedback("xss-dom-message-failure").build(); return failed(this).feedback("xss-dom-message-failure").build();
}
} }
}
} }

32
src/main/java/org/owasp/webgoat/lessons/chromedevtools/NetworkLesson.java
View File

@ -32,8 +32,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController; 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 * @author TMelzer
* @since 30.11.18 * @since 30.11.18
@ -42,19 +42,21 @@ import org.springframework.web.bind.annotation.RestController;
@AssignmentHints({"networkHint1", "networkHint2"}) @AssignmentHints({"networkHint1", "networkHint2"})
public class NetworkLesson extends AssignmentEndpoint { public class NetworkLesson extends AssignmentEndpoint {
@PostMapping(value = "/ChromeDevTools/network", params = {"network_num", "number"}) @PostMapping(
@ResponseBody value = "/ChromeDevTools/network",
public AttackResult completed(@RequestParam String network_num, @RequestParam String number) { params = {"network_num", "number"})
if (network_num.equals(number)) { @ResponseBody
return success(this).feedback("network.success").output("").build(); public AttackResult completed(@RequestParam String network_num, @RequestParam String number) {
} else { if (network_num.equals(number)) {
return failed(this).feedback("network.failed").build(); return success(this).feedback("network.success").output("").build();
} } else {
return failed(this).feedback("network.failed").build();
} }
}
@PostMapping(path = "/ChromeDevTools/network", params = "networkNum") @PostMapping(path = "/ChromeDevTools/network", params = "networkNum")
@ResponseBody @ResponseBody
public ResponseEntity<?> ok(@RequestParam String networkNum) { public ResponseEntity<?> ok(@RequestParam String networkNum) {
return ResponseEntity.ok().build(); return ResponseEntity.ok().build();
} }
} }

Some files were not shown because too many files have changed in this diff Show More