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

Merge pull request #294 from zupzup/images_in_asciidoc

Browse Source 
Issue #293: fix images in asciidoc by setting backend to xhtml
This commit is contained in:
Nanne 2016-12-16 16:43:07 +01:00 committed by GitHub
commit bfe06f9026
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webgoat-container/src/main/java/org/owasp/webgoat/AsciiDoctorTemplateResolver.java
View File

@ -45,6 +45,7 @@ import java.io.InputStream;
import java.io.StringWriter; import java.io.StringWriter;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Map;
import java.util.Optional; import java.util.Optional;
import static org.asciidoctor.Asciidoctor.Factory.create; import static org.asciidoctor.Asciidoctor.Factory.create;
@ -83,7 +84,7 @@ public class AsciiDoctorTemplateResolver extends TemplateResolver {
if (adocFile.isPresent()) { if (adocFile.isPresent()) {
try (FileReader reader = new FileReader(adocFile.get().toFile())) { try (FileReader reader = new FileReader(adocFile.get().toFile())) {
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
asciidoctor.convert(reader, writer, Maps.newHashMap()); asciidoctor.convert(reader, writer, createAttributes());
return new ByteArrayInputStream(writer.getBuffer().toString().getBytes()); return new ByteArrayInputStream(writer.getBuffer().toString().getBytes());
} }
} }
@ -94,6 +95,16 @@ public class AsciiDoctorTemplateResolver extends TemplateResolver {
} }
} }
private Map<String, Object> createAttributes() {
Map<String, Object> attributes = Maps.newHashMap();
attributes.put("backend", "xhtml");
Map<String, Object> options = Maps.newHashMap();
options.put("attributes", attributes);
return options;
}
private Optional<Path> find(Path path, String resourceName) throws IOException { private Optional<Path> find(Path path, String resourceName) throws IOException {
return Files.walk(path) return Files.walk(path)
.filter(Files::isRegularFile) .filter(Files::isRegularFile)