Make reverse proxy support more robust.

[gpl/argeo-suite.git] / org.argeo.app.servlet.odk / src / org / argeo / app / servlet / odk / OdkFormListServlet.java

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 4732e705e48e69bd7520ca46d837a8d8004e2604..41a3039a3df72909bba6ee1dbd5ce1f7ae6b4395 100644 (file)
--- 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;
 
@@ -31,11 +32,6 @@ public class OdkFormListServlet extends HttpServlet {
        private static final long serialVersionUID = 2706191315048423321L;
        private final static CmsLog log = CmsLog.getLog(OdkFormListServlet.class);
 
-//     private Set<OdkForm> odkForms = Collections.synchronizedSet(new HashSet<>());
-
-//     private DateTimeFormatter versionFormatter = DateTimeFormatter.ofPattern("YYYY-MM-dd-HHmm")
-//                     .withZone(ZoneId.from(ZoneOffset.UTC));
-
        private Repository repository;
 
        @Override
@@ -44,26 +40,29 @@ 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();
 
                Session session = RemoteAuthUtils.doAs(() -> Jcr.login(repository, CmsConstants.SYS_WORKSPACE),
                                new ServletHttpRequest(req));
-//             session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
                Writer writer = resp.getWriter();
                writer.append("<?xml version='1.0' encoding='UTF-8' ?>");
                writer.append("<xforms xmlns=\"http://openrosa.org/xforms/xformsList\">");
-//             boolean oldApproach = false;
-//             if (!oldApproach) {
                try {
 
                        Query query;
                        if (pathInfo == null) {
-//                             query = session.getWorkspace().getQueryManager()
-//                                             .createQuery("SELECT * FROM [nt:unstructured]", Query.JCR_SQL2);
                                query = session.getWorkspace().getQueryManager()
                                                .createQuery("SELECT * FROM [" + OrxListName.xform.get() + "]", Query.JCR_SQL2);
                        } else {
@@ -76,12 +75,6 @@ public class OdkFormListServlet extends HttpServlet {
                        QueryResult queryResult = query.execute();
 
                        NodeIterator nit = queryResult.getNodes();
-//                             log.debug(session.getUserID());
-//                             log.debug(session.getWorkspace().getName());
-//                             NodeIterator nit = session.getRootNode().getNodes();
-//                             while (nit.hasNext()) {
-//                                     log.debug(nit.nextNode());
-//                             }
                        while (nit.hasNext()) {
                                StringBuilder sb = new StringBuilder();
                                Node node = nit.nextNode();
@@ -93,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();
@@ -127,37 +114,9 @@ public class OdkFormListServlet extends HttpServlet {
                } finally {
                        Jcr.logout(session);
                }
-
-//             } else {
-//                     for (OdkForm form : odkForms) {
-//                             StringBuilder sb = new StringBuilder();
-//                             sb.append("<xform>");
-//                             sb.append("<formID>" + form.getFormId() + "</formID>");
-//                             sb.append("<name>" + form.getName() + "</name>");
-//                             sb.append("<version>" + form.getVersion() + "</version>");
-//                             sb.append("<hash>" + form.getHash(null) + "</hash>");
-//                             sb.append("<descriptionText>" + form.getDescription() + "</descriptionText>");
-//                             sb.append("<downloadUrl>" + protocol + "://" + serverName
-//                                             + (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form/"
-//                                             + form.getFileName() + "</downloadUrl>");
-//                             sb.append("</xform>");
-//                             String str = sb.toString();
-//                             if (log.isDebugEnabled())
-//                                     log.debug(str);
-//                             writer.append(str);
-//                     }
-//             }
                writer.append("</xforms>");
        }
 
-//     public void addForm(OdkForm odkForm) {
-//             odkForms.add(odkForm);
-//     }
-//
-//     public void removeForm(OdkForm odkForm) {
-//             odkForms.remove(odkForm);
-//     }
-
        public void setRepository(Repository repository) {
                this.repository = repository;
        }