From 6e8f14f374ac3a4e80a9b101808f4a31ab10fc35 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 23 Jul 2015 09:18:50 +0200
Subject: http://mds.edugain.org into swamid-interfederations-2.0

---
 .../mayumba.msh-paris.fr-shibauth.php.xml          | 29 +++++++++++-----------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml')

diff --git a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
index 8b4e527c..7ed7916c 100644
--- a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
+++ b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
@@ -4,11 +4,18 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-06-06T15:31:17Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
+        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">EHESS - FMSH - Eduspot France site</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="fr">https://mayumba.msh-paris.fr/shibauth.php</mdui:InformationURL>
         <mdui:Description xml:lang="en">EHESS - FMSH - Eduspot site France</mdui:Description>
         <mdui:DisplayName xml:lang="fr">EHESS - FMSH - Eduspot site France</mdui:DisplayName>
         <mdui:Description xml:lang="fr">EHESS - FMSH - Eduspot site France</mdui:Description>
@@ -102,31 +109,23 @@ ZUhgs9OPjysee18xEBIstkff54Mlz6IKUzpjhorRIR335+M63Qk7WkwGFt3CAW5C
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="0"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceName>
       <md:ServiceName xml:lang="en">EHESS - FMSH - Eduspot France site</md:ServiceName>
       <md:ServiceDescription xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Adresse mail institutionnelle</saml:AttributeValue>
-      </md:RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
-      </md:RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">Nom Prénom</saml:AttributeValue>
-      </md:RequestedAttribute>
-      <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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">identifiant de session persistant</saml:AttributeValue>
-      </md:RequestedAttribute>
+      <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"/>
+      <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"/>
+      <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"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ehess.fr</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Laurent Henry</md:SurName>
-- 
cgit v1.2.3