[jboss-cvs] Picketbox SVN: r274 - in tags/4.0.5.Final: security-spi/spi/src/main/java/org/jboss/security and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 4 18:34:33 EDT 2011
Author: mmoyses
Date: 2011-10-04 18:34:32 -0400 (Tue, 04 Oct 2011)
New Revision: 274
Modified:
tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java
tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityActions.java
tags/4.0.5.Final/security-spi/spi/src/main/java/org/jboss/security/SecurityConstants.java
Log:
adding callbacks for digest authentication
Modified: tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java
===================================================================
--- tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java 2011-10-04 22:31:20 UTC (rev 273)
+++ tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/CallbackHandlerPolicyContextHandler.java 2011-10-04 22:34:32 UTC (rev 274)
@@ -25,6 +25,8 @@
import javax.security.jacc.PolicyContextException;
import javax.security.jacc.PolicyContextHandler;
+import org.jboss.security.SecurityConstants;
+
/**
A PolicyContextHandler implementation that allows a dynamic CallbackHandler to
be associated with the current context for use with authentication.
@@ -34,7 +36,6 @@
*/
public class CallbackHandlerPolicyContextHandler implements PolicyContextHandler
{
- public static final String CALLBACK_HANDLER_KEY = "org.jboss.security.auth.spi.CallbackHandler";
private static ThreadLocal<CallbackHandler> requestContext = new ThreadLocal<CallbackHandler>();
public static void setCallbackHandler(CallbackHandler bean)
@@ -52,7 +53,7 @@
throws PolicyContextException
{
Object context = null;
- if( key.equalsIgnoreCase(CALLBACK_HANDLER_KEY) == true )
+ if (key.equalsIgnoreCase(SecurityConstants.CALLBACK_HANDLER_KEY))
context = requestContext.get();
return context;
}
@@ -60,14 +61,14 @@
public String[] getKeys()
throws PolicyContextException
{
- String[] keys = {CALLBACK_HANDLER_KEY};
+ String[] keys = {SecurityConstants.CALLBACK_HANDLER_KEY};
return keys;
}
public boolean supports(String key)
throws PolicyContextException
{
- return key.equalsIgnoreCase(CALLBACK_HANDLER_KEY);
+ return key.equalsIgnoreCase(SecurityConstants.CALLBACK_HANDLER_KEY);
}
}
Modified: tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityActions.java
===================================================================
--- tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityActions.java 2011-10-04 22:31:20 UTC (rev 273)
+++ tags/4.0.5.Final/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/callback/SecurityActions.java 2011-10-04 22:34:32 UTC (rev 274)
@@ -31,6 +31,7 @@
import javax.security.jacc.PolicyContext;
import javax.security.jacc.PolicyContextException;
+import org.jboss.security.SecurityConstants;
import org.jboss.security.SecurityContext;
import org.jboss.security.SecurityContextAssociation;
@@ -44,15 +45,13 @@
{
interface PolicyContextActions
{
- /** The JACC PolicyContext key for the current Subject */
- public static final String CALLBACK_HANDLER_KEY = "org.jboss.security.auth.spi.CallbackHandler";
PolicyContextActions PRIVILEGED = new PolicyContextActions()
{
private final PrivilegedExceptionAction<CallbackHandler> exAction = new PrivilegedExceptionAction<CallbackHandler>()
{
public CallbackHandler run() throws Exception
{
- return (CallbackHandler) PolicyContext.getContext(CALLBACK_HANDLER_KEY);
+ return (CallbackHandler) PolicyContext.getContext(SecurityConstants.CALLBACK_HANDLER_KEY);
}
};
public CallbackHandler getContextCallbackHandler()
@@ -78,7 +77,7 @@
public CallbackHandler getContextCallbackHandler()
throws PolicyContextException
{
- return (CallbackHandler) PolicyContext.getContext(CALLBACK_HANDLER_KEY);
+ return (CallbackHandler) PolicyContext.getContext(SecurityConstants.CALLBACK_HANDLER_KEY);
}
};
Modified: tags/4.0.5.Final/security-spi/spi/src/main/java/org/jboss/security/SecurityConstants.java
===================================================================
--- tags/4.0.5.Final/security-spi/spi/src/main/java/org/jboss/security/SecurityConstants.java 2011-10-04 22:31:20 UTC (rev 273)
+++ tags/4.0.5.Final/security-spi/spi/src/main/java/org/jboss/security/SecurityConstants.java 2011-10-04 22:34:32 UTC (rev 274)
@@ -101,6 +101,7 @@
/** Policy Context Constants **/
String SUBJECT_CONTEXT_KEY = "javax.security.auth.Subject.container";
String WEB_REQUEST_KEY = "javax.servlet.http.HttpServletRequest";
+ String CALLBACK_HANDLER_KEY = "org.jboss.security.auth.spi.CallbackHandler";
/**
* Identifier that specifies the last RAI set
More information about the jboss-cvs-commits
mailing list