diff options
| author | Björn Mattsson <bjorn@sunet.se> | 2021-05-19 12:23:53 +0200 |
|---|---|---|
| committer | Björn Mattsson <bjorn@sunet.se> | 2021-05-19 12:23:53 +0200 |
| commit | ae08455b815260bf2c4d4b19e374b00b47d19f05 (patch) | |
| tree | 55c9924198d7febb1707cb332e1ed3fefe7ea292 | |
| parent | 2ea19404edc60f657de96b1a82f92dbe415372da (diff) | |
Updated Makefile and xslt/add-rpi.xsl to get registrationInstant added on new files
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | swamid-2.0/test5.release-check.swamid.se-shibboleth.xml | 2 | ||||
| -rw-r--r-- | xslt/add-rpi.xsl | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -107,7 +107,7 @@ clean: @rm -f *.xml *.tbs *.n *.sig tidy: - @for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/add-rpi.xsl $$x > $$x.c && mv $$x.c $$x; done + @for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $$x > $$x.c && mv $$x.c $$x; done @for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done testMetadataUsage: @@ -286,7 +286,7 @@ test2: $(SWAMIDXML) schematest testEntCat testSimpleSign testALlevel testEduGAIN @xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1 @# make tidy - @xsltproc xslt/add-rpi.xsl $< > $<.c && mv $<.c $< + @xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $< @xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $< @# make testMDUI diff --git a/swamid-2.0/test5.release-check.swamid.se-shibboleth.xml b/swamid-2.0/test5.release-check.swamid.se-shibboleth.xml index e2b4ec0d..2a7e8631 100644 --- a/swamid-2.0/test5.release-check.swamid.se-shibboleth.xml +++ b/swamid-2.0/test5.release-check.swamid.se-shibboleth.xml @@ -2,7 +2,7 @@ <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test5.release-check.swamid.se/shibboleth"> <!-- Test with SP with EC = Code of Conduct from non SWAMID SP--> <md:Extensions> - <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-02-27T13:49:34Z"> + <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/loop" registrationInstant="2020-02-27T13:49:34Z"> <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> diff --git a/xslt/add-rpi.xsl b/xslt/add-rpi.xsl index 687ba626..3e928716 100644 --- a/xslt/add-rpi.xsl +++ b/xslt/add-rpi.xsl @@ -36,7 +36,9 @@ <xsl:template name="add-swamid-ri"> <xsl:if test="not(mdrpi:RegistrationInfo[@registrationAuthority])"> - <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/"> + <mdrpi:RegistrationInfo> + <xsl:attribute name="registrationAuthority">http://www.swamid.se/</xsl:attribute> + <xsl:attribute name="registrationInstant"><xsl:value-of select="$regDate"/></xsl:attribute> <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> </xsl:if> |