From b3541231bc6dbe78834e140ae1ad2959a49b4793 Mon Sep 17 00:00:00 2001
From: Jason White <jason.white@owasp.org>
Date: Thu, 14 Jan 2016 09:01:47 -0500
Subject: [PATCH 1/2] #165 provide default and ability to override in lesson

---
 .../owasp/webgoat/lessons/AbstractLesson.java | 24 ++++++++++++++++++-
 .../owasp/webgoat/lessons/LessonAdapter.java  |  7 ++++++
 .../lessons/model/LessonInfoModel.java        | 20 ++++------------
 .../webgoat/lessons/AbstractLessonTest.java   |  3 +++
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 391edbeab..40aca0fe9 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -233,6 +233,12 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
      */
     protected abstract boolean getDefaultHidden();
 
+    /**
+     * <p>getSubmitMethod</p>
+     */
+    public abstract String getSubmitMethod();
+
+
     /**
      * Gets the fileMethod attribute of the Lesson class
      *
@@ -643,7 +649,23 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
             .append("/").append(getCategory().getRanking()).toString();
     }
 
-    /**
+//    /**
+//     * *Get the method for to provide to the UI for the attack submit
+//     *
+//     * @return
+//     */
+//    public String getSubmitMethod() {
+//        System.out.println("### getting submitMethod");
+//        if ("".equals(this.getLabelManager().get("submitMethod"))) {
+//            System.out.println("*** submitMethod: GET");
+//            return "GET";
+//        } else {
+//            System.out.println("*** submitMethod: " + this.getLabelManager().get("submitMethod"));
+//            return this.getLabelManager().get("submitMethod");
+//        }
+//    }
+
+     /**
      * Get the link to the target servlet.
      *
      * Unlike getLink() this method does not require rendering the output of
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
index 69a1c8d46..419e8a525 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/LessonAdapter.java
@@ -153,6 +153,13 @@ public abstract class LessonAdapter extends AbstractLesson {
         return hints;
     }
 
+    /**
+     * provide a default submitMethod of lesson does not implement
+     */
+    public String getSubmitMethod() {
+        return "GET";
+    }
+
     /**
      * {@inheritDoc}
      *
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java
index d49ea6bd3..9f3ef5162 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/model/LessonInfoModel.java
@@ -4,9 +4,6 @@ import org.owasp.webgoat.lessons.AbstractLesson;
 import org.owasp.webgoat.lessons.Category;
 import org.owasp.webgoat.session.WebSession;
 
-/**
- * Created by jason on 9/18/15.
- */
 public class LessonInfoModel {
 
     private String lessonTitle;
@@ -14,9 +11,7 @@ public class LessonInfoModel {
     private boolean hasSource;
     private boolean hasSolution;
     private boolean hasPlan;
-    private String source;
-    private String solution;
-    private String plan;
+    private String submitMethod;
 
     public LessonInfoModel(WebSession webSession) {
         AbstractLesson lesson = webSession.getCurrentLesson();
@@ -26,6 +21,7 @@ public class LessonInfoModel {
         this.hasSolution = !lesson.getSolution(webSession).contains("Could not find the solution file or solution file does not exist");
         this.lessonTitle = lesson.getTitle();
         this.numberHints = lesson.getHintCount(webSession);
+        this.submitMethod = lesson.getSubmitMethod();
 
         if ( this.numberHints < 1 || lesson.getHint(webSession,0).equals("Hint: There are no hints defined.")) {
             this.numberHints = 0;
@@ -60,16 +56,8 @@ public class LessonInfoModel {
         return hasPlan;
     }
 
-    public String getSource() {
-        return source;
-    }
-
-    public String getSolution() {
-        return solution;
-    }
-
-    public String getPlan() {
-        return plan;
+    public String getSubmitMethod() {
+        return submitMethod;
     }
 
 }
diff --git a/webgoat-container/src/test/java/org/owasp/webgoat/lessons/AbstractLessonTest.java b/webgoat-container/src/test/java/org/owasp/webgoat/lessons/AbstractLessonTest.java
index 82b74e34b..37f5206f5 100644
--- a/webgoat-container/src/test/java/org/owasp/webgoat/lessons/AbstractLessonTest.java
+++ b/webgoat-container/src/test/java/org/owasp/webgoat/lessons/AbstractLessonTest.java
@@ -9,6 +9,7 @@ import org.owasp.webgoat.session.WebSession;
 import java.util.Arrays;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 public class AbstractLessonTest  {
@@ -41,6 +42,7 @@ public class AbstractLessonTest  {
         public String getCurrentAction(WebSession s) {
             return "an action";
         }
+        public String getSubmitMethod() { return "GET";}
         public void restartLesson() {
         }
         public void setCurrentAction(WebSession s, String lessonScreen) {
@@ -56,6 +58,7 @@ public class AbstractLessonTest  {
         String srvLink = lesson.getServletLink();
         assertThat(srvLink, CoreMatchers.startsWith("attack?Screen="));
         assertThat(srvLink, CoreMatchers.endsWith("&menu=900"));
+        assertEquals(lesson.getSubmitMethod(),"GET");
     }
 }
 

From 07f0cea0a0d8d5a0a0adf9d38d1a9f007c084e43 Mon Sep 17 00:00:00 2001
From: Jason White <jason.white@owasp.org>
Date: Thu, 14 Jan 2016 09:03:43 -0500
Subject: [PATCH 2/2] #165 cleaning up interim code

---
 .../owasp/webgoat/lessons/AbstractLesson.java    | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 40aca0fe9..d358fbba4 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -649,22 +649,6 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
             .append("/").append(getCategory().getRanking()).toString();
     }
 
-//    /**
-//     * *Get the method for to provide to the UI for the attack submit
-//     *
-//     * @return
-//     */
-//    public String getSubmitMethod() {
-//        System.out.println("### getting submitMethod");
-//        if ("".equals(this.getLabelManager().get("submitMethod"))) {
-//            System.out.println("*** submitMethod: GET");
-//            return "GET";
-//        } else {
-//            System.out.println("*** submitMethod: " + this.getLabelManager().get("submitMethod"));
-//            return this.getLabelManager().get("submitMethod");
-//        }
-//    }
-
      /**
      * Get the link to the target servlet.
      *