[infra-disco] 04/04: Implement MDA 0.10 deprecations
Ian Young
ian at iay.org.uk
Fri Jul 4 09:54:46 UTC 2025
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository infra-disco.
View the commit online:
http://git.shibboleth.net/view/?p=infra-disco.git;a=commit;h=91e064c7ad8b74addc450154c6a1240c88fa8016
commit 91e064c7ad8b74addc450154c6a1240c88fa8016
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Jul 4 09:52:47 2025 +0000
Implement MDA 0.10 deprecations
---
discoshibb.xml | 90 +++++++++++++++++++++++++---------------------------------
1 file changed, 39 insertions(+), 51 deletions(-)
diff --git a/discoshibb.xml b/discoshibb.xml
index c0c421e..14e790a 100644
--- a/discoshibb.xml
+++ b/discoshibb.xml
@@ -15,23 +15,41 @@
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">
+ <!--
+ Enable property placeholder replacement from system properties only.
+ -->
+ <context:property-placeholder/>
+
+ <!--
+ Pick up MDA standard bean definition resource.
+ -->
+ <import resource="classpath:net/shibboleth/metadata/beans.xml"/>
+
+ <!--
+ *******************************
+ *** ***
+ *** P A R A M E T E R S ***
+ *** ***
+ *******************************
+ -->
+
<!-- Locations of files and feeds. -->
<bean id="shibboleth.metadata" parent="File"
c:_="${config.dir:/etc/shibboleth}/idp.shibboleth.net-metadata.xml"/>
<bean id="DAASI.metadata" parent="File"
c:_="${config.dir:/etc/shibboleth}/daasi-metadata.xml"/>
- <bean id="InCommon.key" parent="X509CertificateFactoryBean"
+ <bean id="InCommon.key" parent="mda.X509CertificateFactoryBean"
p:resource="file:${config.dir:/etc/shibboleth}/inc-md-cert-mdq.pem"/>
<bean id="InCommon.url" parent="String"
c:_="https://mdq.incommon.org/entities/idps/all"/>
- <bean id="Tuakiri.key" parent="X509CertificateFactoryBean"
+ <bean id="Tuakiri.key" parent="mda.X509CertificateFactoryBean"
p:resource="file:${config.dir:/etc/shibboleth}/tuakiri-metadata-cert.pem"/>
<bean id="Tuakiri.url" parent="String"
c:_="https://directory.tuakiri.ac.nz/metadata/tuakiri-metadata-signed.xml"/>
- <bean id="AAF.key" parent="X509CertificateFactoryBean"
+ <bean id="AAF.key" parent="mda.X509CertificateFactoryBean"
p:resource="file:${config.dir:/etc/shibboleth}/aaf-metadata-cert.pem"/>
<bean id="AAF.url" parent="String"
c:_="https://md.aaf.edu.au/aaf-metadata.xml"/>
@@ -50,15 +68,6 @@
<bean id="File" abstract="true" class="java.io.File"/>
<bean id="String" abstract="true" class="java.lang.String"/>
- <!--
- component_parent
-
- Parent for anything based on the Shibboleth component system.
- These all require initialization before use.
- -->
- <bean id="component_parent" abstract="true"
- init-method="initialize" destroy-method="destroy"/>
-
<!--
XMLSignatureValidationStage
@@ -73,12 +82,12 @@
require it.
-->
<bean id="XMLSignatureValidationStage" abstract="true" parent="mda.XMLSignatureValidationStage">
- <property name="blacklistedDigests">
+ <property name="disallowedDigests">
<list>
<value>http://www.w3.org/2001/04/xmldsig-more#md5</value>
</list>
</property>
- <property name="blacklistedSignatureMethods">
+ <property name="disallowedSignatureMethods">
<list>
<value>http://www.w3.org/2001/04/xmldsig-more#rsa-md5</value>
</list>
@@ -94,13 +103,13 @@
-->
<bean id="XMLSignatureValidationStageSHA256" abstract="true"
parent="XMLSignatureValidationStage">
- <property name="blacklistedDigests">
+ <property name="disallowedDigests">
<list>
<value>http://www.w3.org/2000/09/xmldsig#sha1</value>
<value>http://www.w3.org/2001/04/xmldsig-more#md5</value>
</list>
</property>
- <property name="blacklistedSignatureMethods">
+ <property name="disallowedSignatureMethods">
<list>
<value>http://www.w3.org/2000/09/xmldsig#rsa-sha1</value>
<value>http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1</value>
@@ -109,22 +118,8 @@
</property>
</bean>
- <!--
- Shibboleth-defined Resource class parent bean.
- -->
- <bean id="HTTPResource" abstract="true"
- class="net.shibboleth.ext.spring.resource.HTTPResource"/>
-
- <!--
- Pick up Shibboleth MDA beans.
- -->
- <import resource="classpath:net/shibboleth/metadata/beans.xml"/>
-
- <bean id="X509CertificateFactoryBean" abstract="true"
- class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean"/>
-
<!-- *** Default Shibboleth component bean id property from Spring bean id *** -->
- <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" lazy-init="false"/>
+ <bean parent="mda.IdentifiableBeanPostProcessor" lazy-init="false"/>
<!--
*****************************
@@ -134,20 +129,15 @@
*****************************
-->
- <!--
- Enable property placeholder replacement from system properties only.
- -->
- <context:property-placeholder/>
-
<!-- This bean MUST be called "conversionService" to work properly. -->
<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
<property name="converters">
<set>
- <bean class="net.shibboleth.ext.spring.config.StringToDurationConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
- <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
- <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
+ <bean parent="mda.StringToDurationConverter"/>
+ <bean parent="mda.StringToIPRangeConverter"/>
+ <bean parent="mda.BooleanToPredicateConverter"/>
+ <bean parent="mda.StringBooleanToPredicateConverter"/>
+ <bean parent="mda.StringToResourceConverter"/>
</set>
</property>
</bean>
@@ -199,7 +189,7 @@
Warnings are not announced, and do not cause termination.
-->
<bean id="errorTerminatingFilter" parent="mda.CompositeStage">
- <property name="composedStages">
+ <property name="stages">
<list>
<ref bean="errorAnnouncer"/>
<ref bean="errorTerminator"/>
@@ -235,11 +225,10 @@
These options can be removed once the underlying issue has been resolved.
-->
- <bean id="httpClientBuilder"
- class="net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder"
+ <bean id="httpClientBuilder" parent="mda.HttpClientBuilder"
p:connectionDisregardTLSCertificate="true"
- p:socketTimeout="100000"
- p:connectionTimeout="100000"
+ p:socketTimeout="PT100S"
+ p:connectionTimeout="PT100S"
/>
<!--
@@ -254,8 +243,7 @@
A pre-configured parser pool for use by source stages.
-->
- <bean id="parserPool" parent="component_parent"
- class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
+ <bean id="parserPool" parent="mda.BasicParserPool"
p:ignoreComments="false"
p:ignoreElementContentWhitespace="false"/>
@@ -273,7 +261,7 @@
<bean id="aggregate" parent="mda.DOMResourceSourceStage">
<property name="parserPool" ref="parserPool"/>
<property name="DOMResource">
- <bean parent="HTTPResource">
+ <bean parent="mda.HTTPResource">
<constructor-arg name="client" ref="httpClient"/>
<constructor-arg name="url" ref="InCommon.url"/>
</bean>
@@ -311,7 +299,7 @@
<bean id="aggregate" parent="mda.DOMResourceSourceStage">
<property name="parserPool" ref="parserPool"/>
<property name="DOMResource">
- <bean parent="HTTPResource">
+ <bean parent="mda.HTTPResource">
<constructor-arg name="client" ref="httpClient"/>
<constructor-arg name="url" ref="Tuakiri.url"/>
</bean>
@@ -349,7 +337,7 @@
<bean id="aggregate" parent="mda.DOMResourceSourceStage">
<property name="parserPool" ref="parserPool"/>
<property name="DOMResource">
- <bean parent="HTTPResource">
+ <bean parent="mda.HTTPResource">
<constructor-arg name="client" ref="httpClient"/>
<constructor-arg name="url" ref="AAF.url"/>
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list