Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nipapd: Close LDAP connection after authentication #1369

Merged
merged 1 commit into from
May 20, 2024
Merged

nipapd: Close LDAP connection after authentication #1369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions nipap/nipap/authlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,16 +495,6 @@ def __init__(self, name, username, password, authoritative_source, auth_options=
self._ldap_search_password = self._cfg.get(base_auth_backend, 'search_password')
self._ldap_search_conn = ldap.initialize(self._ldap_uri)

if self._ldap_tls:
try:
self._ldap_conn.start_tls_s()
if self._ldap_search_conn is not None:
self._ldap_search_conn.start_tls_s()
except (ldap.CONNECT_ERROR, ldap.SERVER_DOWN) as exc:
self._logger.error('Attempted to start TLS with ldap server but failed.')
self._logger.exception(exc)
raise AuthError('Unable to establish secure connection to ldap server')

@create_span_authenticate
def authenticate(self):
""" Verify authentication.
Expand All @@ -517,6 +507,17 @@ def authenticate(self):
if self._authenticated is not None:
return self._authenticated

# Start TLS session, if needed
if self._ldap_tls:
try:
self._ldap_conn.start_tls_s()
if self._ldap_search_conn is not None:
self._ldap_search_conn.start_tls_s()
except (ldap.CONNECT_ERROR, ldap.SERVER_DOWN) as exc:
self._logger.error('Attempted to start TLS with ldap server but failed.')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (89 > 79 characters)

self._logger.exception(exc)
raise AuthError('Unable to establish secure connection to ldap server')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line too long (87 > 79 characters)


try:
self._ldap_conn.simple_bind_s(self._ldap_binddn_fmt.format(ldap.dn.escape_dn_chars(self.username)),
self.password)
Expand Down Expand Up @@ -585,6 +586,11 @@ def authenticate(self):
if self._ldap_rw_group or self._ldap_ro_group:
self._authenticated = False
return self._authenticated
finally:
# Unbind from LDAP server
self._ldap_conn.unbind_s()
if self._ldap_search_conn is not None:
self._ldap_search_conn.unbind_s()

self._authenticated = True

Expand Down
Loading