From 1774d5c37ee18b82d5c6abfdf8f58a8afd8233b6 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 27 Jul 2015 16:17:47 +0000
Subject: [PATCH] Remove mdui:Logo elements containing data: URLs from CDS-all
 aggregate.

---
 mdx/common-beans.xml         | 22 ++++++++++++++++++++++
 mdx/strip-mdui-logo-data.xsl | 32 ++++++++++++++++++++++++++++++++
 mdx/uk/generate.xml          |  6 ++++++
 3 files changed, 60 insertions(+)
 create mode 100644 mdx/strip-mdui-logo-data.xsl

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 4e13a575..bdec7ae2 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -807,6 +807,28 @@
         </property>
     </bean>
     
+    <!--
+        stripMDUILogoData
+        
+        Remove all mdui:Logo elements containing data: URLs.
+    -->
+    <bean id="stripMDUILogoData" parent="XSLTransformationStage"
+        p:id="stripMDUILogoData">
+        <property name="XSLResource">
+            <bean parent="ClassPathResource" c:_="strip-mdui-logo-data.xsl"/>
+        </property>
+    </bean>
+
+    <!--
+        stripEmptyMDUIUIInfo
+        
+        Remove any empty mdui:UIInfo container elements.
+    -->
+    <bean id="stripEmptyMDUIUIInfo" parent="EmptyContainerStrippingStage"
+        p:id="stripEmptyMDUIUIInfo">
+        <property name="elementNamespace" ref="mdui_namespace"/>
+        <property name="elementName" value="UIInfo"/>
+    </bean>
     
     <!--
         *****************************************************
diff --git a/mdx/strip-mdui-logo-data.xsl b/mdx/strip-mdui-logo-data.xsl
new file mode 100644
index 00000000..da379da0
--- /dev/null
+++ b/mdx/strip-mdui-logo-data.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	
+	strip-mdui-logo-data.xsl
+	
+	Remove all mdui:Logo elements containing data: URLs.
+	
+-->
+<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:Logo elements containing data: URLs.
+	-->
+	<xsl:template match="mdui:Logo[starts-with(., 'data:')]"/>
+	
+	<!--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 f1ae44ef..abfae1e6 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -516,6 +516,12 @@
                 <!-- remove many things that the CDS doesn't look at -->
                 <ref bean="CDSStripUnwanted"/>
                 
+                <!--
+                    Remove embedded images used in mdui:Logo elements.
+                -->
+                <ref bean="stripMDUILogoData"/>
+                <ref bean="stripEmptyMDUIUIInfo"/>
+
                 <ref bean="CDSFinalise"/>
                 <ref bean="CDSNormaliseNamespaces"/>