From 2ce644ffae90c6c280391a14798d2ff846b7dae8 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 10 Dec 2015 11:09:28 +0000
Subject: [PATCH] Retire HideFromWAYF extension from fallback aggregate.

---
 mdx/uk/add_hide_element.xsl | 50 -------------------------------------
 mdx/uk/generate.xml         | 19 ++++++--------
 mdx/uk/ns_norm_back.xsl     |  2 +-
 3 files changed, 8 insertions(+), 63 deletions(-)
 delete mode 100644 mdx/uk/add_hide_element.xsl

diff --git a/mdx/uk/add_hide_element.xsl b/mdx/uk/add_hide_element.xsl
deleted file mode 100644
index 2b8010b6..00000000
--- a/mdx/uk/add_hide_element.xsl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	add_hide_element.xsl
-
-	Adds the UK federation "Hide from WAYF" marker element to IdPs which are already
-	labelled as members of the REFEDS "Hide from Discovery" entity category.
-
--->
-<xsl:stylesheet version="1.0"
-	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
-	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	
-	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">
-
-	<!--Force UTF-8 encoding for the output.-->
-	<xsl:output omit-xml-declaration="no" method="xml" encoding="UTF-8" indent="yes"/>
-
-	<xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor]/md:Extensions
-		[mdattr:EntityAttributes/saml:Attribute
-			[@Name = 'http://macedir.org/entity-category']
-			[@NameFormat = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri']
-			[saml:AttributeValue[.='http://refeds.org/category/hide-from-discovery']]
-		]">
-		<xsl:copy>
-			<xsl:text>&#10;</xsl:text>
-			<xsl:text>        </xsl:text>
-			<xsl:element name="wayf:HideFromWAYF"/>
-			<xsl:apply-templates select="node()"/>
-		</xsl:copy>
-	</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>
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 78e7da72..f9205c1c 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -238,18 +238,6 @@
                 <ref bean="removeBlacklistedEntities"/>
                 <ref bean="standardImportActions"/>
                 
-                <!--
-                    Add UK federation HideFromWAYF element as an equivalent to membership in
-                    the REFEDS Hide from Discovery category.
-                -->
-                <bean p:id="uk_addHideFromWAYF" parent="XSLTransformationStage">
-                    <property name="XSLResource">
-                        <bean parent="ClassPathResource">
-                            <constructor-arg value="uk/add_hide_element.xsl"/>
-                        </bean>
-                    </property>                    
-                </bean>
-                
                 <!--
                     Silently remove entities which are marked as
                     having errors.
@@ -591,6 +579,7 @@
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="uk_assemble"/>
+                <ref bean="stripWayfNamespace"/>
                 <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="stripEmptyExtensions"/>
@@ -1036,6 +1025,12 @@
                 <ref bean="CMSStripUnwanted"/>
                 
                 <ref bean="CMSFinalise"/>
+
+                <!--
+                    Normalise namespaces in the most general way. This will leave in a number
+                    of unwanted namespace prefix declarations (e.g., xmlns:wayf) but that's
+                    not really important for an aggregate we don't publish.
+                -->
                 <ref bean="normaliseNamespaces"/>
                 
                 <ref bean="serializeCMSAggregate"/>
diff --git a/mdx/uk/ns_norm_back.xsl b/mdx/uk/ns_norm_back.xsl
index 934d9f74..40d793e5 100644
--- a/mdx/uk/ns_norm_back.xsl
+++ b/mdx/uk/ns_norm_back.xsl
@@ -38,7 +38,7 @@
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
-	exclude-result-prefixes="alg md mdattr saml"
+	exclude-result-prefixes="alg md mdattr saml wayf"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">