From 65a91debf73bad29919546e1a22c2055f6e0ec49 Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Mon, 16 Sep 2024 12:47:49 +0200 Subject: [PATCH] refactor: reduce use of temporary variables --- ldapauthenticator/ldapauthenticator.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ldapauthenticator/ldapauthenticator.py b/ldapauthenticator/ldapauthenticator.py index 68ef51a..140b83b 100644 --- a/ldapauthenticator/ldapauthenticator.py +++ b/ldapauthenticator/ldapauthenticator.py @@ -406,13 +406,13 @@ async def authenticate(self, handler, data): return None if self.search_filter: - search_filter = self.search_filter.format( - userattr=self.user_attribute, username=escape_filter_chars(username) - ) conn.search( search_base=self.user_search_base, search_scope=ldap3.SUBTREE, - search_filter=search_filter, + search_filter=self.search_filter.format( + userattr=self.user_attribute, + username=escape_filter_chars(username), + ), attributes=self.attributes, ) n_users = len(conn.response) @@ -437,17 +437,14 @@ async def authenticate(self, handler, data): self.log.debug("username:%s Using dn %s", username, userdn) found = False for group in self.allowed_groups: - group_search_filter = self.group_search_filter - group_search_filter = group_search_filter.format( - userdn=escape_filter_chars(userdn), - uid=escape_filter_chars(username), - ) - group_attributes = self.group_attributes found = conn.search( group, search_scope=ldap3.BASE, - search_filter=group_search_filter, - attributes=group_attributes, + search_filter=self.group_search_filter.format( + userdn=escape_filter_chars(userdn), + uid=escape_filter_chars(username), + ), + attributes=self.group_attributes, ) if found: break