diff options
| author | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2019-10-15 11:40:42 +0200 |
|---|---|---|
| committer | Björn Mattsson <Bjorn.Mattsson@bth.se> | 2019-10-15 11:40:42 +0200 |
| commit | 328ea73462b81613813145db73455bfe6dd35ffe (patch) | |
| tree | 58a67551d929441fcc5b26d5b9e9283ca9e0101d | |
| parent | 854220fee9e393057cbf0b73a8abb1a0f03f4082 (diff) | |
Added checks in MAkefile + added md:Organization block to files missing. Based on complaints from eduGAIN
7 files changed, 36 insertions, 0 deletions
@@ -160,6 +160,12 @@ testEduGAINchecks: echo " $$x: AssertionConsumerService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect\" not allowed"; \ fi ; \ done + @for x in `cat swamid-edugain-idp-1.0.mxml swamid-edugain-sp-1.0.mxml | grep -v "\.mxml$$" | grep "xi:include" | awk -F\" '{print $$2}'` ; do \ + sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationName' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationName" | sed 's/.*/[1;31m&[0m/' ; \ + sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationDisplayName' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationDisplayName" | sed 's/.*/[1;31m&[0m/' ; \ + sed 's;\(</*\)[a-z0-9]*:;\1;g' $$x | sed 's/xmlns="[^"]*"//' | xmllint --xpath '/EntityDescriptor/Organization/OrganizationURL' - 2>/dev/null | grep -vq "^$$" || echo " $$x missing OrganizationURL" | sed 's/.*/[1;31m&[0m/' ; \ + done + testMDUI: @echo "Checking for bad lang codes" diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index 4027b422..9bc91d89 100644 --- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -58,6 +58,11 @@ <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement" isRequired="false"/> </md:AttributeConsumingService> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="technical"> <md:GivenName>NORDUNet</md:GivenName> <md:SurName>NOC</md:SurName> diff --git a/swamid-2.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml index f80a1346..8d091215 100644 --- a/swamid-2.0/crowd.nordu.net-shibboleth.xml +++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml @@ -100,6 +100,11 @@ Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA== <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/> </md:AttributeConsumingService> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="technical"> <md:Company>NORDUnet</md:Company> <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress> diff --git a/swamid-2.0/graylog.nordu.net-shibboleth.xml b/swamid-2.0/graylog.nordu.net-shibboleth.xml index 83c34f4f..d0727b2a 100644 --- a/swamid-2.0/graylog.nordu.net-shibboleth.xml +++ b/swamid-2.0/graylog.nordu.net-shibboleth.xml @@ -84,6 +84,11 @@ pc0/wSWsXlCKKdvcilYf9uc4RGpsdIHYHlCIBveUNMaqK3Ce2niYAgSGVH3vejoq <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/POST" index="4"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="support"> <md:GivenName>Sunet</md:GivenName> <md:SurName>NOC</md:SurName> diff --git a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml index cf3e7955..d60c9b7d 100644 --- a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml +++ b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml @@ -111,6 +111,11 @@ JRf9VO1D1PoLKLI1hA== <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SLO/Artifact"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="technical"> <md:GivenName>Technical</md:GivenName> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> diff --git a/swamid-2.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml index b81a6001..b99512a8 100644 --- a/swamid-2.0/sp.swamid.se-shibboleth.xml +++ b/swamid-2.0/sp.swamid.se-shibboleth.xml @@ -117,6 +117,11 @@ oAUJwZp3x5rWpywOLd3MMr2hxEi/ZK4uq//9eZv/pTEhWrI3fSqFkg6LXo2iub8= <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/> </md:AttributeConsumingService> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="technical"> <md:Company>SWAMID</md:Company> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> diff --git a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml index 39713234..4b49ba1d 100644 --- a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml @@ -36,6 +36,11 @@ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">InAcademia operated by GÉANT</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="support"> <md:GivenName>InAcademia</md:GivenName> <md:SurName>Support</md:SurName> |