Author: alessio.soldano(a)jboss.com
Date: 2011-05-18 04:44:52 -0400 (Wed, 18 May 2011)
New Revision: 14393
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java
Log:
[JBWS-3296] Use SecurityDomainContext instead of directly accessing
picketbox/jboss-security for authentication/authorization
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java
===================================================================
---
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java 2011-05-18
08:43:44 UTC (rev 14392)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java 2011-05-18
08:44:52 UTC (rev 14393)
@@ -21,34 +21,27 @@
*/
package org.jboss.ws.extensions.security.operation;
-import java.security.AccessController;
import java.security.Principal;
-import java.security.PrivilegedAction;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.security.auth.Subject;
import org.jboss.logging.Logger;
-import org.jboss.security.AuthenticationManager;
-import org.jboss.security.RealmMapping;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SimplePrincipal;
-import org.jboss.ws.WSException;
import org.jboss.ws.extensions.security.exception.FailedAuthenticationException;
import org.jboss.ws.extensions.security.exception.WSSecurityException;
import org.jboss.ws.metadata.wsse.Authorize;
import org.jboss.ws.metadata.wsse.Role;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
+import org.jboss.wsf.spi.security.SecurityDomainContext;
/**
* Operation to authenticate and check the authorisation of the
@@ -59,35 +52,26 @@
*/
public class AuthorizeOperation
{
-
private static final Logger log = Logger.getLogger(AuthorizeOperation.class);
private Authorize authorize;
- private AuthenticationManager am;
-
- private RealmMapping rm;
-
private SecurityAdaptorFactory secAdapterfactory;
+
+ private SecurityDomainContext sdc;
public AuthorizeOperation(Authorize authorize)
{
this.authorize = authorize;
+ ClassLoader cl =
ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+ SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+ secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class, cl);
- try
+ Endpoint ep = EndpointAssociation.getEndpoint();
+ if (ep != null)
{
- Context ctx = new InitialContext();
- Object obj = ctx.lookup("java:comp/env/security/securityMgr");
- am = (AuthenticationManager)obj;
- rm = (RealmMapping)am;
+ sdc = ep.getSecurityDomainContext();
}
- catch (NamingException ne)
- {
- throw new WSException("Unable to lookup AuthenticationManager", ne);
- }
-
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
}
public void process() throws WSSecurityException
@@ -95,23 +79,35 @@
boolean TRACE = log.isTraceEnabled();
if (TRACE)
- log.trace("About to check authorization, using security domain '"
+ am.getSecurityDomain() + "'");
+ log.trace("About to check authorization, using security domain '"
+ sdc.getSecurityDomain() + "'");
// Step 1 - Authenticate using currently associated principals.
SecurityAdaptor securityAdaptor = secAdapterfactory.newSecurityAdapter();
Principal principal = securityAdaptor.getPrincipal();
Object credential = securityAdaptor.getCredential();
+ if (principal == null)
+ {
+ principal = new Principal()
+ {
+ @Override
+ public String getName()
+ {
+ return null;
+ }
+ };
+ }
+
Subject subject = new Subject();
- if (am.isValid(principal, credential, subject) == false)
+ if (sdc.isValid(principal, credential, subject) == false)
{
String msg = "Authentication failed, principal=" + principal;
log.error(msg);
SecurityException e = new SecurityException(msg);
throw new FailedAuthenticationException(e);
}
- securityAdaptor.pushSubjectContext(subject, principal, credential);
+ sdc.pushSubjectContext(subject, principal, credential);
if (TRACE)
log.trace("Authenticated, principal=" + principal);
@@ -130,9 +126,9 @@
if (TRACE)
log.trace("expectedRoles=" + expectedRoles);
- if (rm.doesUserHaveRole(principal, expectedRoles) == false)
+ if (sdc.doesUserHaveRole(principal, expectedRoles) == false)
{
- Set<Principal> userRoles = rm.getUserRoles(principal);
+ Set<Principal> userRoles = sdc.getUserRoles(principal);
String msg = "Insufficient method permissions, principal=" + principal
+ ", requiredRoles=" + expectedRoles + ", principalRoles=" +
userRoles;
log.error(msg);
SecurityException e = new SecurityException(msg);
Show replies by date