Author: angela
Date: Thu Apr 19 14:56:53 2018
New Revision: 1829556
URL: http://svn.apache.org/viewvc?rev=1829556&view=rev
Log:
OAK-7424 : SecurityProviderBuilder expects CompositeConfiguration
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=1829556&r1=1829555&r2=1829556&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 14:56:53 2018
@@ -69,13 +69,13 @@ public final class SecurityProviderBuild
private UserConfiguration userConfiguration;
private ConfigurationParameters authorizationParams = EMPTY;
- private CompositeAuthorizationConfiguration authorizationConfiguration;
+ private AuthorizationConfiguration authorizationConfiguration;
private ConfigurationParameters principalParams = EMPTY;
- private CompositePrincipalConfiguration principalConfiguration;
+ private PrincipalConfiguration principalConfiguration;
private ConfigurationParameters tokenParams = EMPTY;
- private CompositeTokenConfiguration tokenConfiguration;
+ private TokenConfiguration tokenConfiguration;
private ConfigurationParameters configuration;
@@ -125,11 +125,9 @@ public final class SecurityProviderBuild
@Nonnull ConfigurationParameters authenticationParams,
@Nonnull PrivilegeConfiguration privilegeConfiguration, @Nonnull
ConfigurationParameters privilegeParams,
@Nonnull UserConfiguration userConfiguration, @Nonnull
ConfigurationParameters userParams,
- @Nonnull CompositeAuthorizationConfiguration
authorizationConfiguration,
- @Nonnull ConfigurationParameters authorizationParams,
- @Nonnull CompositePrincipalConfiguration principalConfiguration,
- @Nonnull ConfigurationParameters principalParams, @Nonnull
CompositeTokenConfiguration tokenConfiguration,
- @Nonnull ConfigurationParameters tokenParams) {
+ @Nonnull AuthorizationConfiguration authorizationConfiguration,
@Nonnull ConfigurationParameters authorizationParams,
+ @Nonnull PrincipalConfiguration principalConfiguration, @Nonnull
ConfigurationParameters principalParams,
+ @Nonnull TokenConfiguration tokenConfiguration, @Nonnull
ConfigurationParameters tokenParams) {
this.authenticationConfiguration = authenticationConfiguration;
this.authenticationParams = authenticationParams;
@@ -185,31 +183,46 @@ 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(),
+ CompositeAuthorizationConfiguration ac = new
CompositeAuthorizationConfiguration();
+
ac.withCompositionType(configuration.getConfigValue("authorizationCompositionType",
CompositeAuthorizationConfiguration.CompositionType.AND.toString()));
+ ac.setDefaultConfig(initializeConfiguration(new
AuthorizationConfigurationImpl(),
securityProvider, rootProvider, treeProvider));
+ authorizationConfiguration = ac;
+ }
+
+ if (authorizationConfiguration instanceof
CompositeAuthorizationConfiguration) {
+ initializeConfigurations((CompositeAuthorizationConfiguration)
authorizationConfiguration, securityProvider, authorizationParams,
rootProvider, treeProvider);
+ } else {
+ initializeConfiguration(authorizationConfiguration,
securityProvider, authorizationParams, rootProvider, treeProvider);
}
- initializeConfigurations(authorizationConfiguration, securityProvider,
authorizationParams, rootProvider,
- treeProvider);
securityProvider.setAuthorizationConfiguration(authorizationConfiguration);
// principal
if (principalConfiguration == null) {
- principalConfiguration = new CompositePrincipalConfiguration();
-
principalConfiguration.setDefaultConfig(initializeConfiguration(new
PrincipalConfigurationImpl(),
- securityProvider, rootProvider, treeProvider));
+ CompositePrincipalConfiguration pc = new
CompositePrincipalConfiguration();
+ pc.setDefaultConfig(initializeConfiguration(new
PrincipalConfigurationImpl(), securityProvider, rootProvider, treeProvider));
+ principalConfiguration = pc;
+ }
+
+ if (principalConfiguration instanceof CompositePrincipalConfiguration)
{
+ initializeConfigurations((CompositePrincipalConfiguration)
principalConfiguration, securityProvider, principalParams, rootProvider,
treeProvider);
+ } else {
+ initializeConfiguration(principalConfiguration, securityProvider,
principalParams, rootProvider, treeProvider);
}
- initializeConfigurations(principalConfiguration, securityProvider,
principalParams, rootProvider, treeProvider);
securityProvider.setPrincipalConfiguration(principalConfiguration);
// token
if (tokenConfiguration == null) {
- tokenConfiguration = new CompositeTokenConfiguration();
- tokenConfiguration.setDefaultConfig(initializeConfiguration(new
TokenConfigurationImpl(), securityProvider,
- rootProvider, treeProvider));
+ CompositeTokenConfiguration tc = new CompositeTokenConfiguration();
+ tc.setDefaultConfig(initializeConfiguration(new
TokenConfigurationImpl(), securityProvider, rootProvider, treeProvider));
+ tokenConfiguration = tc;
+ }
+
+ if (tokenConfiguration instanceof CompositeTokenConfiguration) {
+ initializeConfigurations((CompositeTokenConfiguration)
tokenConfiguration, securityProvider, tokenParams, rootProvider, treeProvider);
+ } else {
+ initializeConfiguration(tokenConfiguration, securityProvider,
tokenParams, rootProvider, treeProvider);
}
- initializeConfigurations(tokenConfiguration, securityProvider,
tokenParams, rootProvider, treeProvider);
securityProvider.setTokenConfiguration(tokenConfiguration);
// whiteboard
