Add ExportOptOut extension element.

internet2 · Jul 22, 2014 · 1d29932 · 1d29932
1 parent 2611f64
commit 1d29932
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/mdx/schema/uk-fed-label.xsd b/mdx/schema/uk-fed-label.xsd
@@ -2,7 +2,7 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     targetNamespace="http://ukfederation.org.uk/2006/11/label"
-    version="2008-06-24"
+    version="2014-07-22"
     elementFormDefault="qualified">
 
     <annotation>
@@ -124,4 +124,13 @@
         </annotation>
     </element>
 
+    <element name="ExportOptOut" type="ukfedlabel:datedLabel">
+        <annotation>
+            <documentation>
+                Indicates that the entity has been opted-out from inclusion in
+                the UK federation export aggregate.
+            </documentation>
+        </annotation>
+    </element>
+
 </schema>
diff --git a/mdx/uk/check_ukreg.xsl b/mdx/uk/check_ukreg.xsl
@@ -11,6 +11,7 @@
 -->
 <xsl:stylesheet version="1.0"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 
 	xmlns:mdxMail="xalan://uk.ac.sdss.xalan.md.Mail"
@@ -93,4 +94,15 @@
 	</xsl:template>
 
 
+	<!--
+		Check for entities which are both opted in to and opted out from export.
+	-->
+	<xsl:template match="md:EntityDescriptor/md:Extensions[ukfedlabel:ExportOptIn][ukfedlabel:ExportOptOut]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">
+				<xsl:text>entity cannot be both opted in to and opted out from export</xsl:text>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
 </xsl:stylesheet>
diff --git a/xml/uk-fed-label.xsd b/xml/uk-fed-label.xsd
@@ -2,7 +2,7 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     targetNamespace="http://ukfederation.org.uk/2006/11/label"
-    version="2008-06-24"
+    version="2014-07-22"
     elementFormDefault="qualified">
 
     <annotation>
@@ -124,4 +124,13 @@
         </annotation>
     </element>
 
+    <element name="ExportOptOut" type="ukfedlabel:datedLabel">
+        <annotation>
+            <documentation>
+                Indicates that the entity has been opted-out from inclusion in
+                the UK federation export aggregate.
+            </documentation>
+        </annotation>
+    </element>
+
 </schema>