[java-identity-provider] branch master updated: IDP-1642 - Migrate configuration into jars where feasible
Scott Cantor
cantor.2 at osu.edu
Wed Jul 29 15:00:16 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=7c589fb37634d4ea13746ea805a756cc81295c5c
The following commit(s) were added to refs/heads/master by this push:
new 7c589fb37 IDP-1642 - Migrate configuration into jars where feasible
7c589fb37 is described below
commit 7c589fb37634d4ea13746ea805a756cc81295c5c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 29 11:01:12 2020 -0400
IDP-1642 - Migrate configuration into jars where feasible
https://issues.shibboleth.net/jira/browse/IDP-1642
Migrate system config for reloadable services into idp-conf-impl.
Remove references to older files from services.xml
---
.../shibboleth/idp}/conf/access-control-system.xml | 0
.../idp}/conf/attribute-registry-system.xml | 0
.../idp}/conf/metadata-providers-system.xml | 0
.../idp}/conf/relying-party-mddriven.xml | 0
.../shibboleth/idp}/conf/relying-party-system.xml | 0
.../shibboleth/idp}/conf/saml-nameid-system.xml | 0
idp-conf/src/main/resources/conf/services.xml | 6 ---
.../main/resources/system/conf/services-system.xml | 63 ++++++++++++++++++----
8 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/idp-conf/src/main/resources/system/conf/access-control-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/conf/access-control-system.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/access-control-system.xml
diff --git a/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/attribute-registry-system.xml
diff --git a/idp-conf/src/main/resources/system/conf/metadata-providers-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/conf/metadata-providers-system.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/metadata-providers-system.xml
diff --git a/idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/conf/relying-party-mddriven.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-mddriven.xml
diff --git a/idp-conf/src/main/resources/system/conf/relying-party-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/conf/relying-party-system.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/relying-party-system.xml
diff --git a/idp-conf/src/main/resources/system/conf/saml-nameid-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/conf/saml-nameid-system.xml
rename to idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/saml-nameid-system.xml
diff --git a/idp-conf/src/main/resources/conf/services.xml b/idp-conf/src/main/resources/conf/services.xml
index f384909eb..fae2979af 100644
--- a/idp-conf/src/main/resources/conf/services.xml
+++ b/idp-conf/src/main/resources/conf/services.xml
@@ -11,16 +11,13 @@
<!-- By default we look at resources whose names are derived from %{idp.home}. -->
- <!-- This set of resources supports a native Spring relying-party.xml file. -->
<util:list id="shibboleth.RelyingPartyResolverResources">
<value>%{idp.home}/conf/relying-party.xml</value>
<value>%{idp.home}/conf/credentials.xml</value>
- <value>%{idp.home}/system/conf/relying-party-system.xml</value>
</util:list>
<util:list id="shibboleth.MetadataResolverResources">
<value>%{idp.home}/conf/metadata-providers.xml</value>
- <value>%{idp.home}/system/conf/metadata-providers-system.xml</value>
</util:list>
<util:list id ="shibboleth.AttributeResolverResources">
@@ -33,7 +30,6 @@
-->
<util:list id ="shibboleth.AttributeRegistryResources">
<value>%{idp.home}/conf/attribute-registry.xml</value>
- <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
<value>%{idp.home}/conf/attributes/default-rules.xml</value>
<value>%{idp.home}/conf/attribute-resolver.xml</value>
</util:list>
@@ -44,12 +40,10 @@
<util:list id ="shibboleth.NameIdentifierGenerationResources">
<value>%{idp.home}/conf/saml-nameid.xml</value>
- <value>%{idp.home}/system/conf/saml-nameid-system.xml</value>
</util:list>
<util:list id="shibboleth.AccessControlResources">
<value>%{idp.home}/conf/access-control.xml</value>
- <value>%{idp.home}/system/conf/access-control-system.xml</value>
</util:list>
<util:list id="shibboleth.CASServiceRegistryResources">
diff --git a/idp-conf/src/main/resources/system/conf/services-system.xml b/idp-conf/src/main/resources/system/conf/services-system.xml
index e25d00b24..854d111d2 100644
--- a/idp-conf/src/main/resources/system/conf/services-system.xml
+++ b/idp-conf/src/main/resources/system/conf/services-system.xml
@@ -55,10 +55,7 @@
</bean>
<bean id="shibboleth.AttributeRegistryService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- p:serviceConfigurations-ref="#{
- getObject('%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()) != null
- ? '%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()
- : 'shibboleth.DefaultAttributeRegistryResources' }"
+ p:serviceConfigurations-ref="ExtendedAttributeRegistryResources"
p:failFast="%{idp.service.attribute.registry.failFast:%{idp.service.failFast:false}}"
p:reloadCheckDelay="%{idp.service.attribute.registry.checkInterval:PT0S}"
p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
@@ -69,27 +66,46 @@
p:namingRegistry="#{'%{idp.service.attribute.registry.namingRegistry:shibboleth.DefaultNamingRegistry}'.trim()}" />
</constructor-arg>
</bean>
-
<bean id ="shibboleth.DefaultAttributeRegistryResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
p:firstList-ref="#{'%{idp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}'.trim()}" >
<property name="secondList">
<util:list >
<value>%{idp.home}/conf/attribute-registry.xml</value>
- <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedAttributeRegistryResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ p:firstList-ref="#{
+ getObject('%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()) != null
+ ? '%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()
+ : 'shibboleth.DefaultAttributeRegistryResources' }" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/idp/conf/attribute-registry-system.xml</value>
</util:list>
</property>
</bean>
<bean id="shibboleth.NameIdentifierGenerationService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
c:claz="net.shibboleth.idp.saml.nameid.NameIdentifierGenerationService"
- p:serviceConfigurations-ref="#{'%{idp.service.nameidGeneration.resources:shibboleth.NameIdentifierGenerationResources}'.trim()}"
+ p:serviceConfigurations-ref="ExtendedNameIdentifierGenerationResources"
p:failFast="%{idp.service.nameidGeneration.failFast:%{idp.service.failFast:false}}"
p:reloadCheckDelay="%{idp.service.nameidGeneration.checkInterval:PT0S}"
p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer" />
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedNameIdentifierGenerationResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ p:firstList-ref="#{'%{idp.service.nameidGeneration.resources:shibboleth.NameIdentifierGenerationResources}'.trim()}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/idp/conf/saml-nameid-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
<bean id="shibboleth.RelyingPartyResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
- p:serviceConfigurations-ref="#{'%{idp.service.relyingparty.resources:shibboleth.RelyingPartyResolverResources}'.trim()}"
+ p:serviceConfigurations-ref="ExtendedRelyingPartyResolverResources"
p:failFast="%{idp.service.relyingparty.failFast:%{idp.service.failFast:false}}"
p:reloadCheckDelay="%{idp.service.relyingparty.checkInterval:PT0S}"
p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
@@ -100,10 +116,19 @@
c:serviceableClaz="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver" />
</constructor-arg>
</bean>
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedRelyingPartyResolverResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ p:firstList-ref="#{'%{idp.service.relyingparty.resources:shibboleth.RelyingPartyResolverResources}'.trim()}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/idp/conf/relying-party-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
<bean id="shibboleth.MetadataResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
depends-on="shibboleth.AttributeRegistryService"
- p:serviceConfigurations-ref="#{'%{idp.service.metadata.resources:shibboleth.MetadataResolverResources}'.trim()}"
+ p:serviceConfigurations-ref="ExtendedMetadataResolverResources"
p:failFast="%{idp.service.metadata.failFast:%{idp.service.failFast:false}}"
p:reloadCheckDelay="%{idp.service.metadata.checkInterval:PT0S}"
p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer"
@@ -113,14 +138,32 @@
<bean class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.MetadataResolverServiceStrategy" />
</constructor-arg>
</bean>
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedMetadataResolverResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ p:firstList-ref="#{'%{idp.service.metadata.resources:shibboleth.MetadataResolverResources}'.trim()}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/idp/conf/metadata-providers-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
<bean id="shibboleth.ReloadableAccessControlService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
c:claz="net.shibboleth.utilities.java.support.security.AccessControlService"
- p:serviceConfigurations-ref="#{'%{idp.service.access.resources:shibboleth.AccessControlResources}'.trim()}"
+ p:serviceConfigurations-ref="ExtendedAccessControlResources"
p:failFast="%{idp.service.access.failFast:%{idp.service.failFast:true}}"
p:reloadCheckDelay="%{idp.service.access.checkInterval:PT0S}"
p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer" />
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedAccessControlResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"
+ p:firstList-ref="#{'%{idp.service.access.resources:shibboleth.AccessControlResources}'.trim()}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/idp/conf/access-control-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
<bean id="shibboleth.ReloadableCASServiceRegistry" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
c:claz="net.shibboleth.idp.cas.service.ServiceRegistry"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list