From f709d624a2112793371e1cefaa1e8b3c689c9f76 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 31 Oct 2024 17:15:54 +0000
Subject: [PATCH] Move date arithmetic out of final_tweak

---
 mdx/incommon/beans.xml       |  4 ++++
 mdx/incommon/export.xml      |  4 ++++
 mdx/incommon/final_tweak.xsl | 43 +++++++++++++++++++++++++++---------
 mdx/incommon/import.xml      |  4 ++++
 mdx/incommon/import_sign.xml |  4 ++++
 mdx/incommon/mdq-all.xml     |  4 ++++
 mdx/incommon/sign.xml        |  4 ++++
 7 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/mdx/incommon/beans.xml b/mdx/incommon/beans.xml
index b3e359af..6a1016a1 100644
--- a/mdx/incommon/beans.xml
+++ b/mdx/incommon/beans.xml
@@ -36,6 +36,10 @@
         <property name="transformParameters">
             <map>
                 <entry key="publisher" value-ref="us_incommon_registrar"/>
+                <entry key="validityDays" value="${validUntil.aggregate.days}"/>
+                <entry key="now_ISO" value-ref="now_ISO"/>
+                <entry key="now_local_ISO" value-ref="now_local_ISO"/>
+                <entry key="valid_until_ISO" value-ref="validUntil_aggregate_ISO"/>
             </map>
         </property>
     </bean>
diff --git a/mdx/incommon/export.xml b/mdx/incommon/export.xml
index b45d0df2..59025428 100644
--- a/mdx/incommon/export.xml
+++ b/mdx/incommon/export.xml
@@ -96,6 +96,10 @@
                         <map>
                             <entry key="extraText" value="eduGAIN export metadata"/>
                             <entry key="publisher" value-ref="us_incommon_registrar"/>
+                            <entry key="validityDays" value="${validUntil.aggregate.days}"/>
+                            <entry key="now_ISO" value-ref="now_ISO"/>
+                            <entry key="now_local_ISO" value-ref="now_local_ISO"/>
+                            <entry key="valid_until_ISO" value-ref="validUntil_aggregate_ISO"/>
                         </map>
                     </property>
                 </bean>
diff --git a/mdx/incommon/final_tweak.xsl b/mdx/incommon/final_tweak.xsl
index 6c79fcb4..187459aa 100644
--- a/mdx/incommon/final_tweak.xsl
+++ b/mdx/incommon/final_tweak.xsl
@@ -10,10 +10,6 @@
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi"
 
-	xmlns:date="http://exslt.org/dates-and-times"
-	xmlns:mdxDates="xalan://uk.ac.sdss.xalan.md.Dates"
-	extension-element-prefixes="date mdxDates"
-
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -44,10 +40,36 @@
 		This parameter determines the number of days between the aggregation instant and the
 		end of validity of the signed metadata.
 	-->
-	<xsl:param name="validityDays" select="14"/>
+	<xsl:param name="validityDays"/>
+
+	<!--
+	    now_ISO
+
+	    This parameter is an ISO8601 representation of the UTC instant
+	    at which the aggregate generation started.
+
+	    Example: 2019-10-23T10:25:11Z
+	-->
+	<xsl:param name="now_ISO"/>
+
+	<!--
+	    now_local_ISO
+
+	    This parameter is an ISO8601 representation of the local time
+	    at which the aggregate generation started.
+
+		Example: 2019-10-23T11:25:11
+	-->
+	<xsl:param name="now_local_ISO"/>
 
-	<xsl:variable name="now" select="date:date-time()"/>
-	<xsl:variable name="validUntil" select="mdxDates:dateAdd($now, $validityDays)"/>
+	<!--
+	    valid_until_ISO
+
+        This parameter is an ISO8601 representation of the UTC instant
+        at which the aggregate will become invalid. This has been computed
+        by the caller as now_ISO + validityDays days.
+    -->
+    <xsl:param name="valid_until_ISO"/>
 
 	<!--
 		documentID
@@ -59,9 +81,8 @@
 		that the signature explicitly references an identifier attribute in the element
 		being signed, in this case the document element.
 	-->
-	<xsl:variable name="normalisedNow" select="mdxDates:dateAdd($now, 0)"/>
 	<xsl:variable name="documentID"
