From c2288eecf5a9852ee29268207fefcc2760c45c06 Mon Sep 17 00:00:00 2001 From: kakwa Date: Wed, 17 Jun 2015 19:22:57 +0200 Subject: [PATCH] fix unit test and fix the way ldap connexion options are handled --- ldapcherry/backend/backendLdap.py | 12 ++++++------ tests/test_BackendLdap.py | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ldapcherry/backend/backendLdap.py b/ldapcherry/backend/backendLdap.py index 69de6cf..a978019 100644 --- a/ldapcherry/backend/backendLdap.py +++ b/ldapcherry/backend/backendLdap.py @@ -61,17 +61,17 @@ class Backend(ldapcherry.backend.Backend): ldap_client.set_option(ldap.OPT_REFERRALS, 0) ldap_client.set_option(ldap.OPT_TIMEOUT, self.timeout) if self.starttls == 'on': - ldap.set_option(ldap.OPT_X_TLS_DEMAND, True) + ldap_client.set_option(ldap.OPT_X_TLS_DEMAND, True) else: - ldap.set_option(ldap.OPT_X_TLS_DEMAND, False) + ldap_client.set_option(ldap.OPT_X_TLS_DEMAND, False) if self.ca and self.checkcert == 'on': - ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, self.ca) + ldap_client.set_option(ldap.OPT_X_TLS_CACERTFILE, self.ca) #else: - # ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, '') + # ldap_client.set_option(ldap.OPT_X_TLS_CACERTFILE, '') if self.checkcert == 'off': - ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) + ldap_client.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW) else: - ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) + ldap_client.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND) if self.starttls == 'on': try: ldap_client.start_tls_s() diff --git a/tests/test_BackendLdap.py b/tests/test_BackendLdap.py index 4e05dce..926922f 100644 --- a/tests/test_BackendLdap.py +++ b/tests/test_BackendLdap.py @@ -44,13 +44,13 @@ class TestError(object): inv = Backend(cfg, cherrypy.log, 'ldap', attr, 'uid') return True -# def testConnectSSLNoCheck(self): -# cfg2 = cfg.copy() -# cfg2['uri'] = 'ldaps://ldap.ldapcherry.org:637' -# cfg2['checkcert'] = 'off' -# inv = Backend(cfg2, cherrypy.log, 'ldap', attr, 'uid') -# ldap = inv._connect() -# ldap.simple_bind_s(inv.binddn, inv.bindpassword) + def testConnectSSLNoCheck(self): + cfg2 = cfg.copy() + cfg2['uri'] = 'ldaps://ldap.ldapcherry.org:637' + cfg2['checkcert'] = 'off' + inv = Backend(cfg2, cherrypy.log, 'ldap', attr, 'uid') + ldap = inv._connect() + ldap.simple_bind_s(inv.binddn, inv.bindpassword) def testConnect(self): inv = Backend(cfg, cherrypy.log, 'ldap', attr, 'uid') @@ -60,7 +60,7 @@ class TestError(object): def testConnectSSL(self): cfg2 = cfg.copy() - cfg2['uri'] = 'ldaps://ldap.ldapcherry.org:637' + cfg2['uri'] = 'ldaps://ldap.dnscherry.org:637' cfg2['checkcert'] = 'on' inv = Backend(cfg2, cherrypy.log, 'ldap', attr, 'uid') ldap = inv._connect()