From a5846fbb60810c25dd9353f9aebc2cd07b8dbbd6 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 22 Jul 2009 08:24:11 +0000
Subject: [PATCH] Add check for entity IDs that don't start with an appropriate
 scheme.  Catches things like 'http://xxx' (missing colon).

---
 build/check.xsl          | 16 ++++++++++++++--
 build/check_imported.xsl | 12 ++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/build/check.xsl b/build/check.xsl
index ad7e9f4f..3b287497 100644
--- a/build/check.xsl
+++ b/build/check.xsl
@@ -171,8 +171,20 @@
 			<xsl:with-param name="m">entity ID contains space character</xsl:with-param>
 		</xsl:call-template>
 	</xsl:template>
-	
-	
+
+
+	<!--
+		Entity IDs should start with one of "http://", "https://" or "urn:mace:".
+	-->
+	<xsl:template match="md:EntityDescriptor[not(starts-with(@entityID, 'urn:mace:'))]
+		[not(starts-with(@entityID, 'http://'))]
+		[not(starts-with(@entityID, 'https://'))]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">entity ID <xsl:value-of select="@entityID"/> does not start with acceptable prefix</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
+
 	<!--
 		@Location attributes should not contain space characters.
 		
diff --git a/build/check_imported.xsl b/build/check_imported.xsl
index bc300773..c0db14b9 100644
--- a/build/check_imported.xsl
+++ b/build/check_imported.xsl
@@ -110,6 +110,18 @@
 	</xsl:template>
 	
 	
+	<!--
+		Entity IDs should start with one of "http://", "https://" or "urn:mace:".
+	-->
+	<xsl:template match="md:EntityDescriptor[not(starts-with(@entityID, 'urn:mace:'))]
+		[not(starts-with(@entityID, 'http://'))]
+		[not(starts-with(@entityID, 'https://'))]">
+		<xsl:call-template name="fatal">
+			<xsl:with-param name="m">entity ID <xsl:value-of select="@entityID"/> does not start with acceptable prefix</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	
 	<!--
 		@Location attributes should not contain space characters.