diff --git a/src/main/java/org/dependencytrack/resources/v1/UserResource.java b/src/main/java/org/dependencytrack/resources/v1/UserResource.java index 27685eb9d..e8110efed 100644 --- a/src/main/java/org/dependencytrack/resources/v1/UserResource.java +++ b/src/main/java/org/dependencytrack/resources/v1/UserResource.java @@ -453,7 +453,7 @@ public Response deleteLdapUser(LdapUser jsonUser) { if (user != null) { final LdapUser detachedUser = qm.getPersistenceManager().detachCopy(user); qm.delete(user); - super.logSecurityEvent(LOGGER, SecurityMarkers.SECURITY_AUDIT, "LDAP user deleted: " + detachedUser); + super.logSecurityEvent(LOGGER, SecurityMarkers.SECURITY_AUDIT, "LDAP user deleted: " + detachedUser.getUsername()); Notification.dispatch(new Notification() .scope(NotificationScope.SYSTEM) .group(NotificationGroup.USER_DELETED) @@ -593,7 +593,7 @@ public Response deleteManagedUser(ManagedUser jsonUser) { if (user != null) { final ManagedUser detachedUser = qm.getPersistenceManager().detachCopy(user); qm.delete(user); - super.logSecurityEvent(LOGGER, SecurityMarkers.SECURITY_AUDIT, "Managed user deleted: " +detachedUser); + super.logSecurityEvent(LOGGER, SecurityMarkers.SECURITY_AUDIT, "Managed user deleted: " + detachedUser.getUsername()); Notification.dispatch(new Notification() .scope(NotificationScope.SYSTEM) .group(NotificationGroup.USER_DELETED) @@ -670,7 +670,7 @@ public Response deleteOidcUser(final OidcUser jsonUser) { if (user != null) { final OidcUser detachedUser = qm.getPersistenceManager().detachCopy(user); qm.delete(user); - super.logSecurityEvent(LOGGER, SecurityMarkers.SECURITY_AUDIT, "OpenID Connect user deleted: " + detachedUser); + super.logSecurityEvent(LOGGER, SecurityMarkers.SECURITY_AUDIT, "OpenID Connect user deleted: " + detachedUser.getUsername()); Notification.dispatch(new Notification() .scope(NotificationScope.SYSTEM) .group(NotificationGroup.USER_DELETED) diff --git a/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java b/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java index c8babba72..7dc543d6f 100644 --- a/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java @@ -499,6 +499,19 @@ public void createOidcUserDuplicateUsernameTest() { Assert.assertEquals("A user with the same username already exists. Cannot create new user.", body); } + @Test + public void deleteOidcUserTest() { + qm.createOidcUser("blackbeard"); + OidcUser user = new OidcUser(); + user.setUsername("blackbeard"); + Response response = jersey.target(V1_USER + "/oidc").request() + .header(X_API_KEY, apiKey) + .property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true) // HACK + .method("DELETE", Entity.entity(user, MediaType.APPLICATION_JSON)); // HACK + // Hack: Workaround to https://github.com/eclipse-ee4j/jersey/issues/3798 + Assert.assertEquals(204, response.getStatus(), 0); + } + @Test public void addTeamToUserTest() { qm.createManagedUser("blackbeard", "Captain BlackBeard", "blackbeard@example.com", TEST_USER_PASSWORD_HASH, false, false, false);