Initial cut on CSRF. More to come

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

@@ -41,6 +41,7 @@ public enum Category {
     INJECTION("Injection Flaws", new Integer(200)),
     AUTHENTICATION("Authentication Flaws", new Integer(300)),
     XSS("Cross-Site Scripting (XSS)", new Integer(400)),
+    REQ_FORGERIES("Request Forgeries", new Integer(450)),
     ACCESS_CONTROL("Access Control Flaws", new Integer(500)),
     INSECURE_CONFIGURATION("Insecure Configuration", new Integer(600)),
     INSECURE_COMMUNICATION("Insecure Communication", new Integer(700)),

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

@@ -0,0 +1,36 @@
+package org.owasp.webgoat.plugin;
+
+import com.beust.jcommander.internal.Lists;
+import org.owasp.webgoat.lessons.Category;
+import org.owasp.webgoat.lessons.NewLesson;
+
+import java.util.List;
+
+/**
+ * Created by jason on 9/29/17.
+ */
+public class CSRF extends NewLesson  {
+    @Override
+    public Category getDefaultCategory() {
+        return Category.REQUEST_FORGERIES;
+    }
+
+    @Override
+    public List<String> getHints() {
+        return Lists.newArrayList();
+    }
+
+    @Override
+    public Integer getDefaultRanking() {
+        return 1;
+    }
+
+    @Override
+    public String getTitle() { return "csrf.title"; }
+
+    @Override
+    public String getId() {
+        return "CSRF";
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package org.owasp.webgoat.plugin;
+
+import org.owasp.webgoat.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.assignments.AssignmentHints;
+import org.owasp.webgoat.assignments.AssignmentPath;
+import org.owasp.webgoat.assignments.AttackResult;
+import org.owasp.webgoat.session.UserSessionData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by jason on 9/29/17.
+ */
+
+@AssignmentPath("/csrf/confirm-flag-1")
+@AssignmentHints({""})
+public class CSRFConfirmFlag1 extends AssignmentEndpoint {
+
+    @Autowired
+    UserSessionData userSessionData;
+
+    @PostMapping(produces = {"application/json"})
+    public @ResponseBody AttackResult completed(String confirmFlagVal) {
+//        String host = (req.getHeader("host") == null) ? "NULL" : req.getHeader("host");
+//        String origin = (req.getHeader("origin") == null) ? "NULL" : req.getHeader("origin");
+//        Integer serverPort = (req.getServerPort() < 1) ? 0 : req.getServerPort();
+//        String serverName = (req.getServerName() == null) ? "NULL" : req.getServerName();
+//        String referer = (req.getHeader("referer") == null) ? "NULL" : req.getHeader("referer");
+
+        if (confirmFlagVal.equals(userSessionData.getValue("csrf-get-success"))) {
+            return success().feedback("csrf-get-success").output("Correct, the flag was " + userSessionData.getValue("csrf-get-success")).build();
+        }
+        return  failed().feedback("").build();
+    }
+}

webgoat-lessons/csrf/src/main/java/org/owasp/webgoat/plugin/CSRFGetFlag.java

@@ -0,0 +1,65 @@
+package org.owasp.webgoat.plugin;
+
+import org.owasp.webgoat.assignments.Endpoint;
+import org.owasp.webgoat.i18n.PluginMessages;
+import org.owasp.webgoat.session.UserSessionData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by jason on 9/30/17.
+ */
+
+public class CSRFGetFlag extends Endpoint {
+
+    @Autowired
+    UserSessionData userSessionData;
+    @Autowired
+    private PluginMessages pluginMessages;
+
+    @RequestMapping(produces = {"application/json"}, method = RequestMethod.GET)
+    @ResponseBody
+    public Map<String, Object> invoke(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+        Map<String,Object> response = new HashMap<>();
+
+        String host = (req.getHeader("host") == null) ? "NULL" : req.getHeader("host");
+        String origin = (req.getHeader("origin") == null) ? "NULL" : req.getHeader("origin");
+        Integer serverPort = (req.getServerPort() < 1) ? 0 : req.getServerPort();
+        String serverName = (req.getServerName() == null) ? "NULL" : req.getServerName();
+        String referer = (req.getHeader("referer") == null) ? "NULL" : req.getHeader("referer");
+        String[] refererArr = referer.split("/");
+
+        if (referer.equals("NULL") && req.getParameter("csrf").equals("true")) {
+            userSessionData.setValue("csrf-get-success", Math.floor(Math.random()*100000));
+            response.put("success",true);
+            response.put("message",pluginMessages.getMessage("csrf-get-null-referer.success"));
+            response.put("flag",userSessionData.getValue("csrf-get-success"));
+        }  else if (refererArr[2].equals(host)) {
+            response.put("success", false);
+            response.put("message", "Appears the request came from the original host");
+            response.put("flag", null);
+        } else {
+            response.put("success", false);
+            response.put("message", "TBD");
+            response.put("flag", null);
+        }
+
+        return response;
+
+    }
+
+    @Override
+    public String getPath() {
+        return "/csrf/basic-get-flag";
+    }
+}

webgoat-lessons/csrf/src/main/resources/html/CSRF.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+
+<html xmlns:th="http://www.thymeleaf.org">
+
+    <div class="lesson-page-wrapper">
+        <div class="adoc-content" th:replace="doc:CSRF_intro.adoc"></div>
+    </div>
+
+    <div class="lesson-page-wrapper">
+        <div class="adoc-content" th:replace="doc:CSRF_GET.adoc"></div>
+    </div>
+
+    <div class="lesson-page-wrapper">
+        <div class="adoc-content" th:replace="doc:CSRF_Get_Flag.adoc"></div>
+
+        <form accept-charset="UNKNOWN" id="basic-csrf-get"
+              method="GET" name="form1"
+              successCallback=""
+              action="/WebGoat/csrf/basic-get-flag"
+              enctype="application/json;charset=UTF-8">
+            <input name="csrf" type="hidden" value="false" />
+            <input type="submit" name="ubmit=" />
+
+        </form>
+    </div>
+
+    <div class="lesson-page-wrapper">
+
+        <div class="adoc-content" th:replace="doc:CSRF_Basic_Get-1.adoc"></div>
+
+
+
+        <div class="attack-container">
+            <div class="assignment-success">
+                    <i class="fa fa-2 fa-check hidden" aria-hidden="true">
+                    </i>
+            </div>
+            <form class="attack-form" accept-charset="UNKNOWN" id="confirm-flag-1"
+                      method="POST" name="form2"
+                      successCallback=""
+                      action="/WebGoat/csrf/basic-confirm-flag"
+                      enctype="application/json;charset=UTF-8">
+
+                    Confirm Flag Value:
+                    <input type="text" length="6" name="confirmFlagVal" value="false" />
+
+                    <input name="submit" value="Submit" type="submit"/>
+
+            </form>
+
+            <div class="attack-feedback"></div>
+            <div class="attack-output"></div>
+        </div>
+    </div>
+    <!--</div>-->
+
+</html>

webgoat-lessons/csrf/src/main/resources/i18n/WebGoatLabels.properties

@@ -0,0 +1,4 @@
+csrf.title=Cross-Site Request Forgeries
+csrf-get-null-referer.success=Congratulations! Appears you made the request from your local machine.
+csrf-get-other-referer.successfeedback=Congratulations! Appears you made the request from\
+ 

webgoat-lessons/csrf/src/main/resources/lessonPlans/en/CSRF_Basic_Get-1.adoc

@@ -0,0 +1,3 @@
+== Confirm Flag
+
+Confirm the flag you should have gotten on the previous page below.

webgoat-lessons/csrf/src/main/resources/lessonPlans/en/CSRF_Basic_Get.adoc

@@ -0,0 +1,9 @@
+== The Base Form
+
+The form below has hidden elements and submits to an action of TBD.  You can try it out and watch what it does, but it won't get you the flag. Once you can
+
+Every attack in this lesson will need to be done through another page or site. To see your progress, you will need to reload the
+pages or re-navigate back through the lesson to see your progress.
+
+Just to get your feet wet, issue a request to _SERVER_/WebGoat/csrf/basic-get-flag with a parameter named 'csrf' equal to 'true'. Your request needs to
+come from a local file or be hosted on a different website.

webgoat-lessons/csrf/src/main/resources/lessonPlans/en/CSRF_GET.adoc

@@ -1,6 +1,6 @@
 == CSRF with a GET request
 
-This is the most easiest CSRF attack to perform. For example you receive an e-mail with the following content:
+This is the most simple CSRF attack to perform. For example you receive an e-mail with the following content:
 
 `<a href="http://bank.com/transfer?account_number_from=123456789&account_number_to=987654321&amount=100000">View my Pictures!</a>`
 

webgoat-lessons/csrf/src/main/resources/lessonPlans/en/CSRF_Get_Flag.adoc

@@ -0,0 +1,4 @@
+== Basic Get CSRF Exercise
+
+place holder ...
+

webgoat-lessons/csrf/src/main/resources/lessonPlans/en/CSRF_intro.adoc

@@ -1,11 +1,11 @@
-=== What is a Crosse-site request forgery?
+=== What is a Cross-site request forgery?
 
 Cross-site request forgery, also known as one-click attack or session riding and abbreviated as CSRF
 (sometimes pronounced sea-surf) or XSRF, is a type of malicious exploit of a website where unauthorized commands are transmitted
 from a user that the website trusts. Unlike cross-site scripting (XSS), which exploits the trust a user has for a particular site, CSRF
 exploits the trust that a site has in a user's browser.
 
-A cross-site request forgery is a confused deputy attack against a web browser. CSRF commonly has the following characteristics:
+A cross-site request forgery is a 'confused deputy' attack against a web browser. CSRF commonly has the following characteristics:
 
 * It involves sites that rely on a user's identity.
 * It exploits the site's trust in that identity.
@@ -16,7 +16,7 @@ At risk are web applications that perform actions based on input from trusted an
 the specific action. A user who is authenticated by a cookie saved in the user's web browser could unknowingly send an HTTP request to a site
 that trusts the user and thereby causes an unwanted action.
 
-CSRF attacks target functionality that causes a state change on the server, such as changing the victim's email address or password, or purchasing
+A CSRF attack targets/abuses basic web functionality. If the site allows that causes a state change on the server, such as changing the victim's email address or password, or purchasing
 something. Forcing the victim to retrieve data doesn't benefit an attacker because the attacker doesn't receive the response, the victim does.
 As such, CSRF attacks target state-changing requests.
 

webgoat-lessons/csrf/src/main/resources/plugin/CSRF/html/CSRF.html

@@ -1,181 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org">
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:XXE_plan.adoc"></div>
-</div>
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:XXE_intro.adoc"></div>
-</div>
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this block for each 'page' of content -->
-    <!-- sample ascii doc content for second page -->
-    <div class="adoc-content" th:replace="doc:XXE_simple.adoc"></div>
-    <!-- if including attack, reuse this section, leave classes in place -->
-    <div class="attack-container">
-        <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-        <!-- using attack-form class on your form will allow your request to be ajaxified and stay within the display framework for webgoat -->
-        <!-- you can write your own custom forms, but standard form submission will take you to your endpoint and outside of the WebGoat framework -->
-        <!-- of course, you can write your own ajax submission /handling in your own javascript if you like -->
-        <form class="attack-form" accept-charset="UNKNOWN" prepareData="register" method="POST" name="form"
-              action="/WebGoat/XXE/simple" contentType="application/xml">
-            <script th:src="@{/plugin_lessons/plugin/XXE/js/xxe.js}"
-                    language="JavaScript"></script>
-            <div id="lessonContent">
-                <strong>Registration form</strong>
-                <form prepareData="register" accept-charset="UNKNOWN" method="POST" name="form" action="#attack/307/100">
-                    <table>
-                        <tr>
-                            <td>Username</td>
-                            <td><input name="username" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td>E-mail</td>
-                            <td><input name="email" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td>Password</td>
-                            <td><input name="email" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td align="right"><input type="submit" id="registerButton" value="Sign up"/></td>
-                        </tr>
-                    </table>
-                    <br/>
-                    <br/>
-                </form>
-                <div class="attack-feedback"></div>
-                <div class="attack-output"></div>
-            </div>
-        </form>
-        <div id='registration_success'></div>
-    </div>
-    <!-- do not remove the two following div's, this is where your feedback/output will land -->
-    <div class="attack-feedback"></div>
-    <div class="attack-output"></div>
-    <!-- ... of course, you can move them if you want to, but that will not look consistent to other lessons -->
-</div>
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:XXE_changing_content_type.adoc"></div>
-    <div class="attack-container">
-        <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-        <!-- using attack-form class on your form will allow your request to be ajaxified and stay within the display framework for webgoat -->
-        <!-- you can write your own custom forms, but standard form submission will take you to your endpoint and outside of the WebGoat framework -->
-        <!-- of course, you can write your own ajax submission /handling in your own javascript if you like -->
-        <form class="attack-form" accept-charset="UNKNOWN" prepareData="registerJson" method="POST" name="form"
-              action="/WebGoat/XXE/content-type" contentType="application/json">
-            <script th:src="@{/plugin_lessons/plugin/XXE/js/xxe.js}"
-                    language="JavaScript"></script>
-            <div id="lessonContent">
-                <strong>Registration form</strong>
-                <form prepareData="registerJson" accept-charset="UNKNOWN" method="POST" name="form" action="#attack/307/100">
-                    <table>
-                        <tr>
-                            <td>Username</td>
-                            <td><input name="username" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td>E-mail</td>
-                            <td><input name="email" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td>Password</td>
-                            <td><input name="email" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td align="right"><input type="submit" value="Sign up"/></td>
-                        </tr>
-                    </table>
-                    <br/>
-                    <br/>
-                </form>
-                <div class="attack-feedback"></div>
-                <div class="attack-output"></div>
-            </div>
-        </form>
-    </div>
-</div>
-
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:XXE_overflow.adoc"></div>
-</div>
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:XXE_blind.adoc"></div>
-</div>
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:XXE_blind_assignment.adoc"></div>
-    <div class="attack-container">
-        <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
-        <!-- using attack-form class on your form will allow your request to be ajaxified and stay within the display framework for webgoat -->
-        <!-- you can write your own custom forms, but standard form submission will take you to your endpoint and outside of the WebGoat framework -->
-        <!-- of course, you can write your own ajax submission /handling in your own javascript if you like -->
-        <form class="attack-form" accept-charset="UNKNOWN" prepareData="registerJson" method="POST" name="form"
-              action="/WebGoat/XXE/content-type" contentType="application/json">
-            <script th:src="@{/plugin_lessons/plugin/XXE/js/xxe.js}"
-                    language="JavaScript"></script>
-            <div id="lessonContent">
-                <strong>Registration form</strong>
-                <form prepareData="registerJson" accept-charset="UNKNOWN" method="POST" name="form" action="#attack/307/100">
-                    <table>
-                        <tr>
-                            <td>Username</td>
-                            <td><input name="username" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td>E-mail</td>
-                            <td><input name="email" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td>Password</td>
-                            <td><input name="email" value="" type="TEXT"/></td>
-                        </tr>
-                        <tr>
-                            <td></td>
-                            <td align="right"><input type="submit" value="Sign up"/></td>
-                        </tr>
-                    </table>
-                    <br/>
-                    <br/>
-                </form>
-                <div class="attack-feedback"></div>
-                <div class="attack-output"></div>
-            </div>
-        </form>
-    </div>
-</div>
-
-
-<div class="lesson-page-wrapper">
-    <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
-    <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
-    which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
-    <div class="adoc-content" th:replace="doc:XXE_mitigation.adoc"></div>
-</div>
-
-
-</html>

webgoat-lessons/csrf/src/main/resources/plugin/CSRF/js/xxe.js

@@ -1,15 +0,0 @@
-webgoat.customjs.register = function () {
-    var xml = '<?xml version="1.0"?>' +
-        '<user>' +
-        '  <username>' + 'test' + '</username>' +
-        '  <password>' + 'test' + '</password>' +
-        '</user>';
-    return xml;
-}
-webgoat.customjs.registerJson = function () {
-    var json = '{' +
-        '  "user":' + '"test"' +
-        '  "password":' + '"test"' +
-        '}';
-    return json;
-}

webgoat-lessons/csrf/src/main/resources/plugin/CSRF/secret.txt

@@ -1 +0,0 @@
-WebGoat 8 rocks...

webgoat-lessons/csrf/webgoat-lesson-template/getting-started.txt

@@ -0,0 +1,55 @@
+##### To include lesson template in build #####
+1. edit theh webgoat-server/pom.xml file and uncomment the section under ...
+<!--uncommment below to run/include lesson template in WebGoat Build-->
+
+2. Also uncomment in webgoat-lessons/pom.xml where it says ...
+<!-- uncomment below to include lesson template in build, also uncomment the dependency in webgoat-server/pom.xml-->
+
+##### To add a lesson to WebGoat #####
+
+There are a number of moving parts and this sample lesson will help you navigate those parts. Most of your work will be done in two directories. To start though, you can copy this directory with the name of your-lesson in the webgoat-lessons directory.
+
+0. The POM file
+	a. change the ...
+	<artifactId>webgoat-lesson-template</artifactId>
+	... line to give your lesson its own artifactId.That should be all you need to do there
+
+1.	The Base Class ...
+	In webgoat-lessons/{your-lesson}/src/main/java, refactor the LessonTemplate.java class, changing ...
+	a. the category in which you want your lesson to be in.  You can create a new category if you want, or put in an issue to have one added
+	b. The 'defaultRanking' will move your lesson up or down in the categories list
+	c. implement a new key name pair "lesson-template.title" (the key) and update the same key/value pair (your.key=your value) in src/main/resources/i18n/WebGoatLabels.properties
+	d. Implement a new value for the getId method, which leads us to ...
+
+2. The HTML content framing ...
+	a. Rename the provided file in src/main/resources/html using your value from the getId method in your lesson's base class (e.g. public String getId() { return "your-lesson";  } >> "your-lesson.html")
+	b. Modify that file following the commented instructions in there
+	c. In conjunction with this file you
+
+3. Assignment Endpoints
+	a. In the above html file, you will see an example of an 'attack form'.  You can create endpoints to handle these attacks and provide the user feedback and simulated output.  See the example file here as well as other existing lessons for ways to extend these.  You will extend the AssignmentEndpoint as the example will show
+	b. You can also create supporting (non-assignment) endpoints, that are not evaluated/graded.  
+	c. See other lesson examples for creating unit/integration tests for your project as well
+
+
+4. Getting your lesson to show up
+	a. modify the webgoat-lessons/pom.xml to include your project in the <modules> section
+	<modules>
+		<!-- ... -->
+		<module>webgoat-lesson-template</module>
+		<!-- ... -->
+	</modules>
+
+	b. modify the webgoat-server/pom.xml to add your project as a dependency in the <dependencies> section ...
+	<dependencies>
+		<!-- .... >
+        <dependency>
+            <groupId>org.owasp.webgoat.lesson</groupId>
+            <artifactId>your-artfifact-id-here</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- .... >
+    <dependencies>
+
+
+5. You should be ready to run and test your project. Please create issues at https://github.com/WebGoat/WebGoat if there errors or confusion with this documentation/template

webgoat-lessons/csrf/webgoat-lesson-template/pom.xml

@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>webgoat-lesson-template</artifactId>
+    <packaging>jar</packaging>
+    <parent>
+        <groupId>org.owasp.webgoat.lesson</groupId>
+        <artifactId>webgoat-lessons-parent</artifactId>
+        <version>8.0-SNAPSHOT</version>
+    </parent>
+
+</project>

webgoat-lessons/csrf/webgoat-lesson-template/src/main/java/org/owasp/webgoat/plugin/LessonTemplate.java

@@ -0,0 +1,65 @@
+package org.owasp.webgoat.plugin;
+
+import com.beust.jcommander.internal.Lists;
+import org.owasp.webgoat.lessons.Category;
+import org.owasp.webgoat.lessons.NewLesson;
+
+import java.util.List;
+
+/**
+ * ************************************************************************************************
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ * <p>
+ * Copyright (c) 2002 - 20014 Bruce Mayhew
+ * <p>
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ * <p>
+ * Getting Source ==============
+ * <p>
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ * <p>
+ *
+ * @author misfir3
+ * @version $Id: $Id
+ * @since January 3, 2017
+ */
+public class LessonTemplate extends NewLesson {
+
+    @Override
+    public Category getDefaultCategory() {
+        return Category.GENERAL;
+    }
+
+    @Override
+    public List<String> getHints() {
+        return Lists.newArrayList();
+    }
+
+    @Override
+    public Integer getDefaultRanking() {
+        return 30;
+    }
+
+    @Override
+    public String getTitle() {
+        return "lesson-template.title";
+    }
+
+    @Override
+    public String getId() {
+        return "LessonTemplate";
+    }
+
+}

webgoat-lessons/csrf/webgoat-lesson-template/src/main/java/org/owasp/webgoat/plugin/SampleAttack.java

@@ -0,0 +1,62 @@
+package org.owasp.webgoat.plugin;
+
+import com.google.common.collect.Lists;
+import org.owasp.webgoat.assignments.AssignmentEndpoint;
+import org.owasp.webgoat.assignments.AssignmentPath;
+import org.owasp.webgoat.assignments.AttackResult;
+import org.owasp.webgoat.session.UserSessionData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+
+import java.util.Map;
+
+/**
+ * Created by jason on 1/5/17.
+ */
+
+@AssignmentPath("/lesson-template/sample-attack")
+public class SampleAttack extends AssignmentEndpoint {
+
+    String secretValue = "secr37Value";
+
+    //UserSessionData is bound to session and can be used to persist data across multiple assignments
+    @Autowired
+    UserSessionData userSessionData;
+
+
+    @GetMapping(produces = {"application/json"})
+    public @ResponseBody
+    AttackResult completed(String param1, String param2, HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+
+        if (userSessionData.getValue("some-value") != null) {
+            // do any session updating you want here ... or not, just comment/example here
+            //return trackProgress(failed().feedback("lesson-template.sample-attack.failure-2").build());
+        }
+
+        //overly simple example for success. See other existing lesssons for ways to detect 'success' or 'failure'
+        if (secretValue.equals(param1)) {
+            return trackProgress(success()
+                    .output("Custom Output ...if you want, for success")
+                    .feedback("lesson-template.sample-attack.success")
+                    .build());
+            //lesson-template.sample-attack.success is defined in src/main/resources/i18n/WebGoatLabels.properties
+        }
+
+        // else
+        return trackProgress(failed()
+                .feedback("lesson-template.sample-attack.failure-2")
+                .output("Custom output for this failure scenario, usually html that will get rendered directly ... yes, you can self-xss if you want")
+                .build());
+    }
+
+}

webgoat-lessons/csrf/webgoat-lesson-template/src/main/resources/html/LessonTemplate.html

@@ -0,0 +1,54 @@
+<html xmlns:th="http://www.thymeleaf.org">
+
+    <div class="lesson-page-wrapper">
+        <!-- reuse this lesson-page-wrapper block for each 'page' of content in your lesson -->
+        <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
+        which go in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
+        <div class="adoc-content" th:replace="doc:lesson-template-intro.adoc"></div>
+    </div>
+
+    <div class="lesson-page-wrapper">
+        <!-- reuse the above lesson-page-wrapper block for each 'page' of content in your lesson -->
+        <!-- include content here, or can be placed in another location. Content will be presented via asciidocs files,
+        which you put in src/main/resources/plugin/lessonplans/{lang}/{fileName}.adoc -->
+        <div class="adoc-content" th:replace="doc:lesson-template-video.adoc"></div>
+        <!-- can use multiple adoc's in a page-wrapper if you want ... or not-->
+        <div class="adoc-content" th:replace="doc:lesson-template-attack.adoc"></div>
+
+        <!-- WebGoat will automatically style and scaffold some functionality by using the div.attack-container as below -->
+        <div class="attack-container">
+            <div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
+            <!-- using attack-form class on your form, will allow your request to be ajaxified and stay within the display framework for webgoat -->
+            <!-- you can write your own custom forms, but standard form submission will take you to your endpoint and outside of the WebGoat framework -->
+            <!-- of course, you can write your own ajax submission /handling in your own javascript if you like -->
+
+            <!-- modify the action to point to the intended endpoint and set other attributes as desired -->
+            <script th:src="@{/lesson_js/idor.js}" />
+            <form class="attack-form" accept-charset="UNKNOWN"
+                  method="GET" name="form"
+                  action="/WebGoat/lesson-template/sample-attack"  
+                  enctype="application/json;charset=UTF-8">
+                <table>
+                    <tr>
+                        <td>two random params</td>
+                        <td>parameter 1:<input name="param1" value="" type="TEXT" /></td>
+                        <td>parameter 2:<input name="param2" value="" type="TEXT" /></td>
+                        <td>
+                            <input
+                                name="submit" value="Submit" type="SUBMIT"/>
+                        </td>
+                    </tr>
+                </table>
+            </form>
+            <!-- do not remove the two following div's, this is where your feedback/output will land -->
+            <!-- the attack response will include a 'feedback' and that will automatically go here -->
+            <div class="attack-feedback"></div>
+            <!-- output is intended to be a simulation of what the screen would display in an attack -->
+            <div class="attack-output"></div>
+        </div>
+    </div>
+
+    <!-- repeat and mix-and-match the lesson-page-wrappers with or wihtout the attack-containers as you like ...
+        see other lessons for other more complex examples -->
+
+</html>

webgoat-lessons/csrf/webgoat-lesson-template/src/main/resources/i18n/WebGoatLabels.properties

@@ -0,0 +1,7 @@
+lesson-template.title=Lesson Template
+
+lesson-template.sample-attack.failure-1=Sample failure message
+lesson-template.sample-attack.failure-2=Sample failure message 2
+
+lesson-template.sample-attack.success=Sample success message
+

webgoat-lessons/csrf/webgoat-lesson-template/src/main/resources/js/idor.js

@@ -0,0 +1,18 @@
+// need custom js for this?
+
+webgoat.customjs.idorViewProfile = function(data) {
+    webgoat.customjs.jquery('#idor-profile').html(
+        'name:' + data.name + '<br/>'+
+        'color:' + data.color + '<br/>'+
+        'size:' + data.size + '<br/>'
+    );
+}
+
+var onViewProfile = function () {
+    console.warn("on view profile activated")
+    webgoat.customjs.jquery.ajax({
+        method: "GET",
+        url: "/WebGoat/IDOR/profile",
+        contentType: 'application/json; charset=UTF-8'
+     }).then(webgoat.customjs.idorViewProfile);
+}

webgoat-lessons/csrf/webgoat-lesson-template/src/main/resources/lessonPlans/en/lesson-template-attack.adoc

@@ -0,0 +1,3 @@
+=== Attack Explanation
+
+Explanation of attack here ... Instructions etc.

webgoat-lessons/csrf/webgoat-lesson-template/src/main/resources/lessonPlans/en/lesson-template-intro.adoc

@@ -0,0 +1,19 @@
+
+== Lesson Template Intro
+
+This is the lesson template intro.
+
+=== Sub-heading
+
+Check asciidoc for syntax, but more = means smaller headings.  You can *bold* text and other things.
+
+=== Structuring files
+
+You should set up all content so that it is these *.adoc files.
+
+=== Images
+
+Images can be refereneced as below including setting style (recommended to use lesson-image as the style). The root is {lesson}/src/main/resources
+
+image::images/firefox-proxy-config.png[Firefox Proxy Config,510,634,style="lesson-image"]
+

webgoat-lessons/csrf/webgoat-lesson-template/src/main/resources/lessonPlans/en/lesson-template-video.adoc

@@ -0,0 +1,7 @@
+=== More Content, Video too ...
+
+You can structure and format the content however you like. You can even include video if you like (but may be subject to browser support). You may want to make it more pertinent to web application security than this though.
+
+video::video/sample-video.m4v[width=480,start=5]
+
+see http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/#videos for more detail on video syntax

webgoat-lessons/pom.xml

@@ -29,6 +29,7 @@
         <module>vulnerable-components</module>
 	    <module>auth-bypass</module>
         <module>missing-function-ac</module>
+        <module>csrf</module>
         <!-- uncomment below to include lesson template in build, also uncomment the dependency in webgoat-server/pom.xml to have it run in the project fully -->
         <!--<module>webgoat-lesson-template</module>-->
     </modules>

webgoat-server/pom.xml

@@ -124,6 +124,11 @@
             <artifactId>idor</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.owasp.webgoat.lesson</groupId>
+            <artifactId>csrf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.owasp.webgoat.lesson</groupId>
             <artifactId>insecure-login</artifactId>