X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkFormListServlet.java;h=5310542cd46c9aa5620e33fb5bfb2aceb329044c;hb=dbd2a20e2ea265bcefd5ed4fe92b2ebd2e71e3d9;hp=21b342112df1423a5b1524543a55082862990d35;hpb=6c42d7ee01c29a184390a3fd789ebdf5cde84a00;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java
index 21b3421..5310542 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java
@@ -23,6 +23,7 @@ import org.argeo.app.odk.OrxListName;
 import org.argeo.app.odk.OrxManifestName;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletUtils;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrxApi;
 
@@ -39,9 +40,9 @@ public class OdkFormListServlet extends HttpServlet {
 		resp.setHeader("X-OpenRosa-Version", "1.0");
 		resp.setDateHeader("Date", System.currentTimeMillis());
 
-		String serverName = req.getServerName();
-		int serverPort = req.getServerPort();
-		String protocol = serverPort == 443 || req.isSecure() ? "https" : "http";
+		// we force HTTPS since ODK Collect will fail anyhow when sending http
+		// cf. https://forum.getodk.org/t/authentication-for-non-https-schems/32967/4
+		StringBuilder baseServer = ServletUtils.getRequestUrlBase(req, true);
 
 		String pathInfo = req.getPathInfo();
 
@@ -77,29 +78,23 @@ public class OdkFormListServlet extends HttpServlet {
 					sb.append("<hash>md5:" + JcrxApi.getChecksum(node, JcrxApi.MD5) + "</hash>");
 					if (node.hasProperty(Property.JCR_DESCRIPTION))
 						sb.append("<name>" + node.getProperty(Property.JCR_DESCRIPTION).getString() + "</name>");
-					sb.append("<downloadUrl>" + protocol + "://" + serverName
-							+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form"
-							+ node.getPath() + "</downloadUrl>");
+					sb.append("<downloadUrl>" + baseServer + "/api/odk/form" + node.getPath() + "</downloadUrl>");
 					if (node.hasNode(OrxManifestName.manifest.name())) {
-						sb.append("<manifestUrl>" + protocol + "://" + serverName
-								+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort)
-								+ "/api/odk/formManifest" + node.getNode(OrxManifestName.manifest.name()).getPath()
-								+ "</manifestUrl>");
+						sb.append("<manifestUrl>" + baseServer + "/api/odk/formManifest"
+								+ node.getNode(OrxManifestName.manifest.name()).getPath() + "</manifestUrl>");
 					}
 					sb.append("</xform>");
 				} else if (node.isNodeType(EntityType.formSet.get())) {
 					sb.append("<xforms-group>");
 					sb.append("<groupId>" + node.getPath() + "</groupId>");
 					sb.append("<name>" + node.getProperty(Property.JCR_TITLE).getString() + "</name>");
-					sb.append("<listUrl>" + protocol + "://" + serverName
-							+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/formList"
-							+ node.getPath() + "</listUrl>");
+					sb.append("<listUrl>" + baseServer + "/api/odk/formList" + node.getPath() + "</listUrl>");
 					sb.append("</xforms-group>");
 				}
 				String str = sb.toString();
 				if (!str.equals("")) {
-					if (log.isDebugEnabled())
-						log.debug(str);
+					if (log.isTraceEnabled())
+						log.trace(str);
 					writer.append(str);
 				}
 			}