-		select="concat('INC', translate($normalisedNow, ':-Z', ''))"/>
+		select="concat('INC', translate($now_ISO, ':-Z', ''))"/>
 
 	<!--
 		Document root.
@@ -76,7 +97,7 @@
 	<xsl:template match="/md:EntitiesDescriptor">
 		<EntitiesDescriptor>
 			<xsl:attribute name="validUntil">
-				<xsl:value-of select="$validUntil"/>
+				<xsl:value-of select="$valid_until_ISO"/>
 			</xsl:attribute>
 			<xsl:attribute name="ID">
 				<xsl:value-of select="$documentID"/>
@@ -128,7 +149,7 @@
 				<xsl:value-of select="$publisher"/>
 			</xsl:attribute>
 			<xsl:attribute name="creationInstant">
-				<xsl:value-of select="$normalisedNow"/>
+				<xsl:value-of select="$now_ISO"/>
 			</xsl:attribute>
 		</xsl:element>
 	</xsl:template>
diff --git a/mdx/incommon/import.xml b/mdx/incommon/import.xml
index d27cac67..63916bc8 100644
--- a/mdx/incommon/import.xml
+++ b/mdx/incommon/import.xml
@@ -58,6 +58,10 @@
                         <map>
                             <entry key="extraText" value="Contains InCommon and eduGAIN metadata"/>
                             <entry key="publisher" value-ref="us_incommon_registrar"/>
+                            <entry key="validityDays" value="${validUntil.aggregate.days}"/>
+                            <entry key="now_ISO" value-ref="now_ISO"/>
+                            <entry key="now_local_ISO" value-ref="now_local_ISO"/>
+                            <entry key="valid_until_ISO" value-ref="validUntil_aggregate_ISO"/>
                         </map>
                     </property>
                 </bean>
diff --git a/mdx/incommon/import_sign.xml b/mdx/incommon/import_sign.xml
index b7dabb94..ef93feab 100644
--- a/mdx/incommon/import_sign.xml
+++ b/mdx/incommon/import_sign.xml
@@ -58,6 +58,10 @@
                         <map>
                             <entry key="extraText" value="Contains InCommon and eduGAIN metadata"/>
                             <entry key="publisher" value-ref="us_incommon_registrar"/>
+                            <entry key="validityDays" value="${validUntil.aggregate.days}"/>
+                            <entry key="now_ISO" value-ref="now_ISO"/>
+                            <entry key="now_local_ISO" value-ref="now_local_ISO"/>
+                            <entry key="valid_until_ISO" value-ref="validUntil_aggregate_ISO"/>
                         </map>
                     </property>
                 </bean>
diff --git a/mdx/incommon/mdq-all.xml b/mdx/incommon/mdq-all.xml
index f16a6357..6b38d0ce 100644
--- a/mdx/incommon/mdq-all.xml
+++ b/mdx/incommon/mdq-all.xml
@@ -111,6 +111,10 @@
                         <map>
                             <entry key="extraText" value="Contains InCommon and eduGAIN metadata" />
                             <entry key="publisher" value-ref="us_incommon_registrar" />
+                            <entry key="validityDays" value="${validUntil.aggregate.days}"/>
+                            <entry key="now_ISO" value-ref="now_ISO"/>
+                            <entry key="now_local_ISO" value-ref="now_local_ISO"/>
+                            <entry key="valid_until_ISO" value-ref="validUntil_aggregate_ISO"/>
                         </map>
                     </property>
                 </bean>
diff --git a/mdx/incommon/sign.xml b/mdx/incommon/sign.xml
index 0e13c96a..2eeaab54 100644
--- a/mdx/incommon/sign.xml
+++ b/mdx/incommon/sign.xml
@@ -58,6 +58,10 @@
                         <map>
                             <entry key="extraText" value="Contains InCommon and eduGAIN metadata"/>
                             <entry key="publisher" value-ref="us_incommon_registrar"/>
+                            <entry key="validityDays" value="${validUntil.aggregate.days}"/>
+                            <entry key="now_ISO" value-ref="now_ISO"/>
+                            <entry key="now_local_ISO" value-ref="now_local_ISO"/>
+                            <entry key="valid_until_ISO" value-ref="validUntil_aggregate_ISO"/>
                         </map>
                     </property>
                 </bean>