From 81e3000f2db3303c40a2eb699bd76f50b9ff5409 Mon Sep 17 00:00:00 2001 From: Mario Zupan Date: Sun, 11 Dec 2016 20:05:28 +0100 Subject: [PATCH] Issue #293: fix images in asciidoc by setting backend to xhtml --- .../owasp/webgoat/AsciiDoctorTemplateResolver.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/AsciiDoctorTemplateResolver.java b/webgoat-container/src/main/java/org/owasp/webgoat/AsciiDoctorTemplateResolver.java index 1a2a8c38c..c4697d97f 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/AsciiDoctorTemplateResolver.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/AsciiDoctorTemplateResolver.java @@ -45,6 +45,7 @@ import java.io.InputStream; import java.io.StringWriter; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Map; import java.util.Optional; import static org.asciidoctor.Asciidoctor.Factory.create; @@ -83,7 +84,7 @@ public class AsciiDoctorTemplateResolver extends TemplateResolver { if (adocFile.isPresent()) { try (FileReader reader = new FileReader(adocFile.get().toFile())) { StringWriter writer = new StringWriter(); - asciidoctor.convert(reader, writer, Maps.newHashMap()); + asciidoctor.convert(reader, writer, createAttributes()); return new ByteArrayInputStream(writer.getBuffer().toString().getBytes()); } } @@ -94,6 +95,16 @@ public class AsciiDoctorTemplateResolver extends TemplateResolver { } } + private Map createAttributes() { + Map attributes = Maps.newHashMap(); + attributes.put("backend", "xhtml"); + + Map options = Maps.newHashMap(); + options.put("attributes", attributes); + + return options; + } + private Optional find(Path path, String resourceName) throws IOException { return Files.walk(path) .filter(Files::isRegularFile)