[java-identity-provider] branch master updated: IDP-1423 Remove deprecated "standalong" trust engines

[Rod Widdowson]

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=b8a8b0afd6db64a87a193527a612a429e645b605

The following commit(s) were added to refs/heads/master by this push:
       new  b8a8b0a   IDP-1423 Remove deprecated "standalong" trust engines
b8a8b0a is described below

commit b8a8b0afd6db64a87a193527a612a429e645b605
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 1 16:15:25 2019 +0000

    IDP-1423 Remove deprecated "standalong" trust engines
    
    https://issues.shibboleth.net/jira/browse/IDP-1423
---
 .../filter/SignatureValidationParserTest.java       |  8 --------
 .../filter/switch-metadata-trustengine-inline.xml   | 21 ---------------------
 .../main/resources/schema/shibboleth-metadata.xsd   |  5 -----
 3 files changed, 34 deletions(-)

diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
index bb79261..321b433 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
@@ -90,14 +90,6 @@ public class SignatureValidationParserTest extends AbstractMetadataParserTest {
         Assert.assertTrue(result.iterator().hasNext());
     }
     
-    @Test public void inlineTrustEngine() throws IOException, ResolverException {
-        MetadataResolver resolver =
-                getBean(MetadataResolver.class, "filter/switch-metadata-trustengine-inline.xml", "beans.xml");
-
-        final Iterable<EntityDescriptor> result = resolver.resolve(criteriaFor("urn:mace:switch.ch:SWITCHaai:ethz.ch"));
-        Assert.assertTrue(result.iterator().hasNext());
-    }
-    
     @Test public void inlineFilterTrustEngine() throws IOException, ResolverException {
         MetadataResolver resolver =
                 getBean(MetadataResolver.class, "filter/switch-metadata-trustengine-inline-filter.xml", "beans.xml");
diff --git a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml b/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
deleted file mode 100644
index 6e4eee6..0000000
--- a/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-trustengine-inline.xml
+++ /dev/null
@@ -1,21 +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"
-	xmlns:security="urn:mace:shibboleth:2.0:security"
-	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
-                        urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
-
-	requireValidMetadata="false" failFastInitialization="false" id="signed"
-	xsi:type="metadata:FilesystemMetadataProvider" metadataFile="%{DIR}/filter/metadata.switchaai_signed.xml">
-
-    <security:TrustEngine id="MyTrustEngine" xsi:type="security:StaticExplicitKeySignature">
-        <security:Credential id="IdPCredential" xsi:type="security:X509Filesystem">
-            <security:Certificate>%{DIR}/filter/switch.pem</security:Certificate>
-        </security:Credential>
-    </security:TrustEngine>
-    
-	<metadata:MetadataFilter xsi:type="metadata:SignatureValidation"
-		trustEngineRef="MyTrustEngine" />
-
-</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 00cfb2f..5a07dcb 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -912,11 +912,6 @@
                     </documentation>
                 </annotation>
             </element>
-            <element ref="security:TrustEngine">
-                <annotation>
-                    <documentation>Trust engines used by a filter.  This is deprecated.  Place the engine inside the validation filter</documentation>
-                </annotation>
-            </element>
         </choice>
         <attribute name="id" type="ID" use="required">
             <annotation>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.