[jbossweb-commits] JBossWeb SVN: r1328 - in trunk/java/org/apache/catalina: realm and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2009-12-09 07:37:21 -0500 (Wed, 09 Dec 2009) New Revision: 1328 Modified: trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java trunk/java/org/apache/catalina/authenticator/Constants.java trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java trunk/java/org/apache/catalina/realm/JAASRealm.java Log: - Set the auth type using the API's constant, as the javadoc says they should be comparable with ==. (??) Modified: trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -22,6 +22,7 @@ import java.io.IOException; import java.security.Principal; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.catalina.connector.Request; @@ -178,7 +179,7 @@ principal = context.getRealm().authenticate(username, password); if (principal != null) { - register(request, response, principal, Constants.BASIC_METHOD, + register(request, response, principal, HttpServletRequest.BASIC_AUTH, username, password); return (true); } Modified: trunk/java/org/apache/catalina/authenticator/Constants.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/Constants.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/authenticator/Constants.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -24,10 +24,6 @@ public static final String Package = "org.apache.catalina.authenticator"; // Authentication methods for login configuration - public static final String BASIC_METHOD = "BASIC"; - public static final String CERT_METHOD = "CLIENT_CERT"; - public static final String DIGEST_METHOD = "DIGEST"; - public static final String FORM_METHOD = "FORM"; public static final String LOGIN_METHOD = "LOGIN"; // User data constraints for transport guarantee Modified: trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -25,6 +25,7 @@ import java.security.Principal; import java.util.StringTokenizer; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.catalina.Realm; @@ -174,7 +175,7 @@ if (principal != null) { String username = parseUsername(authorization); register(request, response, principal, - Constants.DIGEST_METHOD, + HttpServletRequest.DIGEST_AUTH, username, null); return (true); } Modified: trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -28,6 +28,7 @@ import javax.servlet.RequestDispatcher; import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.catalina.Realm; @@ -172,7 +173,7 @@ session.setNote(Constants.FORM_PRINCIPAL_NOTE, principal); if (!matchRequest(request)) { register(request, response, principal, - Constants.FORM_METHOD, + HttpServletRequest.FORM_AUTH, username, password); return (true); } @@ -192,7 +193,7 @@ + "'"); principal = (Principal) session.getNote(Constants.FORM_PRINCIPAL_NOTE); - register(request, response, principal, Constants.FORM_METHOD, + register(request, response, principal, HttpServletRequest.FORM_AUTH, (String) session.getNote(Constants.SESS_USERNAME_NOTE), (String) session.getNote(Constants.SESS_PASSWORD_NOTE)); // If we're caching principals we no longer need the username Modified: trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/authenticator/SSLAuthenticator.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -23,6 +23,7 @@ import java.security.Principal; import java.security.cert.X509Certificate; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.catalina.Globals; @@ -155,7 +156,7 @@ } // Cache the principal (if requested) and record this authentication - register(request, response, principal, Constants.CERT_METHOD, + register(request, response, principal, HttpServletRequest.CLIENT_CERT_AUTH, null, null); return (true); Modified: trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java =================================================================== --- trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -18,8 +18,9 @@ import java.security.Principal; +import javax.servlet.http.HttpServletRequest; + import org.apache.catalina.Session; -import org.apache.catalina.authenticator.Constants; /** * A class that represents entries in the cache of authenticated users. @@ -183,8 +184,8 @@ this.username = username; this.password = password; this.canReauthenticate = - (Constants.BASIC_METHOD.equals(authType) - || Constants.FORM_METHOD.equals(authType)); + (HttpServletRequest.BASIC_AUTH.equals(authType) + || HttpServletRequest.FORM_AUTH.equals(authType)); } } Modified: trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java =================================================================== --- trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -36,6 +36,7 @@ import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; +import javax.servlet.http.HttpServletRequest; import org.apache.catalina.Context; import org.apache.catalina.Realm; @@ -354,10 +355,10 @@ if (authMethod == null) { // BASIC or FORM principal = super.authenticate(username, password); - } else if (authMethod.equals(Constants.DIGEST_METHOD)) { + } else if (authMethod.equals(HttpServletRequest.DIGEST_AUTH)) { principal = super.authenticate(username, password, nonce, nc, cnonce, qop, realmName, md5a2); - } else if (authMethod.equals(Constants.CERT_METHOD)) { + } else if (authMethod.equals(HttpServletRequest.CLIENT_CERT_AUTH)) { principal = super.getPrincipal(username); } else { throw new LoginException("Unknown authentication method"); Modified: trunk/java/org/apache/catalina/realm/JAASRealm.java =================================================================== --- trunk/java/org/apache/catalina/realm/JAASRealm.java 2009-12-08 22:19:08 UTC (rev 1327) +++ trunk/java/org/apache/catalina/realm/JAASRealm.java 2009-12-09 12:37:21 UTC (rev 1328) @@ -31,6 +31,7 @@ import javax.security.auth.login.FailedLoginException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; +import javax.servlet.http.HttpServletRequest; import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; @@ -345,7 +346,7 @@ return authenticate(username, new JAASCallbackHandler(this, username, clientDigest, nonce, nc, cnonce, qop, realmName, md5a2, - Constants.DIGEST_METHOD)); + HttpServletRequest.DIGEST_AUTH)); } @@ -471,7 +472,7 @@ return authenticate(username, new JAASCallbackHandler(this, username, null, null, null, null, - null, null, null, Constants.CERT_METHOD)); + null, null, null, HttpServletRequest.CLIENT_CERT_AUTH)); }