From ea389730689203dfca067866152be430291d7904 Mon Sep 17 00:00:00 2001
From: Rene Zubcevic <git@zubcevic.com>
Date: Mon, 22 Jul 2019 08:21:34 +0200
Subject: [PATCH] UTF-8 config added for ThymeLeaf

---
 .../src/main/java/org/owasp/webgoat/MvcConfiguration.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java b/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
index fd2bf0333..e26aa0b5e 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/MvcConfiguration.java
@@ -58,6 +58,8 @@ import java.io.File;
  */
 @Configuration
 public class MvcConfiguration extends WebMvcConfigurerAdapter {
+	
+	private static final String UTF8 = "UTF-8";
 
     @Autowired
     @Qualifier("pluginTargetDirectory")
@@ -80,6 +82,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
         resolver.setSuffix(".html");
         resolver.setOrder(1);
         resolver.setCacheable(false);
+        resolver.setCharacterEncoding(UTF8);
         resolver.setApplicationContext(applicationContext);
         return resolver;
     }
@@ -89,6 +92,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
         LessonTemplateResolver resolver = new LessonTemplateResolver(pluginTargetDirectory, resourceLoader);
         resolver.setOrder(2);
         resolver.setCacheable(false);
+        resolver.setCharacterEncoding(UTF8);
         return resolver;
     }
 
@@ -97,6 +101,7 @@ public class MvcConfiguration extends WebMvcConfigurerAdapter {
         AsciiDoctorTemplateResolver resolver = new AsciiDoctorTemplateResolver(language);
         resolver.setCacheable(false);
         resolver.setOrder(3);
+        resolver.setCharacterEncoding(UTF8);
         return resolver;
     }