[java-identity-provider] branch feature/IDP-1434 updated: Split registry configuration into system and user halves.
Scott Cantor
cantor.2 at osu.edu
Mon May 6 15:22:47 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch feature/IDP-1434
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=af8578112ca943b37f8c553facd1f9fd76a3cbd7
The following commit(s) were added to refs/heads/feature/IDP-1434 by this push:
new af85781 Split registry configuration into system and user halves.
af85781 is described below
commit af8578112ca943b37f8c553facd1f9fd76a3cbd7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon May 6 15:22:45 2019 -0400
Split registry configuration into system and user halves.
---
.../src/main/resources/conf/attribute-registry.xml | 27 ----------------------
.../src/main/resources/conf/services.properties | 4 ++++
idp-conf/src/main/resources/conf/services.xml | 9 ++++++++
.../conf/attribute-registry-system.xml} | 18 ---------------
.../main/resources/system/conf/services-system.xml | 19 +++++++--------
5 files changed, 23 insertions(+), 54 deletions(-)
diff --git a/idp-conf/src/main/resources/conf/attribute-registry.xml b/idp-conf/src/main/resources/conf/attribute-registry.xml
index 7a56789..675aca4 100644
--- a/idp-conf/src/main/resources/conf/attribute-registry.xml
+++ b/idp-conf/src/main/resources/conf/attribute-registry.xml
@@ -13,24 +13,6 @@
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="SAML1StringTranscoder"
- class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1StringAttributeTranscoder" />
- <bean id="SAML1ScopedStringTranscoder"
- class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ScopedStringAttributeTranscoder" />
- <bean id="SAML1ByteTranscoder"
- class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ByteAttributeTranscoder" />
- <bean id="SAML1XMLObjectTranscoder"
- class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1XMLObjectAttributeTranscoder" />
-
<util:list id="DefaultAttributeRegistry">
<map>
@@ -48,13 +30,4 @@
</util:list>
-->
- <util:map id="DefaultNamingRegistry">
- <entry key="#{T(org.opensaml.saml.saml2.core.Attribute)}">
- <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML2AttributeTranscoder.NamingFunction" />
- </entry>
- <entry key="#{T(org.opensaml.saml.saml1.core.AttributeDesignator)}">
- <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML1AttributeTranscoder.NamingFunction" />
- </entry>
- </util:map>
-
</beans>
diff --git a/idp-conf/src/main/resources/conf/services.properties b/idp-conf/src/main/resources/conf/services.properties
index 9e9b102..dfe42f4 100644
--- a/idp-conf/src/main/resources/conf/services.properties
+++ b/idp-conf/src/main/resources/conf/services.properties
@@ -27,6 +27,10 @@ idp.service.attribute.resolver.checkInterval = PT15M
#idp.service.attribute.resolver.maskFailures = true
#idp.service.attribute.resolver.stripNulls = false
+#idp.service.attribute.registry.resources = shibboleth.AttributeRegistryResources
+#idp.service.attribute.registry.failFast = false
+idp.service.attribute.registry.checkInterval = PT15M
+
#idp.service.attribute.filter.resources = shibboleth.AttributeFilterResources
# NOTE: Failing the filter fast leaves no filters enabled.
#idp.service.attribute.filter.failFast = false
diff --git a/idp-conf/src/main/resources/conf/services.xml b/idp-conf/src/main/resources/conf/services.xml
index e04ac8f..11f70b3 100644
--- a/idp-conf/src/main/resources/conf/services.xml
+++ b/idp-conf/src/main/resources/conf/services.xml
@@ -69,6 +69,15 @@
<value>%{idp.home}/conf/attribute-resolver.xml</value>
</util:list>
+ <!--
+ TODO: uncomment this for release, leaving out to test upgrades for now.
+ <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/attribute-resolver.xml</value>
+ </util:list>
+ -->
+
<util:list id ="shibboleth.AttributeFilterResources">
<value>%{idp.home}/conf/attribute-filter.xml</value>
</util:list>
diff --git a/idp-conf/src/main/resources/conf/attribute-registry.xml b/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
similarity index 82%
copy from idp-conf/src/main/resources/conf/attribute-registry.xml
copy to idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
index 7a56789..c8c2a48 100644
--- a/idp-conf/src/main/resources/conf/attribute-registry.xml
+++ b/idp-conf/src/main/resources/system/conf/attribute-registry-system.xml
@@ -12,7 +12,6 @@
default-init-method="initialize"
default-destroy-method="destroy">
- <!--
<bean id="SAML2StringTranscoder"
class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML2StringAttributeTranscoder" />
<bean id="SAML2ScopedStringTranscoder"
@@ -30,23 +29,6 @@
class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1ByteAttributeTranscoder" />
<bean id="SAML1XMLObjectTranscoder"
class="net.shibboleth.idp.saml.attribute.transcoding.impl.SAML1XMLObjectAttributeTranscoder" />
-
- <util:list id="DefaultAttributeRegistry">
-
- <map>
- <entry key="id" value="uid" />
- <entry key="transcoder" value-ref="SAML2StringTranscoder" />
- <entry key="name" value="urn:oid:0.9.2342.19200300.100.1.1" />
- </map>
-
- <map>
- <entry key="id" value="uid" />
- <entry key="transcoder" value-ref="SAML1StringTranscoder" />
- <entry key="name" value="urn:mace:dir:attribute-def:uid" />
- </map>
-
- </util:list>
- -->
<util:map id="DefaultNamingRegistry">
<entry key="#{T(org.opensaml.saml.saml2.core.Attribute)}">
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 3790e17..0178d45 100644
--- a/idp-conf/src/main/resources/system/conf/services-system.xml
+++ b/idp-conf/src/main/resources/system/conf/services-system.xml
@@ -54,14 +54,6 @@
</constructor-arg>
</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: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" />
-
<bean id="shibboleth.AttributeRegistryService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
p:serviceConfigurations-ref="#{
getObject('%{idp.service.attribute.registry.resources:shibboleth.AttributeRegistryResources}'.trim()) != null
@@ -74,14 +66,23 @@
<constructor-arg name="claz" value="net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry" />
<constructor-arg name="strategy">
<bean class="net.shibboleth.idp.attribute.transcoding.spring.impl.AttributeRegistryServiceStrategy"
- p:namingRegistry="DefaultNamingRegistry" />
+ p:namingRegistry="#{'%{idp.service.attribute.registry.namingRegistry:DefaultNamingRegistry}'.trim()}" />
</constructor-arg>
</bean>
<util:list id ="shibboleth.DefaultAttributeRegistryResources">
<value>%{idp.home}/conf/attribute-registry.xml</value>
+ <value>%{idp.home}/system/conf/attribute-registry-system.xml</value>
<value>%{idp.home}/conf/attribute-resolver.xml</value>
</util:list>
+ <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: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" />
+
<bean id="shibboleth.RelyingPartyResolverService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
p:serviceConfigurations-ref="#{'%{idp.service.relyingparty.resources:shibboleth.RelyingPartyResolverResources}'.trim()}"
p:failFast="%{idp.service.relyingparty.failFast:%{idp.service.failFast:false}}"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list