Author: angela
Date: Wed Nov 30 17:11:25 2016
New Revision: 1772088
URL: http://svn.apache.org/viewvc?rev=1772088&view=rev
Log:
minor improvement related to OAK-4930: fix indention, add more comments and
remove unrelated 'svn st' in javadoc of ExternalGroupRef
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java?rev=1772088&r1=1772087&r2=1772088&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalGroupRef.java
Wed Nov 30 17:11:25 2016
@@ -21,9 +21,9 @@ import javax.annotation.Nonnull;
public class ExternalGroupRef extends ExternalIdentityRef {
- /**svn st
- *
+ /**
* Creates a new external group ref with the given id and provider name
+ *
* @param id the id of the identity.
* @param providerName the name of the identity provider
*/
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.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/DynamicSyncContext.java?rev=1772088&r1=1772087&r2=1772088&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
Wed Nov 30 17:11:25 2016
@@ -153,10 +153,15 @@ public class DynamicSyncContext extends
private void collectPrincipalNames(@Nonnull Set<String> principalNames,
@Nonnull Iterable<ExternalIdentityRef> declaredGroupIdRefs, long depth) throws
ExternalIdentityException {
for (ExternalIdentityRef ref : declaredGroupIdRefs) {
if (ref instanceof ExternalGroupRef && depth < 2) {
- //in this case we can avoid calling idp.getIdentity(), saving
a roundtrip
+ // since the ExternalGroupRef marker already indicates that the
+ // ref points to an external group and we already reached the
desired
+ // depth, we can avoid calling idp.getIdentity(), saving a
roundtrip
+ // to the external IDP.
principalNames.add(ref.getId());
- }
- else {
+ } else {
+ // resolve identity from the reference to
+ // - make sure we it is an external group
+ // - recursively collect group-group membership
ExternalIdentity extId = idp.getIdentity(ref);
if (extId instanceof ExternalGroup) {
principalNames.add(ref.getId());
@@ -164,8 +169,7 @@ public class DynamicSyncContext extends
if (depth > 1) {
collectPrincipalNames(principalNames,
extId.getDeclaredGroups(), depth - 1);
}
- }
- else {
+ } else {
log.debug("Not an external group ({}) => ignore.", ref);
}
}
