svn commit: r1829520 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java

[angela]

Author: angela
Date: Thu Apr 19 09:14:38 2018
New Revision: 1829520

URL: http://svn.apache.org/viewvc?rev=1829520&view=rev
Log:
OAK-7418 : SecurityProviderBuilder ignores configuration option 
authorizationCompositionType

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java?rev=1829520&r1=1829519&r2=1829520&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderBuilder.java
 Thu Apr 19 09:14:38 2018
@@ -77,15 +77,20 @@ public final class SecurityProviderBuild
     private ConfigurationParameters tokenParams = EMPTY;
     private CompositeTokenConfiguration tokenConfiguration;
 
+    private ConfigurationParameters configuration;
+
     @Nonnull
     public static SecurityProviderBuilder newBuilder() {
         return new SecurityProviderBuilder();
     }
 
     private SecurityProviderBuilder() {
+        this.configuration = ConfigurationParameters.EMPTY;
     }
 
     public SecurityProviderBuilder with(@Nonnull ConfigurationParameters 
configuration) {
+        this.configuration = configuration;
+
         authenticationParams = 
configuration.getConfigValue(AuthenticationConfiguration.NAME, EMPTY);
         privilegeParams = 
configuration.getConfigValue(PrivilegeConfiguration.NAME, EMPTY);
 
@@ -181,6 +186,7 @@ public final class SecurityProviderBuild
         // authorization
         if (authorizationConfiguration == null) {
             authorizationConfiguration = new 
CompositeAuthorizationConfiguration();
+            ((CompositeAuthorizationConfiguration) 
authorizationConfiguration).withCompositionType(configuration.getConfigValue("authorizationCompositionType",
 CompositeAuthorizationConfiguration.CompositionType.AND.toString()));
             
authorizationConfiguration.setDefaultConfig(initializeConfiguration(new 
AuthorizationConfigurationImpl(),
                     securityProvider, rootProvider, treeProvider));
         }