From df0034cbc2cce74f7203932947ac4502af3a7082 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nbaars@xebia.com>
Date: Tue, 23 Jun 2015 22:56:56 +0200
Subject: [PATCH] Fixed rewriting paths in the jsp/js and css resources

---
 .../org/owasp/webgoat/plugins/Plugin.java     | 27 ++++++++++++++-----
 .../webgoat/plugins/PluginFileUtils.java      |  9 +++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/owasp/webgoat/plugins/Plugin.java b/src/main/java/org/owasp/webgoat/plugins/Plugin.java
index 2b23965ab..8e59cf5ca 100644
--- a/src/main/java/org/owasp/webgoat/plugins/Plugin.java
+++ b/src/main/java/org/owasp/webgoat/plugins/Plugin.java
@@ -32,7 +32,7 @@ public class Plugin {
     private Class<AbstractLesson> lesson;
     private Map<String, File> solutionLanguageFiles = new HashMap<>();
     private Map<String, File> lessonPlansLanguageFiles = new HashMap<>();
-    private List<File> cssFiles = Lists.newArrayList();
+    private List<File> pluginFiles = Lists.newArrayList();
     private File lessonSourceFile;
 
     public Plugin(Path pluginDirectory) {
@@ -79,8 +79,8 @@ public class Plugin {
             if (fileEndsWith(file, ".properties") && hasParentDirectoryWithName(file, NAME_LESSON_I18N_DIRECTORY)) {
                 copyProperties(reload, file);
             }
-            if (fileEndsWith(file, ".css")) {
-                cssFiles.add(file.toFile());
+            if (fileEndsWith(file, ".css", ".jsp", ".js")) {
+                pluginFiles.add(file.toFile());
             }
         }
     }
@@ -120,10 +120,23 @@ 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);
+
+            String[] replacements = {"jsp", "js"};
+            for ( String replacement : replacements ) {
+                String s = String.format("plugin/%s/%s/", this.lesson.getSimpleName(), replacement);
+                String r = String.format("%s/plugin/%s/%s/", pluginTarget.getFileName().toString(),
+                        this.lesson.getSimpleName(), replacement);
+                replaceInFiles(s,r, pluginFiles);
+                replaceInFiles(s,r, Arrays.asList(lessonSourceFile));
+            }
+
+            //CSS with url('/plugin/images') should not begin with / otherwise image cannot be found
+            String s = String.format("/plugin/%s/images/", this.lesson.getSimpleName());
+            String r = String.format("%s/plugin/%s/images/", pluginTarget.getFileName().toString(), this.lesson.getSimpleName());
+            replaceInFiles(s,r, pluginFiles);
+            replaceInFiles(s,r, Arrays.asList(lessonSourceFile));
+
+
         } catch (IOException e) {
             throw new PluginLoadingFailure("Unable to rewrite the paths in the solutions", e);
         }
diff --git a/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java b/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
index 5e87401e5..10a3bcf92 100644
--- a/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
+++ b/src/main/java/org/owasp/webgoat/plugins/PluginFileUtils.java
@@ -21,6 +21,15 @@ public class PluginFileUtils {
         return p.getFileName().toString().endsWith(s);
     }
 
+    public static boolean fileEndsWith(Path p, String... suffixes) {
+        for (String suffix : suffixes) {
+            if (fileEndsWith(p, suffix)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public static boolean hasParentDirectoryWithName(Path p, String s) {
         if (p == null || p.getParent() == null || p.getParent().equals(p.getRoot())) {
             return false;