From a8f1b7be59032d3c5e6c0d4b19d4dccaf9417d41 Mon Sep 17 00:00:00 2001 From: kakwa Date: Thu, 18 Jun 2015 00:23:00 +0200 Subject: [PATCH] reverse because no effect + disable ssl unit test on travis --- ldapcherry/backend/backendLdap.py | 16 ++++++++-------- tests/test_BackendLdap.py | 7 +++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ldapcherry/backend/backendLdap.py b/ldapcherry/backend/backendLdap.py index bf48c6b..a978019 100644 --- a/ldapcherry/backend/backendLdap.py +++ b/ldapcherry/backend/backendLdap.py @@ -58,20 +58,20 @@ class Backend(ldapcherry.backend.Backend): def _connect(self): ldap_client = ldap.initialize(self.uri) - ldap.set_option(ldap.OPT_REFERRALS, 0) - ldap.set_option(ldap.OPT_TIMEOUT, self.timeout) + 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 60be994..752c6b4 100644 --- a/tests/test_BackendLdap.py +++ b/tests/test_BackendLdap.py @@ -9,6 +9,7 @@ import sys from sets import Set from ldapcherry.backend.backendLdap import Backend, DelUserDontExists from ldapcherry.exceptions import * +from disable import travis_disabled import cherrypy import logging import ldap @@ -45,6 +46,7 @@ class TestError(object): inv = Backend(cfg, cherrypy.log, 'ldap', attr, 'uid') return True + @travis_disabled def testConnectSSLNoCheck(self): cfg2 = cfg.copy() cfg2['uri'] = 'ldaps://ldap.ldapcherry.org:637' @@ -59,6 +61,7 @@ class TestError(object): ldap.simple_bind_s(inv.binddn, inv.bindpassword) return True + @travis_disabled def testConnectSSL(self): cfg2 = cfg.copy() cfg2['uri'] = 'ldaps://ldap.dnscherry.org:637' @@ -80,6 +83,7 @@ class TestError(object): else: raise AssertionError("expected an exception") + @travis_disabled def testConnectSSLWrongCA(self): cfg2 = cfg.copy() cfg2['uri'] = 'ldaps://ldap.ldapcherry.org:637' @@ -92,6 +96,7 @@ class TestError(object): except ldap.SERVER_DOWN as e: assert e[0]['info'] == 'TLS: hostname does not match CN in peer certificate' + @travis_disabled def testConnectStartTLS(self): cfg2 = cfg.copy() cfg2['uri'] = 'ldap://ldap.ldapcherry.org:390' @@ -105,8 +110,6 @@ class TestError(object): except ldap.SERVER_DOWN as e: assert e[0]['info'] == 'TLS: hostname does not match CN in peer certificate' - - def testAuthSuccess(self): inv = Backend(cfg, cherrypy.log, 'ldap', attr, 'uid') return True