[Jboss-cvs] JBossAS SVN: r55352 - branches/JBoss_4_0_3_SP1_CP/security/src/main/org/jboss/security/auth/spi

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

Author: ryan.campbell at jboss.com
Date: 2006-08-05 16:02:45 -0400 (Sat, 05 Aug 2006)
New Revision: 55352

Modified:
   branches/JBoss_4_0_3_SP1_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
Log:
merge JBAS-3181: LdapExtLoginModule should not log password in TRACE mode

Modified: branches/JBoss_4_0_3_SP1_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java	2006-08-05 18:52:14 UTC (rev 55351)
+++ branches/JBoss_4_0_3_SP1_CP/security/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java	2006-08-05 20:02:45 UTC (rev 55352)
@@ -469,8 +469,18 @@
       env.setProperty(Context.PROVIDER_URL, providerURL);
       env.setProperty(Context.SECURITY_PRINCIPAL, dn);
       env.put(Context.SECURITY_CREDENTIALS, credential);
-      super.log.trace("Logging into LDAP server, env=" + env);
+      traceLdapEnv(env); 
       return new InitialLdapContext(env, null);
    }
-
+   
+   private void traceLdapEnv(Properties env)
+   {
+      if(trace)
+      {
+         Properties tmp = new Properties();
+         tmp.putAll(env);
+         tmp.setProperty(Context.SECURITY_CREDENTIALS, "***");
+         log.trace("Logging into LDAP server, env=" + tmp.toString()); 
+      }
+   } 
 }