From 21ed2e7a4a53d57d710a4453a26c0f6e53e85583 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 24 May 2012 13:44:00 +0000
Subject: [PATCH] Bug 893 - imported IdPs should be hidden from the normal CDS
 listing

---
 mdx/uk/beans.xml     | 18 ++++++++++++++++++
 mdx/uk/generate.xml  |  1 +
 mdx/uk/hide_idps.xsl | 45 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 mdx/uk/hide_idps.xsl

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
index 942ec141..27ed317a 100644
--- a/mdx/uk/beans.xml
+++ b/mdx/uk/beans.xml
@@ -132,6 +132,24 @@
     </bean>
     
     
+    <!--
+        uk_hide_idps
+        
+        Hide IdPs (which we assume have been imported) from the WAYF/CDS.
+
+        Requires that IdPs already have EntityDescriptor/Extensions elements to put
+        the HideFromWAYF element into.
+    -->
+    <bean id="uk_hide_idps" parent="xslt_parent"
+        p:id="uk_hide_idps">
+        <property name="xslResource">
+            <bean parent="file_parent">
+                <constructor-arg value="#{ systemProperties['basedir'] }/mdx/uk/hide_idps.xsl"/>
+            </bean>
+        </property>
+    </bean>
+
+
     <!--
         check_ukreg
         
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 94af8ea2..0e4187b9 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -42,6 +42,7 @@
                 <ref bean="ie_edugate_exportedEntities"/>
                 <ref bean="uk_performFixups"/>
                 <ref bean="uk_fix_mailto"/>
+                <ref bean="uk_hide_idps"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/uk/hide_idps.xsl b/mdx/uk/hide_idps.xsl
new file mode 100644
index 00000000..fd4e557a
--- /dev/null
+++ b/mdx/uk/hide_idps.xsl
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	hide_idps.xsl
+
+    Hide IdPs (which we assume have been imported) from the WAYF/CDS.
+    
+    Requires that IdPs already have EntityDescriptor/Extensions elements to put
+    the HideFromWAYF element into.
+    
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	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">
+		<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>