https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-1.0

1 files changed, 47 insertions, 28 deletions

diff --git a/swamid-interfederations-1.0/connect.tut.fi.xml b/swamid-interfederations-1.0/connect.tut.fi.xml
index 4e72f55d..b0f9be60 100644
--- a/swamid-interfederations-1.0/connect.tut.fi.xml
+++ b/swamid-interfederations-1.0/connect.tut.fi.xml
@@ -1,43 +1,57 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://connect.tut.fi/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <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 use="signing">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://connect.tut.fi/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE5zCCA8+gAwIBAgIQTC0sMFTDx+8bItkWKEE8EjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDYwODAwMDAwMFoXDTEzMDYwNzIzNTk1OVowgcQxCzAJBgNVBAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYDVQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYDVQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEeMBwGA1UECxMVSHlwZXJtZWRpYSBMYWJvcmF0b3J5MRYwFAYDVQQDEw1hbzQuZWUudHV0LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+q6HSeOwJOL+dhw2C6rmt+XXOC17rS4cqw/GK/MdcEB6OUGGnP7CVnMTt5i7kYRTE2xZZ4puXgunZc4djROOl5U9GpKJr1+PrBJ4bhZvJuuP+NGmk36dhPDelgGrl2g2t5Fdqm5gxLU7JBhDQcttbiQIm4KCUD4RaYkVnt5LRb2XZ5rrfyNjphSr06HopVy77k3H0sd7uPlPg3fj1u6h3GBUwd+/Gdle78H5VF75+uhPZvmI9IjRT8i0I0hIDTXrnKKM+hmYg/OZteb/eSxTdfDcAsm0hfk4C4+i7FeR2ODlY0kegMZEfFLFAxRH950TP2IfRhl7aFHbggQ9zB6XwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD7dPRIPwNod9MvHsOo3Ryx8sENGMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDWFvNC5lZS50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAC58dIBCvOyd04SLE1l+7yZ3ARTE+enLAEDGJzvvjlKG8MdsC/TfDimtTMOXQnNXbnfEzKwjZagmu/FRdhkVTQP48354C/hnAl1/Wyfjab8O9LeC6+pfAyY2mWzrb4kfRBm1KE26B2nURaYtDmZ+MJmjCyLQGaNMZz1q+eSyluTMMUven1FPVVPGlOGqUnPwOQUOvuVSvUyXrqyYfbSpfBsog9tVyW2KwzKvVCFeQ9pbUaxfsWD8qIeeKI17FzHVJEBtg23rz+mEW/8SvYpmYBk5YhfB1rTXQahEGyw8XP+kmmsb5h5d5yHgUXtEpEsBI4ORxMu1YUyAsGo8rZZF7VE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE5zCCA8+gAwIBAgIQTC0sMFTDx+8bItkWKEE8EjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMDYwODAwMDAwMFoXDTEzMDYwNzIzNTk1OVowgcQxCzAJBgNVBAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYDVQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYDVQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEeMBwGA1UECxMVSHlwZXJtZWRpYSBMYWJvcmF0b3J5MRYwFAYDVQQDEw1hbzQuZWUudHV0LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+q6HSeOwJOL+dhw2C6rmt+XXOC17rS4cqw/GK/MdcEB6OUGGnP7CVnMTt5i7kYRTE2xZZ4puXgunZc4djROOl5U9GpKJr1+PrBJ4bhZvJuuP+NGmk36dhPDelgGrl2g2t5Fdqm5gxLU7JBhDQcttbiQIm4KCUD4RaYkVnt5LRb2XZ5rrfyNjphSr06HopVy77k3H0sd7uPlPg3fj1u6h3GBUwd+/Gdle78H5VF75+uhPZvmI9IjRT8i0I0hIDTXrnKKM+hmYg/OZteb/eSxTdfDcAsm0hfk4C4+i7FeR2ODlY0kegMZEfFLFAxRH950TP2IfRhl7aFHbggQ9zB6XwIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD7dPRIPwNod9MvHsOo3Ryx8sENGMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDWFvNC5lZS50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAC58dIBCvOyd04SLE1l+7yZ3ARTE+enLAEDGJzvvjlKG8MdsC/TfDimtTMOXQnNXbnfEzKwjZagmu/FRdhkVTQP48354C/hnAl1/Wyfjab8O9LeC6+pfAyY2mWzrb4kfRBm1KE26B2nURaYtDmZ+MJmjCyLQGaNMZz1q+eSyluTMMUven1FPVVPGlOGqUnPwOQUOvuVSvUyXrqyYfbSpfBsog9tVyW2KwzKvVCFeQ9pbUaxfsWD8qIeeKI17FzHVJEBtg23rz+mEW/8SvYpmYBk5YhfB1rTXQahEGyw8XP+kmmsb5h5d5yHgUXtEpEsBI4ORxMu1YUyAsGo8rZZF7VE=</ds:X509Certificate>
+          <ds:X509Certificate>MIIE5zCCA8+gAwIBAgIQTC0sMFTDx+8bItkWKEE8EjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDYwODAwMDAwMFoXDTEzMDYwNzIzNTk1OVowgcQxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYD
+VQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYD
+VQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEeMBwGA1UECxMV
+SHlwZXJtZWRpYSBMYWJvcmF0b3J5MRYwFAYDVQQDEw1hbzQuZWUudHV0LmZpMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+q6HSeOwJOL+dhw2C6rmt+X
+XOC17rS4cqw/GK/MdcEB6OUGGnP7CVnMTt5i7kYRTE2xZZ4puXgunZc4djROOl5U
+9GpKJr1+PrBJ4bhZvJuuP+NGmk36dhPDelgGrl2g2t5Fdqm5gxLU7JBhDQcttbiQ
+Im4KCUD4RaYkVnt5LRb2XZ5rrfyNjphSr06HopVy77k3H0sd7uPlPg3fj1u6h3GB
+Uwd+/Gdle78H5VF75+uhPZvmI9IjRT8i0I0hIDTXrnKKM+hmYg/OZteb/eSxTdfD
+cAsm0hfk4C4+i7FeR2ODlY0kegMZEfFLFAxRH950TP2IfRhl7aFHbggQ9zB6XwID
+AQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
+VR0OBBYEFD7dPRIPwNod9MvHsOo3Ryx8sENGMA4GA1UdDwEB/wQEAwIFoDAMBgNV
+HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
+ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
+BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgG
+A1UdEQQRMA+CDWFvNC5lZS50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAC58dIBC
+vOyd04SLE1l+7yZ3ARTE+enLAEDGJzvvjlKG8MdsC/TfDimtTMOXQnNXbnfEzKwj
+Zagmu/FRdhkVTQP48354C/hnAl1/Wyfjab8O9LeC6+pfAyY2mWzrb4kfRBm1KE26
+B2nURaYtDmZ+MJmjCyLQGaNMZz1q+eSyluTMMUven1FPVVPGlOGqUnPwOQUOvuVS
+vUyXrqyYfbSpfBsog9tVyW2KwzKvVCFeQ9pbUaxfsWD8qIeeKI17FzHVJEBtg23r
+z+mEW/8SvYpmYBk5YhfB1rTXQahEGyw8XP+kmmsb5h5d5yHgUXtEpEsBI4ORxMu1
+YUyAsGo8rZZF7VE=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML/POST" index="2"/>
-    <md:AttributeConsumingService index="0">
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="fi">Acrobat Connect Pro -verkkokokouspalvelu</md:ServiceName>
       <md:ServiceName xml:lang="en">TUT Acrobat Connect Pro</md:ServiceName>
       <md:ServiceName xml:lang="sv">TUT Acrobat Connect Pro</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">TTY:n verkkokokouspalvelu.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">TUT web conference service.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">TUT-tjänsten för e-möten.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:ServiceDescription xml:lang="sv">TUT-tjansten for e-moten.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <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 Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -51,4 +65,9 @@
     <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>Pasi</md:GivenName>
+    <md:SurName>Hakkinen</md:SurName>
+    <md:EmailAddress>pasi.hakkinen@tut.fi</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>