X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FCmsUtils.java;h=3a9337a114929d2b26f6eecc791d494fdbfd08bd;hb=50077824250f3a7f5c092d0a5ce28a171287ac7c;hp=6011345d1dc6ca716b2512b93c5d62fc7d626e5f;hpb=91fcd647244c5d87f8f434f261a0768bea84c528;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
index 6011345d1..3a9337a11 100644
--- a/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CmsUtils.java
@@ -1,9 +1,12 @@
 package org.argeo.cms.util;
 
+import static org.argeo.cms.internal.kernel.KernelConstants.WEBDAV_PRIVATE;
 import static org.argeo.cms.internal.kernel.KernelConstants.WEBDAV_PUBLIC;
 import static org.argeo.jcr.ArgeoJcrConstants.ALIAS_NODE;
 
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 
 import javax.jcr.Item;
 import javax.jcr.Node;
@@ -12,9 +15,12 @@ import javax.jcr.RepositoryException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.CmsView;
+import org.argeo.cms.auth.CurrentUser;
 import org.argeo.eclipse.ui.specific.UiContext;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.rap.rwt.RWT;
@@ -34,6 +40,8 @@ import org.eclipse.swt.widgets.Widget;
 
 /** Static utilities for the CMS framework. */
 public class CmsUtils implements CmsConstants {
+	private final static Log log = LogFactory.getLog(CmsUtils.class);
+
 	/**
 	 * The CMS view related to this display, or null if none is available from
 	 * this call.
@@ -42,23 +50,56 @@ public class CmsUtils implements CmsConstants {
 		return UiContext.getData(CmsView.KEY);
 	}
 
+	public static StringBuilder getServerBaseUrl(HttpServletRequest request) {
+		try {
+			URL url = new URL(request.getRequestURL().toString());
+			StringBuilder buf = new StringBuilder();
+			buf.append(url.getProtocol()).append("://").append(url.getHost());
+			if (url.getPort() != -1)
+				buf.append(':').append(url.getPort());
+			return buf;
+		} catch (MalformedURLException e) {
+			throw new CmsException("Cannot extract server base URL from "
+					+ request.getRequestURL(), e);
+		}
+	}
+
 	public static String getDataUrl(Node node, HttpServletRequest request)
 			throws RepositoryException {
-		return request.getRequestURL().append(getDataPath(node).substring(1))
-				.toString();
+		try {
+			StringBuilder buf = getServerBaseUrl(request);
+			buf.append(getDataPath(node));
+			return new URL(buf.toString()).toString();
+		} catch (MalformedURLException e) {
+			throw new CmsException("Cannot build data URL for " + node, e);
+		}
 	}
 
 	public static String getDataPath(Node node) throws RepositoryException {
-		return new StringBuilder().append(WEBDAV_PUBLIC).append('/')
-				.append(ALIAS_NODE + "/")
+		if (log.isTraceEnabled())
+			log.trace(CurrentUser.getUsername() + " : " + node.getPath());
+		StringBuilder buf = new StringBuilder();
+		if (CurrentUser.isAnonymous())
+			buf.append(WEBDAV_PUBLIC);
+		else
+			buf.append(WEBDAV_PRIVATE);
+		// TODO convey repo alias vie repository properties
+		return buf.append('/').append(ALIAS_NODE).append('/')
 				.append(node.getSession().getWorkspace().getName())
 				.append(node.getPath()).toString();
 	}
 
 	public static String getCanonicalUrl(Node node, HttpServletRequest request)
 			throws RepositoryException {
-		return request.getRequestURL().append('!').append(node.getPath())
-				.toString();
+		try {
+			StringBuilder buf = getServerBaseUrl(request);
+			buf.append('/').append('!').append(node.getPath());
+			return new URL(buf.toString()).toString();
+		} catch (MalformedURLException e) {
+			throw new CmsException("Cannot build data URL for " + node, e);
+		}
+		// return request.getRequestURL().append('!').append(node.getPath())
+		// .toString();
 	}
 
 	/** @deprecated Use rowData16px() instead. GridData should not be reused. */