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

1 files changed, 31 insertions, 56 deletions

diff --git a/swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml
index 9e87d374..dc57563d 100644
--- a/swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml
@@ -1,13 +1,21 @@
 <?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://haka.saimia.fi/idp/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
       <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Saimaa University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Yrkehögskola Saimaa</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Yrkehögskola Saimaa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Saimaa University of Applied Sciences</mdui:DisplayName>
+        <mdui:Logo height="16" width="16">https://idp.saimia.fi/idp/images/saimaa_uas_logo_16x16px.png</mdui:Logo>
+        <mdui:Logo height="115" width="100">https://idp.saimia.fi/idp/images/saimaa_uas_logo_100x115px.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="fi">http://www.saimia.fi</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.saimia.fi</mdui:InformationURL>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>157.24.192.0/19</mdui:IPHint>
+        <mdui:DomainHint>saimia.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>
@@ -16,64 +24,31 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
-OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
-KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
-DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
-sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
-BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
-ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
-MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
-9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
-1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
-0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
-E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
-2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
-PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
+          <ds:X509Certificate>MIIDIDCCAgigAwIBAgIVAJM2XabBahqh+GJlO/MtV85nxJyXMA0GCSqGSIb3DQEB
+CwUAMBgxFjAUBgNVBAMMDWlkcC5zYWltaWEuZmkwHhcNMTYwNTA2MDY1MjU4WhcN
+MzYwNTA2MDY1MjU4WjAYMRYwFAYDVQQDDA1pZHAuc2FpbWlhLmZpMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmsho87hpGMeukfjA2l9UVhii0QnHfp+y
+QjEO2KUSz8cfHDAbCXtvQ86eh3U2wqVC9rrNPOx3+rrQXSBUJZAVTDOhG079/RML
++CzIMzGT2JmhPR/U8Inn2eCtKUE+wM3DaZ9Q8+wS/7Ne2ve+0aA/HlQLRBNQBD2t
+0FVkBxUTLTEFY9DTn/HdK9JQPHUutAsA3SCEidXfRKsQEnGsqz1diLxfVoJVoIgn
+gWtklC9pz3W2Pdds4X9IFF40drV6wL/zT99fuVFFgXth+9S9t3mqbr/WNDOojE9E
+NASaOfZFAvHoRpB//Izdg5UP03QE2fBZknqgFjU902AEtN208WsGlQIDAQABo2Ew
+XzAdBgNVHQ4EFgQUxnIFmoaljcLOrNVzoR5bMEGvVI4wPgYDVR0RBDcwNYINaWRw
+LnNhaW1pYS5maYYkaHR0cHM6Ly9pZHAuc2FpbWlhLmZpL2lkcC9zaGliYm9sZXRo
+MA0GCSqGSIb3DQEBCwUAA4IBAQBXq3ThcmPvH9eCXI20WK/N98kBRlcuO1v7E0KT
+tohTpH/gDsxJdAL308KA3CgggNJz4LRVMmOLKH5Ph8c5eAgVNnizO3t7Et5HBtZx
+ityiG+z8oH6TrricAU6QT79PBhJ9SGcUzN9vVORMGPwtLyI1jKYTs2N1vq7V8LXA
+NYaWWqig79ClQiXsbkCJNkz21OD3b2IvkKXGfH+prWF9Ug0gF7WdcwTZQDZTAQbM
+M6kujhH3Sb7AOvqQAl54MTOjiL/KNUWrolPyJEWWwGOulztBeuZL2mQjW9BaEr2W
+vjQ/53OUFOfNVVp2kcmdXGPUDjf4WXEDneyzZSnB5lJeNPp3</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://haka.saimia.fi/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://haka.saimia.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://haka.saimia.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <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.saimia.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.saimia.fi/idp/profile/SAML2/POST/SSO"/>
   </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
-OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
-KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
-DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
-sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
-BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
-ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
-MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
-9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
-1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
-0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
-E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
-2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
-PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://haka.saimia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://haka.saimia.fi/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationName>