Author: angela
Date: Mon Mar 6 13:06:57 2017
New Revision: 1785645
URL: http://svn.apache.org/viewvc?rev=1785645&view=rev
Log:
OAK-4920 : DefaultSyncHandler.listIdentities() search too broad, triggers
traversal warning
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java?rev=1785645&r1=1785644&r2=1785645&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
Mon Mar 6 13:06:57 2017
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.Iterator;
import java.util.Map;
-
import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFactory;
@@ -140,7 +139,7 @@ public class DefaultSyncHandler implemen
@Nonnull
@Override
public Iterator<SyncedIdentity> listIdentities(@Nonnull UserManager
userManager) throws RepositoryException {
- final Iterator<Authorizable> iter =
userManager.findAuthorizables("jcr:primaryType", null);
+ final Iterator<Authorizable> iter =
userManager.findAuthorizables(DefaultSyncContext.REP_EXTERNAL_ID, null);
return new AbstractLazyIterator<SyncedIdentity>() {
@Override
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java?rev=1785645&r1=1785644&r2=1785645&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
Mon Mar 6 13:06:57 2017
@@ -252,4 +252,17 @@ public class DefaultSyncHandlerTest exte
}
assertTrue(expected.isEmpty());
}
+
+ @Test
+ public void testListIdentitiesIgnoresLocal() throws Exception {
+ sync(USER_ID, false);
+
+ Iterator<SyncedIdentity> identities =
syncHandler.listIdentities(userManager);
+ while (identities.hasNext()) {
+ SyncedIdentity si = identities.next();
+ ExternalIdentityRef ref = si.getExternalIdRef();
+ assertNotNull(ref);
+ assertNotNull(ref.getProviderName());
+ }
+ }
}
\ No newline at end of file
