diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
index bca1a18a9..b725d9d9f 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
@@ -1,9 +1,8 @@
package org.owasp.webgoat.plugins;
import com.google.common.collect.Lists;
+import org.apache.catalina.loader.WebappClassLoader;
import org.apache.commons.io.FileUtils;
-import org.owasp.webgoat.plugins.classloader.PluginClassLoaderFactory;
-import org.owasp.webgoat.plugins.classloader.PluginClassLoaderRepository;
import org.owasp.webgoat.util.LabelProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -11,7 +10,6 @@ import org.springframework.util.ResourceUtils;
import java.io.IOException;
import java.net.URL;
-import java.net.URLClassLoader;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -35,7 +33,6 @@ public class PluginsLoader implements Runnable {
private static final String WEBGOAT_PLUGIN_EXTENSION = "jar";
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private final Path pluginSource;
- private final PluginClassLoaderRepository repository;
private Path pluginTarget;
/**
@@ -44,26 +41,28 @@ public class PluginsLoader implements Runnable {
* @param pluginSource a {@link java.nio.file.Path} object.
* @param pluginTarget a {@link java.nio.file.Path} object.
*/
- public PluginsLoader(PluginClassLoaderRepository repository, Path pluginSource, Path pluginTarget) {
+ public PluginsLoader(Path pluginSource, Path pluginTarget) {
this.pluginSource = Objects.requireNonNull(pluginSource, "plugin source cannot be null");
this.pluginTarget = Objects.requireNonNull(pluginTarget, "plugin target cannot be null");
- this.repository = Objects.requireNonNull(repository, "repository cannot be null");
}
/**
* loadPlugins.
*
- * @param reload a boolean.
* @return a {@link java.util.List} object.
*/
- public List loadPlugins(final boolean reload) {
+ public List loadPlugins() {
List plugins = Lists.newArrayList();
+ WebappClassLoader cl = (WebappClassLoader) Thread.currentThread().getContextClassLoader();
try {
PluginFileUtils.createDirsIfNotExists(pluginTarget);
cleanupExtractedPluginsDirectory();
List jars = listJars();
- initClassLoader(jars);
+ for (URL url : jars) {
+ cl.addRepository(url.toString());
+ }
+
plugins = processPlugins(jars);
} catch (Exception e) {
logger.error("Loading plugins failed", e);
@@ -71,11 +70,7 @@ public class PluginsLoader implements Runnable {
return plugins;
}
- private void initClassLoader(List jars) {
- URLClassLoader classLoader = PluginClassLoaderFactory.createClassLoader(jars);
- this.repository.replaceClassLoader(classLoader);
- Thread.currentThread().setContextClassLoader(classLoader);
- }
+
private void cleanupExtractedPluginsDirectory() {
Path i18nDirectory = pluginTarget.resolve("plugin/i18n/");
@@ -135,6 +130,6 @@ public class PluginsLoader implements Runnable {
/** {@inheritDoc} */
@Override
public void run() {
- loadPlugins(true);
+ loadPlugins();
}
}
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/classloader/PluginClassLoaderFactory.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/classloader/PluginClassLoaderFactory.java
deleted file mode 100644
index cd20a0215..000000000
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/classloader/PluginClassLoaderFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.owasp.webgoat.plugins.classloader;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.List;
-
-/**
- * Create a classloader for the plugins
- */
-public class PluginClassLoaderFactory {
-
- private static final Logger logger = LoggerFactory.getLogger(PluginClassLoaderFactory.class);
-
- public static URLClassLoader createClassLoader(List urls) {
- return new URLClassLoader(urls.toArray(new URL[urls.size()]), determineParentClassLoader());
- }
-
- private static ClassLoader determineParentClassLoader() {
- ClassLoader parent = Thread.currentThread().getContextClassLoader();
- try {
- parent = Thread.currentThread().getContextClassLoader().getParent()
- .loadClass("org.apache.jasper.runtime.JspContextWrapper").getClassLoader();
- } catch (ClassNotFoundException e) {
- logger.info("Tomcat JspContextWrapper not found, probably not running on Tomcat...");
- }
- return parent;
- }
-}
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/classloader/PluginClassLoaderRepository.java b/webgoat-container/src/main/java/org/owasp/webgoat/plugins/classloader/PluginClassLoaderRepository.java
deleted file mode 100644
index 994aea0b5..000000000
--- a/webgoat-container/src/main/java/org/owasp/webgoat/plugins/classloader/PluginClassLoaderRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.owasp.webgoat.plugins.classloader;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URLClassLoader;
-
-/**
- * Holds the classloaders for the plugins. For now all the plugins are loaded by the same
- * classloader. This class can be extended to contain a classloader per plugin.
- */
-public class PluginClassLoaderRepository {
-
- private static final Logger logger = LoggerFactory.getLogger(PluginClassLoaderRepository.class);
- private URLClassLoader currentPluginLoader;
-
- /**
- * @return the plugin classloader
- */
- public URLClassLoader get() {
- return currentPluginLoader;
- }
-
- public void replaceClassLoader(URLClassLoader classLoader) {
- if (this.currentPluginLoader != null) {
- try {
- this.currentPluginLoader.close();
- } catch (IOException e) {
- logger.warn("Unable to close the current classloader", e);
- }
- }
- this.currentPluginLoader = classLoader;
- }
-}
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java
index d4cc0ed2b..936cfdcb5 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java
@@ -5,7 +5,6 @@ import org.owasp.webgoat.lessons.AbstractLesson;
import org.owasp.webgoat.lessons.Category;
import org.owasp.webgoat.plugins.Plugin;
import org.owasp.webgoat.plugins.PluginsLoader;
-import org.owasp.webgoat.plugins.classloader.PluginClassLoaderRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +65,6 @@ public class Course {
final Logger logger = LoggerFactory.getLogger(Course.class);
- private final PluginClassLoaderRepository repository = new PluginClassLoaderRepository();
private final List lessons = new LinkedList();
private final static String PROPERTIES_FILENAME = HammerHead.propertiesPath;
@@ -337,7 +335,7 @@ public class Course {
return;
}
lessons.clear();
- List plugins = new PluginsLoader(repository, Paths.get(pluginPath), Paths.get(targetPath)).loadPlugins(true);
+ List plugins = new PluginsLoader(Paths.get(pluginPath), Paths.get(targetPath)).loadPlugins();
for (Plugin plugin : plugins) {
try {
AbstractLesson lesson = plugin.getLesson().get();