[java-identity-provider] 06/06: IDP-1423 Remove Deprecated HTTPmetadataProvider.
Rod Widdowson
rdw at steadingsoftware.com
Tue Feb 26 09:45:14 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=889afabc0659960fb9946b847becd076d5586f7c
commit 889afabc0659960fb9946b847becd076d5586f7c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Feb 26 14:38:47 2019 +0000
IDP-1423 Remove Deprecated HTTPmetadataProvider.
https://issues.shibboleth.net/jira/browse/IDP-1423
---
.../metadata/impl/HTTPMetadataProviderParser.java | 31 +++-----------
.../metadata/impl/MetadataNamespaceHandler.java | 4 --
.../impl/ResourceBackedMetadataProviderParser.java | 2 +-
.../metadata/HTTPMetadataProviderParserTest.java | 47 ++--------------------
.../spring/relyingparty/metadata/HTTPEntities.xml | 12 ------
.../spring/relyingparty/metadata/HTTPEntity.xml | 10 -----
...EntitiesClient.xml => http-entities-client.xml} | 3 +-
...g-file.xml => http-entity-httpCaching-file.xml} | 3 +-
...mory.xml => http-entity-httpCaching-memory.xml} | 3 +-
...g-none.xml => http-entity-httpCaching-none.xml} | 3 +-
.../metadata/{HTTPProxy.xml => http-proxy.xml} | 4 +-
.../main/resources/schema/shibboleth-metadata.xsd | 44 ++++++++------------
12 files changed, 38 insertions(+), 128 deletions(-)
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
index d8ac04b..c93d974 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
@@ -19,17 +19,7 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import javax.xml.namespace.QName;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
-import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -40,14 +30,14 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
/**
* Parser for a FilesystemMetadataProvider.
*/
-public class HTTPMetadataProviderParser extends AbstractReloadingMetadataProviderParser {
-
- /** Element name. */
- @Nonnull public static final QName ELEMENT_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
- "HTTPMetadataProvider");
+public abstract class HTTPMetadataProviderParser extends AbstractReloadingMetadataProviderParser {
/** Default caching type. */
@Nonnull @NotEmpty private static final String DEFAULT_CACHING = "none";
@@ -55,22 +45,11 @@ public class HTTPMetadataProviderParser extends AbstractReloadingMetadataProvide
/** Logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(HTTPMetadataProviderParser.class);
- /** {@inheritDoc} */
- @Override protected Class<? extends HTTPMetadataResolver> getNativeBeanClass(final Element element) {
- return HTTPMetadataResolver.class;
- }
-
// Checkstyle: CyclomaticComplexity OFF
/** {@inheritDoc} */
@Override protected void doNativeParse(final Element element, final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
- if (ELEMENT_NAME.equals(DOMTypeSupport.getXSIType(element))) {
- DeprecationSupport.warn(ObjectType.XSITYPE, ELEMENT_NAME.toString(),
- parserContext.getReaderContext().getResource().getDescription(),
- FileBackedHTTPMetadataProviderParser.ELEMENT_NAME.toString());
- }
-
super.doNativeParse(element, parserContext, builder);
if (element.hasAttributeNS(null, "cacheDuration")) {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java
index 41f766b..4c3585f 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java
@@ -61,10 +61,6 @@ public class MetadataNamespaceHandler extends BaseSpringNamespaceHandler {
registerBeanDefinitionParser(LocalDynamicMetadataProviderParser.ELEMENT_NAME,
new LocalDynamicMetadataProviderParser());
- // TODO: deprecated, remove in 4.0
- registerBeanDefinitionParser(HTTPMetadataProviderParser.ELEMENT_NAME, new HTTPMetadataProviderParser());
-
-
// Resources
registerBeanDefinitionParser(ClasspathResourceParser.ELEMENT_NAME, new ClasspathResourceParser());
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/ResourceBackedMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/ResourceBackedMetadataProviderParser.java
index 3f91417..ca53ea4 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/ResourceBackedMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/ResourceBackedMetadataProviderParser.java
@@ -151,7 +151,7 @@ public class ResourceBackedMetadataProviderParser extends AbstractReloadingMetad
DeprecationSupport.warn(ObjectType.ELEMENT, ResourceNamespaceHandler.HTTP_ELEMENT_NAME.toString(),
parserContext.getReaderContext().getResource().getDescription(),
- HTTPMetadataProviderParser.ELEMENT_NAME.toString());
+ FileBackedHTTPMetadataProviderParser.ELEMENT_NAME.toString());
parseHTTPResource(resources.get(0), parserContext, builder);
} else if (ResourceNamespaceHandler.FILE_HTTP_ELEMENT_NAME.equals(qName)) {
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
index 6987e49..0845ad9 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
@@ -17,10 +17,7 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata;
-import java.util.Iterator;
-
import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolver;
-import org.opensaml.saml.saml2.metadata.EntityDescriptor;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.mock.env.MockPropertySource;
import org.testng.Assert;
@@ -37,30 +34,7 @@ public class HTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
private static final String ENTITY_XML = "idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entity.xml";
private static final String ENTITIES_XML = "idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/entities.xml";
-
- @Test public void entity() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
-
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "HTTPEntity.xml", "beans.xml");
-
- Assert.assertEquals(resolver.getId(), "HTTPEntity");
-
-
- final Iterator<EntityDescriptor> entities = resolver.resolve(criteriaFor(IDP_ID)).iterator();
- Assert.assertTrue(resolver.isFailFastInitialization());
- Assert.assertTrue(resolver.isRequireValidMetadata());
-
- Assert.assertEquals(entities.next().getEntityID(), IDP_ID);
- Assert.assertFalse(entities.hasNext());
-
- Assert.assertEquals(resolver.getRefreshDelayFactor(), 0.75, 0.001);
- Assert.assertEquals(resolver.getExpirationWarningThreshold(), 1000*60*60*12);
- Assert.assertSame(resolver.getParserPool(), parserPool);
- Assert.assertNull(resolver.resolveSingle(criteriaFor(SP_ID)));
- }
-
@Test(enabled=false) public void httpsNoTrustEngine() throws Exception {
MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
RepositorySupport.buildHTTPSResourceURL(REPO_IDP, ENTITY_XML));
@@ -139,24 +113,11 @@ public class HTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
getBean(HTTPMetadataResolver.class, propSource, "HTTPProxy.xml", "beans.xml");
}
- @Test public void entities() throws Exception {
- MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
- RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITIES_XML, false));
-
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "HTTPEntities.xml", "beans.xml");
-
- Assert.assertEquals(resolver.getId(), "HTTPEntities");
- Assert.assertNotNull(resolver.resolveSingle(criteriaFor(SP_ID)));
- Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
- Assert.assertNotSame(resolver.getParserPool(), parserPool);
-
- }
-
@Test public void httpClient() throws Exception {
MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITIES_XML, false));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "HTTPEntitiesClient.xml", "beans.xml", "httpClient.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entities-client.xml", "beans.xml", "httpClient.xml");
Assert.assertEquals(resolver.getId(), "HTTPEntities");
Assert.assertNotNull(resolver.resolveSingle(criteriaFor(SP_ID)));
@@ -169,7 +130,7 @@ public class HTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "HTTPEntity-httpCaching-none.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entity-httpCaching-none.xml", "beans.xml");
Assert.assertEquals(resolver.getId(), "HTTPEntity");
Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
@@ -180,7 +141,7 @@ public class HTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "HTTPEntity-httpCaching-memory.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entity-httpCaching-memory.xml", "beans.xml");
Assert.assertEquals(resolver.getId(), "HTTPEntity");
Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
@@ -193,7 +154,7 @@ public class HTTPMetadataProviderParserTest extends AbstractMetadataParserTest {
MockPropertySource propSource = singletonPropertySource(PROP_MDURL,
RepositorySupport.buildHTTPResourceURL(REPO_IDP, ENTITY_XML, false));
- HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "HTTPEntity-httpCaching-file.xml", "beans.xml");
+ HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, propSource, "http-entity-httpCaching-file.xml", "beans.xml");
Assert.assertEquals(resolver.getId(), "HTTPEntity");
Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml
deleted file mode 100644
index 003c599..0000000
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
- urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
-
- parserPoolRef="myParserPool" requestTimeout="PT40M" basicAuthPassword="pass" basicAuthUser="user" disregardTLSCertificate="true"
- id="HTTPEntities" xsi:type="metadata:HTTPMetadataProvider"
- 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/HTTPEntity.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity.xml
deleted file mode 100644
index f7e0fcd..0000000
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata:MetadataProvider xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:metadata="urn:mace:shibboleth:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.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="HTTPEntity" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}" expirationWarningThreshold="PT12H">
-
-</metadata:MetadataProvider>
-
\ No newline at end of file
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entities-client.xml
similarity index 80%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entities-client.xml
index b61e710..45a9913 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entities-client.xml
@@ -5,7 +5,8 @@
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
parserPoolRef="myParserPool" requestTimeout="PT40M" basicAuthPassword="pass" basicAuthUser="user" disregardTLSCertificate="true"
- id="HTTPEntities" xsi:type="metadata:HTTPMetadataProvider"
+ id="HTTPEntities" xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpentitiesClient.xml"
httpClientRef="apacheClient"
metadataURL="%{metadataURL}">
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-file.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-file.xml
similarity index 83%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-file.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-file.xml
index 513e7a0..17d6c2d 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-file.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-file.xml
@@ -5,7 +5,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="HTTPEntity"
- xsi:type="metadata:HTTPMetadataProvider"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpentitycaching-file.xml"
httpCaching="file"
httpCacheDirectory="#{systemProperties['java.io.tmpdir']}/httpProviderCacheTest"
httpMaxCacheEntries="100"
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-memory.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-memory.xml
similarity index 81%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-memory.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-memory.xml
index 8b6e189..da0fbc4 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-memory.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-memory.xml
@@ -5,7 +5,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="HTTPEntity"
- xsi:type="metadata:HTTPMetadataProvider"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpcaching-memory.xml"
httpCaching="memory"
httpMaxCacheEntries="100"
httpMaxCacheEntrySize="104857600"
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-none.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-none.xml
similarity index 79%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-none.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-none.xml
index 9a2cfb1..be0f810 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntity-httpCaching-none.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-entity-httpCaching-none.xml
@@ -5,7 +5,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="HTTPEntity"
- xsi:type="metadata:HTTPMetadataProvider"
+ xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpentitycaching none.xml"
httpCaching="none"
metadataURL="%{metadataURL}">
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPProxy.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-proxy.xml
similarity index 75%
rename from idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPProxy.xml
rename to idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-proxy.xml
index 7fe6552..75c02ea 100644
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPProxy.xml
+++ b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/http-proxy.xml
@@ -5,7 +5,9 @@
urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"
proxyHost="localhost" proxyUser="user" proxyPassword="pass" proxyPort="123"
- id="HTTPProxy" xsi:type="metadata:HTTPMetadataProvider" metadataURL="%{metadataURL}">
+ id="HTTPProxy" xsi:type="metadata:FileBackedHTTPMetadataProvider"
+ backingFile="%{DIR}/spoolhttpproxy.xml"
+ metadataURL="%{metadataURL}">
</metadata:MetadataProvider>
\ No newline at end of file
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index 3f41688..2a9d61a 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -120,7 +120,23 @@
</documentation>
</annotation>
<complexContent>
- <extension base="shibmd:HTTPMetadataProvider">
+ <extension base="shibmd:ReloadingMetadataProviderType">
+ <sequence>
+ <element name="TLSTrustEngine" minOccurs="0" maxOccurs="1">
+ <annotation>
+ <documentation>
+ TrustEngine used to evaluate HTTPS server TLS certificates.
+
+ This element conflicts with and overriddes the tlsTrustEngineRef attribute.
+ </documentation>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="security:TrustEngine" minOccurs="1" maxOccurs="1" />
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
<attribute name="backingFile" type="string" use="required">
<annotation>
<documentation>
@@ -142,32 +158,6 @@
</documentation>
</annotation>
</attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="HTTPMetadataProvider">
- <annotation>
- <documentation>A metadata provider that periodically pulls metadata from a given URL.</documentation>
- </annotation>
- <complexContent>
- <extension base="shibmd:ReloadingMetadataProviderType">
- <sequence>
- <element name="TLSTrustEngine" minOccurs="0" maxOccurs="1">
- <annotation>
- <documentation>
- TrustEngine used to evaluate HTTPS server TLS certificates.
-
- This element conflicts with and overriddes the tlsTrustEngineRef attribute.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="security:TrustEngine" minOccurs="1" maxOccurs="1" />
- </sequence>
- </complexType>
- </element>
- </sequence>
<attribute name="httpClientRef" type="string">
<annotation>
<documentation>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list