http://mds.edugain.org into swamid-interfederations-2.0

1 files changed, 48 insertions, 38 deletions

diff --git a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
index 5471d360..bc32c713 100644
--- a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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://secure.huygens.knaw.nl">
+<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://secure.huygens.knaw.nl">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-17T11:14:30Z">
+      <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://aai.dfn.de/category/clarin-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
   <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://secure.huygens.knaw.nl/saml2/login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Huygens ING (CLARIN)</mdui:DisplayName>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.huygens.knaw.nl/saml2/login" index="0"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.secure.huygens.knaw.nl/saml2/login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Huygens ING (CLARIN Dienste)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Huygens ING (CLARIN services)</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessä CLARIN aloitteen.</mdui:Description>
+        <mdui:Description xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</mdui:Description>
         <mdui:Description xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</mdui:Description>
         <mdui:Logo height="16" width="16">https://www.huygens.knaw.nl/logo/HuygensING16x16.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://www.huygens.knaw.nl/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.huygens.knaw.nl/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
+        <mdui:Logo height="64" width="96">https://www.huygens.knaw.nl/logo/HuygensING64x96.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl/?lang=en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.huygens.knaw.nl/wp-content/uploads/2013/10/20140327-privacy-policy-HIRE2.pdf</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>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
@@ -72,13 +83,16 @@ wiQLqNk4jM+u1+lFdnx/7HF9im5K+fE3NLt67GjSomKfltIdWrTm/5VrP/V+7bUY
 WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 +XmRUdmsE5uVQ66+ER0qeSsaMLjYjfW3bsDeMjFbezc/T+bfZPuUW6J5cB+K9S2C
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
-hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=</ds:X509Certificate>
+hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
         <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
@@ -130,35 +144,31 @@ wiQLqNk4jM+u1+lFdnx/7HF9im5K+fE3NLt67GjSomKfltIdWrTm/5VrP/V+7bUY
 WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 +XmRUdmsE5uVQ66+ER0qeSsaMLjYjfW3bsDeMjFbezc/T+bfZPuUW6J5cB+K9S2C
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
-hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=</ds:X509Certificate>
+hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="3" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Huygens ING (CLARIN)</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="de">Huygens ING (CLARIN Dienste)</md:ServiceName>
       <md:ServiceName xml:lang="en">Huygens ING (CLARIN services)</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessa CLARIN aloitteen.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <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:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <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 FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <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: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:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Support</md:GivenName>