Endpoints provided by lessons now work

webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java

@@ -1,15 +1,21 @@
 package org.owasp.webgoat;
 
+import com.google.common.collect.Sets;
 import org.owasp.webgoat.session.LabelDebugger;
 import org.owasp.webgoat.session.WebSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring4.SpringTemplateEngine;
+import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver;
+import org.thymeleaf.templateresolver.TemplateResolver;
 
 import java.io.File;
 
@@ -30,6 +36,33 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
         registry.addViewController("/start.mvc").setViewName("main_new");
     }
 
+    @Bean
+    public TemplateResolver springThymeleafTemplateResolver(ApplicationContext applicationContext) {
+        SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();
+        resolver.setPrefix("classpath:/templates/");
+        resolver.setSuffix(".html");
+        resolver.setOrder(1);
+        resolver.setApplicationContext(applicationContext);
+        return resolver;
+    }
+
+    @Bean
+    public LessonTemplateResolver lessonTemplateResolver(WebSession webSession) {
+        LessonTemplateResolver resolver = new LessonTemplateResolver(pluginTargetDirectory, webSession);
+        resolver.setOrder(2);
+        return resolver;
+    }
+
+    @Bean
+    public SpringTemplateEngine thymeleafTemplateEngine(TemplateResolver springThymeleafTemplateResolver, LessonTemplateResolver lessonTemplateResolver) {
+        SpringTemplateEngine engine = new SpringTemplateEngine();
+        engine.addDialect(new SpringSecurityDialect());
+        engine.setTemplateResolvers(
+                Sets.newHashSet(springThymeleafTemplateResolver, lessonTemplateResolver));
+        return engine;
+    }
+
+
     @Bean
     public ServletRegistrationBean servletRegistrationBean(HammerHead hammerHead) {
         return new ServletRegistrationBean(hammerHead, "/attack/*");