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

1 files changed, 71 insertions, 18 deletions

diff --git a/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
index 7d29f076..e51c2177 100644
--- a/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
@@ -1,46 +1,99 @@
 <?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://agw-sparknet.utu.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://agw-sparknet.utu.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>MIIE4zCCA8ugAwIBAgIQbnMIzP8TsRk95w/HSxaw8TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMTEyMzAwMDAwMFoXDTEzMTEyMjIzNTk1OVowgboxCzAJBgNVBAYTAkZJMQ4wDAYDVQQREwUyMDUwMDEYMBYGA1UECBMPV2VzdGVybiBGaW5sYW5kMQ4wDAYDVQQHEwVUdXJrdTEaMBgGA1UECRMRQXNzaXN0ZW50aW5rYXR1IDUxHDAaBgNVBAoTE1VuaXZlcnNpdHkgb2YgVHVya3UxGTAXBgNVBAsTEENvbXB1dGluZyBDZW50cmUxHDAaBgNVBAMTE2Fndy1zcGFya25ldC51dHUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/DfwsS+l2OcvB8YLJqMKLUrUc9KmEgLuCIBNhsy5hZDOnV7vieUzsxibSsz8LO/sqNXZu+oAJvQEbKVzglohKVpvZkXDWB4fJ7/HkAXSSnKFUvA6D7NyITFHus2OuPVtWg7rOH53Hcsj7zDey1tLpt75+r9VYz+rfj7dYZhBjQxjnVboDdD0KCw5SuPTYo2L+ZQit7Ede4g9KY970iSjXsPA5pFrjN1pezrse7MLBeqfiISwvEsmFvnRImzhnGlc1jkgK1mAxpGGFUOB3wRvlR9uQ1KjlSaFhPfUjV09/dG5tdEvc3bUV+3FEM+5Wv/9JMFXmfW/twfGE1cFVL5mRAgMBAAGjggFmMIIBYjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpAIR/AL9x2BJgB91p7Z1RDOOGjowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITYWd3LXNwYXJrbmV0LnV0dS5maTANBgkqhkiG9w0BAQUFAAOCAQEAQ09BWmqzKH3PywMfrWMAShhiowX3us9JTTJ8HLlApPWjW0feHpzvPCv86J2Ryeg+tRqtsYGAenvLFLqYnD65FaKos7/RrwQuxrwsDDbCk0LLVyDhlms7aOSvKRCmK1oyK9MABnraFh8em3ueojjatPYaUG+ivTalv5oWuYi/Ye6GRGBlhyx2u972UqngRYnHAHCYrRzRA/l8VRtAw/rJTS3Yj5kDUG3LYeBH5A4myDeIHghg7n0s7A9qDtepxZFYgDzrwUusEo/aNbLlYF90/H/wrBP9SogebSqmAAEd7V+vMe2+W7N03f80xajbIli0+P0sEolPPgrWDSWPf8vQpQ==</ds:X509Certificate>
