urkund new entityID

1 files changed, 55 insertions, 49 deletions

diff --git a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
index b8217741..2db5d514 100644
--- a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -1,26 +1,32 @@
-<?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://logout.uwasa.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://logout.uwasa.fi/idp/shibboleth">
     <md:Extensions>
-      <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
-      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>uwasa.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>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+    <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">student.uwasa.fi</shibmd:Scope>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwasa.fi</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
+        </mdui:UIInfo>
+        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
+        </mdui:DiscoHints>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
 QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
 Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
@@ -45,31 +51,31 @@ StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
 6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
 ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
 yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</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://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sami</md:GivenName>
-    <md:SurName>Kinnunen</md:SurName>
-    <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sami</md:GivenName>
-    <md:SurName>Kinnunen</md:SurName>
-    <md:EmailAddress>mailto:skk@uwasa.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://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
+      <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
+      <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="administrative">
+      <md:GivenName>Sami</md:GivenName>
+      <md:SurName>Kinnunen</md:SurName>
+      <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Sami</md:GivenName>
+      <md:SurName>Kinnunen</md:SurName>
+      <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>