Skip to content

Commit

Permalink
update logging
Browse files Browse the repository at this point in the history
  • Loading branch information
claire-peters committed Sep 18, 2024
1 parent 6bbbe6b commit d683899
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion coldfront/core/project/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ def post(self, request, *args, **kwargs):
request,
f"could not remove user {user_obj}: {e}"
)
logger.error(
logger.exception(
"P802: Coldfront user %s could NOT remove AD User for %s from AD Group for %s: %s",
self.request.user,
user_obj.username,
Expand Down
6 changes: 4 additions & 2 deletions coldfront/plugins/ldap/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,9 @@ def add_member_to_group(self, member, group):
except Exception as e:
logger.exception("Error encountered while adding user to group: %s", e)
raise LDAPUserAdditionError("Error adding user to group.")
if not self.member_in_group(member_dn, group_dn):
if not self.member_in_group(member_dn, group_dn) or not result:
raise LDAPUserAdditionError("Member not successfully added to group.")
logger.info('user %s added to AD group %s', member_dn, group_dn)
return result

def remove_member_from_group(self, user_name, group_name):
Expand All @@ -219,8 +220,9 @@ def remove_member_from_group(self, user_name, group_name):
except Exception as e:
logger.exception("Error encountered while removing user from group: %s", e)
raise LDAPUserRemovalError("Error removing user from group.")
if self.member_in_group(user_dn, group_dn):
if self.member_in_group(user_dn, group_dn) or not result:
raise LDAPUserRemovalError("Member not successfully removed from group.")
logger.info('user %s removed from AD group %s', user_dn, group_dn)
return result

def users_in_primary_group(self, usernames, groupname):
Expand Down

0 comments on commit d683899

Please sign in to comment.