dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring creation of the lesson moving it towards the plugin

Browse Source
This commit is contained in:
nbaars 2015-03-01 15:59:42 +01:00
parent 4865a4b606
commit 3e9331d46e
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/owasp/webgoat/plugins/Plugin.java
View File

@ -124,9 +124,12 @@ public class Plugin {
} }
} }
public AbstractLesson getLesson() {
public Class<AbstractLesson> getLesson() { try {
return lesson; return lesson.newInstance();
} catch (IllegalAccessException | InstantiationException e) {
throw new PluginLoadingFailure("Unable to instantiate the lesson " + lesson.getName(), e);
}
} }
public Optional<File> getLessonSolution(String language) { public Optional<File> getLessonSolution(String language) {

8
src/main/java/org/owasp/webgoat/plugins/PluginClassLoader.java
View File

@ -1,15 +1,21 @@
package org.owasp.webgoat.plugins; package org.owasp.webgoat.plugins;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class PluginClassLoader extends ClassLoader { public class PluginClassLoader extends ClassLoader {
private final Logger logger = LoggerFactory.getLogger(Plugin.class);
private final byte[] classFile; private final byte[] classFile;
public PluginClassLoader(ClassLoader parent, byte[] classFile) { public PluginClassLoader(ClassLoader parent, String nameOfClass, byte[] classFile) {
super(parent); super(parent);
logger.debug("Creating class loader for {}", nameOfClass);
this.classFile = classFile; this.classFile = classFile;
} }
public Class findClass(String name) { public Class findClass(String name) {
logger.debug("Finding class " + name);
return defineClass(name, classFile, 0, classFile.length); return defineClass(name, classFile, 0, classFile.length);
} }

6
src/main/java/org/owasp/webgoat/session/Course.java
View File

@ -304,12 +304,8 @@ public class Course {
List<Plugin> plugins = new PluginsLoader(Paths.get(pluginPath), Paths.get(targetPath)).loadPlugins(true); List<Plugin> plugins = new PluginsLoader(Paths.get(pluginPath), Paths.get(targetPath)).loadPlugins(true);
for (Plugin plugin : plugins) { for (Plugin plugin : plugins) {
try { try {
Class<AbstractLesson> c = plugin.getLesson(); AbstractLesson lesson = plugin.getLesson();
Object o = c.newInstance();
AbstractLesson lesson = (AbstractLesson) o;
lesson.setWebgoatContext(webgoatContext); lesson.setWebgoatContext(webgoatContext);
lesson.update(properties); lesson.update(properties);
if (!lesson.getHidden()) { if (!lesson.getHidden()) {