diff options
| -rw-r--r-- | xslt/idp-summary.xslt | 10 | ||||
| -rw-r--r-- | xslt/sp-summary.xslt | 36 |
2 files changed, 30 insertions, 16 deletions
diff --git a/xslt/idp-summary.xslt b/xslt/idp-summary.xslt index 90e57adf..cc5a5f16 100644 --- a/xslt/idp-summary.xslt +++ b/xslt/idp-summary.xslt @@ -10,6 +10,7 @@ xmlns:remd="http://refeds.org/metadata" xmlns:exsl="http://exslt.org/common" extension-element-prefixes="exsl" + xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"> <xsl:output method="text"/> @@ -29,7 +30,7 @@ </xsl:template> <xsl:template match="/md:EntitiesDescriptor"> - <xsl:text>||EntityID||Organization||Technical Contact||Support Contact||Security Contact||Administrative Contact||Scopes||Entity category support||Assurance Certification|| + <xsl:text>||EntityID||Organization||Technical Contact||Support Contact||Security Contact||Administrative Contact||Scopes||Entity category support||Assurance Certification||Registration Authority|| </xsl:text> <xsl:apply-templates select="md:EntityDescriptor[md:IDPSSODescriptor]"/> </xsl:template> @@ -44,10 +45,15 @@ <xsl:text> | </xsl:text><xsl:apply-templates select="md:IDPSSODescriptor"/><xsl:text> </xsl:text> <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdattr:EntityAttributes/samla:Attribute[@Name='http://macedir.org/entity-category-support']/samla:AttributeValue"/><xsl:text> </xsl:text> <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdattr:EntityAttributes/samla:Attribute[@Name='urn:oasis:names:tc:SAML:attribute:assurance-certification']/samla:AttributeValue"/><xsl:text> </xsl:text> + <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdrpi:RegistrationInfo"/> <xsl:text> | </xsl:text> </xsl:template> + <xsl:template match="mdrpi:RegistrationInfo"> + <xsl:value-of select="@registrationAuthority"/><xsl:text> </xsl:text> + </xsl:template> + <xsl:template match="md:ContactPerson"> <xsl:apply-templates select="md:EmailAddress"/> </xsl:template> @@ -81,7 +87,7 @@ <xsl:call-template name="string-replace-all"> <xsl:with-param name="text" select="text()" /> <xsl:with-param name="replace" select="'-'" /> - <xsl:with-param name="by" select="'&#x2011;'" /> + <xsl:with-param name="by" select="'-'" /> </xsl:call-template> <xsl:text> \\</xsl:text> </xsl:template> diff --git a/xslt/sp-summary.xslt b/xslt/sp-summary.xslt index d54141c2..a580c83e 100644 --- a/xslt/sp-summary.xslt +++ b/xslt/sp-summary.xslt @@ -9,6 +9,7 @@ xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:exsl="http://exslt.org/common" extension-element-prefixes="exsl" + xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"> <xsl:output method="text"/> @@ -28,31 +29,38 @@ </xsl:template> <xsl:template match="/md:EntitiesDescriptor"> - <xsl:text>||EntityID||Service Name||Service Description||Organization||Technical Contact||Administrative Contact||Entity Categories|| + <xsl:text>||EntityID||Service Name||Organization||Contacts||Entity Categories||Assurance Certification||Registration Authority|| </xsl:text> <xsl:apply-templates select="md:EntityDescriptor[md:SPSSODescriptor]"/> </xsl:template> <xsl:template match="md:EntityDescriptor"> <xsl:text> | </xsl:text><xsl:value-of select="@entityID"/> - <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceName"/> - <xsl:text> | </xsl:text><xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceDescription"/> + <xsl:text> | </xsl:text> + <xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceName"/><xsl:text> \\ </xsl:text> + <xsl:apply-templates select="md:SPSSODescriptor/md:AttributeConsumingService/md:ServiceDescription"/> <xsl:text> | </xsl:text><xsl:apply-templates select="md:Organization"/> - <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='technical']"/> - <xsl:text> | </xsl:text><xsl:apply-templates select="md:ContactPerson[@contactType='administrative']"/> - <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdattr:EntityAttributes/samla:Attribute[@Name='http://macedir.org/entity-category']/samla:AttributeValue"/><xsl:text> | + <xsl:text> | </xsl:text> + <xsl:apply-templates select="md:ContactPerson[@contactType='technical']"/> + <xsl:apply-templates select="md:ContactPerson[@contactType='administrative']"/> + <xsl:apply-templates select="md:ContactPerson[@contactType='support']"/> + <xsl:apply-templates select="md:ContactPerson[@contactType='other']"/> + <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdattr:EntityAttributes/samla:Attribute[@Name='http://macedir.org/entity-category']/samla:AttributeValue"/> + <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdattr:EntityAttributes/samla:Attribute[@Name='urn:oasis:names:tc:SAML:attribute:assurance-certification']/samla:AttributeValue"/><xsl:text> </xsl:text> + <xsl:text> | </xsl:text><xsl:apply-templates select="md:Extensions/mdrpi:RegistrationInfo"/> + <xsl:text> | </xsl:text> </xsl:template> - <xsl:template match="md:AttributeConsumingService"> - <xsl:apply-templates/> + <xsl:template match="mdrpi:RegistrationInfo"> + <xsl:value-of select="@registrationAuthority"/><xsl:text> </xsl:text> </xsl:template> - <xsl:template match="md:ServiceDescription"> - <xsl:value-of select="normalize-space(text())"/><xsl:text> </xsl:text> + <xsl:template match="md:AttributeConsumingService"> + <xsl:apply-templates/> </xsl:template> - <xsl:template match="md:ServiceName"> + <xsl:template match="md:ServiceName|md:ServiceDescription"> <xsl:call-template name="string-replace-all"> <xsl:with-param name="text" select="text()" /> <xsl:with-param name="replace" select="'|'" /> @@ -64,13 +72,13 @@ <xsl:call-template name="string-replace-all"> <xsl:with-param name="text" select="substring-after(text(),'/category/')" /> <xsl:with-param name="replace" select="'-'" /> - <xsl:with-param name="by" select="'&#x2011;'" /> + <xsl:with-param name="by" select="'-'" /> </xsl:call-template> <xsl:text> \\</xsl:text> </xsl:template> <xsl:template match="md:ContactPerson"> - <xsl:apply-templates select="md:EmailAddress"/> + <xsl:value-of select="@contactType"/><xsl:text>: </xsl:text><xsl:apply-templates select="md:EmailAddress"/> </xsl:template> <xsl:template match="md:Organization"> @@ -84,7 +92,7 @@ </xsl:template> <xsl:template match="md:EmailAddress"> - <xsl:value-of select="text()"/><xsl:text> \\</xsl:text> + <xsl:text>[</xsl:text><xsl:value-of select="text()"/><xsl:text>] \\</xsl:text> </xsl:template> <xsl:template match="md:OrganizationDisplayName"> |