[jbossws-commits] JBossWS SVN: r9019 - in container/jboss50/branches/jboss500GA: src/main/java/org/jboss/wsf/container/jboss50/invocation and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2009-01-13 11:38:40 -0500 (Tue, 13 Jan 2009)
New Revision: 9019

Modified:
   container/jboss50/branches/jboss500GA/.project
   container/jboss50/branches/jboss500GA/pom.xml
   container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
Log:
[JBWS-1999] WS-Security, authentication and authorization for POJO endpoints - Testsuite fixes.

Modified: container/jboss50/branches/jboss500GA/.project
===================================================================
--- container/jboss50/branches/jboss500GA/.project	2009-01-13 16:38:23 UTC (rev 9018)
+++ container/jboss50/branches/jboss500GA/.project	2009-01-13 16:38:40 UTC (rev 9019)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>jbossws-jboss501</name>
+	<name>jbossws-jboss500</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: container/jboss50/branches/jboss500GA/pom.xml
===================================================================
--- container/jboss50/branches/jboss500GA/pom.xml	2009-01-13 16:38:23 UTC (rev 9018)
+++ container/jboss50/branches/jboss500GA/pom.xml	2009-01-13 16:38:40 UTC (rev 9019)
@@ -25,7 +25,7 @@
   <!-- Properties -->
   <properties>
     <jbossws.common.version>1.0.8.GA</jbossws.common.version>
-    <jbossws.spi.version>1.0.7.GA</jbossws.spi.version>
+    <jbossws.spi.version>1.0.8-SNAPSHOT</jbossws.spi.version>
     <!--
       JBoss component versions taken from
       http://repository.jboss.org/maven2/org/jboss/jbossas/jboss-as-component-matrix/5.0.0.GA/jboss-as-component-matrix-5.0.0.GA.pom

Modified: container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
===================================================================
--- container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java	2009-01-13 16:38:23 UTC (rev 9018)
+++ container/jboss50/branches/jboss500GA/src/main/java/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java	2009-01-13 16:38:40 UTC (rev 9019)
@@ -22,10 +22,16 @@
 package org.jboss.wsf.container.jboss50.invocation;
 
 import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
 import org.jboss.wsf.spi.invocation.SecurityAdaptor;
 
+import java.security.AccessController;
 import java.security.Principal;
+import java.security.PrivilegedAction;
 
+import javax.security.auth.Subject;
+
 /**
  * A JBoss specific SecurityAssociationAdaptor 
  *
@@ -57,4 +63,34 @@
    {
       SecurityAssociation.setCredential(credential);
    }
+   
+   public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+   {
+      SecurityAdaptorImpl.pushSubjectContext(principal, credential, subject);
+   }
+
+   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;
+         }
+      });
+   }   
 }