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

1 files changed, 37 insertions, 32 deletions

diff --git a/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
index 7c5d0466..0f2dd88e 100644
--- a/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://edugain-group.cesnet.cz/idp/shibboleth">
-  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugain-group.cesnet.cz/idp/shibboleth">
+  <md:Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-23T11:20:04Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</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://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">edugain-group.cesnet.cz</shibmd:Scope>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edugain-group.cesnet.cz</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">eduGAIN Group AA</mdui:DisplayName>
         <mdui:DisplayName xml:lang="cs">eduGAIN Group AA</mdui:DisplayName>
@@ -21,8 +26,8 @@
       <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
         <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
       </eduidmd:RepublishRequest>
-    </Extensions>
-    <KeyDescriptor>
+    </md:Extensions>
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -54,28 +59,28 @@ cU/I3dCI+bvdo7O6bNqXqahLqhpBXuEaFFzDuT+6kbx8N9SRf0urvUNlejHQ
                     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CESNET</OrganizationName>
-    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">CESNET z.s.p.o.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michal</GivenName>
-    <SurName>Prochazka</SurName>
-    <EmailAddress>michalp@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Slávek</GivenName>
-    <SurName>Licehammer</SurName>
-    <EmailAddress>slavek@ics.muni.cz</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET z.s.p.o.</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Michal</md:GivenName>
+    <md:SurName>Prochazka</md:SurName>
+    <md:EmailAddress>michalp@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Slávek</md:GivenName>
+    <md:SurName>Licehammer</md:SurName>
+    <md:EmailAddress>slavek@ics.muni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>