Skip to content

Commit

Permalink
📝 Add debug messages for each group and user added to the LDAP tree
Browse files Browse the repository at this point in the history
  • Loading branch information
jemrobinson committed May 21, 2024
1 parent 44d6263 commit 86ab169
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
3 changes: 3 additions & 0 deletions apricot/ldap/oauth_ldap_entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,6 @@ def _bind(password: bytes) -> "OAuthLDAPEntry":
raise LDAPInvalidCredentials(msg)

return defer.maybeDeferred(_bind, password)

def list_children(self) -> "list[OAuthLDAPEntry]":
return [cast(OAuthLDAPEntry, entry) for entry in self._children.values()]
22 changes: 20 additions & 2 deletions apricot/ldap/oauth_ldap_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,33 @@ def root(self) -> OAuthLDAPEntry:

# Add groups to the groups OU
if self.debug:
log.msg(f"Adding {len(oauth_adaptor.groups)} groups to the LDAP tree.")
log.msg(
f"Attempting to add {len(oauth_adaptor.groups)} groups to the LDAP tree."
)
for group_attrs in oauth_adaptor.groups:
groups_ou.add_child(f"CN={group_attrs.cn}", group_attrs.to_dict())
if self.debug:
children = groups_ou.list_children()
for child in children:
log.msg(f"... {child.dn.getText()}")
log.msg(
f"There are {len(children)} groups in the LDAP tree."
)

# Add users to the users OU
if self.debug:
log.msg(f"Adding {len(oauth_adaptor.users)} users to the LDAP tree.")
log.msg(
f"Attempting to add {len(oauth_adaptor.users)} users to the LDAP tree."
)
for user_attrs in oauth_adaptor.users:
users_ou.add_child(f"CN={user_attrs.cn}", user_attrs.to_dict())
if self.debug:
children = users_ou.list_children()
for child in children:
log.msg(f"... {child.dn.getText()}")
log.msg(
f"There are {len(children)} users in the LDAP tree."
)

# Set last updated time
log.msg("Finished building LDAP tree.")
Expand Down

0 comments on commit 86ab169

Please sign in to comment.