From 5365f632e7d2277fa024b5a0863654c416c0b3bc Mon Sep 17 00:00:00 2001
From: mayhew64 <mayhew64@yahoo.com>
Date: Fri, 18 Sep 2015 13:30:32 -0400
Subject: [PATCH] Added a lesson restart call to allow lesson specific restart
 functionality

---
 .../java/org/owasp/webgoat/lessons/AbstractLesson.java    | 5 +++++
 .../java/org/owasp/webgoat/lessons/LessonAdapter.java     | 8 ++++++++
 .../main/java/org/owasp/webgoat/session/WebSession.java   | 1 +
 3 files changed, 14 insertions(+)

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 45bfea76f..dcc4f7cdb 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
@@ -201,6 +201,11 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
 
     protected abstract Category getDefaultCategory();
 
+    /**
+     * Initiates lesson restart functionality
+     */
+    public abstract void restartLesson();
+
     protected abstract boolean getDefaultHidden();
 
     /**
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 83258c855..5107576de 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
@@ -108,6 +108,14 @@ public abstract class LessonAdapter extends AbstractLesson {
         return false;
     }
 
+    /**
+     * Initiates lesson restart functionality. Lessons should override this for 
+     * lesson specific actions 
+     */
+    public void restartLesson() {
+        // Do Nothing - called when restart lesson is pressed. Each lesson can do something
+    }
+    
     private final static Integer DEFAULT_RANKING = new Integer(1000);
 
     protected Integer getDefaultRanking() {
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
index 879c3af03..375ff5921 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/WebSession.java
@@ -949,6 +949,7 @@ public class WebSession {
     public void restartLesson(int lessonId) {
         AbstractLesson al = getLesson(lessonId);
         System.out.println("Restarting lesson: " + al);
+        al.restartLesson();
         al.getLessonTracker(this).setCompleted(false);
         if (al instanceof SequentialLessonAdapter) {
             SequentialLessonAdapter sla = (SequentialLessonAdapter) al;