From 567707b5db5e567c4fd3682b8b20081c65a7e2b6 Mon Sep 17 00:00:00 2001 From: Fredrik Domeij Date: Mon, 17 Jul 2017 08:58:36 +0200 Subject: IDPSSODescripts removed from SP:s, they should not be there and confuses by showing up in discovery service --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cbe37e44..23ebe5df 100644 --- a/Makefile +++ b/Makefile @@ -168,6 +168,10 @@ testMDUI: @echo "Check for IdP:s with Logos over http" @for x in `find $(SRCDIRS) -name \*.xml`; do if cat $$x | sed -n '/IDPSSODescriptor/,/\/IDPSSODescriptor/p' | grep -q 'Logo .*http://' ; then echo " $$x" | sed 's/.*/&/' ; fi ; done +testIdPinSP: + @echo "Check that SP:s does not define IDPSSODescriptor" + @for spfile in `cat swamid-sp-2.0.mxml swamid-externals-sp-2.0.xml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do grep -q IDPSSODescriptor $$spfile && echo " $$spfile" | sed 's/.*/&/' ; done | grep . && exit 1 || exit 0 + testMDUIreach: @echo "Check that MDUI URLs are reachable" @cat swamid-idp-2.0.mxml swamid-sp-2.0.mxml swamid-externals-sp-2.0.xml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}' | \ @@ -199,7 +203,7 @@ testBadStrings: @echo "Check for bad strings in metadata" @for x in `find $(SRCDIRS) -name \*.xml`; do grep -E 'ServiceName xml:lang="[^"]*"/>' $$x | sed 's/^/ /' ; done | grep . && exit 1 || exit 0 -committest: test testMDUI testOrgData testEntCat testSimpleSign testALlevel testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings +committest: test testMDUI testOrgData testEntCat testSimpleSign testALlevel testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP deeptest: committest testMDUIreach -- cgit v1.2.3 From 10de8e246745dd84e3d8d46a22f3153b276220d7 Mon Sep 17 00:00:00 2001 From: Fredrik Domeij Date: Mon, 17 Jul 2017 16:08:21 +0200 Subject: RT135 connect.eoppimispalvelut.fi added --- Makefile | 2 +- .../connect.eoppimispalvelut.fi-shibboleth.xml | 119 +++++++++++++++++++++ .../fs.test.ad.liu.se-adfs-services-trust.xml | 10 +- swamid-sp-2.0.mxml | 1 + 4 files changed, 126 insertions(+), 6 deletions(-) create mode 100644 swamid-2.0/connect.eoppimispalvelut.fi-shibboleth.xml (limited to 'Makefile') diff --git a/Makefile b/Makefile index 23ebe5df..08fa8ec3 100644 --- a/Makefile +++ b/Makefile @@ -156,7 +156,7 @@ testGeantCoCo: 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 + @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 @echo "Checking for uniq IdP MDUI DisplayName" diff --git a/swamid-2.0/connect.eoppimispalvelut.fi-shibboleth.xml b/swamid-2.0/connect.eoppimispalvelut.fi-shibboleth.xml new file mode 100644 index 00000000..038446f8 --- /dev/null +++ b/swamid-2.0/connect.eoppimispalvelut.fi-shibboleth.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + http://www.swamid.se/category/nren-service + http://www.swamid.se/category/research-and-education + + + + + + + + + + + + + + + + + + + Lapland E-Meeting Service + eOppimispalvelut E-Meeting Service + Lapland E-Meeting Service + + + + + connect.eoppimispalvelut.fi + + CN=connect.eoppimispalvelut.fi + MIIFHzCCAwegAwIBAgIJAM/iGU5RC6ggMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV +BAMMG2Nvbm5lY3QuZW9wcGltaXNwYWx2ZWx1dC5maTAeFw0xNzA3MTExNDA5MDVa +Fw0yNzA3MDkxNDA5MDVaMCYxJDAiBgNVBAMMG2Nvbm5lY3QuZW9wcGltaXNwYWx2 +ZWx1dC5maTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOrFJSEYwSrl +GAKy6EZ1ArvYntmfOYgwsEDBwyBb3lyJh6lo0kU7pny4DkvDOeUB8zz5iTWUSUab +j64n6Nh8sT3pMG/wd1KMKJHtiF7wA7/3mNXN5AmNLW6MC4VR5oQgjZV3Ja4de69j +2AU0+OqfKKYq5r6PQPR68AVb4Iek8/YnDMo/3iMQTzBNBAPeR7bbXITJffFFR9gl +z4KLlnsmLaNIyICszRcBBfN1aZdJZ4f+5kp6TDnspWdNo5SnksO+SNFyBSV83V0M +OMf5E9e2jSF1sGkdOiFzc6QxtL98bBUYg9NErr9X1MP1kSh7WT5WaE4LGfNFScf4 +4+T5qYCHrINB5QjB2cl5NBh9riN7RImL/RzCPyH3XaNft1RhN1TJ8nVpgVirgjNy +G1cbdFJeoqqfzlOOMwVAWCBJwiWUSr7voFsvxcHGFW/lp14czCb9cwrgT+Y37Wi2 +4vxyR9vQjd1+yojxltt3E3+8VkSCn5hR3/CuUHgwUoUgiu3yI9qrANQ/B/RsGJ5Z +mgqGoKkTb1mQbXjxvr7pxfneFbU/TnICFBmLhCJwNK6znjaZIiPZ0076FCSjgX0j +pWdgsRAcCYTABI/3UCG7MD+8Ysqh+WoXfO+W8KVmOgAjFxzSgn7P/MZdjAjba70O +G/40AM0eY5jkC7KLlKL9t6h18sE6l9/jAgMBAAGjUDBOMB0GA1UdDgQWBBTTFaPz +03n7WwFnxOlTBqWjf1KanjAfBgNVHSMEGDAWgBTTFaPz03n7WwFnxOlTBqWjf1Ka +njAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQB5ijNlpDR7DhwT7lMp +OvKvTtaYB+k8MJLLALxGRSgWjd7FVEa/lXBq8o45L25fHjyZkv419pr25a/rEWA+ +jjPGCYay+ivXdyrhrAE0ZlusCUi1cjEeRxL7t5B4qIBsUB2XAMuo2cNN9dTa6lkZ +HnzIiAru9C5FSUUskwcW5Tz9FRP1yzxMXVEEl0bWfEZeiOIXD0gQqMt00+427Bqm +q1zwwji4r7h+p6oJbEBNmCBV6IZ+9rpDHW+Cza61loIPGf8QwuLPBBFsWajBws7g +1WtiGmEv8Kr8u2zqNaQkwvuRE3hLjGch+TP+zESRDM7wjHNsx0YU123hPnwhKeHN +Z7Qx1MIBShQCagZdb/m+wHmuQ2Cwzh5cySdzTvhcJKka5XpdygXLFP2aOrRCc2Z0 +Xf8USeIYX4iLde56FvkfDYn7ATr7spbWotn8BJn3rWuK/Zsx8HMcOkqwGK03gUg3 +HDrUiFxeXBtdPGAlcbFoNPRVECfSkyzDL7RqvU/e/O7FDfNK8FYRNZ0SdCV/1ITZ +I695b+MfI3EQfDkg2j2/XOi+yyNfwgrkf4oAFNC31Cc2puXsfWb1pVIEmQG7ovfm +gAhzBP0snGc/6uQ8gK9u+l6PCRiuGBuWzN/uwlIxMdEdAJ9bEHVe06u5TGU0Hxvo +YsO5+6eqWfrGgcbrEy6s5qH2VA== + + + + + + + + + + + + + + + + + + + + + + NORDUnet + NORDUnet A/S + http://www.nordu.net + + + Harri + Kuusisto + mailto:harri.kuusisto@csc.fi + + + NORDUnet NOC + mailto:noc@nordu.net + + + Vesa + Savolainen + mailto:Vesa.Savolainen@csc.fi + + diff --git a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml index 781c72e6..b98eefc0 100644 --- a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml +++ b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml @@ -664,9 +664,9 @@ - Linköping University Test (ADFS) + Linköpings universitet Test (ADFS) Linköping University Test (ADFS) - Linköping University Test (ADFS) + Linköpings universityet Test (ADFS) Linköping University Test (ADFS) LIU Linköping+University LIU Linköping+University @@ -768,9 +768,9 @@ - Linköpings universitet - Linköpings universitet - https://www.liu.se/ + Linköpings universitet + Linköpings universitet Test (ADFS) + https://www.liu.se/ Johan diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index 021de365..a733ac46 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -658,4 +658,5 @@ + -- cgit v1.2.3