Author: darran.lofthouse(a)jboss.com
Date: 2009-01-13 11:39:48 -0500 (Tue, 13 Jan 2009)
New Revision: 9023
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java
stack/native/trunk/pom.xml
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite
fixes.
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 2009-01-13
16:39:25 UTC (rev 9022)
+++
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/AuthorizeOperation.java 2009-01-13
16:39:48 UTC (rev 9023)
@@ -36,6 +36,7 @@
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;
@@ -110,7 +111,8 @@
SecurityException e = new SecurityException(msg);
throw new FailedAuthenticationException(e);
}
- pushSubjectContext(principal, credential, subject);
+ securityAdaptor.pushSubjectContext(subject, principal, credential);
+
if (TRACE)
log.trace("Authenticated, principal=" + principal);
@@ -158,29 +160,4 @@
return expectedRoles;
}
- private static SecurityContext getSecurityContext()
- {
- return (SecurityContext)AccessController.doPrivileged(new PrivilegedAction() {
- public Object run()
- {
- return SecurityContextAssociation.getSecurityContext();
- }
- });
- }
-
- private static void pushSubjectContext(final Principal p, final Object cred, final
Subject s)
- {
- AccessController.doPrivileged(new PrivilegedAction() {
-
- public Object run()
- {
- SecurityContext sc = getSecurityContext();
- if (sc == null)
- throw new IllegalStateException("Security Context is null");
- sc.getUtil().createSubjectInfo(p, cred, s);
- return null;
- }
- });
- }
-
}
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-01-13 16:39:25 UTC (rev 9022)
+++ stack/native/trunk/pom.xml 2009-01-13 16:39:48 UTC (rev 9023)
@@ -50,14 +50,14 @@
<properties>
<jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.0.6-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
- <jbossws.jboss422.version>3.0.5.GA</jbossws.jboss422.version>
- <jbossws.jboss423.version>3.0.5.GA</jbossws.jboss423.version>
- <jbossws.jboss424.version>3.0.5.GA</jbossws.jboss424.version>
- <jbossws.jboss500.version>3.0.5.GA</jbossws.jboss500.version>
+ <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
+ <jbossws.jboss422.version>3.0.6-SNAPSHOT</jbossws.jboss422.version>
+ <jbossws.jboss423.version>3.0.6-SNAPSHOT</jbossws.jboss423.version>
+ <jbossws.jboss424.version>3.0.6-SNAPSHOT</jbossws.jboss424.version>
+ <jbossws.jboss500.version>3.0.6-SNAPSHOT</jbossws.jboss500.version>
<!-- [JBWS-2263] -->
<!-- START -->
- <jbossws.jboss510.version>3.0.5.GA</jbossws.jboss510.version>
+ <jbossws.jboss510.version>3.0.6-SNAPSHOT</jbossws.jboss510.version>
<jbossws.jboss600.version>3.0.6-SNAPSHOT</jbossws.jboss600.version>
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
Show replies by date