[jboss-cvs] Picketbox SVN: r44 - in trunk/picketbox/src: test/java/org/picketbox/test/api and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2010-02-22 21:01:59 -0500 (Mon, 22 Feb 2010)
New Revision: 44

Modified:
   trunk/picketbox/src/main/java/org/picketbox/factories/SecurityActions.java
   trunk/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java
   trunk/picketbox/src/test/java/org/picketbox/test/api/AuthenticationUnitTestCase.java
Log:
add api

Modified: trunk/picketbox/src/main/java/org/picketbox/factories/SecurityActions.java
===================================================================
--- trunk/picketbox/src/main/java/org/picketbox/factories/SecurityActions.java	2010-02-22 23:28:39 UTC (rev 43)
+++ trunk/picketbox/src/main/java/org/picketbox/factories/SecurityActions.java	2010-02-23 02:01:59 UTC (rev 44)
@@ -26,6 +26,9 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
+
 /**
  * Privileged Blocks
  * @author Anil.Saldhana at redhat.com
@@ -68,4 +71,17 @@
          }
       });
    }
+   
+   static void setSecurityContext(final SecurityContext sc)
+   {
+      AccessController.doPrivileged(new PrivilegedAction<Object>()
+      {
+         public Object run()
+         {
+            SecurityContextAssociation.setSecurityContext(sc);
+            return null;
+         }
+      });
+   }
+   
 }
\ No newline at end of file

Modified: trunk/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java
===================================================================
--- trunk/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java	2010-02-22 23:28:39 UTC (rev 43)
+++ trunk/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java	2010-02-23 02:01:59 UTC (rev 44)
@@ -28,7 +28,9 @@
 import org.jboss.security.AuthenticationManager;
 import org.jboss.security.AuthorizationManager;
 import org.jboss.security.ISecurityManagement;
-import org.jboss.security.audit.AuditManager; 
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextFactory;
+import org.jboss.security.audit.AuditManager;
 import org.jboss.security.config.ApplicationPolicyRegistration;
 import org.jboss.security.config.StandaloneConfiguration;
 import org.jboss.security.mapping.MappingManager;
@@ -146,6 +148,25 @@
    }
    
    /**
+    * Establish a security context on the thread
+    * @param securityDomainName
+    */
+   public static SecurityContext establishSecurityContext(String securityDomainName)
+   { 
+      SecurityContext securityContext = null;
+      try
+      {
+         securityContext = SecurityContextFactory.createSecurityContext(securityDomainName);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+      SecurityActions.setSecurityContext(securityContext);
+      return securityContext;
+   }
+   
+   /**
     * <p>
     * Set the Log4J logger Plugin on the system property
     * <b>org.jboss.logging.Logger.pluginClass</b>

Modified: trunk/picketbox/src/test/java/org/picketbox/test/api/AuthenticationUnitTestCase.java
===================================================================
--- trunk/picketbox/src/test/java/org/picketbox/test/api/AuthenticationUnitTestCase.java	2010-02-22 23:28:39 UTC (rev 43)
+++ trunk/picketbox/src/test/java/org/picketbox/test/api/AuthenticationUnitTestCase.java	2010-02-23 02:01:59 UTC (rev 44)
@@ -27,10 +27,8 @@
 
 import junit.framework.TestCase;
 
-import org.jboss.security.AuthenticationManager; 
+import org.jboss.security.AuthenticationManager;
 import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
-import org.jboss.security.SecurityContextFactory;
 import org.picketbox.config.PicketBoxConfiguration;
 import org.picketbox.factories.SecurityFactory;
 
@@ -103,10 +101,9 @@
          String configFile = "config/authentication.conf";
          PicketBoxConfiguration idtrustConfig = new PicketBoxConfiguration();
          idtrustConfig.load(configFile);
-
-         SecurityContext securityContext = SecurityContextFactory.createSecurityContext(securityDomainName);
-         SecurityContextAssociation.setSecurityContext(securityContext);
          
+         SecurityContext securityContext = SecurityFactory.establishSecurityContext(securityDomainName); 
+         
          AuthenticationManager am = securityContext.getAuthenticationManager(); 
          assertNotNull(am);