From e15b0403e0d8577654aee22c88b8ab00813cc078 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 26 Jan 2015 10:15:41 +0000
Subject: [PATCH] Use EntityAttributeAddingStage for hide from discovery.

The old XSLT-based translation from wayf:HideFromWAYF to the new hide-from-discovery category didn't interact properly with explicit entity attributes present in the fragment files. Fix this by using EntityAttributeAddingStage instead.
---
 mdx/uk/add_hide_category.xsl | 66 ------------------------------------
 mdx/uk/beans.xml             | 42 ++++++++++++++++++++---
 2 files changed, 37 insertions(+), 71 deletions(-)
 delete mode 100644 mdx/uk/add_hide_category.xsl

diff --git a/mdx/uk/add_hide_category.xsl b/mdx/uk/add_hide_category.xsl
deleted file mode 100644
index 164ffd88..00000000
--- a/mdx/uk/add_hide_category.xsl
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	add_hide_category.xsl
-
-	Adds the REFEDS "Hide from Discovery" entity category to IdPs which are already
-	labelled with the UK federation's "HideFromWAYF" marker element.
-	
-	Assumes that the IdP in question has an Extensions element already, but no
-	entity attributes. This is currently true for UKf-registered entities, but
-	a longer term solution will require the ability to add a new value into
-	an existing collection of entity attributes.
-
--->
-<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[wayf:HideFromWAYF]">
-		<xsl:copy>
-			<xsl:text>&#10;</xsl:text>
-			<xsl:text>        </xsl:text>
-			<xsl:element name="mdattr:EntityAttributes">
-				<xsl:text>&#10;</xsl:text>
-				<xsl:text>            </xsl:text>
-				<xsl:element name="saml:Attribute">
-					<xsl:attribute name="Name">http://macedir.org/entity-category</xsl:attribute>
-					<xsl:attribute name="NameFormat">urn:oasis:names:tc:SAML:2.0:attrname-format:uri</xsl:attribute>
-					<xsl:text>&#10;</xsl:text>
-					<xsl:text>                </xsl:text>
-					<xsl:element name="saml:AttributeValue">
-						<xsl:text>http://refeds.org/category/hide-from-discovery</xsl:text>
-					</xsl:element>
-					<xsl:text>&#10;</xsl:text>
-					<xsl:text>            </xsl:text>
-				</xsl:element>
-				<xsl:text>&#10;</xsl:text>
-				<xsl:text>        </xsl:text>
-			</xsl:element>
-			<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/beans.xml b/mdx/uk/beans.xml
index 2989b872..581c3953 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -444,12 +444,44 @@
                     Add REFEDS Hide from Discovery category as a standardised
                     equivalent to our HideFromWAYF element.
                 -->
-                <bean p:id="uk_addHideFromDiscovery" parent="XSLTransformationStage">
-                    <property name="XSLResource">
-                        <bean parent="ClassPathResource">
-                            <constructor-arg value="uk/add_hide_category.xsl"/>
+                <bean p:id="uk_addHideFromDiscovery" parent="SplitMergeStage">
+                    <!-- select entities with HideFromWayf label -->
+                    <property name="selectionStrategy">
+                        <bean parent="XPathItemSelectionStrategy">
+                            <constructor-arg value="/md:EntityDescriptor[md:Extensions/wayf:HideFromWAYF]"/>
+                            <constructor-arg ref="commonNamespaces"/>
                         </bean>
-                    </property>                    
+                    </property>
+                    
+                    <!--
+                        Pipeline for selected items.
+                    -->
+                    <property name="selectedItemPipeline">
+                        <bean p:id="selectedItemPipeline" parent="SimplePipeline">
+                            <property name="stages">
+                                <bean p:id="addHideFromDiscovery" parent="EntityAttributeAddingStage"
+                                    p:attributeValue="http://refeds.org/category/hide-from-discovery"
+                                    p:addingFirstChild="true"/>
+                            </property>
+                        </bean>
+                    </property>
+                    
+                    <!--
+                        Pipeline for unselected items.
+                        
+                        This is only required because of MDA-140, and can be removed when
+                        we move to MDA 0.9.0.
+                    -->
+                    <property name="nonselectedItemPipeline">
+                        <bean p:id="nonselectedItemPipeline" parent="SimplePipeline">
+                            <property name="stages">
+                                <list>
+                                    <!-- nothing required -->
+                                </list>
+                            </property>
+                        </bean>
+                    </property>
+
                 </bean>
                 
                 <ref bean="checkSchemas"/>