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

1 files changed, 51 insertions, 28 deletions

diff --git a/swamid-interfederations-2.0/moodle.utu.fi.xml b/swamid-interfederations-2.0/moodle.utu.fi.xml
index 77116f41..3023c901 100644
--- a/swamid-interfederations-2.0/moodle.utu.fi.xml
+++ b/swamid-interfederations-2.0/moodle.utu.fi.xml
@@ -1,51 +1,74 @@
 <?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://moodle.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://moodle.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>MIIE2DCCA8CgAwIBAgIRAIzFEsSaNiwZ9NKWqNV1nEUwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDExMDMwMDAwMDBaFw0xMzExMDIyMzU5NTlaMIG0MQswCQYDVQQGEwJGSTEOMAwGA1UEERMFMjA1MDAxGDAWBgNVBAgTD1dlc3Rlcm4gRmlubGFuZDEOMAwGA1UEBxMFVHVya3UxGjAYBgNVBAkTEUFzc2lzdGVudGlua2F0dSA1MRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIFR1cmt1MRkwFwYDVQQLExBDb21wdXRpbmcgQ2VudHJlMRYwFAYDVQQDEw1tb29kbGUudXR1LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0LrBU3P7BUaGjMQQXLIvyJG30hdL6LeVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTvS/dpyjiBgLBZ3bM2RHKYmPTzUxW6yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hvQAvcQr0hpi4eYmflRcLN+Vogwvo2U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO4CVhrWjyXSNpLtq7CS/n7xbw6/ky8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwiMfeM0wIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHSb32e0HpXDgKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDW1vb2RsZS51dHUuZmkwDQYJKoZIhvcNAQEFBQADggEBAMAInGTI7z6J5t8LBcGZPFRW8atXoaxMsYnrrM//+m3nuJXEZI3Bt/1/zOmQhd+Z7hwGiSLsVwaBlfdSCJwv33Oe4h7OSLXPtsPobOmhabdPtpyrwFE+9+Q+kRFgWNXzG2ljZqu0BXMawDIovMlyDu3Bwdu3xtXUgyN9ulirTItGNg6f6a0g7OglqdDTzNpB7d2FbznzGx3D9x9ywHw8HKAAEjxVHewGXyTGKlQg2OqGI9Pxl+JdUN1oby1ktstPHYPzhZlxjZZF90kqtBlTZ0ATZGViZ/dJiMGOYt1I1CwOpyO8yRc8WeYZqbrKPxO/VsQ9b15tdADxcf+EMeuQNSs=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE2DCCA8CgAwIBAgIRAIzFEsSaNiwZ9NKWqNV1nEUwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMDExMDMwMDAwMDBaFw0xMzExMDIyMzU5NTlaMIG0MQswCQYDVQQGEwJGSTEOMAwGA1UEERMFMjA1MDAxGDAWBgNVBAgTD1dlc3Rlcm4gRmlubGFuZDEOMAwGA1UEBxMFVHVya3UxGjAYBgNVBAkTEUFzc2lzdGVudGlua2F0dSA1MRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIFR1cmt1MRkwFwYDVQQLExBDb21wdXRpbmcgQ2VudHJlMRYwFAYDVQQDEw1tb29kbGUudXR1LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0LrBU3P7BUaGjMQQXLIvyJG30hdL6LeVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTvS/dpyjiBgLBZ3bM2RHKYmPTzUxW6yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hvQAvcQr0hpi4eYmflRcLN+Vogwvo2U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO4CVhrWjyXSNpLtq7CS/n7xbw6/ky8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwiMfeM0wIDAQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHSb32e0HpXDgKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDW1vb2RsZS51dHUuZmkwDQYJKoZIhvcNAQEFBQADggEBAMAInGTI7z6J5t8LBcGZPFRW8atXoaxMsYnrrM//+m3nuJXEZI3Bt/1/zOmQhd+Z7hwGiSLsVwaBlfdSCJwv33Oe4h7OSLXPtsPobOmhabdPtpyrwFE+9+Q+kRFgWNXzG2ljZqu0BXMawDIovMlyDu3Bwdu3xtXUgyN9ulirTItGNg6f6a0g7OglqdDTzNpB7d2FbznzGx3D9x9ywHw8HKAAEjxVHewGXyTGKlQg2OqGI9Pxl+JdUN1oby1ktstPHYPzhZlxjZZF90kqtBlTZ0ATZGViZ/dJiMGOYt1I1CwOpyO8yRc8WeYZqbrKPxO/VsQ9b15tdADxcf+EMeuQNSs=</ds:X509Certificate>
+          <ds:X509Certificate>MIIE2DCCA8CgAwIBAgIRAIzFEsSaNiwZ9NKWqNV1nEUwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDExMDMwMDAwMDBaFw0xMzExMDIyMzU5NTlaMIG0MQswCQYD
+VQQGEwJGSTEOMAwGA1UEERMFMjA1MDAxGDAWBgNVBAgTD1dlc3Rlcm4gRmlubGFu
+ZDEOMAwGA1UEBxMFVHVya3UxGjAYBgNVBAkTEUFzc2lzdGVudGlua2F0dSA1MRww
+GgYDVQQKExNVbml2ZXJzaXR5IG9mIFR1cmt1MRkwFwYDVQQLExBDb21wdXRpbmcg
+Q2VudHJlMRYwFAYDVQQDEw1tb29kbGUudXR1LmZpMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0LrBU3P7BUaGjMQQXLIvyJG30hdL6L
+eVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTvS/dpyjiBgLBZ3bM2RHKYmPTzUxW6
+yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hvQAvcQr0hpi4eYmflRcLN+Vogwvo2
+U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO4CVhrWjyXSNpLtq7CS/n7xbw6/ky
+8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa
+7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwiMfeM0wIDAQABo4IBYDCCAVwwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFHSb32e0HpXD
+gKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDW1vb2Rs
+ZS51dHUuZmkwDQYJKoZIhvcNAQEFBQADggEBAMAInGTI7z6J5t8LBcGZPFRW8atX
+oaxMsYnrrM//+m3nuJXEZI3Bt/1/zOmQhd+Z7hwGiSLsVwaBlfdSCJwv33Oe4h7O
+SLXPtsPobOmhabdPtpyrwFE+9+Q+kRFgWNXzG2ljZqu0BXMawDIovMlyDu3Bwdu3
+xtXUgyN9ulirTItGNg6f6a0g7OglqdDTzNpB7d2FbznzGx3D9x9ywHw8HKAAEjxV
+HewGXyTGKlQg2OqGI9Pxl+JdUN1oby1ktstPHYPzhZlxjZZF90kqtBlTZ0ATZGVi
+Z/dJiMGOYt1I1CwOpyO8yRc8WeYZqbrKPxO/VsQ9b15tdADxcf+EMeuQNSs=</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://moodle.utu.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.utu.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://moodle.utu.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.utu.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="fi">Turun yliopiston Moodle-oppimisalusta</md:ServiceName>
       <md:ServiceName xml:lang="en">University of Turku's Moodle learning management system</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Moodle-oppimisalusta</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Moodle learning management system</md:ServiceDescription>
-      <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.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:1.3.6.1.4.1.25178.1.2.14" 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: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.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:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <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>
     <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="technical">
+    <md:GivenName>Miika</md:GivenName>
+    <md:SurName>Kauppi</md:SurName>
+    <md:EmailAddress>hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Teemu</md:GivenName>
+    <md:SurName>Valimaki</md:SurName>
+    <md:EmailAddress>moodle-tuki@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>