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

[stillalex]

Author: stillalex
Date: Thu Mar 22 09:51:43 2018
New Revision: 1827473

URL: http://svn.apache.org/viewvc?rev=1827473&view=rev
Log:
OAK-7354 Test failure 
ExternalIdentityImporterTest.importExternalUserWithPrincipalNames


Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java
    
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/ConfigurationInitializer.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java?rev=1827473&r1=1827472&r2=1827473&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/ConfigurationInitializer.java
 Thu Mar 22 09:51:43 2018
@@ -48,7 +48,7 @@ final class ConfigurationInitializer {
         return configuration;
     }
 
-    static void initializeConfigurations(@Nonnull CompositeConfiguration 
configuration, @Nonnull SecurityProvider securityProvider,
+    static <T extends SecurityConfiguration> void 
initializeConfigurations(@Nonnull CompositeConfiguration<T> configuration, 
@Nonnull SecurityProvider securityProvider,
                                          @Nonnull ConfigurationParameters 
parameters,
                                          @Nonnull RootProvider rootProvider,
                                          @Nonnull TreeProvider treeProvider) {
@@ -56,8 +56,8 @@ final class ConfigurationInitializer {
         configuration.setRootProvider(rootProvider);
         configuration.setTreeProvider(treeProvider);
 
-        List<? extends SecurityConfiguration> configs = 
configuration.getConfigurations();
-        for (SecurityConfiguration config : configs) {
+        List<T> configs = configuration.getConfigurations();
+        for (T config : configs) {
             initializeConfiguration(config, securityProvider, parameters, 
rootProvider, treeProvider);
         }
     }

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=1827473&r1=1827472&r2=1827473&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 Mar 22 09:51:43 2018
@@ -94,7 +94,7 @@ public class SecurityProviderBuilder {
             userParams = configuration.getConfigValue(UserConfiguration.NAME, 
EMPTY);
         } else {
             AuthorizableActionProvider authorizableActionProvider = new 
DefaultAuthorizableActionProvider();
-            AuthorizableNodeName authorizableNodeName = new 
RandomAuthorizableNodeName();
+            AuthorizableNodeName authorizableNodeName = 
AuthorizableNodeName.DEFAULT;
             UserAuthenticationFactory userAuthenticationFactory = 
UserConfigurationImpl
                     .getDefaultAuthenticationFactory();
 
@@ -182,7 +182,8 @@ public class SecurityProviderBuilder {
         // authorization
         if (authorizationConfiguration == null) {
             authorizationConfiguration = new 
CompositeAuthorizationConfiguration();
-            authorizationConfiguration.setDefaultConfig(new 
AuthorizationConfigurationImpl());
+            
authorizationConfiguration.setDefaultConfig(initializeConfiguration(new 
AuthorizationConfigurationImpl(),
+                    securityProvider, rootProvider, treeProvider));
         }
         initializeConfigurations(authorizationConfiguration, securityProvider, 
authorizationParams, rootProvider,
                 treeProvider);
@@ -191,7 +192,8 @@ public class SecurityProviderBuilder {
         // principal
         if (principalConfiguration == null) {
             principalConfiguration = new CompositePrincipalConfiguration();
-            principalConfiguration.setDefaultConfig(new 
PrincipalConfigurationImpl());
+            
principalConfiguration.setDefaultConfig(initializeConfiguration(new 
PrincipalConfigurationImpl(),
+                    securityProvider, rootProvider, treeProvider));
         }
         initializeConfigurations(principalConfiguration, securityProvider, 
principalParams, rootProvider, treeProvider);
         securityProvider.setPrincipalConfiguration(principalConfiguration);
@@ -199,12 +201,13 @@ public class SecurityProviderBuilder {
         // token
         if (tokenConfiguration == null) {
             tokenConfiguration = new CompositeTokenConfiguration();
-            tokenConfiguration.setDefaultConfig(new TokenConfigurationImpl());
+            tokenConfiguration.setDefaultConfig(initializeConfiguration(new 
TokenConfigurationImpl(), securityProvider,
+                    rootProvider, treeProvider));
         }
-
         initializeConfigurations(tokenConfiguration, securityProvider, 
tokenParams, rootProvider, treeProvider);
         securityProvider.setTokenConfiguration(tokenConfiguration);
 
+        // whiteboard
         if (whiteboard != null) {
             securityProvider.setWhiteboard(whiteboard);
         }