[java-identity-provider] 03/06: IDP-1423 Stop using deprecated HTTPmetadataProvider in https tests
Rod Widdowson
rdw at steadingsoftware.com
Tue Feb 26 09:45:11 EST 2019
This is an automated email from the git hooks/post-receive script.
rdw 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=34d6abded1c54276f768ed22cc3c3ebf3d317c47
commit 34d6abded1c54276f768ed22cc3c3ebf3d317c47
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Feb 25 16:52:58 2019 +0000
IDP-1423 Stop using deprecated HTTPmetadataProvider in https tests
https://issues.shibboleth.net/jira/browse/IDP-1423
Use HTTP file backed instead of HTTP
---
.../spring/relyingparty/metadata/https-client-security-params.xml | 5 ++++-
.../idp/profile/spring/relyingparty/metadata/https-indexes.xml | 3 ++-
.../idp/profile/spring/relyingparty/metadata/https-noTrustEngine.xml | 4 +++-
.../idp/profile/spring/relyingparty/metadata/https-timeouts.xml | 3 ++-
.../spring/relyingparty/metadata/https-trustEngine-explicitKey.xml | 5 ++++-
.../spring/relyingparty/metadata/https-trustEngine-invalidKey.xml | 5 ++++-
.../spring/relyingparty/metadata/https-trustEngine-invalidPKIX.xml | 5 ++++-
.../metadata/https-trustEngine-validPKIX-explicitTrustedName.xml | 5 ++++-
.../spring/relyingparty/metadata/https-trustEngine-validPKIX.xml | 5 ++++-
9 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-client-security-params.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-client-security-params.xml
index 74abf11..87da807 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-client-security-params.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-client-security-params.xml
@@ -8,8 +8,11 @@
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
id="HTTPSEntityWithClientSecurityParams"
- xsi:type="metadata:HTTPMetadataProvider"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
metadataURL="%{metadataURL}"
+
+ backingFile="%{DIR}/spoolClientSecurityParams.xml"
+
httpClientSecurityParametersRef="metadata.HttpClientSecurityParameters"
>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-indexes.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-indexes.xml
index 1634cd5..3a9dd96 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-indexes.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-indexes.xml
@@ -8,7 +8,8 @@
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
id="HTTPSEntityWithIndexes"
- xsi:type="metadata:HTTPMetadataProvider"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpsindexies.xml"
metadataURL="%{metadataURL}"
indexesRef="metadata.Indexes"
>
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-noTrustEngine.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-noTrustEngine.xml
index 5eeea11..54e8960 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-noTrustEngine.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-noTrustEngine.xml
@@ -7,7 +7,9 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- id="HTTPSEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+ id="HTTPSEntity" xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpsnotrustengine.xml"
+ metadataURL="%{metadataURL}">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-timeouts.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-timeouts.xml
index d6e5a34..b91584a 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-timeouts.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-timeouts.xml
@@ -8,7 +8,8 @@
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
id="HTTPSEntityWithTimeouts"
- xsi:type="metadata:HTTPMetadataProvider"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpstimeouts.xml"
metadataURL="%{metadataURL}"
connectionTimeout="PT2M30S"
connectionRequestTimeout="PT2M30S"
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-explicitKey.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-explicitKey.xml
index c9762c0..73d21da 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-explicitKey.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-explicitKey.xml
@@ -7,7 +7,10 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- id="HTTPSEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+ id="HTTPSEntity"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpstrustengineexplicitkey.xml"
+ metadataURL="%{metadataURL}">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidKey.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidKey.xml
index d6ea45f..1712882 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidKey.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidKey.xml
@@ -7,7 +7,10 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- id="HTTPSEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+ id="HTTPSEntity"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpstrustengineinvalidkey.xml"
+ metadataURL="%{metadataURL}">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticExplicitKey">
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidPKIX.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidPKIX.xml
index ae3ccf2..bde17a5 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidPKIX.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-invalidPKIX.xml
@@ -7,7 +7,10 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- id="HTTPSEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+ id="HTTPSEntity"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpstrustengineinvalidPKIX.xml"
+ metadataURL="%{metadataURL}">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticPKIXX509Credential" trustedNameCheckEnabled="false">
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml
index afb5c65..f4f69c2 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX-explicitTrustedName.xml
@@ -7,7 +7,10 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- id="HTTPSEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+ id="HTTPSEntity"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpstrustvalidpkixexplicit.xml"
+ metadataURL="%{metadataURL}">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticPKIXX509Credential">
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX.xml
index 4e0f528..16e353c 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-trustEngine-validPKIX.xml
@@ -7,7 +7,10 @@
urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
- id="HTTPSEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+ id="HTTPSEntity"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpsvalidpkix.xml"
+ metadataURL="%{metadataURL}">
<metadata:TLSTrustEngine>
<security:TrustEngine id="trustEngine" xsi:type="security:StaticPKIXX509Credential" trustedNameCheckEnabled="false">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list