[jboss-cvs] JBossAS SVN: r73223 - in projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins: auth and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 9 12:44:19 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-05-09 12:44:18 -0400 (Fri, 09 May 2008)
New Revision: 73223
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NoAccessSecurityManager.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NullSecurityManager.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
Log:
SECURITY-217: auth mgr interface has a jaspi method to take CBH
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NoAccessSecurityManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NoAccessSecurityManager.java 2008-05-09 16:43:48 UTC (rev 73222)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NoAccessSecurityManager.java 2008-05-09 16:44:18 UTC (rev 73223)
@@ -28,6 +28,7 @@
import java.util.Set;
import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.message.MessageInfo;
import org.jboss.security.AuthenticationManager;
@@ -93,12 +94,24 @@
return false;
}
+ /**
+ * @see AuthenticationManager#isValid(MessageInfo, Subject, String)
+ */
public boolean isValid(MessageInfo requestMessage, Subject clientSubject, String layer)
{
return false;
}
/**
+ * @see AuthenticationManager#isValid(MessageInfo, Subject, String, CallbackHandler)
+ */
+ public boolean isValid(MessageInfo requestMessage, Subject clientSubject, String layer,
+ CallbackHandler handler)
+ {
+ return false;
+ }
+
+ /**
* @see AuthenticationManager#getTargetPrincipal(Principal,Map)
*/
public Principal getTargetPrincipal(Principal anotherDomainPrincipal, Map<String,Object> contextMap)
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NullSecurityManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NullSecurityManager.java 2008-05-09 16:43:48 UTC (rev 73222)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/NullSecurityManager.java 2008-05-09 16:44:18 UTC (rev 73223)
@@ -28,6 +28,7 @@
import java.util.Set;
import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.message.MessageInfo;
import org.jboss.security.AnybodyPrincipal;
@@ -94,12 +95,24 @@
return true;
}
+ /**
+ * @see AuthenticationManager#isValid(MessageInfo, Subject, String)
+ */
public boolean isValid(MessageInfo requestMessage, Subject clientSubject, String layer)
{
return true;
}
/**
+ * @see AuthenticationManager#isValid(MessageInfo, Subject, String, CallbackHandler)
+ */
+ public boolean isValid(MessageInfo requestMessage, Subject clientSubject, String layer,
+ CallbackHandler handler)
+ {
+ return true;
+ }
+
+ /**
* @see AuthenticationManager#getTargetPrincipal(Principal,Map)
*/
public Principal getTargetPrincipal(Principal anotherDomainPrincipal, Map<String,Object> contextMap)
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2008-05-09 16:43:48 UTC (rev 73222)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2008-05-09 16:44:18 UTC (rev 73223)
@@ -373,6 +373,17 @@
*/
public boolean isValid(MessageInfo requestMessage,Subject clientSubject, String layer)
{
+ CallbackHandler cbh = new AppCallbackHandler("DUMMY","DUMMY".toCharArray());
+ return this.isValid(requestMessage, clientSubject, layer, cbh);
+ }
+
+ /**
+ * @see AuthenticationManager#isValid(MessageInfo, Subject, String, CallbackHandler)
+ */
+ @SuppressWarnings("unchecked")
+ public boolean isValid(MessageInfo requestMessage,Subject clientSubject, String layer,
+ CallbackHandler handler)
+ {
AuthStatus status = AuthStatus.FAILURE;
try
@@ -383,8 +394,7 @@
if(provider == null)
throw new IllegalStateException("Provider is null for "+ layer + " for "+ contextID);
- ServerAuthConfig serverConfig = provider.getServerAuthConfig(layer,contextID,
- new AppCallbackHandler("DUMMY","DUMMY".toCharArray()));
+ ServerAuthConfig serverConfig = provider.getServerAuthConfig(layer,contextID,handler);
ServerAuthContext sctx = serverConfig.getAuthContext(contextID,
new Subject(), new HashMap());
if(clientSubject == null)
@@ -399,7 +409,7 @@
}
return AuthStatus.SUCCESS == status ;
}
-
+
/** Map the argument principal from the deployment environment principal
to the developer environment. This is called by the EJB context
getCallerPrincipal() to return the Principal as described by
@@ -571,6 +581,7 @@
/** Validate the cache credential value against the provided credential
*/
+ @SuppressWarnings("unchecked")
private boolean validateCache(DomainInfo info, Object credential,
Subject theSubject)
{
More information about the jboss-cvs-commits
mailing list