sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't bind all the time.

This commit is contained in:
Dan Funk 2020-06-04 15:38:45 -04:00
parent fed6e86f92
commit 9cfe00dfd0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crc/services/ldap_service.py
View File

@ -29,9 +29,10 @@ class LdapService(object):
conn = Connection(server, client_strategy=MOCK_SYNC) conn = Connection(server, client_strategy=MOCK_SYNC)
file_path = os.path.abspath(os.path.join(app.root_path, '..', 'tests', 'data', 'ldap_response.json')) file_path = os.path.abspath(os.path.join(app.root_path, '..', 'tests', 'data', 'ldap_response.json'))
conn.strategy.entries_from_json(file_path) conn.strategy.entries_from_json(file_path)
conn.bind()
else: else:
server = Server(app.config['LDAP_URL'], connect_timeout=app.config['LDAP_TIMEOUT_SEC']) server = Server(app.config['LDAP_URL'], connect_timeout=app.config['LDAP_TIMEOUT_SEC'])
conn = Connection(server, conn = Connection(server, auto_bind=True,
receive_timeout=app.config['LDAP_TIMEOUT_SEC'], receive_timeout=app.config['LDAP_TIMEOUT_SEC'],
) )
LdapService.conn = conn LdapService.conn = conn
@ -44,7 +45,6 @@ class LdapService(object):
if not user_info: if not user_info:
search_string = LdapService.uid_search_string % uva_uid search_string = LdapService.uid_search_string % uva_uid
conn = LdapService.__get_conn() conn = LdapService.__get_conn()
conn.bind()
conn.search(LdapService.search_base, search_string, attributes=LdapService.attributes) conn.search(LdapService.search_base, search_string, attributes=LdapService.attributes)
if len(conn.entries) < 1: if len(conn.entries) < 1:
raise ApiError("missing_ldap_record", "Unable to locate a user with id %s in LDAP" % uva_uid) raise ApiError("missing_ldap_record", "Unable to locate a user with id %s in LDAP" % uva_uid)
@ -72,7 +72,6 @@ class LdapService(object):
print(search_string) print(search_string)
try: try:
conn = LdapService.__get_conn() conn = LdapService.__get_conn()
conn.bind()
conn.search(LdapService.search_base, search_string, attributes=LdapService.attributes) conn.search(LdapService.search_base, search_string, attributes=LdapService.attributes)
# Entries are returned as a generator, accessing entries # Entries are returned as a generator, accessing entries
# can make subsequent calls to the ldap service, so limit # can make subsequent calls to the ldap service, so limit