From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 8 Jun 2021 09:17:02 +0000 (+0200)
Subject: Deal with URL-encoded form paths.
X-Git-Tag: argeo-suite-2.3.1~47
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=7bd35bd6f8c2b2b9c812b9febd4c9133dca060de

Deal with URL-encoded form paths.
---

diff --git a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
index 7b727e3..cab562c 100644
--- a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
+++ b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
@@ -3,6 +3,8 @@ package org.argeo.support.odk.servlet;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -41,7 +43,8 @@ public class OdkFormServlet extends HttpServlet {
 		boolean oldApproach = false;
 		try {
 			if (!oldApproach) {
-				session.exportDocumentView(pathInfo + "/" + OdkNames.H_HTML, resp.getOutputStream(), true, false);
+				String path = URLDecoder.decode(pathInfo, StandardCharsets.UTF_8);
+				session.exportDocumentView(path + "/" + OdkNames.H_HTML, resp.getOutputStream(), true, false);
 			} else {
 
 				String fileName = FilenameUtils.getName(pathInfo);