From: Mathieu Baudier Date: Wed, 5 Jan 2022 09:45:22 +0000 (+0100) Subject: Rename remote auth interfaces X-Git-Tag: argeo-slc-2.3.1~34 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=69a25048f4a4e78a00e1a8a60455e83e00e06dcc;p=gpl%2Fargeo-slc.git 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 ad976b114..45dcd73fc 100644 --- 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 461953790..6bf8d2250 100644 --- 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 be45fba1c..ac342d3ac 100644 --- 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 274e0ed49..b95e56ef6 100644 --- 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 fc100e0e4..a1cdb257e 100644 --- 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());