From 08beac23b5f5a013beb88dc75d969b93685303db Mon Sep 17 00:00:00 2001
From: Nanne Baars <nbaars@xebia.com>
Date: Mon, 22 Jun 2015 13:13:48 +0200
Subject: [PATCH] Added methods for retrieving the correct directory in which
 resources resided (like js, jsp etc)

---
 .../owasp/webgoat/lessons/AbstractLesson.java   | 17 +++++++++++++++--
 .../java/org/owasp/webgoat/plugins/Plugin.java  |  3 +++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java b/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
index 36aab1e60..5b914f535 100644
--- a/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
+++ b/src/main/java/org/owasp/webgoat/lessons/AbstractLesson.java
@@ -355,8 +355,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
      * @return The lessonPlan value
      */
     protected String getLessonName() {
-        int index = this.getClass().getName().indexOf("lessons.");
-        return this.getClass().getName().substring(index + "lessons.".length());
+        return this.getClass().getSimpleName();
     }
 
     /**
@@ -738,6 +737,7 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
         Form form = new Form(getFormAction(), Form.POST).setName("form").setEncType("");
         form.addElement(createContent(s));
         setContent(form);
+        s.getRequest().getRequestURL();
     }
 
     public String getFormAction() {
@@ -806,4 +806,17 @@ public abstract class AbstractLesson extends Screen implements Comparable<Object
     	}
     	return labelManager;
     }
+
+    protected final String buildImagePath(WebSession w, String imgResourceName) {
+        return w.getRequest().getContextPath() + "/plugin_extracted/plugin/" + getLessonName() + "/images/" + imgResourceName;
+    }
+
+    protected final String buildJspPath(WebSession w, String jspResourceName) {
+        return w.getRequest().getContextPath() + "/plugin_extracted/plugin/" + getLessonName() + "/jsp/" + jspResourceName;
+    }
+
+    protected final String buildJsPath(WebSession w, String jsResourceName) {
+        return w.getRequest().getContextPath() + "/plugin_extracted/plugin/" + getLessonName() + "/js/" +  jsResourceName;
+    }
+
 }
diff --git a/src/main/java/org/owasp/webgoat/plugins/Plugin.java b/src/main/java/org/owasp/webgoat/plugins/Plugin.java
index 2a2bfd15a..2b23965ab 100644
--- a/src/main/java/org/owasp/webgoat/plugins/Plugin.java
+++ b/src/main/java/org/owasp/webgoat/plugins/Plugin.java
@@ -10,6 +10,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -119,6 +120,8 @@ public class Plugin {
                     pluginTarget.getFileName().toString() + "/plugin/" + this.lesson
                             .getSimpleName() + "/lessonPlans/en/" + this.lesson.getSimpleName() + "_files",
                     lessonPlansLanguageFiles.values());
+            replaceInFiles("setSrc\\(\"js\\/", "setSrc\\(\"" + pluginTarget.getFileName().toString() + "/plugin/" + this.lesson
+                    .getSimpleName() + "/js/", Arrays.asList(lessonSourceFile));
             replaceInFiles("url\\(images", "url\\(" + pluginTarget.getFileName().toString() + "/plugin/" + this.lesson
                     .getSimpleName() + "/jsp/images", cssFiles);
         } catch (IOException e) {