From 8cee602054dc03bca11c3d01bbff0519f18948e7 Mon Sep 17 00:00:00 2001 From: Björn Mattsson Date: Wed, 18 Oct 2017 09:35:14 +0200 Subject: Fixed fs.liu.se to get OK from edugain. Also fixed testMDUI to only check IDP mdui Disolayname. --- Makefile | 2 +- swamid-2.0/fs.liu.se-adfs-services-trust.xml | 10 ++++++++++ swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 08fa8ec3..b3050abf 100644 --- a/Makefile +++ b/Makefile @@ -158,7 +158,7 @@ testMDUI: @echo "Checking for bad lang codes" @for x in swamid-2.0/*.xml ; do bad_langs=`cat $$x | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u | grep -vxE 'cs|da|de|en|fi|fr|it|sv'` ; if [ -n "$$bad_langs" ] ; then echo " $$x: `echo $$bad_langs`" | sed 's/.*/&/' ; fi ; done | grep . && exit 1 || exit 0 @echo "Check for mismatch between MDUI DisplayName and OrganizationDisplayName" - @for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do for lang in `cat $$x | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do mdui_displayname=`cat $$x | sed 's;\(/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)]*>;\1\n;g'` organizationdisplayname=`cat $$x | sed 's;\(/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)]*>;\1\n;g'` ; if [ -n "$$mdui_displayname" -a -n "$$organizationdisplayname" -a "$$mdui_displayname" != "$$organizationdisplayname" ] ; then echo "$$x: $$lang '$$mdui_displayname' vs $$lang '$$organizationdisplayname'" | sed 's/.*/&/'; fi ; done ; done | grep . && exit 1 || true + @for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do for lang in `cat $$x | sed -n 's/.*xml:lang="\(..\)".*/\1/p' | sort -u` ; do mdui_displayname=`cat $$x | sed 's;\(/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)]*>;\1\n;g'` organizationdisplayname=`cat $$x | sed 's;\(/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)]*>;\1\n;g'` ; if [ -n "$$mdui_displayname" -a -n "$$organizationdisplayname" -a "$$mdui_displayname" != "$$organizationdisplayname" ] ; then echo "$$x: $$lang '$$mdui_displayname' vs $$lang '$$organizationdisplayname'" | sed 's/.*/&/'; fi ; done ; done | grep . && exit 1 || true @echo "Checking for uniq IdP MDUI DisplayName" @for lang in `cat swamid-2.0/*.xml | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u` ; do for x in `find $(SRCDIRS) -name \*.xml | xargs grep -l IDPSSODescriptor` ; do cat $$x | sed 's;\(/dev/null | sed 's/^[ ]*//;s/[ ]*$$//' | tr -d '\n' | sed 's;<[^>]*>\([^<]*\)]*>;\1\n;g' | sed "s;^; $$x $$lang ;" | sed 's/.*/&/' ; done | sort -k 3 | uniq -d -f 2 ; done | grep . && exit 1 || true @echo "Checking for invalid IPHint" diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml index cb8d3aa1..dc551949 100644 --- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml +++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml @@ -309,6 +309,16 @@ wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH + + + Linköpings universitet (ADFS) + Linköping University (ADFS) + http://www.liu.se/?l=sv + http://www.liu.se/?l=en + https://liu.se/artikel/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren + https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren + + diff --git a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml index 6336b7f9..9e669d10 100644 --- a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml +++ b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml @@ -35,7 +35,8 @@ Login to Språkbanken's language resources available to researchers and to the public. https://spraakbanken.gu.se/swe/ https://spraakbanken.gu.se/eng/ - https://sp.spraakbanken.gu.se/logo-small.png + https://sp.spraakbanken.gu.se/logo-small.png + https://sp.spraakbanken.gu.se/logo-small.png -- cgit v1.2.3