#6064: forces encoding of MVC responses to UTF-8 in ConfigController (#…

…6067) (#6082)
geosolutions-it · Oct 22, 2020 · 34ec369 · 34ec369
1 parent 39e7216
commit 34ec369
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/backend/src/main/java/it/geosolutions/mapstore/ConfigController.java b/backend/src/main/java/it/geosolutions/mapstore/ConfigController.java
@@ -11,6 +11,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -90,9 +91,9 @@ public ResourceNotAllowedException(String message) {
      * @param {boolean} overrides apply overrides from the configured properties file (if any)
      */
     @RequestMapping(value="/load/{resource}", method = RequestMethod.GET)
-    public @ResponseBody String loadResource(@PathVariable("resource") String resourceName, @RequestParam(value="overrides", defaultValue="true") boolean applyOverrides) throws IOException {
+    public @ResponseBody byte[] loadResource(@PathVariable("resource") String resourceName, @RequestParam(value="overrides", defaultValue="true") boolean applyOverrides) throws IOException {
         if (isAllowed(resourceName)) {
-            return readResource(resourceName + ".json", applyOverrides, resourceName + ".json.patch");
+            return readResource(resourceName + ".json", applyOverrides, resourceName + ".json.patch").getBytes("UTF-8");
         }
         throw new ResourceNotAllowedException("Resource is not allowed");
     }
@@ -103,8 +104,8 @@ public ResourceNotAllowedException(String message) {
      * @param resourceName path of the asset to load
      */
     @RequestMapping(value="/loadasset", method = RequestMethod.GET)
-    public @ResponseBody String loadAsset(@RequestParam("resource") String resourceName) throws IOException {
-		return readResource(resourceName, false, "");
+    public @ResponseBody byte[] loadAsset(@RequestParam("resource") String resourceName) throws IOException {
+		return readResource(resourceName, false, "").getBytes("UTF-8");
     }
 
     private String readResource(String resourceName, boolean applyOverrides, String patchName) throws IOException {

diff --git a/backend/src/test/java/it/geosolutions/mapstore/ConfigControllerTest.java b/backend/src/test/java/it/geosolutions/mapstore/ConfigControllerTest.java
@@ -36,7 +36,7 @@ public void testLoadAllowedResource() throws IOException {
         File tempResource = TestUtils.copyToTemp(ConfigControllerTest.class.getResourceAsStream("/localConfig.json"));
         Mockito.when(context.getRealPath(Mockito.anyString())).thenReturn(tempResource.getAbsolutePath());
         controller.setContext(context);
-        String resource = controller.loadResource("localConfig", false);
+        String resource = new String(controller.loadResource("localConfig", false), "UTF-8");
         assertEquals("{}", resource.trim());
         tempResource.delete();
     }
@@ -63,7 +63,7 @@ public void testLoadFromDataDir() throws IOException {
         controller.setDataDir(dataDir.getAbsolutePath());
         ServletContext context = Mockito.mock(ServletContext.class);
         controller.setContext(context);
-        String resource = controller.loadResource("localConfig", false);
+        String resource = new String(controller.loadResource("localConfig", false), "UTF-8");
         assertEquals("{}", resource.trim());
         tempResource.delete();
     }
@@ -81,9 +81,9 @@ public void testLoadFromManyDataDir() throws IOException {
         controller.setDataDir(dataDir1.getAbsolutePath() + "," + dataDir2.getAbsolutePath());
         ServletContext context = Mockito.mock(ServletContext.class);
         controller.setContext(context);
-        String resource1 = controller.loadResource("localConfig", false);
+        String resource1 = new String(controller.loadResource("localConfig", false), "UTF-8");
         assertEquals("{}", resource1.trim());
-        String resource2 = controller.loadResource("extensions", false);
+        String resource2 = new String(controller.loadResource("extensions", false), "UTF-8");
         assertEquals("{}", resource2.trim());
         tempResource1.delete();
         tempResource2.delete();
@@ -95,7 +95,7 @@ public void testLoadAsset() throws IOException {
         File tempResource = TestUtils.copyToTemp(ConfigControllerTest.class.getResourceAsStream("/bundle.js"));
         Mockito.when(context.getRealPath(Mockito.anyString())).thenReturn(tempResource.getAbsolutePath());
         controller.setContext(context);
-        String resource = controller.loadAsset("localConfig");
+        String resource = new String(controller.loadAsset("localConfig"), "UTF-8");
         assertEquals("console.log('hello')", resource.trim());
         tempResource.delete();
     }
@@ -107,7 +107,7 @@ public void testLoadAssetFromDataDir() throws IOException {
         controller.setDataDir(dataDir.getAbsolutePath());
         ServletContext context = Mockito.mock(ServletContext.class);
         controller.setContext(context);
-        String resource = controller.loadAsset("bundle.js");
+        String resource = new String(controller.loadAsset("bundle.js"), "UTF-8");
         assertEquals("console.log('hello')", resource.trim());
         tempResource.delete();
     }
@@ -121,7 +121,7 @@ public void testOverrides() throws IOException {
         controller.setContext(context);
         controller.setOverrides(tempProperties.getAbsolutePath());
         controller.setMappings("header.height=headerHeight,header.url=headerUrl");
-        String resource = controller.loadResource("localConfig", true);
+        String resource = new String(controller.loadResource("localConfig", true), "UTF-8");
         assertEquals("{\"header\":{\"height\":\"200\",\"url\":\"https://mapstore2.geo-solutions.it\"}}", resource.trim());
         tempResource.delete();
     }
@@ -136,7 +136,7 @@ public void testPatch() throws IOException {
         ServletContext context = Mockito.mock(ServletContext.class);
         Mockito.when(context.getRealPath(Mockito.endsWith(".json"))).thenReturn(tempResource.getAbsolutePath());
         controller.setContext(context);
-        String resource = controller.loadResource("pluginsConfig", true);
+        String resource = new String(controller.loadResource("pluginsConfig", true), "UTF-8");
         assertEquals("{\"plugins\":[{\"name\":\"My\",\"dependencies\":[\"Toolbar\"],\"extension\":true}]}", resource.trim());
         tempResource.delete();
         tempPatch.delete();