From 597c7013edda6cd7d846761233bc57e08ef5f99c Mon Sep 17 00:00:00 2001
From: Mathieu <mbaudier@argeo.org>
Date: Sat, 3 Dec 2022 08:22:45 +0100
Subject: [PATCH] Make reverse proxy support more robust.

---
 .../app/servlet/odk/OdkFormListServlet.java   | 29 ++++++++++---------
 .../app/servlet/odk/OdkManifestServlet.java   | 15 ++++++----
 2 files changed, 25 insertions(+), 19 deletions(-)

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..41a3039 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,17 @@ 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 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);
 
 		String pathInfo = req.getPathInfo();
 
@@ -77,23 +86,17 @@ 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();
diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
index 4df76ea..2c62ba1 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
@@ -33,6 +33,7 @@ import org.argeo.app.api.EntityMimeType;
 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.cms.util.CsvWriter;
 import org.argeo.cms.util.DigestUtils;
 import org.argeo.jcr.Jcr;
@@ -53,9 +54,12 @@ public class OdkManifestServlet extends HttpServlet {
 		if (pathInfo.startsWith("//"))
 			pathInfo = pathInfo.substring(1);
 
-		String serverName = req.getServerName();
-		int serverPort = req.getServerPort();
-		String protocol = serverPort == 443 || req.isSecure() ? "https" : "http";
+//		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);
+		StringBuilder baseServer = ServletUtils.getRequestUrlBase(req);
 
 		Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, null), new ServletHttpRequest(req));
 
@@ -98,9 +102,8 @@ public class OdkManifestServlet extends HttpServlet {
 								writer.append("md5sum:" + DigestUtils.toHexString(out.getMessageDigest().digest()));
 								writer.append("</hash>");
 							}
-							writer.append("<downloadUrl>" + protocol + "://" + serverName
-									+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort)
-									+ "/api/odk/formManifest" + file.getPath() + "</downloadUrl>");
+							writer.append("<downloadUrl>" + baseServer + "/api/odk/formManifest" + file.getPath()
+									+ "</downloadUrl>");
 						}
 						writer.append("</mediaFile>");
 					}
-- 
2.30.2