Resolves SWAMIDOPS-7290

2 files changed, 37 insertions, 39 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index b51e2a3e..d925d66f 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -273,7 +273,6 @@ www.akademiskahogtider.se-shibboleth.xml
 www.antagning.nyautb.its.umu.se-ecs-sp.xml
 www.antagning.se-aws-sp.xml
 www.antagning.se-ecs-sp.xml
-www.cambro.umu.se-shibboleth.xml
 www.diva-portal.org-shibboleth.xml
 www.ifmsa.se-sp.xml
 www.mit.ladok.se-gui-sp.xml
diff --git a/swamid-2.0/www.cambro.umu.se-shibboleth.xml b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
index 565e8106..b522362b 100644
--- a/swamid-2.0/www.cambro.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.cambro.umu.se-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cambro.umu.se/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cambro.umu.se/shibboleth" xml:base="swamid-2.0/www.cambro.umu.se-shibboleth.xml">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.cambro.umu.se/Shibboleth.sso/DS" index="1"/>
@@ -8,24 +8,24 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>www.cambro.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=www.cambro.umu.se,OU=ITS,O=Umea universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDIDCCAggCCQCrwXvQYCuIKDANBgkqhkiG9w0BAQUFADBSMRowGAYDVQQDDBF3
-d3cuY2FtYnJvLnVtdS5zZTEMMAoGA1UECwwDSVRTMRkwFwYDVQQKDBBVbWVhIHVu
-aXZlcnNpdGV0MQswCQYDVQQGEwJTRTAeFw0xMzA2MDQwNjM3MzBaFw0yMzA2MDIw
-NjM3MzBaMFIxGjAYBgNVBAMMEXd3dy5jYW1icm8udW11LnNlMQwwCgYDVQQLDANJ
-VFMxGTAXBgNVBAoMEFVtZWEgdW5pdmVyc2l0ZXQxCzAJBgNVBAYTAlNFMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7NcByBKGr6sdRwoLHbFjF4itjU+
-KOK9wb+AlBLtGnzzA1G3JaIPem7jdX0G/ByIo5neGCqhD+TCqyvu2yx7ZTHdqFex
-WCSUfGpSLUl42JdIEcPsKeUSC04qJHVRqazj2T+unVTkpYMpPJGlYIqDZxim8Ted
-CDsWRMPlKu+tdQ+dsz6VJ1xu+CAfwVQPWEzUTb7QI23puB7kKqNlab1kcjFPUzE7
-75KAxpnqkV1plbnHGO7GaSjl7kLRdrPxY22RCMWr+WVQ+bnO4AGrTBU6xar9o0Z4
-As4XrGORzJotbbowyJhmMwMZ0X6ndRMlSt6XS1/nL1GgbB7J1ADqDM3f5wIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBTKYMPSw+TP4CbRWoi5Qa5i1NxOswu+gt4wxEi
-7PNbLe7q/e/T+AVQxgWoGD9PPcwuwu0/wN8ABNmeumkD75WS+RFUOJ1gH9dCRu/o
-wngOp7z9KfO/OcTJ2aF/jH+A2/j8mT5WMM0LFGNM7k85kcjq+WRM9pj94t8b1oqz
-MM2JcTb0ViBut6iHLaTB8tJ76yLTsL5POpQP0As7Uvifa9UU4SASKJ39Zg3ZNfqf
-AniIXk0YiJnGEuQhOCZ8Zxk8V1BHwbjQc1p9xULgJ7mPc8bqAgpWS/ZEayrW65N7
-zQsPxKRowH5QqduxSzB1CnwAUlJXfWLmdsZctvs/EntiIcq+
+          <ds:X509SubjectName>CN=www.cambro.umu.se,O=Umea universitet,L=Umea,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDIjCCAgoCCQDgHEJYdgx+WTANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJT
+RTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEaMBgG
+A1UEAwwRd3d3LmNhbWJyby51bXUuc2UwHhcNMTQwNzE0MDUyNjMwWhcNMjQwNzEx
+MDUyNjMwWjBTMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQ
+VW1lYSB1bml2ZXJzaXRldDEaMBgGA1UEAwwRd3d3LmNhbWJyby51bXUuc2UwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYjCHkQSRiZaVEFUUk9NSwNl/Y
+KrSFmnz5Aepobjl0mG0yt2nD1lrNRhXxljeJqQzr+u98xqIOpe/Or3OUV6lVb5QH
+tmA/DLJEZDI8DUh3xIrBlsplFFhPw/IPCJikg7TwYo4HJQaT0otZbYDnHMMUSjsk
+RO3C0oxdmZHOWspKoq+gMDaIsIwpG+WZafPqoIYR5TvNCnK5Hj5IEHODfc1gGEjC
+iWQ+fdjuHEmPNWmk76jBMQVzPS5HV8pDaDLZdaPqqH5az2SEhWME7Ob1LdzMgRyN
+LTpafoMfboDUut2INkqIl+nJ3kEd30K0UkiZII4NvWtfung6JvljRQb0DHKbAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIYiRKI4MHTQsxRbbpaMO87V/pGb81ktPfNA
+x9jOsA5yX5dXXH6HbuE9hMeutY/pZFVXVo4j2ASn9Q98lw0JDfy2eFkQzzjgo9wl
++br9YoAVjnslhuerjI4rZXSMkqfdYcvih4DxXPyAoRQPqIz8hXMi2VcXYsENAN1l
+c35rOFVBZdTp7hR88g9aqdaZBOc/4bDpvWgjkBvral6TCwKkR2z46kkaOi4M51F8
+iWocN/BkAiDgRNAj8gKk0QD7flbthIlI3nW2+a+cYBC1oNEZO+ku56tcx1k428VQ
+pq8I9dSLC3ziUGK02/9US8m/ZrZ3ywi6spUEqLBcQRFds2gl6bA=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -34,24 +34,24 @@ zQsPxKRowH5QqduxSzB1CnwAUlJXfWLmdsZctvs/EntiIcq+
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>www.cambro.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=www.cambro.umu.se,OU=ITS,O=Umea universitet,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDIDCCAggCCQCrwXvQYCuIKDANBgkqhkiG9w0BAQUFADBSMRowGAYDVQQDDBF3
-d3cuY2FtYnJvLnVtdS5zZTEMMAoGA1UECwwDSVRTMRkwFwYDVQQKDBBVbWVhIHVu
-aXZlcnNpdGV0MQswCQYDVQQGEwJTRTAeFw0xMzA2MDQwNjM3MzBaFw0yMzA2MDIw
-NjM3MzBaMFIxGjAYBgNVBAMMEXd3dy5jYW1icm8udW11LnNlMQwwCgYDVQQLDANJ
-VFMxGTAXBgNVBAoMEFVtZWEgdW5pdmVyc2l0ZXQxCzAJBgNVBAYTAlNFMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7NcByBKGr6sdRwoLHbFjF4itjU+
-KOK9wb+AlBLtGnzzA1G3JaIPem7jdX0G/ByIo5neGCqhD+TCqyvu2yx7ZTHdqFex
-WCSUfGpSLUl42JdIEcPsKeUSC04qJHVRqazj2T+unVTkpYMpPJGlYIqDZxim8Ted
-CDsWRMPlKu+tdQ+dsz6VJ1xu+CAfwVQPWEzUTb7QI23puB7kKqNlab1kcjFPUzE7
-75KAxpnqkV1plbnHGO7GaSjl7kLRdrPxY22RCMWr+WVQ+bnO4AGrTBU6xar9o0Z4
-As4XrGORzJotbbowyJhmMwMZ0X6ndRMlSt6XS1/nL1GgbB7J1ADqDM3f5wIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBTKYMPSw+TP4CbRWoi5Qa5i1NxOswu+gt4wxEi
-7PNbLe7q/e/T+AVQxgWoGD9PPcwuwu0/wN8ABNmeumkD75WS+RFUOJ1gH9dCRu/o
-wngOp7z9KfO/OcTJ2aF/jH+A2/j8mT5WMM0LFGNM7k85kcjq+WRM9pj94t8b1oqz
-MM2JcTb0ViBut6iHLaTB8tJ76yLTsL5POpQP0As7Uvifa9UU4SASKJ39Zg3ZNfqf
-AniIXk0YiJnGEuQhOCZ8Zxk8V1BHwbjQc1p9xULgJ7mPc8bqAgpWS/ZEayrW65N7
-zQsPxKRowH5QqduxSzB1CnwAUlJXfWLmdsZctvs/EntiIcq+
+          <ds:X509SubjectName>CN=www.cambro.umu.se,O=Umea universitet,L=Umea,C=SE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDIjCCAgoCCQDgHEJYdgx+WTANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJT
+RTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEaMBgG
+A1UEAwwRd3d3LmNhbWJyby51bXUuc2UwHhcNMTQwNzE0MDUyNjMwWhcNMjQwNzEx
+MDUyNjMwWjBTMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQ
+VW1lYSB1bml2ZXJzaXRldDEaMBgGA1UEAwwRd3d3LmNhbWJyby51bXUuc2UwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYjCHkQSRiZaVEFUUk9NSwNl/Y
+KrSFmnz5Aepobjl0mG0yt2nD1lrNRhXxljeJqQzr+u98xqIOpe/Or3OUV6lVb5QH
+tmA/DLJEZDI8DUh3xIrBlsplFFhPw/IPCJikg7TwYo4HJQaT0otZbYDnHMMUSjsk
+RO3C0oxdmZHOWspKoq+gMDaIsIwpG+WZafPqoIYR5TvNCnK5Hj5IEHODfc1gGEjC
+iWQ+fdjuHEmPNWmk76jBMQVzPS5HV8pDaDLZdaPqqH5az2SEhWME7Ob1LdzMgRyN
+LTpafoMfboDUut2INkqIl+nJ3kEd30K0UkiZII4NvWtfung6JvljRQb0DHKbAgMB
+AAEwDQYJKoZIhvcNAQEFBQADggEBAIYiRKI4MHTQsxRbbpaMO87V/pGb81ktPfNA
+x9jOsA5yX5dXXH6HbuE9hMeutY/pZFVXVo4j2ASn9Q98lw0JDfy2eFkQzzjgo9wl
++br9YoAVjnslhuerjI4rZXSMkqfdYcvih4DxXPyAoRQPqIz8hXMi2VcXYsENAN1l
+c35rOFVBZdTp7hR88g9aqdaZBOc/4bDpvWgjkBvral6TCwKkR2z46kkaOi4M51F8
+iWocN/BkAiDgRNAj8gKk0QD7flbthIlI3nW2+a+cYBC1oNEZO+ku56tcx1k428VQ
+pq8I9dSLC3ziUGK02/9US8m/ZrZ3ywi6spUEqLBcQRFds2gl6bA=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -63,7 +63,6 @@ zQsPxKRowH5QqduxSzB1CnwAUlJXfWLmdsZctvs/EntiIcq+
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/Redirect"/>
     <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/NIM/POST"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cambro.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
   </md:SPSSODescriptor>