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

properties loaded from plugin

Browse Source
This commit is contained in:
nbaars
2015-01-10 10:12:08 +01:00
parent 3d8a345264
commit 3d6236242f
13 changed files with 165 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory;
import javax.servlet.ServletContext;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
@ -313,7 +314,9 @@ public class Course {
logger.error("Plugins directory {} not found", path);
return;
}
List<Plugin> plugins = new PluginsLoader(Paths.get(path)).loadPlugins();
Path pluginDirectory = Paths.get(path);
webgoatContext.setPluginDirectory(pluginDirectory);
List<Plugin> plugins = new PluginsLoader(pluginDirectory).loadPlugins();
for (Plugin plugin : plugins) {
try {
Class<AbstractLesson> c = plugin.getLesson();
@ -330,7 +333,7 @@ public class Course {
for(Map.Entry<String, File> lessonPlan : plugin.getLessonPlans().entrySet()) {
lesson.setLessonPlanFileName(lessonPlan.getKey(), lessonPlan.getValue().toString());
}
lesson.setLessonSolutionFileName(plugin.getLessonPlans().get("en").toString());
lesson.setLessonSolutionFileName(plugin.getLessonSolutions().get("en").toString());
lesson.setSourceFileName(plugin.getLessonSource().toString());
} catch (Exception e) {
logger.error("Error in loadLessons: ", e);
@ -433,4 +436,5 @@ public class Course {
//loadResources();
}
}

14
src/main/java/org/owasp/webgoat/session/WebgoatContext.java
View File

@ -1,9 +1,11 @@
package org.owasp.webgoat.session;
import javax.servlet.http.HttpServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.servlet.http.HttpServlet;
import java.nio.file.Path;
public class WebgoatContext {
final Logger logger = LoggerFactory.getLogger(WebgoatContext.class);
@ -80,6 +82,8 @@ public class WebgoatContext {
private String defaultLanguage;
private java.nio.file.Path pluginDirectory;
public WebgoatContext(HttpServlet servlet) {
this.servlet = servlet;
databaseConnectionString = getParameter(servlet, DATABASE_CONNECTION_STRING);
@ -213,4 +217,12 @@ public class WebgoatContext {
return defaultLanguage;
}
public Path getPluginDirectory() {
return pluginDirectory;
}
public void setPluginDirectory(Path pluginDirectory) {
this.pluginDirectory = pluginDirectory;
}
}