X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDataHttp.java;h=88f79c5ea1b8b6810f8b1e41ac05bab01fcbcf93;hb=06acf73a99f0e3908fe8998f1ff08dee109c5562;hp=8f95a3ef993077cc8071828f360079898f582058;hpb=0a7d938324d33848ac7dc4ef4007c73a714171ee;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java index 8f95a3ef9..88f79c5ea 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DataHttp.java @@ -1,16 +1,12 @@ package org.argeo.cms.internal.kernel; -import static org.argeo.cms.auth.AuthConstants.ACCESS_CONTROL_CONTEXT; +import static org.argeo.cms.auth.AuthConstants.LOGIN_CONTEXT_USER; import java.io.IOException; import java.io.Serializable; import java.net.URL; -import java.security.AccessControlContext; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.security.cert.X509Certificate; import java.util.Properties; import java.util.StringTokenizer; @@ -22,13 +18,12 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.login.CredentialNotFoundException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.commons.logging.Log; @@ -38,12 +33,19 @@ import org.apache.jackrabbit.server.remoting.davex.JcrRemotingServlet; import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet; import org.argeo.cms.CmsException; import org.argeo.cms.auth.AuthConstants; +import org.argeo.cms.auth.HttpRequestCallback; +import org.argeo.cms.auth.HttpRequestCallbackHandler; import org.argeo.jcr.ArgeoJcrConstants; import org.argeo.jcr.JcrUtils; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.ServiceReference; import org.osgi.service.http.HttpContext; import org.osgi.service.http.HttpService; import org.osgi.service.http.NamespaceException; import org.osgi.service.useradmin.Authorization; +import org.osgi.util.tracker.ServiceTracker; +import org.osgi.util.tracker.ServiceTrackerCustomizer; /** * Intercepts and enriches http access, mainly focusing on security and @@ -52,12 +54,15 @@ import org.osgi.service.useradmin.Authorization; class DataHttp implements KernelConstants, ArgeoJcrConstants { private final static Log log = LogFactory.getLog(DataHttp.class); - private final static String ATTR_AUTH = "auth"; + // private final static String ATTR_AUTH = "auth"; private final static String HEADER_AUTHORIZATION = "Authorization"; private final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; - // private final AuthenticationManager authenticationManager; + private final static String DEFAULT_PROTECTED_HANDLERS = "/org/argeo/cms/internal/kernel/protectedHandlers.xml"; + + private final BundleContext bc; private final HttpService httpService; + private final ServiceTracker repositories; // FIXME Make it more unique private String httpAuthRealm = "Argeo"; @@ -65,14 +70,16 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { // WebDav / JCR remoting private OpenInViewSessionProvider sessionProvider; - DataHttp(HttpService httpService, NodeRepository node) { - this.httpService = httpService; + DataHttp(HttpService httpService) { + this.bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); sessionProvider = new OpenInViewSessionProvider(); - registerRepositoryServlets(ALIAS_NODE, node); + this.httpService = httpService; + repositories = new ServiceTracker<>(bc, Repository.class, new RepositoriesStc()); + repositories.open(); } public void destroy() { - unregisterRepositoryServlets(ALIAS_NODE); + repositories.close(); } void registerRepositoryServlets(String alias, Repository repository) { @@ -81,130 +88,99 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { registerWebdavServlet(alias, repository, false); registerRemotingServlet(alias, repository, true); registerRemotingServlet(alias, repository, false); + if (log.isDebugEnabled()) + log.debug("Registered servlets for repository '" + alias + "'"); } catch (Exception e) { - throw new CmsException( - "Could not register servlets for repository " + alias, e); + throw new CmsException("Could not register servlets for repository '" + alias + "'", e); } } void unregisterRepositoryServlets(String alias) { - // FIXME unregister servlets + try { + httpService.unregister(webdavPath(alias, true)); + httpService.unregister(webdavPath(alias, false)); + httpService.unregister(remotingPath(alias, true)); + httpService.unregister(remotingPath(alias, false)); + if (log.isDebugEnabled()) + log.debug("Unregistered servlets for repository '" + alias + "'"); + } catch (Exception e) { + log.error("Could not unregister servlets for repository '" + alias + "'", e); + } } - void registerWebdavServlet(String alias, Repository repository, - boolean anonymous) throws NamespaceException, ServletException { - WebdavServlet webdavServlet = new WebdavServlet(repository, - sessionProvider); - String pathPrefix = anonymous ? WEBDAV_PUBLIC : WEBDAV_PRIVATE; - String path = pathPrefix + "/" + alias; + void registerWebdavServlet(String alias, Repository repository, boolean anonymous) + throws NamespaceException, ServletException { + WebdavServlet webdavServlet = new WebdavServlet(repository, sessionProvider); + String path = webdavPath(alias, anonymous); Properties ip = new Properties(); ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_CONFIG, WEBDAV_CONFIG); ip.setProperty(WebdavServlet.INIT_PARAM_RESOURCE_PATH_PREFIX, path); - // httpService.registerFilter(path, anonymous ? new AnonymousFilter() - // : new DavFilter(), null, null); - // Cast to servlet because of a weird behaviour in Eclipse - httpService.registerServlet(path, (Servlet) webdavServlet, ip, - new DataHttpContext(anonymous)); + httpService.registerServlet(path, webdavServlet, ip, new DataHttpContext(anonymous)); } - void registerRemotingServlet(String alias, Repository repository, - boolean anonymous) throws NamespaceException, ServletException { - String pathPrefix = anonymous ? REMOTING_PUBLIC : REMOTING_PRIVATE; - RemotingServlet remotingServlet = new RemotingServlet(repository, - sessionProvider); - String path = pathPrefix + "/" + alias; + void registerRemotingServlet(String alias, Repository repository, boolean anonymous) + throws NamespaceException, ServletException { + RemotingServlet remotingServlet = new RemotingServlet(repository, sessionProvider); + String path = remotingPath(alias, anonymous); Properties ip = new Properties(); ip.setProperty(JcrRemotingServlet.INIT_PARAM_RESOURCE_PATH_PREFIX, path); // Looks like a bug in Jackrabbit remoting init - ip.setProperty(RemotingServlet.INIT_PARAM_HOME, - KernelUtils.getOsgiInstanceDir() + "/tmp/jackrabbit"); + ip.setProperty(RemotingServlet.INIT_PARAM_HOME, KernelUtils.getOsgiInstanceDir() + "/tmp/jackrabbit"); ip.setProperty(RemotingServlet.INIT_PARAM_TMP_DIRECTORY, "remoting"); - // in order to avoid annoying warning. - ip.setProperty(RemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG, ""); - // Cast to servlet because of a weird behaviour in Eclipse - // httpService.registerFilter(path, anonymous ? new AnonymousFilter() - // : new DavFilter(), null, null); - httpService.registerServlet(path, (Servlet) remotingServlet, ip, - new DataHttpContext(anonymous)); - } - - // private Boolean isSessionAuthenticated(HttpSession httpSession) { - // SecurityContext contextFromSession = (SecurityContext) httpSession - // .getAttribute(SPRING_SECURITY_CONTEXT_KEY); - // return contextFromSession != null; - // } - - private void requestBasicAuth(HttpSession httpSession, - HttpServletResponse response) { - response.setStatus(401); - response.setHeader(HEADER_WWW_AUTHENTICATE, "basic realm=\"" - + httpAuthRealm + "\""); - httpSession.setAttribute(ATTR_AUTH, Boolean.TRUE); + ip.setProperty(RemotingServlet.INIT_PARAM_PROTECTED_HANDLERS_CONFIG, DEFAULT_PROTECTED_HANDLERS); + httpService.registerServlet(path, remotingServlet, ip, new DataHttpContext(anonymous)); } - private CallbackHandler basicAuth(String authHeader) { - if (authHeader != null) { - StringTokenizer st = new StringTokenizer(authHeader); - if (st.hasMoreTokens()) { - String basic = st.nextToken(); - if (basic.equalsIgnoreCase("Basic")) { - try { - // TODO manipulate char[] - String credentials = new String(Base64.decodeBase64(st - .nextToken()), "UTF-8"); - // log.debug("Credentials: " + credentials); - int p = credentials.indexOf(":"); - if (p != -1) { - final String login = credentials.substring(0, p) - .trim(); - final char[] password = credentials - .substring(p + 1).trim().toCharArray(); - - return new CallbackHandler() { - public void handle(Callback[] callbacks) { - for (Callback cb : callbacks) { - if (cb instanceof NameCallback) - ((NameCallback) cb).setName(login); - else if (cb instanceof PasswordCallback) - ((PasswordCallback) cb) - .setPassword(password); - } - } - }; - } else { - throw new CmsException( - "Invalid authentication token"); - } - } catch (Exception e) { - throw new CmsException( - "Couldn't retrieve authentication", e); - } - } - } - } - throw new CmsException("Couldn't retrieve authentication"); + private String webdavPath(String alias, boolean anonymous) { + String pathPrefix = anonymous ? WEBDAV_PUBLIC : WEBDAV_PRIVATE; + return pathPrefix + "/" + alias; } - private X509Certificate extractCertificate(HttpServletRequest req) { - X509Certificate[] certs = (X509Certificate[]) req - .getAttribute("javax.servlet.request.X509Certificate"); - if (null != certs && certs.length > 0) { - return certs[0]; - } - return null; + private String remotingPath(String alias, boolean anonymous) { + String pathPrefix = anonymous ? REMOTING_PUBLIC : REMOTING_PRIVATE; + return pathPrefix + "/" + alias; } private Subject subjectFromRequest(HttpServletRequest request) { - HttpSession httpSession = request.getSession(); - Authorization authorization = (Authorization) request - .getAttribute(HttpContext.AUTHORIZATION); + Authorization authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION); if (authorization == null) throw new CmsException("Not authenticated"); - AccessControlContext acc = (AccessControlContext) httpSession - .getAttribute(AuthConstants.ACCESS_CONTROL_CONTEXT); - Subject subject = Subject.getSubject(acc); - return subject; + try { + LoginContext lc = new LoginContext(AuthConstants.LOGIN_CONTEXT_USER, + new HttpRequestCallbackHandler(request)); + lc.login(); + return lc.getSubject(); + } catch (LoginException e) { + throw new CmsException("Cannot login", e); + } + } + + private class RepositoriesStc implements ServiceTrackerCustomizer { + + @Override + public Repository addingService(ServiceReference reference) { + Repository repository = bc.getService(reference); + Object jcrRepoAlias = reference.getProperty(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); + if (jcrRepoAlias != null) { + String alias = jcrRepoAlias.toString(); + registerRepositoryServlets(alias, repository); + } + return repository; + } + + @Override + public void modifiedService(ServiceReference reference, Repository service) { + } + + @Override + public void removedService(ServiceReference reference, Repository service) { + Object jcrRepoAlias = reference.getProperty(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); + if (jcrRepoAlias != null) { + String alias = jcrRepoAlias.toString(); + unregisterRepositoryServlets(alias); + } + } } private class DataHttpContext implements HttpContext { @@ -215,61 +191,48 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { } @Override - public boolean handleSecurity(HttpServletRequest request, - HttpServletResponse response) throws IOException { - final Subject subject; + public boolean handleSecurity(final HttpServletRequest request, HttpServletResponse response) + throws IOException { if (anonymous) { - subject = KernelUtils.anonymousLogin(); - Authorization authorization = subject - .getPrivateCredentials(Authorization.class).iterator() - .next(); + Subject subject = KernelUtils.anonymousLogin(); + Authorization authorization = subject.getPrivateCredentials(Authorization.class).iterator().next(); + request.setAttribute(REMOTE_USER, AuthConstants.ROLE_ANONYMOUS); request.setAttribute(AUTHORIZATION, authorization); return true; } - final HttpSession httpSession = request.getSession(); - AccessControlContext acc = (AccessControlContext) httpSession - .getAttribute(AuthConstants.ACCESS_CONTROL_CONTEXT); - if (acc != null) { - subject = Subject.getSubject(acc); - } else { - // Process basic auth - String basicAuth = request.getHeader(HEADER_AUTHORIZATION); - if (basicAuth != null) { - CallbackHandler token = basicAuth(basicAuth); + if (log.isTraceEnabled()) + KernelUtils.logRequestHeaders(log, request); + try { + new LoginContext(LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request)).login(); + return true; + } catch (CredentialNotFoundException e) { + CallbackHandler token = basicAuth(request); + if (token != null) { try { - LoginContext lc = new LoginContext( - AuthConstants.LOGIN_CONTEXT_USER, token); + LoginContext lc = new LoginContext(LOGIN_CONTEXT_USER, token); lc.login(); - subject = lc.getSubject(); - } catch (LoginException e) { - throw new CmsException("Could not login", e); + // Note: this is impossible to reliably clear the + // authorization header when access from a browser. + return true; + } catch (LoginException e1) { + throw new CmsException("Could not login", e1); } - Subject.doAs(subject, new PrivilegedAction() { - public Void run() { - // add security context to session - httpSession.setAttribute(ACCESS_CONTROL_CONTEXT, - AccessController.getContext()); - return null; - } - }); } else { - requestBasicAuth(httpSession, response); + String path = request.getServletPath(); + if (path.startsWith(REMOTING_PRIVATE)) + requestBasicAuth(request, response); return false; } + } catch (LoginException e) { + throw new CmsException("Could not login", e); } - // authenticate request - Authorization authorization = subject - .getPrivateCredentials(Authorization.class).iterator() - .next(); - request.setAttribute(AUTHORIZATION, authorization); - return true; } @Override public URL getResource(String name) { - return Activator.getBundleContext().getBundle().getResource(name); + return KernelUtils.getBundleContext(DataHttp.class).getBundle().getResource(name); } @Override @@ -277,29 +240,70 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { return null; } + private void requestBasicAuth(HttpServletRequest request, HttpServletResponse response) { + response.setStatus(401); + response.setHeader(HEADER_WWW_AUTHENTICATE, "basic realm=\"" + httpAuthRealm + "\""); + // request.getSession().setAttribute(ATTR_AUTH, Boolean.TRUE); + } + + private CallbackHandler basicAuth(final HttpServletRequest httpRequest) { + String authHeader = httpRequest.getHeader(HEADER_AUTHORIZATION); + if (authHeader != null) { + StringTokenizer st = new StringTokenizer(authHeader); + if (st.hasMoreTokens()) { + String basic = st.nextToken(); + if (basic.equalsIgnoreCase("Basic")) { + try { + // TODO manipulate char[] + String credentials = new String(Base64.decodeBase64(st.nextToken()), "UTF-8"); + // log.debug("Credentials: " + credentials); + int p = credentials.indexOf(":"); + if (p != -1) { + final String login = credentials.substring(0, p).trim(); + final char[] password = credentials.substring(p + 1).trim().toCharArray(); + return new CallbackHandler() { + public void handle(Callback[] callbacks) { + for (Callback cb : callbacks) { + if (cb instanceof NameCallback) + ((NameCallback) cb).setName(login); + else if (cb instanceof PasswordCallback) + ((PasswordCallback) cb).setPassword(password); + else if (cb instanceof HttpRequestCallback) + ((HttpRequestCallback) cb).setRequest(httpRequest); + } + } + }; + } else { + throw new CmsException("Invalid authentication token"); + } + } catch (Exception e) { + throw new CmsException("Couldn't retrieve authentication", e); + } + } + } + } + return null; + } + } /** * Implements an open session in view patter: a new JCR session is created * for each request */ - private class OpenInViewSessionProvider implements SessionProvider, - Serializable { + private class OpenInViewSessionProvider implements SessionProvider, Serializable { private static final long serialVersionUID = 2270957712453841368L; - public Session getSession(HttpServletRequest request, Repository rep, - String workspace) throws javax.jcr.LoginException, - ServletException, RepositoryException { + public Session getSession(HttpServletRequest request, Repository rep, String workspace) + throws javax.jcr.LoginException, ServletException, RepositoryException { return login(request, rep, workspace); } - protected Session login(HttpServletRequest request, - Repository repository, String workspace) + protected Session login(HttpServletRequest request, Repository repository, String workspace) throws RepositoryException { if (log.isTraceEnabled()) - log.trace("Login to workspace " - + (workspace == null ? "" : workspace) - + " in web session " + request.getSession().getId()); + log.trace("Login to workspace " + (workspace == null ? "" : workspace) + " in web session " + + request.getSession().getId()); return repository.login(workspace); } @@ -314,8 +318,7 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { private static final long serialVersionUID = -4687354117811443881L; private final Repository repository; - public WebdavServlet(Repository repository, - SessionProvider sessionProvider) { + public WebdavServlet(Repository repository, SessionProvider sessionProvider) { this.repository = repository; setSessionProvider(sessionProvider); } @@ -325,11 +328,17 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { } @Override - protected void service(final HttpServletRequest request, - final HttpServletResponse response) throws ServletException, - IOException { + protected void service(final HttpServletRequest request, final HttpServletResponse response) + throws ServletException, IOException { try { Subject subject = subjectFromRequest(request); + // TODO make it stronger, with eTags. + // if (CurrentUser.isAnonymous(subject) && + // request.getMethod().equals("GET")) { + // response.setHeader("Cache-Control", "no-transform, public, + // max-age=300, s-maxage=900"); + // } + Subject.doAs(subject, new PrivilegedExceptionAction() { @Override public Void run() throws Exception { @@ -338,8 +347,7 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { } }); } catch (PrivilegedActionException e) { - throw new CmsException("Cannot process webdav request", - e.getException()); + throw new CmsException("Cannot process webdav request", e.getException()); } } } @@ -349,8 +357,7 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { private final Repository repository; private final SessionProvider sessionProvider; - public RemotingServlet(Repository repository, - SessionProvider sessionProvider) { + public RemotingServlet(Repository repository, SessionProvider sessionProvider) { this.repository = repository; this.sessionProvider = sessionProvider; } @@ -366,9 +373,8 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { } @Override - protected void service(final HttpServletRequest request, - final HttpServletResponse response) throws ServletException, - IOException { + protected void service(final HttpServletRequest request, final HttpServletResponse response) + throws ServletException, IOException { try { Subject subject = subjectFromRequest(request); Subject.doAs(subject, new PrivilegedExceptionAction() { @@ -379,8 +385,7 @@ class DataHttp implements KernelConstants, ArgeoJcrConstants { } }); } catch (PrivilegedActionException e) { - throw new CmsException("Cannot process JCR remoting request", - e.getException()); + throw new CmsException("Cannot process JCR remoting request", e.getException()); } } }