https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-2.0

1 files changed, 63 insertions, 92 deletions

diff --git a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
index d54c883c..33fde50d 100644
--- a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
@@ -1,119 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nederlab.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:24:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://clarin.eu/category/clarin-member</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.nederlab.nl/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.nederlab.nl/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</mdui:Description>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Meertens Institute Nederlab</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Meertens Instituutti Nederlab</mdui:DisplayName>
         <mdui:Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment</mdui:Description>
+        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyäNederlab tutkimusympäristö</mdui:Description>
         <mdui:Logo height="135" width="200">https://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="en">Meertens research documentation language culture humanities Nederlab</mdui:Keywords>
+        <mdui:InformationURL xml:lang="fi">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.nederlab.nl</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.nederlab.nl,OU=I&amp;A,O=Meertens,L=Amsterdam,ST=Noord Holland,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGBTCCA+2gAwIBAgIJAIGzep3p2hjqMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-VQQGEwJOTDEWMBQGA1UECAwNTm9vcmQgSG9sbGFuZDESMBAGA1UEBwwJQW1zdGVy
-ZGFtMREwDwYDVQQKDAhNZWVydGVuczEMMAoGA1UECwwDSSZBMRgwFgYDVQQDDA93
-d3cubmVkZXJsYWIubmwxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VkZXNrQGtuYXcu
-bmwwHhcNMTQwNzE3MTIxMDUzWhcNMjQwNzE0MTIxMDUzWjCBmDELMAkGA1UEBhMC
-TkwxFjAUBgNVBAgMDU5vb3JkIEhvbGxhbmQxEjAQBgNVBAcMCUFtc3RlcmRhbTER
-MA8GA1UECgwITWVlcnRlbnMxDDAKBgNVBAsMA0kmQTEYMBYGA1UEAwwPd3d3Lm5l
-ZGVybGFiLm5sMSIwIAYJKoZIhvcNAQkBFhNzZXJ2aWNlZGVza0BrbmF3Lm5sMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA23RweYXXwA9mGVNYCpfxOOMc
-HGsGjCB/rdCHJ9REW3fmdmKn3Rtm9jxI3W/3AneMuE4s+QUog3ec2+iHuOvSYFZx
-SNybqaqZMSTB2IddNPoQiaWV/NNQXC8Cl/BBdCal3TM82R6HgfL3cSFcbq9JPIrh
-TeRfU9QhO7guGKooZGd/emC5GgM4iXowI+UenTHcPVj2eEpCEvigOzBYxY9S9u2n
-yV26sROTLKRTu8q+uZ92YmDbL07oqhmVX7LAjanO/0PcG6Cvhv5m57vyEt4Cwzsf
-mqBswSQSPBSUXRCOeRXh6dvU2Zg2+9+gS4D1VjWDRuSjibQV5BvvbtRe6aVm4TC6
-llySlKw/+WQHKiJF6JgLK8vCg8PWlVPRDskCMEa1z/uwdN4aIb43xsyu6RzzDti5
-Qjgiy3dMK7ARrIKoByF289lw9PR2w6/YGiefgzdp5DVSM6XSax6+4MnpQhd9FrnI
-aW16bvErETJIV8folcTivazGf6pA9/5esJCzZjr4cxAkC22HysNsVHVZpdp+6oqG
-ObeOQ9YflT/0Mp3jZbzANAXHADZCLmqO0pqb8xC5gpd1ITvIWIndgy8M2BWz+QtE
-FVK4Vf/ynjaOp6e+ZFrszdne/d8VRRpUnFpDOHsGsi6uuT/3N13WjQmEYNxOfCST
-IkIAwi8mVQbhD5ARy48CAwEAAaNQME4wHQYDVR0OBBYEFPU7oll5Mreed7gM0ubx
-wNxhJWb9MB8GA1UdIwQYMBaAFPU7oll5Mreed7gM0ubxwNxhJWb9MAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggIBACaAhHAW5xNKt9bjOBk3Sr5Tj0x5puRo
-zg+B5RgNQiWR8PIBMCgn1RPGHKXHKbNP4M6b/MWXsmo5VBBcv4ofZW2jlwnonu0b
-aKHNpxhV4xbF1oYicGHN25Uw/VbJFljCHOGy2k+UFpSHAOm0kp67wYo/4p7yy4oq
-5twu1tPDlURwlOcjA8g/2m1ym2j3pNLcyKKWhvzUzUvq4SM3IHZ8RR0OLwBBim7k
-AW6/jydmTX8/EVgFnwh1gkWm5w01ok+5Zy+NhMeqpFixL848pLmOdh8L7r4RYbmD
-8iQKrBgI8dpVTtZLgkEfh3IsDB9vwwyEqkdRXTwLLxCnjyEapp1s13mTjo86Fx6j
-L0V2bWOEZiQqFObmI1GJOqCwx9Fiot5zyUpZ9cTTOufwo5dsL4SLpuDPXCOcgZ7P
-Zn7P9mTNyK5bm454f/Y4lYVZyOLp0hUVrKkXSdOPap2QqO5Hcui6wvCMENKaZrP4
-VckqI0UohXM40SjP5Q9f6od6NevvBBg2R/7amAkXXm/MtGEpYtauZZp/XvBWEw3U
-anLI4k0jYr3bxxk2d325UpxVKnKp+vaIRli99xYLLroaiolrj8k981I4u1gBoEGD
-728wR2l94IA0c+LxNkOwwv4cwsnqO6QKeENxz/eN6RXVcrO1U7ZS2qVvKgQ9sORu
-7Hwjg9MqBq4i
-</ds:X509Certificate>
+          <ds:X509Certificate>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
+7Hwjg9MqBq4i</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Artifact"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
-      <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</md:ServiceDescription>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Meertens Instituutti Nederlab</md:ServiceName>
+      <md:ServiceName xml:lang="en">Meertens Institute Nederlab</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Tama Palveluntarjoaja saatelee paasyaNederlab tutkimusymparisto</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>KNAW</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="administrative">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>