X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.servlet.odk%2Fsrc%2Forg%2Fargeo%2Fapp%2Fservlet%2Fodk%2FOdkFormListServlet.java;h=965082c70d9ce274e830ad0a39a41e5045b0a9e4;hb=616a062e9d061ce91589556624ed622298a21ac7;hp=41a3039a3df72909bba6ee1dbd5ce1f7ae6b4395;hpb=597c7013edda6cd7d846761233bc57e08ef5f99c;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 41a3039..965082c 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
@@ -16,9 +16,9 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.argeo.api.app.EntityType;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
-import org.argeo.app.api.EntityType;
 import org.argeo.app.odk.OrxListName;
 import org.argeo.app.odk.OrxManifestName;
 import org.argeo.cms.auth.RemoteAuthUtils;
@@ -40,17 +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";
-////		String baseServer = protocol + "://" + serverName
-////				+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort);
-//		String requestUri=req.getRequestURI();
-//		String forwardedHost = req.getHeader("X-Forwarded-Host");
-//		URL requestUrl = new URL(req.getRequestURL().toString());
-//		String baseServer = requestUrl.getProtocol() + "://" + requestUrl.getHost()
-//				+ (requestUrl.getPort() > 0 ? ":" + requestUrl.getPort() : "");
-		StringBuilder baseServer = ServletUtils.getRequestUrlBase(req);
+		// 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();
 
@@ -101,8 +93,8 @@ public class OdkFormListServlet extends HttpServlet {
 				}
 				String str = sb.toString();
 				if (!str.equals("")) {
-					if (log.isDebugEnabled())
-						log.debug(str);
+					if (log.isTraceEnabled())
+						log.trace(str);
 					writer.append(str);
 				}
 			}