X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FNodeHttp.java;h=9a35e279ce28164ba6d53c79367c3b0f1021a2f8;hb=a08c47e28f87d464330567e72481d213c52fd844;hp=418771d981669295308a51958aa6b979e0a38385;hpb=9417e33dda6b8987312a89ca44cdb2f511f04050;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
index 418771d98..9a35e279c 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeHttp.java
@@ -30,7 +30,6 @@ import org.osgi.service.http.NamespaceException;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 /**
@@ -73,20 +72,33 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 		// DAV
 		sessionProvider = new OpenInViewSessionProvider();
 
+		registerRepositoryServlets(ALIAS_NODE, node);
 		try {
-			registerWebdavServlet(ALIAS_NODE, node, true);
-			registerWebdavServlet(ALIAS_NODE, node, false);
-			registerRemotingServlet(ALIAS_NODE, node, true);
-			registerRemotingServlet(ALIAS_NODE, node, false);
-
 			httpService.registerFilter("/", rootFilter, null, null);
 		} catch (Exception e) {
-			throw new CmsException("Could not initialise http", e);
+			throw new CmsException("Could not register root filter", e);
 		}
 	}
 
 	public void destroy() {
 		sessionProvider.destroy();
+		unregisterRepositoryServlets(ALIAS_NODE);
+	}
+
+	void registerRepositoryServlets(String alias, Repository repository) {
+		try {
+			registerWebdavServlet(alias, repository, true);
+			registerWebdavServlet(alias, repository, false);
+			registerRemotingServlet(alias, repository, true);
+			registerRemotingServlet(alias, repository, false);
+		} catch (Exception e) {
+			throw new CmsException(
+					"Could not register servlets for repository " + alias, e);
+		}
+	}
+
+	void unregisterRepositoryServlets(String alias) {
+		// FIXME unregister servlets
 	}
 
 	void registerWebdavServlet(String alias, Repository repository,
@@ -123,11 +135,11 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 		httpService.registerServlet(path, (Servlet) remotingServlet, ip, null);
 	}
 
-	private Boolean isSessionAuthenticated(HttpSession httpSession) {
-		SecurityContext contextFromSession = (SecurityContext) httpSession
-				.getAttribute(SPRING_SECURITY_CONTEXT_KEY);
-		return contextFromSession != null;
-	}
+	// private Boolean isSessionAuthenticated(HttpSession httpSession) {
+	// SecurityContext contextFromSession = (SecurityContext) httpSession
+	// .getAttribute(SPRING_SECURITY_CONTEXT_KEY);
+	// return contextFromSession != null;
+	// }
 
 	private void requestBasicAuth(HttpSession httpSession,
 			HttpServletResponse response) {
@@ -176,8 +188,12 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 		public void doFilter(HttpSession httpSession,
 				HttpServletRequest request, HttpServletResponse response,
 				FilterChain filterChain) throws IOException, ServletException {
-			if (log.isTraceEnabled())
+			if (log.isTraceEnabled()) {
+				log.trace(request.getRequestURL().append(
+						request.getQueryString() != null ? "?"
+								+ request.getQueryString() : ""));
 				logRequest(request);
+			}
 
 			String servletPath = request.getServletPath();
 
@@ -207,7 +223,7 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 			int pathLength = path.length();
 			if (pathLength != 0 && (path.charAt(0) == '/')
 					&& !servletPath.endsWith("rwt-resources")
-					&& !path.equals("/")) {
+					&& path.lastIndexOf('/') != 0) {
 				String newLocation = request.getServletPath() + "#" + path;
 				response.setHeader("Location", newLocation);
 				response.setStatus(HttpServletResponse.SC_FOUND);
@@ -220,10 +236,10 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 	}
 
 	private void logRequest(HttpServletRequest request) {
-		log.debug(request.getContextPath());
-		log.debug(request.getServletPath());
-		log.debug(request.getRequestURI());
-		log.debug(request.getQueryString());
+		log.debug("contextPath=" + request.getContextPath());
+		log.debug("servletPath=" + request.getServletPath());
+		log.debug("requestURI=" + request.getRequestURI());
+		log.debug("queryString=" + request.getQueryString());
 		StringBuilder buf = new StringBuilder();
 		// headers
 		Enumeration<String> en = request.getHeaderNames();
@@ -263,10 +279,10 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 				FilterChain filterChain) throws IOException, ServletException {
 
 			// Authenticate from session
-			if (isSessionAuthenticated(httpSession)) {
-				filterChain.doFilter(request, response);
-				return;
-			}
+			// if (isSessionAuthenticated(httpSession)) {
+			// filterChain.doFilter(request, response);
+			// return;
+			// }
 
 			KernelUtils.anonymousLogin(authenticationManager);
 			filterChain.doFilter(request, response);
@@ -293,9 +309,9 @@ class NodeHttp implements KernelConstants, ArgeoJcrConstants {
 				UsernamePasswordAuthenticationToken token = basicAuth(basicAuth);
 				Authentication auth = authenticationManager.authenticate(token);
 				SecurityContextHolder.getContext().setAuthentication(auth);
-				httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
-						SecurityContextHolder.getContext());
-				httpSession.setAttribute(ATTR_AUTH, Boolean.FALSE);
+				// httpSession.setAttribute(SPRING_SECURITY_CONTEXT_KEY,
+				// SecurityContextHolder.getContext());
+				// httpSession.setAttribute(ATTR_AUTH, Boolean.FALSE);
 				filterChain.doFilter(request, response);
 				return;
 			}