cleanup, implement PublicationInfo and remove saml-md-tool dependency

1 files changed, 16 insertions, 4 deletions

diff --git a/xslt/normalize.xsl b/xslt/normalize.xsl
index 031acbcb..9cbebd1d 100644
--- a/xslt/normalize.xsl
+++ b/xslt/normalize.xsl
@@ -22,7 +22,7 @@ the use of the Metadata. By accessing or using the Metadata You accept that the
 use will be on and subject to these Terms. These Terms will be binding and enforceable on 
 You as contractual obligations.
 
-The Terms are available at
+The SWAMID Metadata Terms of Access and Use can be found here:
 
 - http://md.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding!
 - http://md.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation
@@ -31,6 +31,7 @@ If You do not accept these Terms, then You must not continue to use this Metadat
 
     </xsl:comment></xsl:if>
     <md:EntitiesDescriptor>
+      <xsl:attribute name="ID"><xsl:value-of select="$ID"/></xsl:attribute>
       <xsl:attribute name="Name"><xsl:value-of select="@Name"/></xsl:attribute>
       <xsl:if test="@cacheDuration">
          <xsl:attribute name="cacheDuration"><xsl:value-of select="@cacheDuration"/></xsl:attribute>
@@ -40,6 +41,9 @@ If You do not accept these Terms, then You must not continue to use this Metadat
       </xsl:if>
       <xsl:apply-templates/>
     </md:EntitiesDescriptor>
+    <xsl:if test="$target='true'">
+       <md:Extensions><xsl:call-template name="add-swamid-pi"/></md:Extensions>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template match="md:EntityDescriptor">
@@ -61,7 +65,7 @@ If You do not accept these Terms, then You must not continue to use this Metadat
     <md:EntityDescriptor>
        <xsl:apply-templates select="@*"/>
        <xsl:if test="$rpi='true' and not(md:Extensions)">
-          <md:Extensions><xsl:call-template name="add-swamid-rpi"/></md:Extensions>
+          <md:Extensions><xsl:call-template name="add-swamid-ri"/></md:Extensions>
        </xsl:if>
        <xsl:apply-templates select="text()|comment()|md:Extensions|md:RoleDescriptor|md:IDPSSODescriptor|md:SPSSODescriptor|md:AuthnAuthorityDescriptor|md:AttributeAuthorityDescriptor|md:PDPDescriptor|md:AffiliationDescriptor"/>
        <xsl:if test="$org='true' and not(md:Organization)">
@@ -78,12 +82,12 @@ If You do not accept these Terms, then You must not continue to use this Metadat
 
   <xsl:template match="md:EntityDescriptor/md:Extensions">
      <md:Extensions>
-       <xsl:call-template name="add-swamid-rpi"/>
+       <xsl:call-template name="add-swamid-ri"/>
        <xsl:apply-templates select="text()|comment()|node()"/>
      </md:Extensions>
   </xsl:template>
 
-  <xsl:template name="add-swamid-rpi">
+  <xsl:template name="add-swamid-ri">
      <xsl:if test="$rpi='true' and not(mdrpi:RegistrationInfo[@registrationAuthority='http://swamid.se/'])">
        <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
           <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
@@ -91,6 +95,14 @@ If You do not accept these Terms, then You must not continue to use this Metadat
      </xsl:if>
   </xsl:template>
 
+  <xsl:template name="add-swamid-pi">
+     <mdrpi:PublicationInfo>
+        <xsl:attribute Name="creationInstant"><xsl:value-of select="$now"/></xsl:attribute>
+        <xsl:attribute Name="publisher"><xsl:value-of select="$target"/></xsl:attribute>
+        <mdrpi:UsagePolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2015/12/SWAMID-Terms-of-Use-20110714.pdf</mdrpi:UsagePolicy>
+     </mdrpi:PublicationInfo>
+  </xsl:template>
+
   <xsl:template match="@xml:base|@ID|@validUntil|@cacheDuration"/>
 
   <xsl:template match="text()|comment()|@*">