Rename remote auth interfaces

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
index ad976b114a8dad6b0622b3c77b3d8bb19602123c..45dcd73fce35e179f5f3f2104b58076e06002cec 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsSessionId;
-import org.argeo.cms.auth.HttpRequestCallback;
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.auth.RemoteAuthCallback;
+import org.argeo.cms.auth.RemoteAuthCallbackHandler;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.cms.servlet.ServletHttpResponse;
 import org.osgi.service.useradmin.Authorization;
@@ -49,16 +49,16 @@ public class CmsLoginServlet extends HttpServlet {
                ServletHttpRequest request = new ServletHttpRequest(req);
                ServletHttpResponse response = new ServletHttpResponse(resp);
                try {
-                       lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response) {
+                       lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) {
                                public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
                                        for (Callback callback : callbacks) {
                                                if (callback instanceof NameCallback && username != null)
                                                        ((NameCallback) callback).setName(username);
                                                else if (callback instanceof PasswordCallback && password != null)
                                                        ((PasswordCallback) callback).setPassword(password.toCharArray());
-                                               else if (callback instanceof HttpRequestCallback) {
-                                                       ((HttpRequestCallback) callback).setRequest(request);
-                                                       ((HttpRequestCallback) callback).setResponse(response);
+                                               else if (callback instanceof RemoteAuthCallback) {
+                                                       ((RemoteAuthCallback) callback).setRequest(request);
+                                                       ((RemoteAuthCallback) callback).setResponse(response);
                                                }
                                        }
                                }

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
index 461953790b3cbe02297bd9ddbe9d3202d712d51f..6bf8d22502f1144a754ed35fd918eb44c4750f83 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
@@ -16,8 +16,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsSessionId;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.auth.HttpRequestCallback;
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.auth.RemoteAuthCallback;
+import org.argeo.cms.auth.RemoteAuthCallbackHandler;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.cms.servlet.ServletHttpResponse;
 
@@ -39,12 +39,12 @@ public class CmsLogoutServlet extends HttpServlet {
                LoginContext lc = null;
                try {
                        lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
-                                       new HttpRequestCallbackHandler(httpRequest, httpResponse) {
+                                       new RemoteAuthCallbackHandler(httpRequest, httpResponse) {
                                                public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
                                                        for (Callback callback : callbacks) {
-                                                               if (callback instanceof HttpRequestCallback) {
-                                                                       ((HttpRequestCallback) callback).setRequest(httpRequest);
-                                                                       ((HttpRequestCallback) callback).setResponse(httpResponse);
+                                                               if (callback instanceof RemoteAuthCallback) {
+                                                                       ((RemoteAuthCallback) callback).setRequest(httpRequest);
+                                                                       ((RemoteAuthCallback) callback).setResponse(httpResponse);
                                                                }
                                                        }
                                                }

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
index be45fba1cce72a969bee4a86368f36ef85acc66c..ac342d3acab2b47f6f73f948d01f1a25be64eedf 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
@@ -13,8 +13,8 @@ import javax.security.auth.login.LoginException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
-import org.argeo.cms.servlet.ServletAuthUtils;
+import org.argeo.cms.auth.RemoteAuthCallbackHandler;
+import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.cms.servlet.ServletHttpResponse;
 import org.osgi.service.http.context.ServletContextHelper;
@@ -46,7 +46,7 @@ public class CmsPrivateServletContext extends ServletContextHelper {
                if ((pathInfo != null && (servletPath + pathInfo).equals(loginPage)) || servletPath.contentEquals(loginServlet))
                        return true;
                try {
-                       lc = new LoginContext(LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response));
+                       lc = new LoginContext(LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response));
                        lc.login();
                } catch (LoginException e) {
                        lc = processUnauthorized(req, resp);
@@ -58,7 +58,7 @@ public class CmsPrivateServletContext extends ServletContextHelper {
                        @Override
                        public Void run() {
                                // TODO also set login context in order to log out ?
-                               ServletAuthUtils.configureRequestSecurity(request);
+                               RemoteAuthUtils.configureRequestSecurity(request);
                                return null;
                        }
 
@@ -69,7 +69,7 @@ public class CmsPrivateServletContext extends ServletContextHelper {
 
        @Override
        public void finishSecurity(HttpServletRequest req, HttpServletResponse resp) {
-               ServletAuthUtils.clearRequestSecurity(new ServletHttpRequest(req));
+               RemoteAuthUtils.clearRequestSecurity(new ServletHttpRequest(req));
        }
 
        protected LoginContext processUnauthorized(HttpServletRequest request, HttpServletResponse response) {

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
index 274e0ed49b30c3eae89fc0d703fa7339975f1ab7..b95e56ef69c2867f8f8efa76ddc6c7a27ffca0af 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
@@ -17,8 +17,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsUserManager;
-import org.argeo.cms.auth.HttpRequestCallback;
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.auth.RemoteAuthCallback;
+import org.argeo.cms.auth.RemoteAuthCallbackHandler;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.cms.servlet.ServletHttpResponse;
 import org.argeo.naming.NamingUtils;
@@ -45,12 +45,12 @@ public class CmsTokenServlet extends HttpServlet {
                ServletHttpResponse response = new ServletHttpResponse(resp);
                LoginContext lc = null;
                try {
-                       lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response) {
+                       lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) {
                                public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
                                        for (Callback callback : callbacks) {
-                                               if (callback instanceof HttpRequestCallback) {
-                                                       ((HttpRequestCallback) callback).setRequest(request);
-                                                       ((HttpRequestCallback) callback).setResponse(response);
+                                               if (callback instanceof RemoteAuthCallback) {
+                                                       ((RemoteAuthCallback) callback).setRequest(request);
+                                                       ((RemoteAuthCallback) callback).setResponse(response);
                                                }
                                        }
                                }

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
index fc100e0e46475fdff2b085974229a64eb45e6c44..a1cdb257e228a641b4ded6e128a17936f99717fc 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
@@ -15,8 +15,8 @@ import javax.websocket.server.ServerEndpointConfig.Configurator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
-import org.argeo.cms.auth.HttpRequestCallbackHandler;
-import org.argeo.cms.auth.HttpSession;
+import org.argeo.cms.auth.RemoteAuthCallbackHandler;
+import org.argeo.cms.auth.RemoteAuthSession;
 import org.argeo.cms.servlet.ServletHttpSession;
 import org.osgi.service.http.context.ServletContextHelper;
 
@@ -64,7 +64,7 @@ public class CmsWebSocketConfigurator extends Configurator {
        @Override
        public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
 
-               HttpSession httpSession = new ServletHttpSession((javax.servlet.http.HttpSession) request.getHttpSession());
+               RemoteAuthSession httpSession = new ServletHttpSession((javax.servlet.http.HttpSession) request.getHttpSession());
                if (log.isDebugEnabled() && httpSession != null)
                        log.debug("Web socket HTTP session id: " + httpSession.getId());
 
@@ -73,7 +73,7 @@ public class CmsWebSocketConfigurator extends Configurator {
                }
                try {
                        LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
-                                       new HttpRequestCallbackHandler(httpSession));
+                                       new RemoteAuthCallbackHandler(httpSession));
                        lc.login();
                        if (log.isDebugEnabled())
                                log.debug("Web socket logged-in as " + lc.getSubject());