[jboss-cvs] JBossAS SVN: r72585 - projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2008-04-22 18:08:35 -0400 (Tue, 22 Apr 2008)
New Revision: 72585

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java
Log:
SECURITY-199: client login module push of subject context

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java	2008-04-22 19:20:33 UTC (rev 72584)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociationActions.java	2008-04-22 22:08:35 UTC (rev 72585)
@@ -37,7 +37,7 @@
  */
 class SecurityAssociationActions
 {
-   private static class SetPrincipalInfoAction implements PrivilegedAction
+   private static class SetPrincipalInfoAction implements PrivilegedAction<Object>
    {
       Principal principal;
       Object credential;
@@ -55,19 +55,18 @@
          {
             SecurityAssociation.pushSubjectContext(subject, principal, credential);
          }
-         SecurityContext sc = SecurityContextAssociation.getSecurityContext();
-         if(sc == null)
+         
+         //Always create a new security context
+         SecurityContext sc = null;
+         try
          {
-            try
-            {
-               sc = SecurityContextFactory.createSecurityContext(principal, 
+            sc = SecurityContextFactory.createSecurityContext(principal, 
                                                 credential, subject, "CLIENT_LOGIN_MODULE");
-            }
-            catch (Exception e)
-            {
-               throw new RuntimeException(e);
-            }
          }
+         catch (Exception e)
+         {
+            throw new RuntimeException(e);
+         }          
          setSecurityContext(sc); 
          
          credential = null;
@@ -76,7 +75,7 @@
          return null;
       }
    }
-   private static class PopPrincipalInfoAction implements PrivilegedAction
+   private static class PopPrincipalInfoAction implements PrivilegedAction<Object>
    {
       public Object run()
       {
@@ -85,18 +84,18 @@
          return null;
       }
    }
-   private static class SetServerAction implements PrivilegedAction
+   private static class SetServerAction implements PrivilegedAction<Object>
    {
-      static PrivilegedAction ACTION = new SetServerAction();
+      static PrivilegedAction<Object> ACTION = new SetServerAction();
       public Object run()
       {
          SecurityAssociation.setServer();
          return null;
       }
    }
-   private static class ClearAction implements PrivilegedAction
+   private static class ClearAction implements PrivilegedAction<Object>
    {
-      static PrivilegedAction ACTION = new ClearAction();
+      static PrivilegedAction<Object> ACTION = new ClearAction();
       public Object run()
       {
          if(!getServer())
@@ -104,27 +103,27 @@
          return null;
       }
    }
-   private static class GetSubjectAction implements PrivilegedAction
+   private static class GetSubjectAction implements PrivilegedAction<Subject>
    {
-      static PrivilegedAction ACTION = new GetSubjectAction();
-      public Object run()
+      static PrivilegedAction<Subject> ACTION = new GetSubjectAction();
+      public Subject run()
       {
          Subject subject = SecurityAssociation.getSubject();
          return subject;
       }
    }
-   private static class GetPrincipalAction implements PrivilegedAction
+   private static class GetPrincipalAction implements PrivilegedAction<Principal>
    {
-      static PrivilegedAction ACTION = new GetPrincipalAction();
-      public Object run()
+      static PrivilegedAction<Principal> ACTION = new GetPrincipalAction();
+      public Principal run()
       {
          Principal principal = SecurityAssociation.getPrincipal();
          return principal;
       }
    }
-   private static class GetCredentialAction implements PrivilegedAction
+   private static class GetCredentialAction implements PrivilegedAction<Object>
    {
-      static PrivilegedAction ACTION = new GetCredentialAction();
+      static PrivilegedAction<Object> ACTION = new GetCredentialAction();
       public Object run()
       {
          Object credential = SecurityAssociation.getCredential();
@@ -134,7 +133,7 @@
    
    static void setSecurityContext(final SecurityContext sc)
    {
-      AccessController.doPrivileged(new PrivilegedAction()
+      AccessController.doPrivileged(new PrivilegedAction<Object>()
       { 
          public Object run()
          {
@@ -146,9 +145,9 @@
    
    static SecurityContext getSecurityContext()
    {
-      return (SecurityContext)AccessController.doPrivileged(new PrivilegedAction()
+      return AccessController.doPrivileged(new PrivilegedAction<SecurityContext>()
       { 
-         public Object run()
+         public SecurityContext run()
          {
             return SecurityContextAssociation.getSecurityContext(); 
          }
@@ -158,7 +157,7 @@
    static void pushSecurityContext(final Principal p, final Object cred, 
          final Subject subject, final String securityDomain)
    {
-      AccessController.doPrivileged(new PrivilegedAction()
+      AccessController.doPrivileged(new PrivilegedAction<Object>()
       { 
          public Object run()
          {