Thymeleaf works with AsciiDoc

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

@@ -1,3 +1,33 @@
+/**
+ *************************************************************************************************
+ *
+ *
+ * This file is part of WebGoat, an Open Web Application Security Project utility. For details,
+ * please see http://www.owasp.org/
+ *
+ * Copyright (c) 2002 - 20014 Bruce Mayhew
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if
+ * not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Getting Source ==============
+ *
+ * Source for this application is maintained at https://github.com/WebGoat/WebGoat, a repository for free software
+ * projects.
+ *
+ * @author WebGoat
+ * @since October 28, 2003
+ * @version $Id: $Id
+ */
 package org.owasp.webgoat;
 
 import com.google.common.collect.Sets;
@@ -20,7 +50,7 @@ import org.thymeleaf.templateresolver.TemplateResolver;
 import java.io.File;
 
 /**
- *
+ * Configuration for Spring MVC
  */
 @Configuration
 public class MvcConfiguration extends WebMvcConfigurerAdapter {
@@ -50,15 +80,26 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
     public LessonTemplateResolver lessonTemplateResolver() {
         LessonTemplateResolver resolver = new LessonTemplateResolver(pluginTargetDirectory);
         resolver.setOrder(2);
+        resolver.setCacheable(false);
         return resolver;
     }
 
     @Bean
-    public SpringTemplateEngine thymeleafTemplateEngine(TemplateResolver springThymeleafTemplateResolver, LessonTemplateResolver lessonTemplateResolver) {
+    public AsciiDoctorTemplateResolver asciiDoctorTemplateResolver() {
+        AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(pluginTargetDirectory);
+        resolver.setCacheable(true);
+        resolver.setOrder(3);
+        return resolver;
+    }
+
+    @Bean
+    public SpringTemplateEngine thymeleafTemplateEngine(TemplateResolver springThymeleafTemplateResolver,
+                                                        LessonTemplateResolver lessonTemplateResolver,
+                                                        AsciiDoctorTemplateResolver asciiDoctorTemplateResolver) {
         SpringTemplateEngine engine = new SpringTemplateEngine();
         engine.addDialect(new SpringSecurityDialect());
         engine.setTemplateResolvers(
-                Sets.newHashSet(springThymeleafTemplateResolver, lessonTemplateResolver));
+                Sets.newHashSet(springThymeleafTemplateResolver, lessonTemplateResolver, asciiDoctorTemplateResolver));
         return engine;
     }
 
@@ -68,6 +109,11 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
         return new ServletRegistrationBean(hammerHead, "/attack/*");
     }
 
+    /**
+     * This way we expose the plugins target directory as a resource within the web application.
+     *
+     * @param registry
+     */
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/plugin_lessons/**").addResourceLocations("file:///" + pluginTargetDirectory.toString() + "/");