[java-sp-server] branch main updated: Wire up initial set of core services.
Scott Cantor
cantor.2 at osu.edu
Wed Oct 19 13:42:32 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-sp-server.
View the commit online:
http://git.shibboleth.net/view/?p=java-sp-server.git;a=commit;h=a8960457f481e4e7f13b51349c85211fd88d322d
The following commit(s) were added to refs/heads/main by this push:
new a896045 Wire up initial set of core services.
a896045 is described below
commit a8960457f481e4e7f13b51349c85211fd88d322d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 19 09:42:29 2022 -0400
Wire up initial set of core services.
---
sp-conf-impl/pom.xml | 33 +++++--
.../shibboleth/sp/conf/attribute-filter-system.xml | 18 ++++
.../sp/conf/attribute-registry-system.xml | 45 +++++++++
.../sp/conf/attribute-resolver-system.xml | 18 ++++
.../net/shibboleth/sp/conf/endpoints-system.xml | 6 +-
.../net/shibboleth/sp/conf/integration.xml | 2 +-
.../sp/conf/metadata-providers-system.xml | 56 +++++++++++
.../net/shibboleth/sp/conf/primitives.xml | 19 ++++
.../net/shibboleth/sp/conf/services-system.xml | 109 ++++++++++++++++++++-
.../src/main/resources/conf/services.properties | 30 +++++-
sp-conf/src/main/resources/conf/services.xml | 30 ++++++
11 files changed, 350 insertions(+), 16 deletions(-)
diff --git a/sp-conf-impl/pom.xml b/sp-conf-impl/pom.xml
index 7f68e8b..52d00ef 100644
--- a/sp-conf-impl/pom.xml
+++ b/sp-conf-impl/pom.xml
@@ -34,21 +34,18 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>net.shibboleth</groupId>
- <artifactId>shib-networking-spring</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>net.shibboleth</groupId>
- <artifactId>shib-spring</artifactId>
+ <artifactId>shib-attribute-filter-spring</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.shibboleth</groupId>
- <artifactId>shib-velocity-spring</artifactId>
+ <artifactId>shib-attribute-resolver-spring</artifactId>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-core-api</artifactId>
@@ -69,17 +66,35 @@
<artifactId>opensaml-storage-impl</artifactId>
<scope>runtime</scope>
</dependency>
+
<dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-ip</artifactId>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-networking-spring</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-spring</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.shibboleth</groupId>
+ <artifactId>shib-velocity-spring</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.integration</groupId>
+ <artifactId>spring-integration-ip</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-filter-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-filter-system.xml
new file mode 100644
index 0000000..d517632
--- /dev/null
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-filter-system.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <!-- Wildcard import hook for plugins. -->
+ <import resource="classpath*:/META-INF/net/shibboleth/sp/service/attribute/filter/postconfig.xml" />
+
+</beans>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-registry-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-registry-system.xml
new file mode 100644
index 0000000..29ff401
--- /dev/null
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-registry-system.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <bean id="SAML2StringTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2StringAttributeTranscoder" />
+ <bean id="SAML2ScopedStringTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ScopedStringAttributeTranscoder" />
+ <bean id="SAML2ByteTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2ByteAttributeTranscoder" />
+ <bean id="SAML2XMLObjectTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2XMLObjectAttributeTranscoder" />
+ <bean id="SAML2DateTimeTranscoder"
+ class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2DateTimeAttributeTranscoder" />
+
+ <bean id="shibboleth.TranscodingRule"
+ class="net.shibboleth.idp.attribute.transcoding.TranscodingRule" abstract="true" />
+
+ <bean id="shibboleth.TranscodingRuleLoader"
+ class="net.shibboleth.idp.attribute.transcoding.impl.TranscodingRuleLoader" abstract="true" />
+
+ <bean id="shibboleth.TranscodingProperties" lazy-init="true"
+ class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="saml1.encodeType">%{sp.service.attribute.registry.encodeType:false}</prop>
+ <prop key="saml2.encodeType">%{sp.service.attribute.registry.encodeType:false}</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- Wildcard import hook for plugins. -->
+ <import resource="classpath*:/META-INF/net/shibboleth/sp/service/attribute/registry/postconfig.xml" />
+
+</beans>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-resolver-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-resolver-system.xml
new file mode 100644
index 0000000..113bd23
--- /dev/null
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/attribute-resolver-system.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <!-- Wildcard import hook for plugins. -->
+ <import resource="classpath*:/META-INF/net/shibboleth/sp/service/attribute/resolver/postconfig.xml" />
+
+</beans>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/endpoints-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/endpoints-system.xml
index 10cb8ce..4ad0e2c 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/endpoints-system.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/endpoints-system.xml
@@ -34,7 +34,11 @@
p:parserPool-ref="shibboleth.DefaultParserPool" />
<bean id="shibboleth.Application" class="net.shibboleth.sp.impl.BasicApplication" abstract="true"
- p:endpointManager-ref="shibboleth.ApplicationEndpointManager" />
+ p:endpointManager-ref="shibboleth.ApplicationEndpointManager"
+ p:metadataResolver-ref="shibboleth.MetadataResolverService"
+ p:attributeTranscoderRegistry-ref="shibboleth.AttributeRegistryService"
+ p:attributeResolver-ref="shibboleth.AttributeResolverService"
+ p:attributeFilter-ref="shibboleth.AttributeFilterService" /> />
<import resource="${sp.home}/conf/applications.xml" />
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml
index 7003c26..326e433 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/integration.xml
@@ -31,7 +31,7 @@
class="org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer" />
<!--
- This worked funtionally but didn't manage to allow blocked message exceptions to be raised against
+ This worked fuctionally but didn't manage to allow blocked message exceptions to be raised against
the error channel.
<bean id="shibboleth.TCPInterceptorFactory"
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/metadata-providers-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/metadata-providers-system.xml
new file mode 100644
index 0000000..d5dbe6b
--- /dev/null
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/metadata-providers-system.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <context:annotation-config />
+
+ <!-- BeanPostProcessors that auto-install MetadataFilters for internal use. -->
+
+ <bean class="net.shibboleth.spring.metadata.ByReferenceFilterBeanPostProcessor"
+ p:enabled="%{idp.service.metadata.enableByReferenceFilters:true}" />
+
+ <bean class="net.shibboleth.spring.metadata.NodeProcessingAttachingBeanPostProcessor"
+ p:nodeProcessors="#{getObject('shibboleth.MetadataNodeProcessors')}" />
+
+ <!-- Default NodeProcessors to auto-wire. -->
+ <bean class="org.opensaml.saml.metadata.resolver.filter.impl.EntitiesDescriptorNameProcessor" />
+ <bean class="net.shibboleth.idp.saml.security.impl.KeyAuthorityNodeProcessor" />
+ <bean class="net.shibboleth.idp.saml.metadata.impl.ScopesNodeProcessor" />
+ <bean class="net.shibboleth.idp.saml.metadata.impl.UIInfoNodeProcessor" />
+ <bean class="net.shibboleth.idp.saml.attribute.impl.AttributeMappingNodeProcessor"
+ c:_0-ref="shibboleth.AttributeRegistryService" />
+
+ <!-- Signature Validation Criteria -->
+
+ <bean id="shibboleth.MetadataSignatureValidationStaticCriteria"
+ class="net.shibboleth.spring.metadata.filter.SignatureValidationCriteriaSetFactoryBean"
+ p:includeOpenSAMLGlobalConfig="true"
+ p:otherCriteria="#{getObject('shibboleth.MetadataSignatureValidationOtherCriteria')}"
+ p:signatureValidationParametersResolver="#{getObject('shibboleth.MetadataSignatureValidationParametersResolver')}">
+ <property name="signatureValidationConfigurations">
+ <list>
+ <bean parent="shibboleth.BasicSignatureValidationConfiguration"
+ p:includedAlgorithms="#{getObject('shibboleth.IncludedSignatureAlgorithms')}"
+ p:excludedAlgorithms="#{getObject('shibboleth.ExcludedSignatureAlgorithms')}" />
+ </list>
+ </property>
+ </bean>
+
+ <!-- Metadata Query Protocol (MDQ) artifact support. -->
+ <bean id="shibboleth.Metadata.MDQ.URLBuilder.SAMLArtifact" lazy-init="true"
+ class="org.opensaml.saml.metadata.resolver.impl.SAMLArtifactURLBuilder" />
+
+ <!-- Wildcard import hook for plugins. -->
+ <import resource="classpath*:/META-INF/net/shibboleth/sp/service/saml/metadata/postconfig.xml" />
+
+</beans>
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml
index 51159bc..9212040 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/primitives.xml
@@ -25,8 +25,27 @@
class="net.shibboleth.ext.spring.factory.ProxiedFactoryBean"
c:service-ref="shibboleth.ManagedBeanService" />
+ <!-- List combiner factory bean. -->
+
+ <bean id="shibboleth.ListCombiner" abstract="true"
+ class="net.shibboleth.shared.spring.factory.CombiningListFactoryBean" />
+
+ <!-- Resource beans. -->
+
+ <bean id="shibboleth.ConditionalReesource" abstract="true"
+ class="net.shibboleth.shared.spring.resource.ConditionalResource" />
+
+ <bean id="shibboleth.RunnableFileSystemResource" abstract="true"
+ class="net.shibboleth.shared.spring.resource.RunnableFileSystemResource" />
+
<!-- TrustEngine helpers. -->
+ <bean id="shibboleth.StaticExplicitTrustEngine" abstract="true"
+ class="org.opensaml.spring.trust.StaticExplicitKeyFactoryBean" />
+
+ <bean id="shibboleth.StaticPKIXTrustEngine" abstract="true"
+ class="org.opensaml.spring.trust.StaticPKIXFactoryBean" />
+
<bean id="shibboleth.X509TrustManager" abstract="true"
class="org.opensaml.security.trust.impl.TrustEngineX509TrustManager" />
diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
index 8569743..4d31f8a 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
@@ -12,6 +12,8 @@
default-init-method="initialize"
default-destroy-method="destroy">
+ <import resource="${sp.home}/conf/services.xml" />
+
<!-- Parent beans for defining services. -->
<bean id="shibboleth.ReloadableService" abstract="true"
@@ -33,6 +35,8 @@
p:reloadCheckDelay="%{sp.service.logging.checkInterval:PT0S}"
p:failFast="%{sp.service.logging.failFast:%{sp.service.failFast:true}}" />
+ <!-- The SP "guts", the remoted endpoints. -->
+
<bean id="shibboleth.ServiceProvider" parent="shibboleth.ReloadableService"
c:claz="net.shibboleth.sp.remoting.EndpointManager"
p:serviceConfigurations-ref="ExtendedServiceProviderResources"
@@ -49,7 +53,110 @@
</property>
</bean>
- <!-- TODO: add attribute and metadata services (at least) -->
+ <!-- Attribute Filter Service -->
+
+ <bean id="shibboleth.AttributeFilterService" parent="shibboleth.ReloadableService"
+ depends-on="shibboleth.VelocityEngine"
+ p:serviceConfigurations-ref="ExtendedAttributeFilterResources"
+ p:failFast="%{sp.service.attribute.filter.failFast:%{sp.service.failFast:false}}"
+ p:reloadCheckDelay="%{sp.service.attribute.filter.checkInterval:PT0S}">
+ <constructor-arg name="claz" value="net.shibboleth.idp.attribute.filter.AttributeFilter" />
+ <constructor-arg name="strategy">
+ <bean class="net.shibboleth.idp.attribute.filter.spring.impl.AttributeFilterServiceStrategy"
+ id="ShibbolethAttributeFilter"/>
+ </constructor-arg>
+ </bean>
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedAttributeFilterResources" parent="shibboleth.ListCombiner"
+ p:firstList="#{getObject('%{sp.service.attribute.filter.resources:shibboleth.AttributeFilterResources}'.trim())}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/sp/conf/attribute-filter-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
+
+ <!-- Attribute Resolver Service -->
+
+ <bean id="shibboleth.AttributeResolverService" parent="shibboleth.ReloadableService"
+ depends-on="shibboleth.VelocityEngine"
+ p:serviceConfigurations-ref="ExtendedAttributeResolverResources"
+ p:failFast="%{sp.service.attribute.resolver.failFast:%{sp.service.failFast:false}}"
+ p:reloadCheckDelay="%{sp.service.attribute.resolver.checkInterval:PT0S}">
+ <constructor-arg name="claz" value="net.shibboleth.idp.attribute.resolver.AttributeResolver" />
+ <constructor-arg name="strategy">
+ <bean class="net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverServiceStrategy"
+ p:stripNulls="%{sp.service.attribute.resolver.stripNulls:false}"
+ id="ShibbolethAttributeResolver"/>
+ </constructor-arg>
+ </bean>
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedAttributeResolverResources" parent="shibboleth.ListCombiner"
+ p:firstList="#{getObject('%{sp.service.attribute.resolver.resources:shibboleth.AttributeResolverResources}'.trim())}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/sp/conf/attribute-resolver-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
+
+ <!-- Attribute Registry Service -->
+
+ <bean id="shibboleth.AttributeRegistryService" parent="shibboleth.ReloadableService"
+ p:serviceConfigurations-ref="ExtendedAttributeRegistryResources"
+ p:failFast="%{sp.service.attribute.registry.failFast:%{sp.service.failFast:false}}"
+ p:reloadCheckDelay="%{sp.service.attribute.registry.checkInterval:PT0S}">
+ <constructor-arg name="claz" value="net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry" />
+ <constructor-arg name="strategy">
+ <bean class="net.shibboleth.idp.attribute.transcoding.impl.AttributeRegistryServiceStrategy">
+ <!--
+ <property name="extendedConditionFactory">
+ <bean class="net.shibboleth.idp.relyingparty.impl.RelyingPartiesActivationConditionFactory" />
+ </property>
+ -->
+ </bean>
+ </constructor-arg>
+ </bean>
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedAttributeRegistryResources" parent="shibboleth.ListCombiner"
+ p:firstList="#{getObject('%{sp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()) ?:
+ getObject('shibboleth.DefaultAttributeRegistryResources')}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/sp/conf/attribute-registry-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
+
+ <!-- Metadata Resolver Service -->
+
+ <bean id="shibboleth.MetadataResolverService" parent="shibboleth.ReloadableService"
+ depends-on="shibboleth.AttributeRegistryService"
+ p:serviceConfigurations-ref="ExtendedMetadataResolverResources"
+ p:failFast="%{sp.service.metadata.failFast:%{sp.service.failFast:false}}"
+ p:reloadCheckDelay="%{sp.service.metadata.checkInterval:PT0S}">
+ <constructor-arg name="claz" value="org.opensaml.saml.metadata.resolver.MetadataResolver" />
+ <constructor-arg name="strategy">
+ <bean class="net.shibboleth.idp.saml.metadata.impl.MetadataResolverServiceStrategy" />
+ </constructor-arg>
+ </bean>
+ <!-- Auto-append system config file to resource set. -->
+ <bean id ="ExtendedMetadataResolverResources" parent="shibboleth.ListCombiner"
+ p:firstList-ref="#{'%{sp.service.metadata.resources:shibboleth.MetadataResolverResources}'.trim()}" >
+ <property name="secondList">
+ <util:list >
+ <value>classpath:/net/shibboleth/sp/conf/metadata-providers-system.xml</value>
+ </util:list>
+ </property>
+ </bean>
+
+ <!-- May not need this? -->
+ <!--
+ <bean id="shibboleth.MetadataResolver"
+ class="net.shibboleth.idp.saml.metadata.impl.ReloadableMetadataResolver"
+ c:resolverService-ref="shibboleth.MetadataResolverService" />
+ -->
+
<import resource="conditional:%{sp.home}/conf/services.xml" />
diff --git a/sp-conf/src/main/resources/conf/services.properties b/sp-conf/src/main/resources/conf/services.properties
index 8409c82..f962115 100644
--- a/sp-conf/src/main/resources/conf/services.properties
+++ b/sp-conf/src/main/resources/conf/services.properties
@@ -1,7 +1,7 @@
# Configure the resources to load for various services,
# and the settings for failure handling and auto-reload.
-# failFast=true prevents IdP startup if a configuration is bad
+# failFast=true prevents sp startup if a configuration is bad
# checkInterval = PT0S means never reload (this is the default)
# Global default for fail-fast behavior of most subsystems
@@ -12,9 +12,31 @@
#sp.service.logging.failFast = true
sp.service.logging.checkInterval = PT5M
-#idp.service.provider.resources = shibboleth.ServiceProviderResources
-#idp.service.provider.failFast = true
-idp.service.provider.checkInterval = PT5M
+#sp.service.provider.resources = shibboleth.ServiceProviderResources
+#sp.service.provider.failFast = true
+sp.service.provider.checkInterval = PT5M
+
+#sp.service.metadata.resources = shibboleth.MetadataResolverResources
+#sp.service.metadata.failFast = false
+#sp.service.metadata.checkInterval = PT0S
+# Set to false if not using ByReference MetadataFilters for a small perf gain
+#sp.service.metadata.enableByReferenceFilters = true
+
+#sp.service.attribute.registry.resources = shibboleth.AttributeRegistryResources
+#sp.service.attribute.registry.failFast = false
+sp.service.attribute.registry.checkInterval = PT15M
+
+#sp.service.attribute.resolver.resources = shibboleth.AttributeResolverResources
+#sp.service.attribute.resolver.failFast = false
+sp.service.attribute.resolver.checkInterval = PT15M
+#sp.service.attribute.resolver.maskFailures = true
+#sp.service.attribute.resolver.stripNulls = false
+
+#sp.service.attribute.filter.resources = shibboleth.AttributeFilterResources
+# NOTE: Failing the filter fast leaves no filters enabled.
+#sp.service.attribute.filter.failFast = false
+sp.service.attribute.filter.checkInterval = PT15M
+#sp.service.attribute.filter.maskFailures = true
# These settings impact the behavior of the internal HTTP Client used by default
diff --git a/sp-conf/src/main/resources/conf/services.xml b/sp-conf/src/main/resources/conf/services.xml
new file mode 100644
index 0000000..2a63d9f
--- /dev/null
+++ b/sp-conf/src/main/resources/conf/services.xml
@@ -0,0 +1,30 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p"
+ xmlns:c="http://www.springframework.org/schema/c" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+
+ default-init-method="initialize"
+ default-destroy-method="destroy">
+
+ <!-- By default we look at resources whose names are derived from %{sp.home}. -->
+
+ <util:list id="shibboleth.MetadataResolverResources">
+ <value>%{sp.home}/conf/metadata-providers.xml</value>
+ </util:list>
+
+ <util:list id ="shibboleth.AttributeResolverResources">
+ <value>%{sp.home}/conf/attribute-resolver.xml</value>
+ </util:list>
+
+ <util:list id ="shibboleth.AttributeRegistryResources">
+ <value>%{sp.home}/conf/attribute-registry.xml</value>
+ </util:list>
+
+ <util:list id ="shibboleth.AttributeFilterResources">
+ <value>%{sp.home}/conf/attribute-filter.xml</value>
+ </util:list>
+
+</beans>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list