Author: angela
Date: Wed Nov 30 15:18:19 2016
New Revision: 1772052
URL: http://svn.apache.org/viewvc?rev=1772052&view=rev
Log:
OAK-5195 : ExternalPrincipalConfiguration uses 'group.autoMembership' instead
of 'user.autoMembership'
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/dynamic.md
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.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/principal/ExternalPrincipalConfiguration.java?rev=1772052&r1=1772051&r2=1772052&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
Wed Nov 30 15:18:19 2016
@@ -233,7 +233,7 @@ public class ExternalPrincipalConfigurat
Map<String, String[]> autoMembership = new HashMap<String,
String[]>();
for (ServiceReference ref : enablingRefs) {
String syncHandlerName =
PropertiesUtil.toString(ref.getProperty(DefaultSyncConfigImpl.PARAM_NAME),
DefaultSyncConfigImpl.PARAM_NAME_DEFAULT);
- String[] membership =
PropertiesUtil.toStringArray(ref.getProperty(DefaultSyncConfigImpl.PARAM_GROUP_AUTO_MEMBERSHIP),
new String[0]);
+ String[] membership =
PropertiesUtil.toStringArray(ref.getProperty(DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP),
new String[0]);
for (String idpName :
mappingTracker.getIdpNames(syncHandlerName)) {
String[] previous = autoMembership.put(idpName,
membership);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java?rev=1772052&r1=1772051&r2=1772052&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleAutoMembershipTest.java
Wed Nov 30 15:18:19 2016
@@ -151,7 +151,7 @@ public class ExternalLoginModuleAutoMemb
Map props = ImmutableMap.of(
DefaultSyncConfigImpl.PARAM_NAME, syncHandlerName,
DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP,
setup.sc.user().getDynamicMembership(),
- DefaultSyncConfigImpl.PARAM_GROUP_AUTO_MEMBERSHIP,
setup.sc.user().getAutoMembership());
+ DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP,
setup.sc.user().getAutoMembership());
ctx.registerService(SyncHandler.class, setup.sh, props);
Map mappingProps = ImmutableMap.of(
Modified:
jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/dynamic.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/dynamic.md?rev=1772052&r1=1772051&r2=1772052&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/dynamic.md
(original)
+++
jackrabbit/oak/trunk/oak-doc/src/site/markdown/security/authentication/external/dynamic.md
Wed Nov 30 15:18:19 2016
@@ -67,6 +67,8 @@ effects:
upon other calls (e.g. `PrincipalProvider.getPrincipal(String)`.
- Any changes to the auto-membership configuration will be immediately
reflected
to new instances of the `PrincipalProvider`.
+- Note, that in the initial version (Oak 1.6) only the `user.autoMembership`
+ configuration is respected (see also [OAK-5194] and [OAK-5195])
#### Effect of Dynamic Membership on other Security Modules
@@ -132,4 +134,6 @@ membership configuration.
[DynamicSyncContext]:
/oak/docs/apidocs/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicSyncContext.html
[OAK-4101]: https://issues.apache.org/jira/browse/OAK-4101
[OAK-2687]: https://issues.apache.org/jira/browse/OAK-2687
-[OAK-4087]: https://issues.apache.org/jira/browse/OAK-4087
\ No newline at end of file
+[OAK-4087]: https://issues.apache.org/jira/browse/OAK-4087
+[OAK-5194]: https://issues.apache.org/jira/browse/OAK-5194
+[OAK-5195]: https://issues.apache.org/jira/browse/OAK-5195
\ No newline at end of file
