From bac6067c29d1a98c13a8823165931b17191cdfef Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 17 Jun 2009 14:36:55 +0000
Subject: [PATCH] Handle namespace prefix on md:Extensions elements.  Repair
 broken DiscoveryService elements generated by some versions of the Shib 2 SP.
  Reorder some things to make them clearer.

---
 build/import.xsl | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/build/import.xsl b/build/import.xsl
index c64f5da1..0b38f019 100644
--- a/build/import.xsl
+++ b/build/import.xsl
@@ -25,10 +25,12 @@
 -->
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
 	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	
 	xmlns:ukfxd="xalan://uk.org.ukfederation.xalan.Dates"
@@ -37,7 +39,7 @@
 
 	xmlns:xalan="http://xml.apache.org/xalan"
 	
-	exclude-result-prefixes="md xalan"
+	exclude-result-prefixes="idpdisc md xalan"
 
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
@@ -224,6 +226,18 @@
 	</xsl:template>
 	
 	
+	<!--
+		md:Extensions
+		
+		Normalise namespace prefix.
+	-->
+	<xsl:template match="md:Extensions">
+		<Extensions>
+			<xsl:apply-templates select="node()|@*"/>
+		</Extensions>
+	</xsl:template>
+	
+	
 	<!--
 		md:KeyDescriptor
 		
@@ -328,6 +342,22 @@
 		<!-- do nothing -->
 	</xsl:template>
 	
+	
+	<!--
+		idpdisc:DiscoveryResponse
+		
+		Normalise namespace prefix, add missing Binding attribute.
+	-->
+	<xsl:template match="idpdisc:DiscoveryResponse">
+		<DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol">
+			<xsl:if test="not(@Binding)">
+				<xsl:attribute name="Binding">urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates select="node()|@*"/>
+		</DiscoveryResponse>
+	</xsl:template>
+	
+	
 	<!--By default, copy text blocks, comments and attributes unchanged.-->
 	<xsl:template match="text()|comment()|@*">
 		<xsl:copy/>