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 re...@apache.org on 2025/02/07 12:40:45 UTC
(jackrabbit-oak) 02/02: OAK-11465: undo non-test changes done in OAK-11317
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch revert-OAK-11317
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 7025090b9912f75c14d600b1df4e7c36207747d7
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Feb 7 13:38:23 2025 +0100
OAK-11465: undo non-test changes done in OAK-11317
---
.../external/impl/principal/ExternalGroupPrincipalProvider.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
index aee6213c60..89817f4009 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
@@ -39,6 +39,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.query.Query;
+import org.apache.commons.collections4.IterableUtils;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
@@ -148,9 +149,7 @@ class ExternalGroupPrincipalProvider implements PrincipalProvider, ExternalIdent
autoMembershipPrincipals = new AutoMembershipPrincipals(userManager, syncConfigTracker.getAutoMembership(), syncConfigTracker.getAutoMembershipConfig());
groupAutoMembershipPrincipals = (idpNamesWithDynamicGroups.isEmpty()) ? null : new AutoMembershipPrincipals(userManager, syncConfigTracker.getGroupAutoMembership(), syncConfigTracker.getAutoMembershipConfig());
- cacheReaderFactory = (String idpName) -> userConfiguration.getCachedMembershipReader(root,
- (principalName) -> new CachedGroupPrincipal(principalName, userManager),
- CACHE_PRINCIPAL_NAMES);
+ cacheReaderFactory = (String idpName) -> userConfiguration.getCachedMembershipReader(root, (principalName) -> new CachedGroupPrincipal(principalName, userManager), CACHE_PRINCIPAL_NAMES, CACHE_EXP_PROPERTY_NAME);
}
// Tests only
@@ -611,7 +610,7 @@ class ExternalGroupPrincipalProvider implements PrincipalProvider, ExternalIdent
Tree tree = root.getTree(((ItemBasedPrincipal) member).getPath());
if (UserUtil.isType(tree, AuthorizableType.USER)) {
PropertyState ps = tree.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
- return (ps != null && Iterables.contains(ps.getValue(Type.STRINGS), name));
+ return (ps != null && IterableUtils.contains(ps.getValue(Type.STRINGS), name));
}
} else {
Authorizable a = userManager.getAuthorizable(member);