From dfbdd97bf7407a72eee710d00acb08bf9e4b50ec Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 5 Dec 2016 12:06:41 +0000
Subject: [PATCH] Restrict locally registered SIRTFI metadata to the test
 aggregate

---
 mdx/uk/generate.xml              | 15 +++++++++++++-
 mdx/uk/strip_sirtfi_contacts.xsl | 34 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 mdx/uk/strip_sirtfi_contacts.xsl

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 618a8db7..9285cab2 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -164,6 +164,10 @@
     <bean id="strip.SIRTFI" parent="CompositeStage">
         <property name="composedStages">
             <list>
+                <!-- remove REFEDS contacts associated with SIRTFI -->
+                <bean id="strip.SIRTFI.contacts" parent="XSLTransformationStage"
+                    p:XSLResource="classpath:uk/strip_sirtfi_contacts.xsl"/>
+
                 <!-- remove the REFEDS metadata namespace -->
                 <ref bean="strip.remd.namespace"/>
 
@@ -666,6 +670,11 @@
     <bean id="uk_exportPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
+                <!--
+                    Remove SIRTFI metadata.
+                -->
+                <ref bean="strip.SIRTFI"/>
+
                 <!--
                     Additional rules excluding entities from the aggregate.
                     
@@ -776,7 +785,11 @@
     <bean id="uk_exportPreviewPipeline" parent="SimplePipeline">
         <property name="stages">
             <list>
-
+                <!--
+                    Remove SIRTFI metadata.
+                -->
+                <ref bean="strip.SIRTFI"/>
+                
                 <!--
                     Additional rules excluding entities from the aggregate.
                     
diff --git a/mdx/uk/strip_sirtfi_contacts.xsl b/mdx/uk/strip_sirtfi_contacts.xsl
new file mode 100644
index 00000000..9975d051
--- /dev/null
+++ b/mdx/uk/strip_sirtfi_contacts.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	strip_sirtfi_contacts.xsl
+	
+	Strip out any UK federation-registered ContactPerson elements associated with SIRTFI.
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
+	xmlns:remd="http://refeds.org/metadata"
+	
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	exclude-result-prefixes="md">
+
+	<xsl:template match="md:EntityDescriptor[md:Extensions/mdrpi:RegistrationInfo[@registrationAuthority='http://ukfederation.org.uk']]
+		/md:ContactPerson[@contactType='other'][@remd:contactType='http://refeds.org/metadata/contactType/security']">
+		<!-- remove -->
+	</xsl:template>
+
+	<!--By default, copy text blocks, comments and attributes unchanged.-->
+	<xsl:template match="text()|comment()|@*">
+		<xsl:copy/>
+	</xsl:template>
+	
+	<!--By default, copy all elements from the input to the output, along with their attributes and contents.-->
+	<xsl:template match="*">
+		<xsl:copy>
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:copy>
+	</xsl:template>
+	
+</xsl:stylesheet>