Put entityID first, added timestamp in baseline report

InCommon · Jan 23, 2018 · 2c7a1e9 · 2c7a1e9
1 parent 4bb528b
commit 2c7a1e9
Showing 1 changed file with 40 additions and 28 deletions.
diff --git a/lib/baseline_report_csv.xsl b/lib/baseline_report_csv.xsl
@@ -21,15 +21,16 @@
 	IdP and SP baseline compliance factors (documented at [1]) for entities registered by 'https://incommon.org', containing the following fields:
 
 IdPs:
-          1. Organization Display Name
-          2. "IdP" string literal
-	  3. IdP Display Name: mdui:DisplayName or md:OrganizationDisplayName (in that order)
-	  4. IdP Privacy URL or NONE
-	  5. IdP Logo present TRUE/FALSE
-	  6. IdP Tech contact or NONE
-	  7. IdP Admin contact or NONE
-	  8. IdP Security contact or NONE
-	  9. IdP Entity ID: @entityID
+      1. entityID
+      2. timestamp
+      3. Organization Display Name
+      4. "IdP" string literal
+	  5. IdP Display Name: mdui:DisplayName or md:OrganizationDisplayName (in that order)
+	  6. IdP Privacy URL or NONE
+	  7. IdP Logo present TRUE/FALSE
+	  8. IdP Tech contact or NONE
+	  9. IdP Admin contact or NONE
+	  10. IdP Security contact or NONE
 	
 	The IdP Display Name field is set to "NONE" if neither mdui:DisplayName nor 
 	md:OrganizationDisplayName exist in the entity descriptor. The IdP Discovery 
@@ -39,15 +40,16 @@ IdPs:
 	BUG: Incorrectly processes an entity with multiple IDPSSODescriptor elements
 
 SPs:
-          1. Organization Display Name
-          2. "SP" string literal
-	  3. SP Display Name: mdui:DisplayName or md:OrganizationDisplayName (in that order)
-	  4. SP Privacy URL or NONE
-	  5. SP Logo present TRUE/FALSE
-	  6. SP Tech contact or NONE
-	  7. SP Admin contact or NONE
-	  8. SP Security contact or NONE
-	  9. SP Entity ID: @entityID
+      1. entityID
+      2. timestamp
+      3. Organization Display Name
+      4. "SP" string literal
+	  5. SP Display Name: mdui:DisplayName or md:OrganizationDisplayName (in that order)
+	  6. SP Privacy URL or NONE
+	  7. SP Logo present TRUE/FALSE
+	  8. SP Tech contact or NONE
+	  9. SP Admin contact or NONE
+	  10. SP Security contact or NONE
 
 	The SP Display Name field is set to "NONE" if neither mdui:DisplayName nor
 	md:OrganizationDisplayName exist in the entity descriptor. The SP Discovery
@@ -67,18 +69,20 @@ SPs:
 	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:remd="http://refeds.org/metadata"
-	xmlns:icmd="http://id.incommon.org/metadata">
+	xmlns:icmd="http://id.incommon.org/metadata"
+	xmlns:date="http://exslt.org/dates-and-times">
 
 	<!-- search-and-replace constants -->
 	<xsl:variable name="double_quote" select="'&quot;'"/>
 	<xsl:variable name="double_double_quote" select="'&quot;&quot;'"/>
+	<xsl:variable name="timestamp" select="date:date-time()"/>
 
 	<!-- output is plain text -->
 	<xsl:output method="text"/>
 
 	<!-- output the heading line -->
 	<xsl:template match="/">
-		<xsl:text>Organization Display Name,Entity Type,Entity Display Name,Privacy URL,Logo Present,Tech Contact,Admin Contact,Security Contact,Entity ID</xsl:text>
+		<xsl:text>entityID,timestamp,Organization Display Name,Entity Type,Entity Display Name,Privacy URL,Logo Present,Tech Contact,Admin Contact,Security Contact</xsl:text>
 		<xsl:text>&#x0a;</xsl:text>
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -96,7 +100,15 @@ SPs:
 		<xsl:variable name="rEFEDSSecurityContact" select="normalize-space(md:ContactPerson[@remd:contactType='http://refeds.org/metadata/contactType/security']/md:EmailAddress)"/>
 		<xsl:variable name="inCommonSecurityContact" select="normalize-space(md:ContactPerson[@icmd:contactType='http://id.incommon.org/metadata/contactType/security']/md:EmailAddress)"/>	
 
+		<!-- output the IdP entityID -->
+		<xsl:value-of select="@entityID"/>
+
+		<!-- output the current timestamp -->
+		<xsl:text>,</xsl:text>
+		<xsl:value-of select="$timestamp"/>
+
 		<!-- output md:OrganizationDisplayName or "NONE" (in that order) -->
+		<xsl:text>,</xsl:text>
 		<xsl:choose>
 			<xsl:when test="$orgDisplayName != ''">
 				<!-- escape literal double quotes in md:OrganizationDisplayName -->
@@ -222,10 +234,6 @@ SPs:
 			</xsl:otherwise>
 		</xsl:choose>
 
-		<!-- output the IdP entityID -->
-		<xsl:text>,</xsl:text>
-		<xsl:value-of select="@entityID"/>
-
 		<!-- output "hide" or "show" depending on the hide-from-discovery entity attribute -->
 <!--
 		<xsl:text>,</xsl:text>
@@ -261,7 +269,15 @@ SPs:
 		<xsl:variable name="rEFEDSSecurityContact" select="normalize-space(md:ContactPerson[@remd:contactType='http://refeds.org/metadata/contactType/security']/md:EmailAddress)"/>
 		<xsl:variable name="inCommonSecurityContact" select="normalize-space(md:ContactPerson[@icmd:contactType='http://id.incommon.org/metadata/contactType/security']/md:EmailAddress)"/>
 
+		<!-- output the SP entityID -->
+		<xsl:value-of select="@entityID"/>
+
+		<!-- output the current timestamp -->
+		<xsl:text>,</xsl:text>
+		<xsl:value-of select="$timestamp"/>
+
 		<!-- output md:OrganizationDisplayName or "NONE" (in that order) -->
+		<xsl:text>,</xsl:text>
 		<xsl:choose>
 			<xsl:when test="$orgDisplayName != ''">
 				<!-- escape literal double quotes in md:OrganizationDisplayName -->
@@ -388,10 +404,6 @@ SPs:
 			</xsl:otherwise>
 		</xsl:choose>
 
-		<!-- output the SP entityID -->
-		<xsl:text>,</xsl:text>
-		<xsl:value-of select="@entityID"/>
-
 		<!-- output the registrar ID -->
 <!--
 		<xsl:text>,</xsl:text>