urkund new entityID

1 files changed, 78 insertions, 72 deletions

diff --git a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
index d669914d..817c07bf 100644
--- a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
@@ -1,37 +1,43 @@
-<?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.tut.fi/shibboleth2">
-  <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.tut.fi/shibboleth2">
     <md:Extensions>
-      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
-        <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.tut.fi/TTY-ratas/TTY_ratas-16x16.png</mdui:Logo>
-        <mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
-        <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
-        <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.167.88.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
-        <mdui:DomainHint>tut.fi</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
-      </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>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+    <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">tut.fi</shibmd:Scope>
+        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
+          <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
+          <mdui:Description xml:lang="fi">Tampereen teknillinen yliopisto</mdui:Description>
+          <mdui:Description xml:lang="sv">Tammerfors tekniska universitet</mdui:Description>
+          <mdui:Description xml:lang="en">Tampere University of Technology</mdui:Description>
+          <mdui:Logo height="16" width="16">https://www.tut.fi/TTY-ratas/TTY_ratas-16x16.png</mdui:Logo>
+          <mdui:Logo height="300" width="300">https://www.tut.fi/TTY-ratas/TTY_ratas-300x300.png</mdui:Logo>
+          <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
+          <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
+        </mdui:UIInfo>
+        <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+          <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
+          <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
+          <mdui:IPHint>193.167.88.0/21</mdui:IPHint>
+          <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
+          <mdui:DomainHint>tut.fi</mdui:DomainHint>
+          <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
+        </mdui:DiscoHints>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
@@ -55,22 +61,22 @@ Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
 7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
 DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
 ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
+      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
+    </md:IDPSSODescriptor>
+    <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+      <md:Extensions>
+        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
+      </md:Extensions>
+      <md:KeyDescriptor>
+        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+          <ds:X509Data>
+            <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
 CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
@@ -94,27 +100,27 @@ Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
 7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
 DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
 ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jussi</md:GivenName>
-    <md:SurName>Tirkkonen</md:SurName>
-    <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+          </ds:X509Data>
+        </ds:KeyInfo>
+      </md:KeyDescriptor>
+      <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+      <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    </md:AttributeAuthorityDescriptor>
+    <md:Organization>
+      <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
+      <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
+      <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
+      <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
+      <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
+      <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
+      <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="technical">
+      <md:GivenName>Jussi</md:GivenName>
+      <md:SurName>Tirkkonen</md:SurName>
+      <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
+    </md:ContactPerson>
+  </md:EntityDescriptor>