[jboss-cvs] JBossAS SVN: r63503 - projects/security/security-spi/trunk/src/main/org/jboss/security.

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

Author: anil.saldhana at jboss.com
Date: 2007-06-13 15:23:32 -0400 (Wed, 13 Jun 2007)
New Revision: 63503

Modified:
   projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContext.java
   projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContextUtil.java
   projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityIdentity.java
Log:
SECURITY-62: differentiate incoming/outgoing runas

Modified: projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContext.java
===================================================================
--- projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContext.java	2007-06-13 15:16:24 UTC (rev 63502)
+++ projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContext.java	2007-06-13 19:23:32 UTC (rev 63503)
@@ -68,11 +68,25 @@
    void setSubjectInfo(SubjectInfo si); 
    
    /**
+    * RunAs that is being propagated into this context
+    * by an external context
+    * {@link #setIncomingRunAs()} 
+    */
+   public RunAs getIncomingRunAs();
+   
+   /**
+    * Set the RunAs that is propagating into this
+    * context.
+    * @param runAs The RunAs 
+    */
+   public void setIncomingRunAs(RunAs runAs);
+   
+   /**
     * RunAs Representation
     * 
-    * @see #setRunAs(RunAs)
+    * {@link #setOutgoingRunAs(RunAs)}
     */
-   public RunAs getRunAs();
+   public RunAs getOutgoingRunAs();
    
    /**
     * Set the current RunAs for the security context that will be
@@ -86,7 +100,7 @@
     * 
     * @param runAs
     */
-   public void setRunAs(RunAs runAs);
+   public void setOutgoingRunAs(RunAs runAs);
    
    /**
     * Return a utility that is a facade to the internal 

Modified: projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContextUtil.java
===================================================================
--- projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContextUtil.java	2007-06-13 15:16:24 UTC (rev 63502)
+++ projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityContextUtil.java	2007-06-13 19:23:32 UTC (rev 63503)
@@ -64,24 +64,9 @@
     * Get the subject the security context
     * @return
     */
-   public abstract Subject getSubject();
+   public abstract Subject getSubject(); 
    
    /**
-    * Get the RunAs that was passed into the current security context
-    * The security context RunAs is the RunAs that will be propagated out of it
-    * @return
-    */
-   public abstract RunAs getCallerRunAs();
-   
-   /**
-    * Set the Caller RunAs in the security context
-    * Security Context implementations are free to store
-    * the caller runas in any manner
-    * @param runAs
-    */
-   public abstract void setCallerRunAs(RunAs runAs);
-   
-   /**
     * Get a holder of subject, runAs and caller RunAs
     * @return
     */

Modified: projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityIdentity.java
===================================================================
--- projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityIdentity.java	2007-06-13 15:16:24 UTC (rev 63502)
+++ projects/security/security-spi/trunk/src/main/org/jboss/security/SecurityIdentity.java	2007-06-13 19:23:32 UTC (rev 63503)
@@ -41,11 +41,17 @@
    RunAs runAs = null;
    RunAs callerRunAs = null;
    
-   public SecurityIdentity(SubjectInfo subject, RunAs runAs, RunAs callerRunAs)
+   /**
+    * Create a SecurityIdentity Instance
+    * @param subject The SubjectInfo
+    * @param outgoingRunAs RunAs that is propagating out
+    * @param incomingRunAs RunAs that is propagating in
+    */
+   public SecurityIdentity(SubjectInfo subject, RunAs outgoingRunAs, RunAs incomingRunAs)
    {
       this.theSubject = subject;
-      this.runAs = runAs;
-      this.callerRunAs = callerRunAs;
+      this.runAs = outgoingRunAs;
+      this.callerRunAs = incomingRunAs;
    }
 
    public Principal getPrincipal()
@@ -63,12 +69,12 @@
       return theSubject != null ? theSubject.getAuthenticatedSubject() : null;
    }
 
-   public RunAs getRunAs()
+   public RunAs getOutgoingRunAs()
    {
       return runAs;
    }
 
-   public RunAs getCallerRunAs()
+   public RunAs getIncomingRunAs()
    {
       return callerRunAs;
    }