From c8836029d49bea7d06b77d13eaa66b3989e90ddb Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 17 Feb 2012 16:24:41 +0000
Subject: [PATCH] Bugzilla 898 - add mdrpi boilerplate during registration
 import transform Also arranges for any such information to be stripped (for
 now) from the production, WAYF and fallback aggregates. It *will* appear in
 the test and export aggregates.

---
 build/import.xsl           | 35 ++++++++++++++++++++++++++++++++++-
 build/ns_norm_fragment.xsl |  2 +-
 mdx/common-beans.xml       | 30 +++++++++++++++++++++---------
 mdx/uk/generate.xml        |  3 +++
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/build/import.xsl b/build/import.xsl
index b54ae04b..98e28e99 100644
--- a/build/import.xsl
+++ b/build/import.xsl
@@ -29,13 +29,15 @@
 	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
 	xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
 	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	
+	xmlns:date="http://exslt.org/dates-and-times"
 	xmlns:mdxDates="xalan://uk.ac.sdss.xalan.md.Dates"
 	xmlns:mdxTextUtils="xalan://uk.ac.sdss.xalan.md.TextUtils"
-	extension-element-prefixes="mdxDates mdxTextUtils"
+	extension-element-prefixes="date mdxDates mdxTextUtils"
 
 	xmlns:xalan="http://xml.apache.org/xalan"
 	
@@ -61,6 +63,7 @@
 		<EntityDescriptor ID="uk000000_CHANGE_THIS"
 			xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata ../xml/saml-schema-metadata-2.0.xsd
 			urn:oasis:names:tc:SAML:metadata:algsupport ../xml/sstc-saml-metadata-algsupport-v1.0.xsd
+			urn:oasis:names:tc:SAML:metadata:rpi ../xml/saml-metadata-rpi-v1.0.xsd
 			urn:oasis:names:tc:SAML:metadata:ui ../xml/sstc-saml-metadata-ui-v1.0.xsd
 			urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol ../xml/sstc-saml-idp-discovery.xsd
 			urn:oasis:names:tc:SAML:profiles:SSO:request-init ../xml/sstc-request-initiation.xsd
@@ -129,6 +132,19 @@
 				-->
 				<xsl:apply-templates select="md:Extensions/*"/>
 
+				<!--
+                    Add registration information consisting of the registration instant
+                    and an identifier for the registrar.
+                    
+                    Any RegistrationInfo on the input document is discarded by a rule below.
+                -->
+				<xsl:element name="mdrpi:RegistrationInfo">
+					<xsl:attribute name="registrationInstant">
+						<xsl:value-of select="mdxDates:dateAdd(date:date-time(), 0)"/>
+					</xsl:attribute>
+					<xsl:attribute name="registrationAuthority">http://ukfederation.org.uk</xsl:attribute>
+				</xsl:element>
+				
 			</Extensions>
 			
 			<!--
@@ -267,6 +283,23 @@
 	</xsl:template>
 	
 	
+	<!--
+        *****************************************
+        ***                                   ***
+        ***   M D R P I   N A M E S P A C E   ***
+        ***                                   ***
+        *****************************************
+    -->
+	
+	<!--
+		mdrpi:RegistrationInfo
+		
+		By definition, any RegistrationInfo element appearing within the input
+		document should be discarded, as this is a new registration.
+	-->
+	<xsl:template match="mdrpi:RegistrationInfo"/>
+	
+	
 	<!--
 		*********************************************
 		***                                       ***
diff --git a/build/ns_norm_fragment.xsl b/build/ns_norm_fragment.xsl
index b8189e7d..8f816793 100644
--- a/build/ns_norm_fragment.xsl
+++ b/build/ns_norm_fragment.xsl
@@ -28,7 +28,7 @@
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
 	
-	exclude-result-prefixes="alg elab md mdrpi mdattr saml"
+	exclude-result-prefixes="alg elab md mdattr saml"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index abdd6143..18b87551 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -49,6 +49,13 @@
         </constructor-arg>
     </bean>
     
+    <!--
+        Parent (template) for namespace stripping stages.
+    -->
+    <bean id="stripNamespace_parent" abstract="true"
+        class="uk.org.ukfederation.mda.NamespaceStrippingStage"
+        init-method="initialize" lazy-init="true"/>
+    
     <!--
         stripElabNamespace
         
@@ -56,8 +63,7 @@
     -->
     <bean id="stripElabNamespace" p:id="stripElabNamespace"
         p:namespace="http://eduserv.org.uk/labels"
-        class="uk.org.ukfederation.mda.NamespaceStrippingStage"
-        init-method="initialize" lazy-init="true"/>
+        parent="stripNamespace_parent"/>
 
     <!--
         stripMdattrNamespace
@@ -66,8 +72,16 @@
     -->
     <bean id="stripMdattrNamespace" p:id="stripMdattrNamespace"
         p:namespace="urn:oasis:names:tc:SAML:metadata:attribute"
-        class="uk.org.ukfederation.mda.NamespaceStrippingStage"
-        init-method="initialize" lazy-init="true"/>
+        parent="stripNamespace_parent"/>
+    
+    <!--
+        stripMdrpiNamespace
+        
+        Remove the namespace used by the registration and publication metdata extension.
+    -->
+    <bean id="stripMdrpiNamespace" p:id="stripMdrpiNamespace"
+        p:namespace="urn:oasis:names:tc:SAML:metadata:rpi"
+        parent="stripNamespace_parent"/>
     
     <!--
         stripUkfedlabelNamespace
@@ -76,9 +90,8 @@
     -->
     <bean id="stripUkfedlabelNamespace" p:id="stripUkfedlabelNamespace"
         p:namespace="http://ukfederation.org.uk/2006/11/label"
-        class="uk.org.ukfederation.mda.NamespaceStrippingStage"
-        init-method="initialize" lazy-init="true"/>
-
+        parent="stripNamespace_parent"/>
+    
     <!--
         stripWayfNamespace
         
@@ -86,8 +99,7 @@
     -->
     <bean id="stripWayfNamespace" p:id="stripWayfNamespace"
         p:namespace="http://sdss.ac.uk/2006/06/WAYF"
-        class="uk.org.ukfederation.mda.NamespaceStrippingStage"
-        init-method="initialize" lazy-init="true"/>
+        parent="stripNamespace_parent"/>
     
     <!--
         normaliseNamespaces
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index 96c4726e..72efcfaf 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -142,6 +142,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_assemble"/>
+                <ref bean="stripMdrpiNamespace"/>
                 <ref bean="uk_addTrustRoots"/>
                 <ref bean="uk_finaliseProduction"/>
                 <ref bean="uk_normaliseNamespaces"/>
@@ -186,6 +187,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_assemble"/>
+                <ref bean="stripMdrpiNamespace"/>
                 <ref bean="uk_finaliseProduction"/>
                 <ref bean="uk_normaliseNamespaces"/>
 
@@ -238,6 +240,7 @@
         <property name="stages">
             <list>
                 <ref bean="uk_assemble"/>
+                <ref bean="stripMdrpiNamespace"/>
                 <ref bean="uk_addTrustRoots"/>
                 <ref bean="uk_finaliseFallback"/>
                 <ref bean="uk_normaliseNamespaces"/>