Lesson overview

webgoat-container/src/main/java/org/owasp/webgoat/session/Course.java

@@ -1,10 +1,9 @@
 package org.owasp.webgoat.session;
 
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.webgoat.lessons.AbstractLesson;
 import org.owasp.webgoat.lessons.Category;
-import org.owasp.webgoat.lessons.NewLesson;
-import org.owasp.webgoat.plugins.Plugin;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -42,6 +41,7 @@ import static java.util.stream.Collectors.toList;
  * @since October 28, 2003
  */
 @Slf4j
+@AllArgsConstructor
 public class Course {
 
     private List<AbstractLesson> lessons = new LinkedList<>();
@@ -89,18 +89,5 @@ public class Course {
         this.lessons = lessons;
     }
 
-    /**
-     * <p>createLessonsFromPlugins.</p>
-     */
-    public void createLessonsFromPlugins(List<Plugin> plugins) {
-        for (Plugin plugin : plugins) {
-            try {
-                NewLesson lesson = (NewLesson) plugin.getLesson().get();
-                lesson.setAssignments(plugin.getAssignments());
-                lessons.add(lesson);
-            } catch (Exception e) {
-                log.error("Error in loadLessons: ", e);
-            }
-        }
-    }
+
 }

webgoat-container/src/main/java/org/owasp/webgoat/session/LessonTracker.java

@@ -1,11 +1,16 @@
 
 package org.owasp.webgoat.session;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import lombok.Getter;
 import org.owasp.webgoat.lessons.AbstractLesson;
+import org.owasp.webgoat.lessons.Assignment;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -42,12 +47,17 @@ import java.util.stream.Collectors;
  */
 public class LessonTracker implements Serializable {
     private static final long serialVersionUID = 5410058267505412928L;
-    private final List<String> assignments;
-    private final Set<String> solvedAssignments = Sets.newHashSet();
+    private final Set<Assignment> solvedAssignments = Sets.newHashSet();
+    private final List<Assignment> allAssignments = Lists.newArrayList();
+    @Getter
     private int numberOfAttempts = 0;
 
     public LessonTracker(AbstractLesson lesson) {
-        this.assignments = lesson.getAssignments().stream().map(a -> a.getSimpleName()).collect(Collectors.toList());
+        allAssignments.addAll(lesson.getAssignments());
+    }
+
+    public Optional<Assignment> getAssignment(String name) {
+        return allAssignments.stream().filter(a -> a.getName().equals(name)).findFirst();
     }
 
     /**
@@ -56,14 +66,14 @@ public class LessonTracker implements Serializable {
      * @param solvedAssignment the assignment which the user solved
      */
     public void assignmentSolved(String solvedAssignment) {
-        solvedAssignments.add(solvedAssignment);
+        getAssignment(solvedAssignment).ifPresent(a -> solvedAssignments.add(a));
     }
 
     /**
-     * @return did they user solved all assignments for the lesson?
+     * @return did they user solved all solvedAssignments for the lesson?
      */
     public boolean isLessonSolved() {
-        return solvedAssignments.size() == assignments.size();
+        return allAssignments.size() == solvedAssignments.size();
     }
 
     /**
@@ -79,4 +89,16 @@ public class LessonTracker implements Serializable {
     void reset() {
         solvedAssignments.clear();
     }
+
+    /**
+     * @return list containing all the assignments solved or not
+     */
+    public Map<Assignment, Boolean> getLessonOverview() {
+        List<Assignment> notSolved = allAssignments.stream()
+                .filter(i -> !solvedAssignments.contains(i))
+                .collect(Collectors.toList());
+        Map<Assignment, Boolean> overview = notSolved.stream().collect(Collectors.toMap(a -> a, b -> false));
+        overview.putAll(solvedAssignments.stream().collect(Collectors.toMap(a -> a, b -> true)));
+        return overview;
+    }
 }

webgoat-container/src/main/java/org/owasp/webgoat/session/UserTracker.java

@@ -1,10 +1,9 @@
 
 package org.owasp.webgoat.session;
 
+import com.google.common.collect.Maps;
 import lombok.SneakyThrows;
 import org.owasp.webgoat.lessons.AbstractLesson;
-import org.owasp.webgoat.lessons.Assignment;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.SerializationUtils;
 
@@ -47,11 +46,13 @@ public class UserTracker {
 
     private final String webgoatHome;
     private final String user;
+    private final boolean overwrite;
     private Map<String, LessonTracker> storage = new HashMap<>();
 
-    public UserTracker(@Value("${webgoat.user.directory}") final String webgoatHome, final String user) {
+    public UserTracker(final String webgoatHome, final String user, final boolean overwrite) {
         this.webgoatHome = webgoatHome;
         this.user = user;
+        this.overwrite = overwrite;
     }
 
     /**
@@ -69,10 +70,10 @@ public class UserTracker {
         return lessonTracker;
     }
 
-    public void assignmentSolved(AbstractLesson lesson, Assignment assignment) {
+    public void assignmentSolved(AbstractLesson lesson, String assignmentName) {
         LessonTracker lessonTracker = getLessonTracker(lesson);
         lessonTracker.incrementAttempts();
-        lessonTracker.assignmentSolved(assignment.getClass().getSimpleName());
+        lessonTracker.assignmentSolved(assignmentName);
         save();
     }
 
@@ -85,7 +86,9 @@ public class UserTracker {
     @SneakyThrows
     public void load() {
         File file = new File(webgoatHome, user + ".progress");
-        if (file.exists() && file.isFile()) {
+        if (overwrite) {
+            this.storage = Maps.newHashMap();
+        } else if (file.exists() && file.isFile()) {
             this.storage = (Map<String, LessonTracker>) SerializationUtils.deserialize(FileCopyUtils.copyToByteArray(file));
         }
     }