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

Thymeleaf resolver does not need WebSession anymore

Browse Source
This commit is contained in:
Nanne Baars 2016-05-13 15:57:52 +02:00
parent 22d2255664
commit e8628599fe
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webgoat-container/src/main/java/org/owasp/webgoat/LessonTemplateResolver.java
View File

@ -2,7 +2,6 @@ package org.owasp.webgoat;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.io.Files; import com.google.common.io.Files;
import org.owasp.webgoat.session.WebSession;
import org.thymeleaf.TemplateProcessingParameters; import org.thymeleaf.TemplateProcessingParameters;
import org.thymeleaf.resourceresolver.IResourceResolver; import org.thymeleaf.resourceresolver.IResourceResolver;
import org.thymeleaf.templateresolver.TemplateResolver; import org.thymeleaf.templateresolver.TemplateResolver;
@ -20,12 +19,9 @@ public class LessonTemplateResolver extends TemplateResolver {
private final static String PREFIX = "lesson:"; private final static String PREFIX = "lesson:";
private final File pluginTargetDirectory; private final File pluginTargetDirectory;
private final WebSession webSession;
public LessonTemplateResolver(File pluginTargetDirectory) {
public LessonTemplateResolver(File pluginTargetDirectory, WebSession webSession) {
this.pluginTargetDirectory = pluginTargetDirectory; this.pluginTargetDirectory = pluginTargetDirectory;
this.webSession = webSession;
setResourceResolver(new LessonResourceResolver()); setResourceResolver(new LessonResourceResolver());
setResolvablePatterns(Sets.newHashSet(PREFIX + "*")); setResolvablePatterns(Sets.newHashSet(PREFIX + "*"));
} }
@ -33,7 +29,6 @@ public class LessonTemplateResolver extends TemplateResolver {
@Override @Override
protected String computeResourceName(TemplateProcessingParameters params) { protected String computeResourceName(TemplateProcessingParameters params) {
String templateName = params.getTemplateName(); String templateName = params.getTemplateName();
return templateName.substring(PREFIX.length()); return templateName.substring(PREFIX.length());
} }
@ -41,8 +36,7 @@ public class LessonTemplateResolver extends TemplateResolver {
@Override @Override
public InputStream getResourceAsStream(TemplateProcessingParameters params, String resourceName) { public InputStream getResourceAsStream(TemplateProcessingParameters params, String resourceName) {
String lessonName = webSession.getCurrentLesson().getClass().getSimpleName(); File lesson = new File(pluginTargetDirectory, "/plugin/" + resourceName + "/html/" + resourceName + ".html");
File lesson = new File(pluginTargetDirectory, "/plugin/" + lessonName + "/html/" + lessonName + ".html");
if (lesson != null) { if (lesson != null) {
try { try {
return new ByteArrayInputStream(Files.toByteArray(lesson)); return new ByteArrayInputStream(Files.toByteArray(lesson));

4
webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
View File

@ -47,8 +47,8 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
} }
@Bean @Bean
public LessonTemplateResolver lessonTemplateResolver(WebSession webSession) { public LessonTemplateResolver lessonTemplateResolver() {
LessonTemplateResolver resolver = new LessonTemplateResolver(pluginTargetDirectory, webSession); LessonTemplateResolver resolver = new LessonTemplateResolver(pluginTargetDirectory);
resolver.setOrder(2); resolver.setOrder(2);
return resolver; return resolver;
} }

2
webgoat-container/src/main/resources/templates/lesson_content.html
View File

@ -7,6 +7,6 @@
<div id="message" class="info" th:utext="${message}"></div> <div id="message" class="info" th:utext="${message}"></div>
<br/> <br/>
<div th:utext="${lesson.content}"></div> <div th:utext="${lesson.content}"></div>
<div th:replace="lesson:__${lesson}__"></div> <div th:replace="lesson:__${lesson.class.simpleName}__"></div> <!-- __lesson__ makes Thymeleaf dynamic and calling the Thymeleaf resolver -->
</html> </html>