From cf35cb3694924250ffbad1b9cb8f8d174373c3dc Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 9 Dec 2013 12:28:55 +0000
Subject: [PATCH] Bugzilla 1031,1032,1036,1052: strip imported MDUI metadata on
 attribute descriptor roles.

---
 mdx/common-beans.xml  | 14 ++++++++++++++
 mdx/strip-aa-mdui.xsl | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 mdx/strip-aa-mdui.xsl

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 47b94732..9b2271cb 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -681,6 +681,19 @@
         p:elementName="DiscoHints"
         p:elementNamespace-ref="mdui_namespace"/>
     
+    <!--
+        stripAAMDUI
+        
+        Remove all MDUI metadata from attribute authority roles.
+    -->
+    <bean id="stripAAMDUI" parent="XSLTransformationStage"
+        p:id="stripAAMDUI">
+        <property name="XSLResource">
+            <bean parent="ClasspathResource">
+                <constructor-arg value="strip-aa-mdui.xsl"/>
+            </bean>
+        </property>
+    </bean>
     
     
     <!--
@@ -951,6 +964,7 @@
                 <ref bean="stripMdattrNamespace"/>
 
                 <ref bean="cleanImport"/>
+                <ref bean="stripAAMDUI"/>
                 <ref bean="trimImportElementWhitespace"/>
                 <ref bean="removeEmptyExtensions"/>
                 <ref bean="checkSchemas"/>
diff --git a/mdx/strip-aa-mdui.xsl b/mdx/strip-aa-mdui.xsl
new file mode 100644
index 00000000..dd323f4b
--- /dev/null
+++ b/mdx/strip-aa-mdui.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	
+	strip-aa-mdui.xsl
+	
+	Remove all MDUI metadata from attribute authority roles.
+	
+-->
+<xsl:stylesheet version="1.0"
+	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+
+	<!--
+		Remove all MDUI metadata from attribute authority roles.
+	-->
+	<xsl:template match="md:AttributeAuthorityDescriptor/md:Extensions/mdui:*"/>
+	
+	<!--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>