You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2022/07/27 14:13:50 UTC
[jackrabbit-oak] branch trunk updated: OAK-9865 : DefaultSyncContext: extract method to get external group from ExternalIdentityRef
This is an automated email from the ASF dual-hosted git repository.
angela pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8a867380dc OAK-9865 : DefaultSyncContext: extract method to get external group from ExternalIdentityRef
8a867380dc is described below
commit 8a867380dc40fe7c74ad699691a6852715c58495
Author: angela <an...@adobe.com>
AuthorDate: Wed Jul 27 16:13:41 2022 +0200
OAK-9865 : DefaultSyncContext: extract method to get external group from ExternalIdentityRef
---
.../external/basic/DefaultSyncContext.java | 29 +++++++++++++---------
.../external/basic/package-info.java | 2 +-
.../external/TestIdentityProvider.java | 4 ++-
.../external/basic/DefaultSyncContextTest.java | 28 +++++++++++++++++++++
4 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
index a929e8e9a6..073efb4fab 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
@@ -532,20 +532,10 @@ public class DefaultSyncContext implements SyncContext {
for (ExternalIdentityRef ref : externalGroups) {
log.debug("- processing membership {}", ref.getId());
// get group
- ExternalGroup extGroup;
- try {
- ExternalIdentity extId = idp.getIdentity(ref);
- if (extId instanceof ExternalGroup) {
- extGroup = (ExternalGroup) extId;
- } else {
- log.warn("No external group found for ref '{}'.", ref.getString());
- continue;
- }
- } catch (ExternalIdentityException e) {
- log.warn("Unable to retrieve external group '{}' from provider.", ref.getString(), e);
+ ExternalGroup extGroup = getExternalGroupFromRef(ref);
+ if (extGroup == null) {
continue;
}
- log.debug("- idp returned '{}'", extGroup.getId());
// mark group as processed
boolean idMatches = declaredExternalGroupIds.contains(extGroup.getId());
@@ -596,6 +586,21 @@ public class DefaultSyncContext implements SyncContext {
timer.mark("removing");
log.debug("syncMembership({}) {}", external.getId(), timer);
}
+
+ protected @Nullable ExternalGroup getExternalGroupFromRef(@NotNull ExternalIdentityRef externalGroupRef) {
+ try {
+ ExternalIdentity extId = idp.getIdentity(externalGroupRef);
+ if (extId instanceof ExternalGroup) {
+ log.debug("- idp returned '{}'", extId.getId());
+ return (ExternalGroup) extId;
+ } else {
+ log.warn("No external group found for ref '{}'.", externalGroupRef.getString());
+ }
+ } catch (ExternalIdentityException e) {
+ log.warn("Unable to retrieve external group '{}' from provider.", externalGroupRef.getString(), e);
+ }
+ return null;
+ }
/**
* Ensures that the given authorizable is member of the specific groups. Note that it does not create groups
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
index e70a09ea01..efe234b6c7 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.5.0")
+@Version("1.6.0")
package org.apache.jackrabbit.oak.spi.security.authentication.external.basic;
import org.osgi.annotation.versioning.Version;
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
index 9c4dbffe02..b547c399c1 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
@@ -105,7 +105,9 @@ public class TestIdentityProvider implements ExternalIdentityProvider {
if (ID_EXCEPTION.equals(ref.getId())) {
throw new ExternalIdentityException(ID_EXCEPTION);
}
-
+ if (ref.getProviderName() == null || !idpName.equals(ref.getProviderName())) {
+ return null;
+ }
ExternalIdentity id = externalUsers.get(ref.getId().toLowerCase());
if (id != null) {
return id;
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
index 0aed75343d..3bce53887f 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
@@ -995,6 +995,34 @@ public class DefaultSyncContextTest extends AbstractExternalAuthTest {
verify(um, never()).createGroup(any(String.class), any(Principal.class), any(String.class));
}
+ @Test
+ public void testGetExternalGroupFromGroupRef() throws Exception {
+ ExternalGroup gr = idp.listGroups().next();
+ ExternalGroup externalGroup = syncCtx.getExternalGroupFromRef(gr.getExternalId());
+
+ assertNotNull(externalGroup);
+ assertEquals(gr.getId(), externalGroup.getId());
+ }
+
+ @Test
+ public void testGetExternalGroupFromGroupRefIdpMismatch() throws Exception {
+ ExternalGroup gr = idp.listGroups().next();
+ ExternalIdentityRef ref = new ExternalIdentityRef(gr.getId(), "differentIDP");
+
+ assertNull(syncCtx.getExternalGroupFromRef(ref));
+ }
+
+ @Test
+ public void testGetExternalGroupFromRefFails() {
+ assertNull(syncCtx.getExternalGroupFromRef(new ExternalIdentityRef(TestIdentityProvider.ID_EXCEPTION, idp.getName())));
+ }
+
+ @Test
+ public void testGetExternalGroupFromUserRef() throws Exception {
+ ExternalUser user = idp.listUsers().next();
+ assertNull(syncCtx.getExternalGroupFromRef(user.getExternalId()));
+ }
+
@Test
public void testApplyMembershipNonExistingGroup() throws Exception {
User u = getTestUser();