Resolves SWAMID-2898

1 files changed, 39 insertions, 8 deletions

diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
index f86b4c5f..68307b01 100644
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
@@ -12,6 +12,44 @@
       </saml:Attribute>
     </attr:EntityAttributes>
   </md:Extensions>
+  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Umea University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Umeå universitet</mdui:Description>
+        <mdui:Description xml:lang="en">Umea University</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="63" width="350">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.umu.se/om-webbplatsen/juridisk-information/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.umu.se/en/about-the-website/legal-information/processing-of-personal-data/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <KeyDescriptor use="encryption">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIDPzCCAiegAwIBAgIQZZaF7oNvrrFM0KEHaU+uTjANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB4XDTIwMDMzMDE4MTk0MVoXDTMwMDMzMDE4Mjk0MVowITEfMB0GA1UEAwwWZW5jcnlwdGluZy5hZGZzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHsEXdstjSkejB8LPg7sGTdluCxuZxEV4gI7SVzRuDH0rjerrDv/OYNVqm7sG2VnXZcaUvRoJVRQ7bJXajrnQ2D3Bb3/2sa327jOe8QzwDCB+VHTY4WkG70A2zvGkXnsxImCrlwCl0btjKS1IRvJh0585hjyiSKJsJ52t7UAGH+it69NptFfBJz1fOKfgDFCu1y2oFe9XpBs6h/C0UhXIDKUi6jsd08Q/wBUWEafHxVMaCwvy6NTB+vCQzAslObsu1JB1BpkTA9bW5lmpCLCr8Ss1jyBFYljT8yx0psYOAS9BZOSPsmidKuYAqEzzGBAZDl8EH/9CAp13Q2AG7aavkCAwEAAaNzMHEwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAhBgNVHREEGjAYghZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB0GA1UdDgQWBBQgqiHEOf263xD/m6n/6GJb8UMHcDANBgkqhkiG9w0BAQsFAAOCAQEAe0ZI71gIdAtDagLS1XgAPTsIdIFahZ44rvDDKIgzaOmzIoL/azdKxlwFLwoDIYDnMcgDq0a/huspsf3SJ9YdDQt7k+PFx+77VC3sdbEblYzH9jS1FfBrsYNpohqLrkx3bihbCdd5/bSEh4hbM7Uar14734iBO5L7oYhDIGj8jjTSTWq5MEyKO66nfeReDgKkOHukFGb5L4eKruoCNtdsFCpsOX0ZDLHoUXJrrB1M+s9dyOk3sN7MwXq3d+SuhHSLZljg0W/plgt2L+aA9AeoNqAxPI1qJJZsSjkL0z0KcLlWOFEqFaEmAdMPCrS2NA8dT0daC5W24TYn+zJYBELNVw==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+        <X509Data>
+          <X509Certificate>MIIDNjCCAh6gAwIBAgIQVSHRo4JhuLdHW1GUlYqsITANBgkqhkiG9w0BAQsFADAeMRwwGgYDVQQDDBNzaWduaW5nLmFkZnMudW11LnNlMB4XDTIwMDMzMDE4MTUxOVoXDTMwMDMzMDE4MjUxOFowHjEcMBoGA1UEAwwTc2lnbmluZy5hZGZzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiKlvURcVQKnT+nobTLtNTRAtQR2GFnhjE0vBb6Hrwa/Iy7hZBEEM7cvtOXByuPuKJ45zBN2ystjYbXyN+2ojZ1tVGj+f4kjGDpz2/lsZrX+NSW+dvcE8b1EC6FId1P37THyOpTgzfrlz7mz06mxAFkGwqqwgjjTfnKT05D6Nc3t1YCA0cJ4FtzLTrEFjS+tFqhf/jg1VtvsYm7CCt9QTbi0guT3XfRxBloQUqsMPTc7N95F1iXrxkLWIgLp7pq35Rwf+M5YHQcNVNEna7sNtHFpWKfNfXVGdEpx9h/k/kqs2qc/22BwAjcblzu7idXqeGR6wNkUl4EA/qJW8kx0ekCAwEAAaNwMG4wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzaWduaW5nLmFkZnMudW11LnNlMB0GA1UdDgQWBBTK78kU5AxbYkP3ZoKCF0nOsCQdEjANBgkqhkiG9w0BAQsFAAOCAQEAXD6IfM/pvFZVB1bx/GitQMOgBwoAfBtuEzkj3bqNov5Ez2a7Duq54MVh4YEkmmIBACRgG1pZ9YG51PfrU45pTntEHaoFdHGCKu6xQJYjC3WCGrALJ+vglsDrVvQNNo0+VW3ZERT+fgh8DAkGYEeABO6aRmNZp86NbfUw+UsPsnGKEOPbySanJLIv5DXr23AXUVkZD1iaXP5cNsk1W9Ze5epWz4arEN+t/lywF1Lk/sBrrAhXOie0vnnesaj5PJWOlyPqYekAUH/Hnvu6TcArHgpgrfofn7Xdmz9XLbjavxayFtpXTVqlBiR0Epvw3t4V8jo+yX7/tJfiRmvRwfvSag==</X509Certificate>
+        </X509Data>
+      </KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.umu.se/adfs/ls/"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.umu.se/adfs/ls/" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.umu.se/adfs/ls/" index="2"/>
+  </SPSSODescriptor>
   <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns="" regexp="false">umu.se</shibmd:Scope>
