From d227aed66fe6b113d36cefcf7ebd22fd05f0a855 Mon Sep 17 00:00:00 2001 From: Björn Mattsson Date: Mon, 22 Jan 2024 11:31:39 +0100 Subject: Added check into Makefile Fixed RegistrationInfo --- Makefile | 22 +++++++++++++++++++++- .../fidustest.skolverket.se-shibboleth.xml | 3 +++ .../production-sp/skolverket.eduid.se-dnp-sp.xml | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ffc036c..9ace1cc 100644 --- a/Makefile +++ b/Makefile @@ -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;\(/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationName" | sed 's/.*/&/' ; \ + echo $$XML | xmllint --xpath '/EntityDescriptor/Organization/OrganizationDisplayName' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationDisplayName" | sed 's/.*/&/' ; \ + echo $$XML | xmllint --xpath '/EntityDescriptor/Organization/OrganizationURL' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationURL" | sed 's/.*/&/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/ContactPerson[@contactType='technical']" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing ContactPerson contactType='technical'." | sed 's/.*/&/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/Extensions/RegistrationInfo" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing RegistrationInfo." | sed 's/.*/&/' ; \ + 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/.*/&/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/SPSSODescriptor/Extensions/UIInfo/InformationURL" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing mdui:InformationURL." | sed 's/.*/&/' ; \ + else \ + echo $$XML | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/DisplayName" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing mdui:DisplayName." | sed 's/.*/&/' ; \ + echo $$XML | xmllint --xpath "/EntityDescriptor/IDPSSODescriptor/Extensions/UIInfo/InformationURL" - 2>/dev/null | grep -vq "^$$" || echo " $$x: Missing mdui:InformationURL." | sed 's/.*/&/' ; \ + fi; \ + if grep -q " " $$x ; then \ + echo " $$x" | sed 's/.*/&/' ;\ + 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 @@ + + https://github.com/FIDUSFederation/policy/blob/main/FIDUS_Interfederationsramverk.md + 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 @@ - + https://github.com/FIDUSFederation/policy/blob/main/FIDUS_Interfederationsramverk.md -- cgit v1.2.3