[jboss-cvs] JBossAS SVN: r72472 - 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-21 00:09:23 -0400 (Mon, 21 Apr 2008)
New Revision: 72472

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java
Log:
SECURITY-200: client side SA usage

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java	2008-04-21 04:07:59 UTC (rev 72471)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/SecurityAssociation.java	2008-04-21 04:09:23 UTC (rev 72472)
@@ -223,6 +223,9 @@
          else
             thePrincipal = principal;
       }*/
+     
+      if(!server)
+         return principal;
       
       //Just pluck it from the current security context
       SecurityContext sc = SecurityContextAssociation.getSecurityContext();
@@ -295,7 +298,7 @@
          subject = sc.getSubject();
       return subject;*/
       
-      SecurityContext secContext = SecurityContextAssociation.getSecurityContext();
+      SecurityContext secContext = SecurityAssociationActions.getSecurityContext();
       if(secContext != null)
       {
          if(trace)
@@ -515,25 +518,29 @@
       // Push the subject context
       SubjectContext sc = new SubjectContext(subject, principal, credential);
       threadSubjectStacks.push(sc);
-      if (trace)
-         log.trace("pushSubjectContext, subject=" + subject + ", sc="+sc);
-      //Use the new method
-      SecurityContext sctx = SecurityContextAssociation.getSecurityContext();
-      if(sctx == null)
-      {
-         if(trace)
-            log.trace("WARN::Deprecated usage of SecurityAssociation. Use SecurityContext");
-         try
+      
+      if(server)
+      { 
+         if (trace)
+            log.trace("pushSubjectContext, subject=" + subject + ", sc="+sc);
+         //Use the new method
+         SecurityContext sctx = SecurityContextAssociation.getSecurityContext();
+         if(sctx == null)
          {
-            sctx = SecurityContextFactory.createSecurityContext("FROM_SECURITY_ASSOCIATION");
+            if(trace)
+               log.trace("WARN::Deprecated usage of SecurityAssociation. Use SecurityContext");
+            try
+            {
+               sctx = SecurityAssociationActions.createSecurityContext("FROM_SECURITY_ASSOCIATION");
+            }
+            catch (Exception e)
+            {
+               throw new RuntimeException(e);
+            }
          }
-         catch (Exception e)
-         {
-            throw new RuntimeException(e);
-         }
+         sctx.getUtil().createSubjectInfo(principal, credential,subject);
+         SecurityAssociationActions.setSecurityContext(sctx);   
       }
-      sctx.getUtil().createSubjectInfo(principal, credential,subject);
-      SecurityContextAssociation.setSecurityContext(sctx);
    }
    /**
     * Push a duplicate of the current SubjectContext if one exists.