From 7e7920ce00691726b30ab0d7420317b1d490ba35 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 28 Feb 2006 17:47:55 +0000
Subject: [PATCH] Fix for SEC-202. Intialize manager password to default
 "manager_password_not_set".

---
 .../ldap/DefaultInitialDirContextFactory.java |  3 ++-
 .../DefaultInitialDirContextFactoryTests.java | 24 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactory.java b/core/src/main/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactory.java
index 5774288dcf..6382645a04 100644
--- a/core/src/main/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactory.java
+++ b/core/src/main/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactory.java
@@ -100,7 +100,7 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
     /**
      * The manager user's password.
      */
-    private String managerPassword = null;
+    private String managerPassword = "manager_password_not_set";
 
     /** Type of authentication within LDAP; default is simple. */
     private String authenticationType = "simple";
@@ -164,6 +164,7 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
 
         Hashtable env = getEnvironment();
         env.put(Context.SECURITY_AUTHENTICATION, AUTH_TYPE_NONE);
+
         return connect(env);
     }
 
diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactoryTests.java b/core/src/test/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactoryTests.java
index 563dd439c0..afcabe202a 100644
--- a/core/src/test/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactoryTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/ldap/DefaultInitialDirContextFactoryTests.java
@@ -78,14 +78,34 @@ public class DefaultInitialDirContextFactoryTests extends AbstractLdapServerTest
         ctx.close();
     }
 
+    public void testBindAsManagerFailsIfNoPasswordSet() throws Exception {
+        idf.setManagerDn(MANAGER_USER);
+
+        DirContext ctx = null;
+
+        try {
+            ctx = idf.newInitialDirContext();
+            fail("Binding with no manager password should fail.");
+// Can't rely on this property being there with embedded server
+//        assertEquals("true",ctx.getEnvironment().get("com.sun.jndi.ldap.connect.pool"));
+        } catch(BadCredentialsException expected) {
+        }
+
+        LdapUtils.closeContext(ctx);
+    }
+
     public void testInvalidPasswordCausesBadCredentialsException() throws Exception {
         idf.setManagerDn(MANAGER_USER);
         idf.setManagerPassword("wrongpassword");
+
+        DirContext ctx = null;
         try {
-            DirContext ctx = idf.newInitialDirContext();
-            fail("Authentication with wrong credentials should fail.");
+            ctx = idf.newInitialDirContext();
+            fail("Binding with wrong credentials should fail.");
         } catch(BadCredentialsException expected) {
         }
+
+        LdapUtils.closeContext(ctx);
     }
 
     public void testConnectionAsSpecificUserSucceeds() throws Exception {