[jboss-cvs] JBossAS SVN: r67090 - in branches: JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/login and 2 other directories.

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

Author: mmoyses
Date: 2007-11-14 14:39:16 -0500 (Wed, 14 Nov 2007)
New Revision: 67090

Modified:
   branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/SecurityConstants.java
   branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
   branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/SecurityConstants.java
   branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
Log:
JBPAPP-428

Modified: branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/SecurityConstants.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/SecurityConstants.java	2007-11-14 18:46:13 UTC (rev 67089)
+++ branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/SecurityConstants.java	2007-11-14 19:39:16 UTC (rev 67090)
@@ -41,4 +41,10 @@
     * name the LoginModule was configured in.
     */
    String SECURITY_DOMAIN_OPTION = "jboss.security.security_domain";
+   
+   /**
+    * System Property that disables the addition of security domain
+    * in the module options passed to login module
+    */
+   String DISABLE_SECDOMAIN_OPTION = "jboss.security.disable.secdomain.option";
 }

Modified: branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java	2007-11-14 18:46:13 UTC (rev 67089)
+++ branches/JBPAPP_4_2_0_GA_CP/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java	2007-11-14 19:39:16 UTC (rev 67090)
@@ -21,6 +21,8 @@
  */
 package org.jboss.security.auth.login;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -72,8 +74,11 @@
       for(int i = 0; i < copy.length; i ++)
       {
          AppConfigurationEntry entry = (AppConfigurationEntry) loginModules.get(i);
-	 HashMap options = new HashMap(entry.getOptions()); 
-         options.put(SecurityConstants.SECURITY_DOMAIN_OPTION, this.getName());
+      	 HashMap options = new HashMap(entry.getOptions()); 
+      	 if(!disableSecurityDomainInOptions())
+         {
+            options.put(SecurityConstants.SECURITY_DOMAIN_OPTION, this.getName());
+         }
          copy[i] = new AppConfigurationEntry(entry.getLoginModuleName(),
 					     entry.getControlFlag(), options);
       }
@@ -141,5 +146,16 @@
       }
       return buffer.toString();
    }
-
-}
+   
+   private boolean disableSecurityDomainInOptions()
+   {
+      String sysprop = (String)AccessController.doPrivileged(new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return System.getProperty(SecurityConstants.DISABLE_SECDOMAIN_OPTION);
+         }
+      });
+      return "true".equalsIgnoreCase(sysprop); 
+   }
+}
\ No newline at end of file

Modified: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/SecurityConstants.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/SecurityConstants.java	2007-11-14 18:46:13 UTC (rev 67089)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/SecurityConstants.java	2007-11-14 19:39:16 UTC (rev 67090)
@@ -41,4 +41,10 @@
     * name the LoginModule was configured in.
     */
    String SECURITY_DOMAIN_OPTION = "jboss.security.security_domain";
+   
+   /**
+    * System Property that disables the addition of security domain
+    * in the module options passed to login module
+    */
+   String DISABLE_SECDOMAIN_OPTION = "jboss.security.disable.secdomain.option";
 }

Modified: branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java	2007-11-14 18:46:13 UTC (rev 67089)
+++ branches/JBPAPP_4_2_0_GA_CP01_JBPAPP-428/security/src/main/org/jboss/security/auth/login/AuthenticationInfo.java	2007-11-14 19:39:16 UTC (rev 67090)
@@ -21,6 +21,8 @@
  */
 package org.jboss.security.auth.login;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -72,8 +74,11 @@
       for(int i = 0; i < copy.length; i ++)
       {
          AppConfigurationEntry entry = (AppConfigurationEntry) loginModules.get(i);
-	 HashMap options = new HashMap(entry.getOptions()); 
-         options.put(SecurityConstants.SECURITY_DOMAIN_OPTION, this.getName());
+         HashMap options = new HashMap(entry.getOptions()); 
+         if(!disableSecurityDomainInOptions())
+         {
+            options.put(SecurityConstants.SECURITY_DOMAIN_OPTION, this.getName());
+         }
          copy[i] = new AppConfigurationEntry(entry.getLoginModuleName(),
 					     entry.getControlFlag(), options);
       }
@@ -142,4 +147,15 @@
       return buffer.toString();
    }
 
-}
+   private boolean disableSecurityDomainInOptions()
+   {
+      String sysprop = (String)AccessController.doPrivileged(new PrivilegedAction()
+      {
+         public Object run()
+         {
+            return System.getProperty(SecurityConstants.DISABLE_SECDOMAIN_OPTION);
+         }
+      });
+      return "true".equalsIgnoreCase(sysprop); 
+   }
+}
\ No newline at end of file