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

1 files changed, 14 insertions, 8 deletions

diff --git a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
index 615a7b36..52f00a38 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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="http://fse.eduuni.fi/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fse.eduuni.fi/adfs/services/trust">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</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://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:2.0:protocol">
     <md:Extensions>
-      <mdui:UIInfo>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
@@ -11,13 +21,9 @@
         <mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</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>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIHATCCBOmgAwIBAgIEC/N6MDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJG
 STEhMB8GA1UEChMYVmFlc3RvcmVraXN0ZXJpa2Vza3VzIENBMRowGAYDVQQLExFQ
@@ -70,7 +76,7 @@ xfA0vCqs9R2/KT1nyuxdYWxcutJx</ds:X509Certificate>
       <md:ServiceName xml:lang="sv">Eduuni</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Eduuni on sahkoisen tyoskentelyn ja verkostoitumisen palveluymparisto</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Eduuni is an environment for e-work and collaboration services</md:ServiceDescription>
-      <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 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>