Merge branch 'develop' of github.com:cloudfoundry/uaa into feature/cl…

…ient_auth/storeIt
cloudfoundry · Jul 6, 2023 · 14d61fa · 14d61fa
2 parents bfd72d2 + 1fbb9bf
commit 14d61fa
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -13,7 +13,7 @@ versions.springSecurityJwtVersion = "1.1.1.RELEASE"
 versions.springSecurityOAuthVersion = "2.5.2.RELEASE"
 versions.springSecuritySamlVersion = "1.0.10.RELEASE"
 versions.tomcatCargoVersion = "9.0.76"
-versions.guavaVersion = "32.0.1-jre"
+versions.guavaVersion = "32.1.1-jre"
 versions.seleniumVersion = "4.10.0"
 
 // Versions we're overriding from the Spring Boot Bom (Dependabot does not issue PRs to bump these versions, so we need to manually bump them)

diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/CommonSigner.java b/server/src/main/java/org/cloudfoundry/identity/uaa/oauth/jwt/CommonSigner.java
@@ -25,7 +25,7 @@ public class CommonSigner implements Signer {
     public CommonSigner(String keyId, String signingKey, String keyURL) {
         if (signingKey == null) {
             throw new IllegalArgumentException(signingKey);
-        } else if (isAssymetricKey(signingKey)) {
+        } else if (isAsymmetricKey(signingKey)) {
             delegate = new RsaSigner(signingKey);
         } else {
             delegate = new MacSigner(signingKey);
@@ -36,7 +36,7 @@ public CommonSigner(String keyId, String signingKey, String keyURL) {
     }
 
 
-    private static boolean isAssymetricKey(String key) {
+    private static boolean isAsymmetricKey(String key) {
         return key.startsWith("-----BEGIN");
     }
 

diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java b/server/src/main/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpoints.java
@@ -306,7 +306,7 @@ public ScimUser deleteUser(@PathVariable String userId,
         int version = etag == null ? -1 : getVersion(userId, etag);
         ScimUser user = getUser(userId, httpServletResponse);
         throwWhenUserManagementIsDisallowed(user.getOrigin(), request);
-        membershipManager.removeMembersByMemberId(userId, user.getOrigin(), identityZoneManager.getCurrentIdentityZoneId());
+        membershipManager.removeMembersByMemberId(userId, identityZoneManager.getCurrentIdentityZoneId());
         scimUserProvisioning.delete(userId, version, identityZoneManager.getCurrentIdentityZoneId());
         scimDeletes.incrementAndGet();
         if (publisher != null) {

diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/scim/endpoints/ScimUserEndpointsTests.java
@@ -462,6 +462,22 @@ void deleteIsAllowedWithCorrectVersionInEtag() {
                 new MockHttpServletRequest(), new MockHttpServletResponse());
     }
 
+    @Test
+    void deleteAllGroupMemberEntriesIfUserIsDeleted() {
+        ScimUser newUser = new ScimUser(null, "myuser", "given", "family");
+        newUser.addEmail("exguy@imonlyheretobedeleted.com");
+        newUser.setOrigin("testOrigin");
+        newUser = jdbcScimUserProvisioning.createUser(newUser, "exguyspassword", identityZone.getId());
+        ScimGroup g1 = new ScimGroup(null, "scimgroup", identityZone.getId());
+        g1 = jdbcScimGroupProvisioning.create(g1, identityZone.getId());
+        ScimGroupMember m1 = new ScimGroupMember(newUser.getId(), ScimGroupMember.Type.USER);
+        ScimGroupMember m2 = scimGroupMembershipManager.addMember(g1.getId(), m1, identityZone.getId());
+        assertEquals(1, scimGroupMembershipManager.getMembers(g1.getId(), false, identityZone.getId()).size());
+        scimUserEndpoints.deleteUser(newUser.getId(), Integer.toString(newUser.getMeta().getVersion()),
+            new MockHttpServletRequest(), new MockHttpServletResponse());
+        assertEquals(0, scimGroupMembershipManager.getMembers(g1.getId(), false, identityZone.getId()).size());
+    }
+
     @Test
     void deleteIsAllowedWithQuotedEtag() {
         ScimUser exGuy = new ScimUser(null, "deleteme", "Expendable", "Guy");