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

clean up course class

Browse Source
This commit is contained in:
nbaars 2015-01-11 18:52:55 +01:00
parent bb0d27d14b
commit b0619ef5db
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/owasp/webgoat/plugins/PluginExtractor.java
View File

@ -1,8 +1,5 @@
package org.owasp.webgoat.plugins; package org.owasp.webgoat.plugins;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
@ -19,16 +16,18 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static java.lang.String.format;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
import static org.owasp.webgoat.plugins.PluginFileUtils.createDirsIfNotExists;
/** /**
* Extract the wpf file and collect the classes to load and files(lesson plans etc) * Extract the wpf file and place them in the system temp directory in the folder webgoat and collect the files
* and classes.
*/ */
public class PluginExtractor { public class PluginExtractor {
private static final String DIRECTORY = "webgoat"; private static final String DIRECTORY = "webgoat";
private final Path pluginArchive; private final Path pluginArchive;
private final Logger logger = LoggerFactory.getLogger(getClass());
private final Map<String, byte[]> classes = new HashMap<String, byte[]>(); private final Map<String, byte[]> classes = new HashMap<String, byte[]>();
private final List<Path> files = new ArrayList<>(); private final List<Path> files = new ArrayList<>();
private Path baseDirectory; private Path baseDirectory;
@ -38,7 +37,7 @@ public class PluginExtractor {
try { try {
baseDirectory = createDirsIfNotExists(Paths.get(System.getProperty("java.io.tmpdir"), DIRECTORY)); baseDirectory = createDirsIfNotExists(Paths.get(System.getProperty("java.io.tmpdir"), DIRECTORY));
} catch (IOException io) { } catch (IOException io) {
logger.error(String.format("Unable to create base directory: {}", pluginArchive.getFileName()), io); new Plugin.PluginLoadingFailure(format("Unable to create base directory: {}", pluginArchive.getFileName()), io);
} }
} }
@ -58,7 +57,7 @@ public class PluginExtractor {
} }
}); });
} catch (IOException io) { } catch (IOException io) {
logger.error(String.format("Unable to extract: %s", pluginArchive.getFileName()), io); new Plugin.PluginLoadingFailure(format("Unable to extract: %s", pluginArchive.getFileName()), io);
} }
} }
@ -79,10 +78,5 @@ public class PluginExtractor {
return FileSystems.newFileSystem(uri, new HashMap<String, Object>()); return FileSystems.newFileSystem(uri, new HashMap<String, Object>());
} }
public Path createDirsIfNotExists(Path p) throws IOException {
if ( Files.notExists(p)) {
Files.createDirectories(p);
}
return p;
}
} }

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

@ -1,6 +1,8 @@
package org.owasp.webgoat.plugins; package org.owasp.webgoat.plugins;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
public class PluginFileUtils { public class PluginFileUtils {
@ -19,4 +21,11 @@ public class PluginFileUtils {
return hasParentDirectoryWithName(p.getParent(), s); return hasParentDirectoryWithName(p.getParent(), s);
} }
public static Path createDirsIfNotExists(Path p) throws IOException {
if ( Files.notExists(p)) {
Files.createDirectories(p);
}
return p;
}
} }

2
src/main/java/org/owasp/webgoat/plugins/PluginsLoader.java
View File

@ -36,7 +36,7 @@ public class PluginsLoader implements Runnable {
plugin.loadFiles(extractor.getFiles(), reload); plugin.loadFiles(extractor.getFiles(), reload);
plugins.add(plugin); plugins.add(plugin);
} catch (Plugin.PluginLoadingFailure e) { } catch (Plugin.PluginLoadingFailure e) {
logger.error("Unable to load plugin, continue reading others..."); logger.error("Unable to load plugin, continue loading others...");
} }
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
} }

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

@ -431,9 +431,9 @@ public class Course {
logger.info("Loading courses: " + path); logger.info("Loading courses: " + path);
this.webgoatContext = webgoatContext; this.webgoatContext = webgoatContext;
loadLessionFromPlugin(context); loadLessionFromPlugin(context);
//loadFiles(context, path); loadFiles(context, path);
//loadLessons(path); //loadLessons(path);
//loadResources(); loadResources();
} }