[jboss-cvs] JBossAS SVN: r90208 - in projects/security/security-jboss-sx/trunk/jbosssx/src: test/java/org/jboss/test/authentication/jaas and 1 other directory.

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

Author: anil.saldhana at jboss.com
Date: 2009-06-15 14:55:09 -0400 (Mon, 15 Jun 2009)
New Revision: 90208

Modified:
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociationActions.java
   projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/authentication/jaas/ClientLoginModuleUnitTestCase.java
Log:
SECURITY-415: ClientLoginModule multi-threaded=false should set client side SC association

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java	2009-06-15 18:39:29 UTC (rev 90207)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java	2009-06-15 18:55:09 UTC (rev 90208)
@@ -118,6 +118,11 @@
             log.trace("Enabling multi-threaded mode");
          SecurityAssociationActions.setServer(); 
       }
+      else
+      {
+         //Turn on the client side vm wide association
+         SecurityAssociationActions.setClient();
+      }
 
       flag = (String) options.get("restore-login-identity");
       restoreLoginIdentity = Boolean.valueOf(flag).booleanValue();

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociationActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociationActions.java	2009-06-15 18:39:29 UTC (rev 90207)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociationActions.java	2009-06-15 18:55:09 UTC (rev 90208)
@@ -224,6 +224,18 @@
       });
    }
    
+   static void setClient()
+   {
+      AccessController.doPrivileged(new PrivilegedAction<Object>()
+      {
+         public Object run()
+         {
+            SecurityContextAssociation.setClient();
+            return null;
+         }
+      });
+   }
+   
    static void setServer()
    {
       AccessController.doPrivileged(SetServerAction.ACTION);

Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/authentication/jaas/ClientLoginModuleUnitTestCase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/authentication/jaas/ClientLoginModuleUnitTestCase.java	2009-06-15 18:39:29 UTC (rev 90207)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/test/java/org/jboss/test/authentication/jaas/ClientLoginModuleUnitTestCase.java	2009-06-15 18:55:09 UTC (rev 90208)
@@ -36,6 +36,7 @@
 import junit.framework.TestSuite;
 
 import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContextAssociation;
 import org.jboss.security.SimplePrincipal;
 import org.jboss.security.auth.callback.UsernamePasswordHandler;
 
@@ -61,7 +62,7 @@
          AppConfigurationEntry[] entry = null;
          try
          {
-            Class[] parameterTypes = {};
+            Class<?>[] parameterTypes = {};
             Method m = getClass().getDeclaredMethod(name, parameterTypes);
             Object[] args = {};
             entry = (AppConfigurationEntry[]) m.invoke(this, args);
@@ -74,7 +75,7 @@
       AppConfigurationEntry[] testSingleThreaded()
       {
          String name = "org.jboss.security.ClientLoginModule";
-         HashMap options = new HashMap();
+         HashMap<String,String> options = new HashMap<String,String>();
          options.put("multi-threaded", "false");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
          AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
@@ -84,7 +85,7 @@
       AppConfigurationEntry[] testSingleThreadedRestoreIdentity()
       {
          String name = "org.jboss.security.ClientLoginModule";
-         HashMap options = new HashMap();
+         HashMap<String,String> options = new HashMap<String,String>();
          options.put("multi-threaded", "false");
          options.put("restore-login-identity", "true");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
@@ -95,7 +96,7 @@
       AppConfigurationEntry[] testSingleThreadedRestoreStack()
       {
          String name = "org.jboss.security.ClientLoginModule";
-         HashMap options = new HashMap();
+         HashMap<String,String> options = new HashMap<String,String>();
          options.put("multi-threaded", "false");
          options.put("restore-login-identity", "true");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
@@ -106,7 +107,7 @@
       AppConfigurationEntry[] testMultiThreaded()
       {
          String name = "org.jboss.security.ClientLoginModule";
-         HashMap options = new HashMap();
+         HashMap<String,String> options = new HashMap<String,String>();
          options.put("multi-threaded", "true");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
          AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options);
@@ -116,7 +117,7 @@
       AppConfigurationEntry[] testMultiThreadedRestoreIdentity()
       {
          String name = "org.jboss.security.ClientLoginModule";
-         HashMap options = new HashMap();
+         HashMap<String,String> options = new HashMap<String,String>();
          options.put("multi-threaded", "true");
          options.put("restore-login-identity", "true");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
@@ -127,7 +128,7 @@
       AppConfigurationEntry[] testMultiThreadedRestoreStack()
       {
          String name = "org.jboss.security.ClientLoginModule";
-         HashMap options = new HashMap();
+         HashMap<String,String> options = new HashMap<String,String>();
          options.put("multi-threaded", "true");
          options.put("restore-login-identity", "true");
          AppConfigurationEntry ace = new AppConfigurationEntry(name,
@@ -181,6 +182,8 @@
       char[] password = (char[]) SecurityAssociation.getCredential();
       assertTrue("password == theduke",
          Arrays.equals(password, "theduke".toCharArray()));
+      
+      assertTrue("Client side association?", SecurityContextAssociation.isClient());
    }
 
    public void testSingleThreadedRestoreIdentity() throws Exception
@@ -215,6 +218,7 @@
       
    }
 
+   @SuppressWarnings("deprecation")
    public void testSingleThreadedRestoreStack() throws Exception
    {
       System.out.println("+++ testSingleThreadedRestoreStack");
@@ -382,6 +386,7 @@
    static class TestMultiThreadedRestoreStack implements Runnable
    {
       Exception failure;
+      @SuppressWarnings("deprecation")
       public void run()
       {
          try