diff options
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | metadata/production-sp/fidustest.skolverket.se-shibboleth.xml | 3 | ||||
| -rw-r--r-- | metadata/production-sp/skolverket.eduid.se-dnp-sp.xml | 2 |
3 files changed, 25 insertions, 2 deletions
@@ -7,7 +7,27 @@ bootstrap-trust: ./scripts/update-trust mdtest: - @for dir in test-sp test-idp production-sp production-idp; do find metadata/$$dir -name \*.xml -exec xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd \{\} \; ; done + @for dir in test-sp test-idp production-sp production-idp; do \ + for x in `ls metadata/$$dir/*.xml` ; do \ + xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x; \ + XML=$$(sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//'); \ + echo $$XML | xmllint --xpath '/EntityDescriptor/Organization/OrganizationName' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationName" | sed 's/.*/[1;31m&[0m/' ; \ + echo $$XML | xmllint --xpath '/EntityDescriptor/Organization/OrganizationDisplayName' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationDisplayName" | sed 's/.*/[1;31m&[0m/' ; \ + echo $$XML | xmllint --xpath '/EntityDescriptor/Organization/OrganizationURL' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationURL" | sed 's/.*/[1;31m&[0m/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/ContactPerson[@contactType='technical']" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing ContactPerson contactType='technical'." | sed 's/.*/[1;31m&[0m/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/Extensions/RegistrationInfo" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing RegistrationInfo." | sed 's/.*/[1;31m&[0m/' ; \ + if echo $$XML | xmllint --xpath "/EntityDescriptor/SPSSODescriptor" - 2>/dev/null | grep -qE 'SPSSODescriptor'; then \ + echo $$XML | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo/DisplayName" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing mdui:DisplayName." | sed 's/.*/[1;31m&[0m/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo/InformationURL" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing mdui:InformationURL." | sed 's/.*/[1;31m&[0m/' ; \ + else \ + echo $$XML | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing mdui:DisplayName." | sed 's/.*/[1;31m&[0m/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/InformationURL" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing mdui:InformationURL." | sed 's/.*/[1;31m&[0m/' ; \ + fi; \ + if grep -q " " $$x ; then \ + echo " $$x" | sed 's/.*/[1;31m&[0m/' ;\ + fi;\ + done \ + done idptest: @if (grep -rq IDPSSODescriptor metadata/*-sp); then echo "Hittade en IDP band SP:na !!!"; exit 1; fi diff --git a/metadata/production-sp/fidustest.skolverket.se-shibboleth.xml b/metadata/production-sp/fidustest.skolverket.se-shibboleth.xml index 88e2eb0..61640ac 100644 --- a/metadata/production-sp/fidustest.skolverket.se-shibboleth.xml +++ b/metadata/production-sp/fidustest.skolverket.se-shibboleth.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://fidustest.skolverket.se/shibboleth"> <md:Extensions> + <mdrpi:RegistrationInfo registrationAuthority="https://fidus.skolverket.se/" registrationInstant="2022-10-05T14:18:18Z"> + <mdrpi:RegistrationPolicy xml:lang="en">https://github.com/FIDUSFederation/policy/blob/main/FIDUS_Interfederationsramverk.md</mdrpi:RegistrationPolicy> + </mdrpi:RegistrationInfo> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> diff --git a/metadata/production-sp/skolverket.eduid.se-dnp-sp.xml b/metadata/production-sp/skolverket.eduid.se-dnp-sp.xml index 89152e8..2e2e28f 100644 --- a/metadata/production-sp/skolverket.eduid.se-dnp-sp.xml +++ b/metadata/production-sp/skolverket.eduid.se-dnp-sp.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://skolverket.eduid.se/dnp/sp/"> <md:Extensions> - <mdrpi:RegistrationInfo registrationAuthority="https://fidus.skolverket.se/" registrationInstant="2015-12-17T21:58:45Z"> + <mdrpi:RegistrationInfo registrationAuthority="https://fidus.skolverket.se/" registrationInstant="2023-01-12T23:24:28Z"> <mdrpi:RegistrationPolicy xml:lang="en">https://github.com/FIDUSFederation/policy/blob/main/FIDUS_Interfederationsramverk.md</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> <mdattr:EntityAttributes> |