[java-identity-provider] 02/02: IDP-1423 Remove deprecated ExtensionSchema from SchemaValidation metadata filter
Rod Widdowson
rdw at steadingsoftware.com
Fri Mar 1 10:01:49 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=232f0f242cd30012529c695f3e3f8614098c48f6
commit 232f0f242cd30012529c695f3e3f8614098c48f6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 1 15:00:55 2019 +0000
IDP-1423 Remove deprecated ExtensionSchema from SchemaValidation metadata filter
https://issues.shibboleth.net/jira/browse/IDP-1423
---
.../filter/impl/SchemaValidationParser.java | 16 -------------
.../filter/SchemaValidationParserTest.java | 6 -----
.../metadata/filter/schemaValidationParam.xml | 26 ----------------------
.../main/resources/schema/shibboleth-metadata.xsd | 10 ---------
4 files changed, 58 deletions(-)
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
index e490c2e..72e1661 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
@@ -17,8 +17,6 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
-import java.util.List;
-
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
@@ -30,12 +28,8 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.w3c.dom.Element;
-import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
/**
* Parser for a <SchemaValidation> filter.
@@ -46,10 +40,6 @@ public class SchemaValidationParser extends AbstractSingleBeanDefinitionParser {
@Nonnull public static final QName TYPE_NAME =
new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "SchemaValidation");
- /** Element name for the extension Schema. */
- @Nonnull public static final QName EXTENSION_SCHEMA_NAME =
- new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "ExtensionSchema");
-
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(SchemaValidationParser.class);
@@ -61,18 +51,12 @@ public class SchemaValidationParser extends AbstractSingleBeanDefinitionParser {
/** {@inheritDoc} */
@Override protected void doParse(final Element element, final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
- final List<Element> schemaNameElements = ElementSupport.getChildElements(element, EXTENSION_SCHEMA_NAME);
-
if (element.hasAttributeNS(null, "schemaBuilderRef")) {
builder.addConstructorArgReference(StringSupport.trimOrNull(element
.getAttributeNS(null, "schemaBuilderRef")));
} else {
builder.addConstructorArgReference("shibboleth.SchemaBuilder");
}
- if (null != schemaNameElements && !schemaNameElements.isEmpty()) {
- DeprecationSupport.warn(ObjectType.ELEMENT, "ExtensionSchema", null, null);
- builder.addConstructorArgValue(SpringSupport.getElementTextContentAsManagedList(schemaNameElements));
- }
}
/** {@inheritDoc} */
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParserTest.java
index 72d3dd0..2cde901 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SchemaValidationParserTest.java
@@ -37,12 +37,6 @@ public class SchemaValidationParserTest extends AbstractMetadataParserTest {
Assert.assertEquals(resolver.getMetadataFilter().getClass(), SchemaValidationFilter.class);
}
- @Test public void param() throws IOException {
- MetadataResolver resolver = getBean(MetadataResolver.class, "filter/schemaValidationParam.xml", "beans.xml");
-
- Assert.assertEquals(resolver.getMetadataFilter().getClass(), SchemaValidationFilter.class);
- }
-
@Test public void bean() throws IOException {
MetadataResolver resolver = getBean(MetadataResolver.class, "filter/schemaValidationRefs.xml", "filter/schemaValidationRefs-beans.xml");
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/schemaValidationParam.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/schemaValidationParam.xml
deleted file mode 100644
index 66873c5..0000000
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/schemaValidationParam.xml
+++ /dev/null
@@ -1,26 +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="requiredValidUntil" xsi:type="metadata:InlineMetadataProvider">
-
- <metadata:MetadataFilter xsi:type="metadata:SchemaValidation">
- <metadata:ExtensionSchema>schema</metadata:ExtensionSchema>
- </metadata:MetadataFilter>
-
- <EntityDescriptor ID="uk001502"
- entityID="https://sp.example.org/sp/shibboleth">
-
- <SPSSODescriptor
- protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
- <AssertionConsumerService
- Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
- Location="https://sp.example.org/Shibboleth.sso/SAML2/POST-SimpleSign"
- index="5" />
- </SPSSODescriptor>
- </EntityDescriptor>
-</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 3b1eaaa..00cfb2f 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -1016,16 +1016,6 @@
</annotation>
<complexContent>
<extension base="shibmd:MetadataFilterType">
- <sequence>
- <element name="ExtensionSchema" type="string" minOccurs="0" maxOccurs="unbounded">
- <annotation>
- <documentation>
- Classpath location of schema files that will be used, in addition to those included in
- OpenSAML, to validate an incoming metadata file.
- </documentation>
- </annotation>
- </element>
- </sequence>
<attribute name="schemaBuilderRef" 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