+          <ds:X509Certificate>MIIEOTCCAyGgAwIBAgIQQZ2niozyPoxl4Kgql2ZIADANBgkqhkiG9w0BAQUFADA5
+MQswCQYDVQQGEwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEg
+Q2xhc3MyIENBMB4XDTA5MTIwMTEwMTYyM1oXDTEwMTIwMTEwMTYyM1owgY8xCzAJ
+BgNVBAYTAkZJMQ4wDAYDVQQHEwVUdXJrdTEcMBoGA1UEChMTVW5pdmVyc2l0eSBv
+ZiBUdXJrdTEZMBcGA1UECxMQQ29tcHV0aW5nIENlbnRlcjEcMBoGA1UEAxMTYWd3
+LXNwYXJrbmV0LnV0dS5maTEZMBcGCSqGSIb3DQEJARYKc2VjQHV0dS5maTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMzUfV9RlNogxZEZHTABMuZIdgWB
+8eGxGw2yd27sZy8MrJS/ErSa3kPg4DdMryBiQ6aiQRTcO2tHklA/dqq0+GOKLv9g
+MnNZwqbtlb+Oq4vw4gn6mRA0xg80ts5w/Xx4DJYWWC7/rdSpTg8r+kkhUl1pJa0R
+7jALKsmKJaSe4FTjekm25yXC4v2C09FencjEQTB4RF0ZsszypFJAdAaFp9OYLfSB
+iQ2wn0r6i3ctp4SoFWkwMCByKhZDFV5at2OehDlWdCG3q7I6vjok6yraNW+g2/Wn
+03X2ElH6GdWzKiCsKqmvyotVYu6I8RAAWgyEHC43xqiGQz6Fsk2Z59oRbmkCAwEA
+AaOB5TCB4jATBgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQMA4GDCsGAQQB
+gg8CAwEBAjByBgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQx
+OjM4OS9jbj1Tb25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRp
+ZmljYXRlcmV2b2NhdGlvbmxpc3Q7YmluYXJ5MB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAdBgNVHQ4EFgQUhiDXnbh+V+2mASKGWN1cNWDURSkwDQYJKoZI
+hvcNAQEFBQADggEBAEwsLeR6eIfsgkJUMPGk2TOjiT3Gdmf2HSOw5nCt2IPEjfx5
+9Jxs8B3yRqLXLkaK0rhf8cWydPNu78Ofh3fk7/1CfLc+VRmgmlvxBeW8BLyVb98b
+WOxvbwcv6UJLaQWtTQmdR2dfifihixe4NGoyLe7J+RfcS6JTZrcj2C63mBUHpX0E
+vhpR6lX/HxQoTd9m6ZShbjnOeRS2GqOh//qMI00LzHd9cd/8bhpvaqMlS8cdemyO
+vCKukyeJaETqyRe1jBTsm7xZzPhTitbQo7n6Zot+eODVX6k6Kzffc+0fVG9SLu+V
+cf98ZCMnXbDj3pAx7uSuCZbFACGEWPNrRQ7eY/0=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIQbnMIzP8TsRk95w/HSxaw8TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEwMTEyMzAwMDAwMFoXDTEzMTEyMjIzNTk1OVowgboxCzAJBgNVBAYTAkZJMQ4wDAYDVQQREwUyMDUwMDEYMBYGA1UECBMPV2VzdGVybiBGaW5sYW5kMQ4wDAYDVQQHEwVUdXJrdTEaMBgGA1UECRMRQXNzaXN0ZW50aW5rYXR1IDUxHDAaBgNVBAoTE1VuaXZlcnNpdHkgb2YgVHVya3UxGTAXBgNVBAsTEENvbXB1dGluZyBDZW50cmUxHDAaBgNVBAMTE2Fndy1zcGFya25ldC51dHUuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/DfwsS+l2OcvB8YLJqMKLUrUc9KmEgLuCIBNhsy5hZDOnV7vieUzsxibSsz8LO/sqNXZu+oAJvQEbKVzglohKVpvZkXDWB4fJ7/HkAXSSnKFUvA6D7NyITFHus2OuPVtWg7rOH53Hcsj7zDey1tLpt75+r9VYz+rfj7dYZhBjQxjnVboDdD0KCw5SuPTYo2L+ZQit7Ede4g9KY970iSjXsPA5pFrjN1pezrse7MLBeqfiISwvEsmFvnRImzhnGlc1jkgK1mAxpGGFUOB3wRvlR9uQ1KjlSaFhPfUjV09/dG5tdEvc3bUV+3FEM+5Wv/9JMFXmfW/twfGE1cFVL5mRAgMBAAGjggFmMIIBYjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpAIR/AL9x2BJgB91p7Z1RDOOGjowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITYWd3LXNwYXJrbmV0LnV0dS5maTANBgkqhkiG9w0BAQUFAAOCAQEAQ09BWmqzKH3PywMfrWMAShhiowX3us9JTTJ8HLlApPWjW0feHpzvPCv86J2Ryeg+tRqtsYGAenvLFLqYnD65FaKos7/RrwQuxrwsDDbCk0LLVyDhlms7aOSvKRCmK1oyK9MABnraFh8em3ueojjatPYaUG+ivTalv5oWuYi/Ye6GRGBlhyx2u972UqngRYnHAHCYrRzRA/l8VRtAw/rJTS3Yj5kDUG3LYeBH5A4myDeIHghg7n0s7A9qDtepxZFYgDzrwUusEo/aNbLlYF90/H/wrBP9SogebSqmAAEd7V+vMe2+W7N03f80xajbIli0+P0sEolPPgrWDSWPf8vQpQ==</ds:X509Certificate>
+          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIQbnMIzP8TsRk95w/HSxaw8TANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMTEyMzAwMDAwMFoXDTEzMTEyMjIzNTk1OVowgboxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUyMDUwMDEYMBYGA1UECBMPV2VzdGVybiBGaW5sYW5k
+MQ4wDAYDVQQHEwVUdXJrdTEaMBgGA1UECRMRQXNzaXN0ZW50aW5rYXR1IDUxHDAa
+BgNVBAoTE1VuaXZlcnNpdHkgb2YgVHVya3UxGTAXBgNVBAsTEENvbXB1dGluZyBD
+ZW50cmUxHDAaBgNVBAMTE2Fndy1zcGFya25ldC51dHUuZmkwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC/DfwsS+l2OcvB8YLJqMKLUrUc9KmEgLuCIBNh
+sy5hZDOnV7vieUzsxibSsz8LO/sqNXZu+oAJvQEbKVzglohKVpvZkXDWB4fJ7/Hk
+AXSSnKFUvA6D7NyITFHus2OuPVtWg7rOH53Hcsj7zDey1tLpt75+r9VYz+rfj7dY
+ZhBjQxjnVboDdD0KCw5SuPTYo2L+ZQit7Ede4g9KY970iSjXsPA5pFrjN1pezrse
+7MLBeqfiISwvEsmFvnRImzhnGlc1jkgK1mAxpGGFUOB3wRvlR9uQ1KjlSaFhPfUj
+V09/dG5tdEvc3bUV+3FEM+5Wv/9JMFXmfW/twfGE1cFVL5mRAgMBAAGjggFmMIIB
+YjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpAIR
+/AL9x2BJgB91p7Z1RDOOGjowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
+HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
+BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
+hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
+BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
+YWd3LXNwYXJrbmV0LnV0dS5maTANBgkqhkiG9w0BAQUFAAOCAQEAQ09BWmqzKH3P
+ywMfrWMAShhiowX3us9JTTJ8HLlApPWjW0feHpzvPCv86J2Ryeg+tRqtsYGAenvL
+FLqYnD65FaKos7/RrwQuxrwsDDbCk0LLVyDhlms7aOSvKRCmK1oyK9MABnraFh8e
+m3ueojjatPYaUG+ivTalv5oWuYi/Ye6GRGBlhyx2u972UqngRYnHAHCYrRzRA/l8
+VRtAw/rJTS3Yj5kDUG3LYeBH5A4myDeIHghg7n0s7A9qDtepxZFYgDzrwUusEo/a
+NbLlYF90/H/wrBP9SogebSqmAAEd7V+vMe2+W7N03f80xajbIli0+P0sEolPPgrW
+DSWPf8vQpQ==</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://agw-common.sparknet.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agw-common.sparknet.fi/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://agw-common.sparknet.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agw-common.sparknet.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="fi">Turun yliopiston SparkNet</md:ServiceName>
       <md:ServiceName xml:lang="en">University of Turku SparkNet</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Sparknet, Turun yliopiston langaton verkko</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Sparknet, Wireless network of University of Turku</md:ServiceDescription>
-      <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.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
     <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Abo universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Abo universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Teemu</md:GivenName>
+    <md:SurName>Valimaki</md:SurName>
+    <md:EmailAddress>tietojarjestelmat@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Miika</md:GivenName>
+    <md:SurName>Kauppi</md:SurName>
+    <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>