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

Assignments were not grouped per lesson in the same package

Browse Source
This commit is contained in:
Nanne Baars 2017-04-15 13:59:57 +02:00
parent d28eadcc55
commit eb13ebc26f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webgoat-container/src/main/java/org/owasp/webgoat/WebGoat.java
View File

@ -127,4 +127,5 @@ public class WebGoat extends SpringBootServletInitializer {
} }
} }
} }

7
webgoat-container/src/main/java/org/owasp/webgoat/plugins/PluginResource.java
View File

@ -30,14 +30,15 @@ public class PluginResource {
public List<Class<Endpoint>> getEndpoints() { public List<Class<Endpoint>> getEndpoints() {
return classes.stream(). return classes.stream().
filter(c -> c.getSuperclass() == AssignmentEndpoint.class || c.getSuperclass() == Endpoint.class). filter(c -> c.getSuperclass() == AssignmentEndpoint.class || c.getSuperclass() == Endpoint.class).
map(c -> (Class<Endpoint>)c). map(c -> (Class<Endpoint>) c).
collect(Collectors.toList()); collect(Collectors.toList());
} }
public List<Class<AssignmentEndpoint>> getAssignments() { public List<Class<AssignmentEndpoint>> getAssignments(Class lesson) {
return classes.stream(). return classes.stream().
filter(c -> c.getSuperclass() == AssignmentEndpoint.class). filter(c -> c.getSuperclass() == AssignmentEndpoint.class).
map(c -> (Class<AssignmentEndpoint>)c). filter(c -> c.getPackage().equals(lesson.getPackage())).
map(c -> (Class<AssignmentEndpoint>) c).
collect(Collectors.toList()); collect(Collectors.toList());
} }

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

@ -74,7 +74,7 @@ public class PluginsLoader {
} catch (Exception e) { } catch (Exception e) {
log.error("Error while loading:" + c, e); log.error("Error while loading:" + c, e);
} }
List<Class<AssignmentEndpoint>> assignments = plugin.getAssignments(); List<Class<AssignmentEndpoint>> assignments = plugin.getAssignments(c);
lesson.setAssignments(createAssignment(assignments)); lesson.setAssignments(createAssignment(assignments));
lessons.add(lesson); lessons.add(lesson);
pluginEndpointPublisher.publish(plugin.getEndpoints()); pluginEndpointPublisher.publish(plugin.getEndpoints());