urkund new entityID

1 files changed, 73 insertions, 97 deletions

diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
index d433817d..7b1a7bee 100644
--- a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -1,64 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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://idp.abo.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.abo.fi/idp/shibboleth">
     <md:Extensions>
-      <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
-        <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
-        <mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
-        <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>abo.fi</mdui:DomainHint>
-      </mdui:DiscoHints>
-      <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>
+      <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-support" 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:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEYjCCA0qgAwIBAgIRAPtd73PPNmqn8n4RXo42m8MwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzA0MDUwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMDgxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmFiby5m
-aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO5UWgT90vXzUDlkapH5
-CVGFvoVgNDWxVr7WhrH+z2moP5h1wkK/Dnr0CKsglVyNkHycNkLmNH/9CVynp6LN
-sl+CEli5BmskLGNAvc+Q9bQwV52OJZQnXeCDDYSwSgDiIgrrml8niocBehGJEORC
-KW51UErjEf6U//1VfW1vG2r3BydjqM7pqs2GZx9p/US7F6lds8La1Vf/jp1ErW6G
-g1TzHYkx56EYNpqjo2Uin2vHowhidM37grjJQJ+q2qb7JsS4t074EwEQA0fF4wKa
-Yv6coSZyOpPXuuDLDlp3/dfY+beqR2oRml3HMvPnSp8+x/4y3/zEkcXcksmlwVCG
-LBUCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-MB0GA1UdDgQWBBT6OoUGpLGH7zyiXK+pmGrcVKeRnDAOBgNVHQ8BAf8EBAMCBaAw
-DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmFiby5maTANBgkqhkiG9w0BAQUF
-AAOCAQEABsw3n2IGqqaYTvw7lHIvQzk6FmF3TqhJIV3SZv6Pm/sY1gY/RAykgGkM
-Sggdizdzf7LdaKaJRLOkUjj+za2zCGIE2n75XQBG4Qh+fcSfUFyCOdelGAOsoUDX
-nm7SpO8lLINjKr28Z7ll70fYUUvuwntEfYVcWtiZ/dicL8GWrcewROGGMDuKynKy
-UpUufLIUdgHlejsfRYwsV+rOMlDnzI4Mgw06fqiILAHhW1sGAD6yQ6FX2zOR5oVU
-4jIupvZYa1oNsIp/M5Ks7/uTY9T0cOYFlQaesTr6Mb18BK/lhvZ8hUblemAxM5DJ
-eg6LbC2vP3oGU43ehAd8KuMBp3jegA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQUKEF0Hc6Dw4AYw6tjKijXjANBgkqhkiG9w0BAQsFADBk
+    <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abo.fi</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
+          <mdui:Description xml:lang="fi">Åbo Akademi on Turun ruotsinkielinen yliopisto</mdui:Description>
+          <mdui:Description xml:lang="en">Åbo Akademi is the Swedish language university in Turku, Finland</mdui:Description>
+          <mdui:Description xml:lang="sv">Åbo Akademi är Finlands svenskspråkiga universitet</mdui:Description>
+          <mdui:Logo height="325" width="314">https://web.abo.fi/dc/logo/aalogo-314x325.png</mdui:Logo>
+          <mdui:Keywords xml:lang="sv">ÅA</mdui:Keywords>
+          <mdui:Keywords xml:lang="en">ÅA</mdui:Keywords>
+          <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
+          <mdui:InformationURL xml:lang="en">http://www.abo.fi/?lang=en</mdui:InformationURL>
+          <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
+        </mdui:UIInfo>
+        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DomainHint>abo.fi</mdui:DomainHint>
+        </mdui:DiscoHints>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIEjjCCA3agAwIBAgIQUKEF0Hc6Dw4AYw6tjKijXjANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMjAeFw0xNTA2MDQwMDAwMDBaFw0xODA2MDMyMzU5NTlaMDgxITAfBgNVBAsT
@@ -83,41 +59,41 @@ hhSXlCvW7y7xJBoKm1X8d8Rf+z/6Cpu/lWliNSko2YBqmeXGK+G/xBELvq66fQkq
 CnhkW4Ot1pCYHuQIdcnTjsC6UWtJBKMfGdD0Epp//Rzc+k/AatJYtO3+GemMO+OE
 2p9oUNSkiH/BYtPIo+w9XojB4bUR0PoJ336ldVX4MThHSV0i3MoGba2fGNB9R+B2
 tyET/2ZrFDSClFuAkzB+eYe/</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Barbro</md:GivenName>
-    <md:SurName>Sjoblom</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dennis</md:GivenName>
-    <md:SurName>Holtlund</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Barbro</md:GivenName>
-    <md:SurName>Sjoblom</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Barbro</md:GivenName>
-    <md:SurName>Sjoblom</md:SurName>
-    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
+      <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
+      <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="administrative">
+      <md:GivenName>Barbro</md:GivenName>
+      <md:SurName>Sjoblom</md:SurName>
+      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Dennis</md:GivenName>
+      <md:SurName>Holtlund</md:SurName>
+      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Barbro</md:GivenName>
+      <md:SurName>Sjoblom</md:SurName>
+      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="support">
+      <md:GivenName>Barbro</md:GivenName>
+      <md:SurName>Sjoblom</md:SurName>
+      <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>