Fixed hard coded rewriting of html files was fixed on SqlStringInjection

Added testcases for this situation

src/test/java/org/owasp/webgoat/plugins/GlobalPropertiesTest.java

@@ -1,6 +1,5 @@
 package org.owasp.webgoat.plugins;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -14,16 +13,9 @@ import static org.junit.Assert.assertNotNull;
 
 public class GlobalPropertiesTest {
 
-    private Path tempDirectory;
-
-    @Before
-    public void createTmpDir() throws IOException {
-        tempDirectory = Files.createTempDirectory(GlobalPropertiesTest.class.getSimpleName());
-        tempDirectory.toFile().deleteOnExit();
-    }
-
     @Test
     public void propertyFilesShouldBeLoaded() throws IOException {
+        Path tempDirectory = PluginTestHelper.createTmpDir();
         Path pluginDirectory = Files.createDirectory(Paths.get(tempDirectory.toString(), "plugins"));
         Path directory = Files.createDirectory(Paths.get(tempDirectory.toString(), "i18n"));
         Path globalProperties = Files.createFile(Paths.get(directory.toString(), "global.properties"));
@@ -37,6 +29,7 @@ public class GlobalPropertiesTest {
 
     @Test(expected = IllegalStateException.class)
     public void propertyFilesDirectoryNotFoundShouldRaiseError() throws IOException {
+        Path tempDirectory = PluginTestHelper.createTmpDir();
         Path pluginDirectory = Files.createDirectory(Paths.get(tempDirectory.toString(), "plugins"));
         Path directory = Files.createDirectory(Paths.get(tempDirectory.toString(), "i18n"));
         Files.delete(directory);

src/test/java/org/owasp/webgoat/plugins/PluginTest.java

@@ -0,0 +1,45 @@
+package org.owasp.webgoat.plugins;
+
+import org.junit.Test;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertThat;
+import static org.junit.matchers.JUnitMatchers.containsString;
+import static org.junit.matchers.JUnitMatchers.hasItem;
+
+public class PluginTest {
+
+    @Test
+    public void pathShouldBeRewrittenInHtmlFile() throws Exception {
+        Path tmpDir = PluginTestHelper.createTmpDir();
+        Path pluginSourcePath = PluginTestHelper.pathForLoading();
+        Plugin plugin = PluginTestHelper.createPluginFor(TestPlugin.class);
+        Path htmlFile = Paths.get(pluginSourcePath.toString(), "lessonSolutions", "rewrite_test.html");
+        plugin.loadFiles(Arrays.asList(htmlFile), true);
+        plugin.rewritePaths(tmpDir);
+        List<String> allLines = Files.readAllLines(htmlFile, StandardCharsets.UTF_8);
+
+        assertThat(allLines,
+            hasItem(containsString("lessons/plugin/TestPlugin/lessonSolutions/en/TestPlugin_files/image001.png")));
+    }
+
+    @Test
+    public void shouldNotRewriteOtherLinksStartingWithLesson_solutions() throws Exception {
+        Path tmpDir = PluginTestHelper.createTmpDir();
+        Path pluginSourcePath = PluginTestHelper.pathForLoading();
+        Plugin plugin = PluginTestHelper.createPluginFor(TestPlugin.class);
+        Path htmlFile = Paths.get(pluginSourcePath.toString(), "lessonSolutions", "rewrite_test.html");
+        plugin.loadFiles(Arrays.asList(htmlFile), true);
+        plugin.rewritePaths(tmpDir);
+        List<String> allLines = Files.readAllLines(htmlFile, StandardCharsets.UTF_8);
+
+        assertThat(allLines,
+            hasItem(containsString("lesson_solutions/Unknown_files/image001.png")));
+    }
+}

src/test/java/org/owasp/webgoat/plugins/PluginTestHelper.java

@@ -0,0 +1,34 @@
+package org.owasp.webgoat.plugins;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PluginTestHelper {
+
+    private static Path tempDirectory;
+
+    public static Path createTmpDir() throws IOException {
+        tempDirectory = Files.createTempDirectory(PluginTestHelper.class.getSimpleName());
+        tempDirectory.toFile().deleteOnExit();
+        return tempDirectory;
+    }
+
+    public static Path pathForLoading() throws IOException, URISyntaxException {
+        Path path = Paths.get(PluginTestHelper.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+        return Paths.get(path.toString(), "org/owasp/webgoat/plugins");
+    }
+
+    public static Plugin createPluginFor(Class pluginClass) throws Exception {
+        Path pluginTargetPath = Files.createDirectory(Paths.get(tempDirectory.toString(), "pluginTargetPath"));
+        Plugin plugin = new Plugin(pluginTargetPath);
+        Map<String, byte[]> classes = new HashMap<>();
+        classes.put(pluginClass.getName(), Files.readAllBytes(Paths.get(pathForLoading().toString(), pluginClass.getSimpleName() + ".class")));
+        plugin.loadClasses(classes);
+        return plugin;
+    }
+}

src/test/java/org/owasp/webgoat/plugins/TestPlugin.java

@@ -0,0 +1,6 @@
+package org.owasp.webgoat.plugins;
+
+import org.owasp.webgoat.lessons.SequentialLessonAdapter;
+
+public class TestPlugin extends SequentialLessonAdapter {
+}

src/test/resources/org/owasp/webgoat/plugins/lessonSolutions/rewrite_test.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+<v:imagedata src="lesson_solutions/TestPlugin_files/image001.png" o:title=""/>
+<v:imagedata src="lesson_solutions/Unknown_files/image001.png" o:title=""/>
+</body>
+</html>