Centralise HTTP headers

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / RemoteSessionLoginModule.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
index 3abcf8c9483d52176d9cb058723577f9c1a7963a..d801b5e57978aed234b519c0a657e9d2861fd240 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
@@ -14,13 +14,12 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.CmsDeployProperty;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.argeo.cms.internal.runtime.CmsStateImpl;
-import org.osgi.service.http.HttpContext;
+import org.argeo.util.http.HttpHeader;
 import org.osgi.service.useradmin.Authorization;
 
 /** Use the HTTP session as the basis for authentication. */
@@ -34,8 +33,6 @@ public class RemoteSessionLoginModule implements LoginModule {
        private RemoteAuthRequest request = null;
        private RemoteAuthResponse response = null;
 
-//     private BundleContext bc;
-
        private Authorization authorization;
        private Locale locale;
 
@@ -43,8 +40,6 @@ public class RemoteSessionLoginModule implements LoginModule {
        @Override
        public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState,
                        Map<String, ?> options) {
-//             bc = FrameworkUtil.getBundle(RemoteSessionLoginModule.class).getBundleContext();
-//             assert bc != null;
                this.subject = subject;
                this.callbackHandler = callbackHandler;
                this.sharedState = (Map<String, Object>) sharedState;
@@ -79,7 +74,7 @@ public class RemoteSessionLoginModule implements LoginModule {
                                        log.trace("Retrieved authorization from " + cmsSession);
                        }
                } else {
-                       authorization = (Authorization) request.getAttribute(HttpContext.AUTHORIZATION);
+                       authorization = (Authorization) request.getAttribute(RemoteAuthRequest.AUTHORIZATION);
                        if (authorization == null) {// search by session ID
                                RemoteAuthSession httpSession = request.getSession();
                                if (httpSession == null) {
@@ -110,7 +105,7 @@ public class RemoteSessionLoginModule implements LoginModule {
                } else {
                        if (log.isTraceEnabled())
                                log.trace("HTTP login: " + true);
-                       request.setAttribute(HttpContext.AUTHORIZATION, authorization);
+                       request.setAttribute(RemoteAuthRequest.AUTHORIZATION, authorization);
                        return true;
                }
        }
@@ -119,7 +114,7 @@ public class RemoteSessionLoginModule implements LoginModule {
        public boolean commit() throws LoginException {
                byte[] outToken = (byte[]) sharedState.get(CmsAuthUtils.SHARED_STATE_SPNEGO_OUT_TOKEN);
                if (outToken != null) {
-                       response.setHeader(CmsAuthUtils.HEADER_WWW_AUTHENTICATE,
+                       response.setHeader(HttpHeader.WWW_AUTHENTICATE.getName(),
                                        "Negotiate " + java.util.Base64.getEncoder().encodeToString(outToken));
                }
 
@@ -157,7 +152,7 @@ public class RemoteSessionLoginModule implements LoginModule {
        }
 
        private void extractHttpAuth(final RemoteAuthRequest httpRequest) {
-               String authHeader = httpRequest.getHeader(CmsAuthUtils.HEADER_AUTHORIZATION);
+               String authHeader = httpRequest.getHeader(HttpHeader.AUTHORIZATION.getName());
                extractHttpAuth(authHeader);
        }
 
@@ -166,7 +161,7 @@ public class RemoteSessionLoginModule implements LoginModule {
                        StringTokenizer st = new StringTokenizer(authHeader);
                        if (st.hasMoreTokens()) {
                                String basic = st.nextToken();
-                               if (basic.equalsIgnoreCase("Basic")) {
+                               if (basic.equalsIgnoreCase(HttpHeader.BASIC)) {
                                        try {
                                                // TODO manipulate char[]
                                                Base64.Decoder decoder = Base64.getDecoder();
@@ -184,7 +179,7 @@ public class RemoteSessionLoginModule implements LoginModule {
                                        } catch (Exception e) {
                                                throw new IllegalStateException("Couldn't retrieve authentication", e);
                                        }
-                               } else if (basic.equalsIgnoreCase("Negotiate")) {
+                               } else if (basic.equalsIgnoreCase(HttpHeader.NEGOTIATE)) {
                                        String spnegoToken = st.nextToken();
                                        Base64.Decoder decoder = Base64.getDecoder();
                                        byte[] authToken = decoder.decode(spnegoToken);