Merge lp:~lmc/repoze.who.plugins.ldap/bind_pass-fix into lp:repoze.who.plugins.ldap

[Lorenzo M. Catucci]

The branch wraps the bugfix from lp:~salmon/repoze.who.plugins.ldap/fixes in some more unittests. The plugin coverage grows from 76% to 79%!

Unmerged revisions

81. By Lorenzo M. Catucci <lorenzo@sancho> on 2010-10-04

Merge bugfix from lp:~salmon/repoze.who.plugins.ldap/fixes .

80. By Lorenzo M. Catucci <lorenzo@sancho> on 2010-10-04

Add tests for the privileged bind_dn searches.

=== modified file 'repoze/who/plugins/ldap/plugins.py'
--- repoze/who/plugins/ldap/plugins.py	2010-06-03 09:13:51 +0000
+++ repoze/who/plugins/ldap/plugins.py	2010-10-04 13:32:45 +0000
@@ -208,7 +208,7 @@
 
         if self.bind_dn:
             try:
-                self.ldap_connection.bind_s(self.bind_dn, self.bind_password)
+                self.ldap_connection.bind_s(self.bind_dn, self.bind_pass)
             except ldap.LDAPError:
                 raise ValueError("Couldn't bind with supplied credentials")
         try:
@@ -300,7 +300,7 @@
 
         if self.bind_dn:
             try:
-                self.ldap_connection.bind_s(self.bind_dn, self.bind_password)
+                self.ldap_connection.bind_s(self.bind_dn, self.bind_pass)
             except ldap.LDAPError:
                 raise ValueError("Couldn't bind with supplied credentials")
         try:

=== modified file 'repoze/who/plugins/ldap/tests.py'
--- repoze/who/plugins/ldap/tests.py	2010-05-24 22:16:50 +0000
+++ repoze/who/plugins/ldap/tests.py	2010-10-04 13:32:45 +0000
@@ -40,6 +40,8 @@
         # Connecting to a fake server with a fake account:
         conn = fakeldap.FakeLDAPConnection()
         conn.simple_bind_s('Manager', 'some password')
+        # monkey-patch the bind_s method into the connection
+        conn.bind_s = conn.simple_bind_s
         # We must explicitly create the base_dn DIT components
         fakeldap.addTreeItems(base_dn)
         # Adding a fake user, which is used in the tests
@@ -271,6 +273,14 @@
         verifyClass(IAuthenticator, LDAPAuthenticatorPlugin, tentative=True)
 
 
+class TestLDAPSearchAuthenticatorBindDnPlugin(TestLDAPAuthenticatorPlugin):
+    """Tests for the L{LDAPSearchAuthenticatorPlugin} IAuthenticator plugin in the bind_dn set case"""
+    
+    def setUp(self):
+        super(TestLDAPAuthenticatorPlugin, self).setUp()
+        # Loading the plugin:
+        self.plugin = LDAPSearchAuthenticatorPlugin(self.connection, base_dn, bind_dn = 'Manager', bind_pass = 'some password')
+
 class TestMakeLDAPAttributesPlugin(unittest.TestCase):
     """Tests for the constructor of L{LDAPAttributesPlugin}"""
     
@@ -478,6 +488,8 @@
                                      "test"))
     suite.addTest(unittest.makeSuite(TestLDAPAuthenticatorPluginStartTls,
                                      "test"))
+    suite.addTest(unittest.makeSuite(TestLDAPSearchAuthenticatorBindDnPlugin,
+                                     "test"))
     return suite