@@ -36,14 +74,7 @@
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIFNTCCBB2gAwIBAgIQCzf9ZHgJcF7mpwWknUXpMDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNzA0MjEwMDAwMDBaFw0yMDA0MjkxMjAwMDBaMHAxCzAJBgNVBAYTAlNFMQ4wDAYDVQQIDAVVbWXDpTEOMAwGA1UEBwwFVW1lw6UxGjAYBgNVBAoMEVVtZcOlIFVuaXZlcnNpdGV0MSUwIwYDVQQDExx0b2tlbi1kZWNyeXB0aW5nLmFkZnMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArHj2v6UyLyh+BEkvunK7hOd/UTXTZisraY8aZF6QJVofJ5lEalf79JIjt/g54gHTyrPKQ6j9UzgAkirHZg1KAAPphNOwS/dQPmmm6JBQeWck/Z2S+3eib20BmCw1KPGDNah4DIR9RSl+PQsmlLv8b6S07S63umPAsDW+itLtBn9qHhSkAAH8Ial6NXllZrYiXwSfMjeZ31u9zJlvJAxGOfhgx3g/lZNmK9XfbWHmvqa0IV3GlHRx9GWEZoBv2G8YfZgPGhfFDnby1RRRfCvpAwfXnJielULLGuHrekLXPLBMo08MZazdCe1OYK1Fc4whGCgVWijNua0t5gADFZv22wIDAQABo4IB1TCCAdEwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFEmS0NRPSeqHKeED/5IKQaCL+LFzMCcGA1UdEQQgMB6CHHRva2VuLWRlY3J5cHRpbmcuYWRmcy51bXUuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACRze/2X3y8TbHKlz43oFYibuHF+GPcIOAWaDqfWLEBDjbmsGfNYGfpSgoLV3Nk2Jd49t2Ql35lnh74QBi6knYL3/Xt6YP+DG3tJ9Q1/fYo/TrYmE4dBIpdpWhrXa7eLmligAbSErW8mal4BA1A97Pivi/RGn6P5a9P23NH1qV7KaXbINtWf5LZqicz6VBNe0UA9axYBP0iafWH1HiBr3qIwUOBY0GyquuLq40Ick/6BgGi2dV53ZjPJL/IXaU9BOSLQF1n3kI2UeE4+6rEpSiN23T7eBRz4/Cue/SIENZKYh1ZPXsSRgb68gcCjlsR9Oju1GAgwVaButtEzfXFlhhc=</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIFLzCCBBegAwIBAgIQAfTYranwbnd8TM7tB8paNTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNzA0MjEwMDAwMDBaFw0yMDA0MjkxMjAwMDBaMG0xCzAJBgNVBAYTAlNFMQ4wDAYDVQQIDAVVbWXDpTEOMAwGA1UEBwwFVW1lw6UxGjAYBgNVBAoMEVVtZcOlIFVuaXZlcnNpdGV0MSIwIAYDVQQDExl0b2tlbi1zaWduaW5nLmFkZnMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmGw6PELjzKfWRNIdhOJ9YDC+JMCv2d64FjzALVTpUVmb3bjgC/Gyzmn/mjZx5tgZayIq+F/f7zs6Hhe4StbAshScwosH0O82iEoHYAKck9QL2bmjQeQ4sbv5TcUIAZv4/VRVQFGUCcOVEJGpGebUGk0WJac9p2swOEE3djURIMuAuDNsnX/gn00DBUbCOjLVU7S977EbZbx7BpNXQveheaxoFFVOo/TjPJJKsxaW7aUGrSq12SJh4EvnIdxel5nzsHUMVstyvsGfM9a2HTE5/BH66nQdP2xhEFg7QuJzPqAqHqs+C37JlxRLwFk4LWFk4OxvEWQmROJgezC27Qx+lwIDAQABo4IB0jCCAc4wHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFI/AJm2doFUDKNT2wl6IKlW9lu32MCQGA1UdEQQdMBuCGXRva2VuLXNpZ25pbmcuYWRmcy51bXUuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAKVVQLj7DotlFWf0v4hajVuDwxKCT65CB41MJeIdsHDtmHheRXJ/mLV7XNaLRnNDsk+a+pXbwINHzBiZvjBR1YhvzuwX3IPbajv3YMxG8/KlHmNFtfMmj9l1fsXXKCpO2YFy0dOq39qnUbcJZbDDOLriSxH3Zf7lt3BL3W80ZHQdgkBpu4NA+N/Y5Md2BkG9epHByro7RgElamqdV4HtmTtci92tBK6D9ppm6xku9GAUKikZdXDurGB+ueB/Zm+J8tWRSEQeNe498HkFmLM1AzU6tQJQhcLJYcp0x+FwW8wh2sCRWC2e7r2TN/WtFfQAQEo2k9CLM3jk+UGy5thdAGg=</X509Certificate>
+          <X509Certificate>MIIDPzCCAiegAwIBAgIQZZaF7oNvrrFM0KEHaU+uTjANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDDBZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB4XDTIwMDMzMDE4MTk0MVoXDTMwMDMzMDE4Mjk0MVowITEfMB0GA1UEAwwWZW5jcnlwdGluZy5hZGZzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALHsEXdstjSkejB8LPg7sGTdluCxuZxEV4gI7SVzRuDH0rjerrDv/OYNVqm7sG2VnXZcaUvRoJVRQ7bJXajrnQ2D3Bb3/2sa327jOe8QzwDCB+VHTY4WkG70A2zvGkXnsxImCrlwCl0btjKS1IRvJh0585hjyiSKJsJ52t7UAGH+it69NptFfBJz1fOKfgDFCu1y2oFe9XpBs6h/C0UhXIDKUi6jsd08Q/wBUWEafHxVMaCwvy6NTB+vCQzAslObsu1JB1BpkTA9bW5lmpCLCr8Ss1jyBFYljT8yx0psYOAS9BZOSPsmidKuYAqEzzGBAZDl8EH/9CAp13Q2AG7aavkCAwEAAaNzMHEwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAhBgNVHREEGjAYghZlbmNyeXB0aW5nLmFkZnMudW11LnNlMB0GA1UdDgQWBBQgqiHEOf263xD/m6n/6GJb8UMHcDANBgkqhkiG9w0BAQsFAAOCAQEAe0ZI71gIdAtDagLS1XgAPTsIdIFahZ44rvDDKIgzaOmzIoL/azdKxlwFLwoDIYDnMcgDq0a/huspsf3SJ9YdDQt7k+PFx+77VC3sdbEblYzH9jS1FfBrsYNpohqLrkx3bihbCdd5/bSEh4hbM7Uar14734iBO5L7oYhDIGj8jjTSTWq5MEyKO66nfeReDgKkOHukFGb5L4eKruoCNtdsFCpsOX0ZDLHoUXJrrB1M+s9dyOk3sN7MwXq3d+SuhHSLZljg0W/plgt2L+aA9AeoNqAxPI1qJJZsSjkL0z0KcLlWOFEqFaEmAdMPCrS2NA8dT0daC5W24TYn+zJYBELNVw==</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>