From d6838990d2e9cca9b91961c57dc39b762b37df1f Mon Sep 17 00:00:00 2001 From: claire-peters Date: Wed, 18 Sep 2024 01:31:20 -0400 Subject: [PATCH] update logging --- coldfront/core/project/views.py | 2 +- coldfront/plugins/ldap/utils.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coldfront/core/project/views.py b/coldfront/core/project/views.py index 9d54d2ca0..0b742687c 100644 --- a/coldfront/core/project/views.py +++ b/coldfront/core/project/views.py @@ -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, diff --git a/coldfront/plugins/ldap/utils.py b/coldfront/plugins/ldap/utils.py index 84e3afd46..2afa305e2 100644 --- a/coldfront/plugins/ldap/utils.py +++ b/coldfront/plugins/ldap/utils.py @@ -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): @@ -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):