Resolves SWAMIDOPS-7621

1 files changed, 28 insertions, 46 deletions

diff --git a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index ebe75042..6fd13f88 100644
--- a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
@@ -11,61 +11,43 @@
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.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://mondo-test.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <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://mondo-test.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <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://calypso.sau.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Mondo Stockholms universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Mondo Stockholm University</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Mondo är en webbaserad lär-och samarbetsplattform vid Stockholms universitet.</mdui:Description>
         <mdui:Description xml:lang="en">Mondo is a web based system for learning and collaboration at Stockholm University.</mdui:Description>
       </mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF/wavelan"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF/idp.secure.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mondo-test.su.se/Shibboleth.sso/WAYF/idp-test.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mondo-test.su.se/Shibboleth.sso/SWAMID"/>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mondo-test-sp02</ds:KeyName>
+        <ds:KeyName>mondo-test-app06</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=mondo-test-sp02</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANS6H+ZEuG+GMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21vbmRvLXRlc3Qtc3AwMjAeFw0xMDExMTkxMjI2NDBaFw0yMDExMTYxMjI2
-NDBaMBoxGDAWBgNVBAMTD21vbmRvLXRlc3Qtc3AwMjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOIAVezbVicqgGVl4CfANA02mB+4tGTZA7w1NPbJOjP1
-Ukkj51030JFiZujGWQLyfD/EkPsVmqXBm4+WQIg8y3HzB3AEiqYymXjBGJu9WzWJ
-ViF9DGNFh6gJPjTx/M3eMGXCj75id7Im08oCIYLHohbzhD7UYGJA4CvnWDpZLZl/
-G2smP//9TO0rpV5ej4BF+uCAfRo4H612qYEzcPNhLRK+kF1cyuUEVxho14M4HiV1
-0m0+c3nqnpox8hCORiX/CY52bnHDZGOPH5frfpOmOBCTs43a/KN2p/O9Hq2mn8Cl
-ngDyeIiaOhrbQCSDlYysxU4QHXPT/hUCiCCq3PqOS9cCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbW9uZG8tdGVzdC1zcDAyMB0GA1UdDgQWBBTFdJY70DroOGtg1pVjQxP5
-/PAqFzANBgkqhkiG9w0BAQUFAAOCAQEAZ2I4vpiyUNTHg7GepXn6s7kV6bvrCuBN
-+dpr6EkktwtUhvlPXBn9QIODryfP4+H+ijSbeOgyQ+nWvvaMhFiQHHQFfRjviDnZ
-4KorilYWRdrF6/SGGxQRG0dqOnLXqlmgQiZHgIZCkCTK5GiNv1xwvjh6BJJfSD+2
-rOrfBqB3iDmnPAqhJJ+OUqwuuqyw29UIcwphzcg/0K9nDcpCNOwJ6eyEQNBVAa4g
-NRNexZusZNK19ruk+O8wYdVKjwu+iSGjWsrecrd8rUPQlRPMWfXMaltZyKSwcgp6
-gPEuvyJcqNew1GkpXzoPXU8ty7cuJ7ZgB100cnoXttIkiq13tlTaRw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mondo-test-sp02</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mondo-test-sp02</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANS6H+ZEuG+GMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD21vbmRvLXRlc3Qtc3AwMjAeFw0xMDExMTkxMjI2NDBaFw0yMDExMTYxMjI2
-NDBaMBoxGDAWBgNVBAMTD21vbmRvLXRlc3Qtc3AwMjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOIAVezbVicqgGVl4CfANA02mB+4tGTZA7w1NPbJOjP1
-Ukkj51030JFiZujGWQLyfD/EkPsVmqXBm4+WQIg8y3HzB3AEiqYymXjBGJu9WzWJ
-ViF9DGNFh6gJPjTx/M3eMGXCj75id7Im08oCIYLHohbzhD7UYGJA4CvnWDpZLZl/
-G2smP//9TO0rpV5ej4BF+uCAfRo4H612qYEzcPNhLRK+kF1cyuUEVxho14M4HiV1
-0m0+c3nqnpox8hCORiX/CY52bnHDZGOPH5frfpOmOBCTs43a/KN2p/O9Hq2mn8Cl
-ngDyeIiaOhrbQCSDlYysxU4QHXPT/hUCiCCq3PqOS9cCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPbW9uZG8tdGVzdC1zcDAyMB0GA1UdDgQWBBTFdJY70DroOGtg1pVjQxP5
-/PAqFzANBgkqhkiG9w0BAQUFAAOCAQEAZ2I4vpiyUNTHg7GepXn6s7kV6bvrCuBN
-+dpr6EkktwtUhvlPXBn9QIODryfP4+H+ijSbeOgyQ+nWvvaMhFiQHHQFfRjviDnZ
-4KorilYWRdrF6/SGGxQRG0dqOnLXqlmgQiZHgIZCkCTK5GiNv1xwvjh6BJJfSD+2
-rOrfBqB3iDmnPAqhJJ+OUqwuuqyw29UIcwphzcg/0K9nDcpCNOwJ6eyEQNBVAa4g
-NRNexZusZNK19ruk+O8wYdVKjwu+iSGjWsrecrd8rUPQlRPMWfXMaltZyKSwcgp6
-gPEuvyJcqNew1GkpXzoPXU8ty7cuJ7ZgB100cnoXttIkiq13tlTaRw==
+          <ds:X509SubjectName>CN=mondo-test-app06</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJAOsiPNEaF413MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEG1vbmRvLXRlc3QtYXBwMDYwHhcNMTQwNjA5MTAyMzIxWhcNMjQwNjA2MTAy
+MzIxWjAbMRkwFwYDVQQDExBtb25kby10ZXN0LWFwcDA2MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5VPBP//hXn5z1JwKv7eDBgTUFHeVU+V7hCFeOti0
+BHTjCCWwa4ToFnEX92yi+b7/0iLKRZXMQN7cNIatZ0ytUCyuzuVPLNG9SWDKig8z
+gitq0kpK9kaX4Z9LkcM5XYwtXu6gmDGK7U/GL1veen8L9ZoGTP75M1gk29mpHeQz
+t2bb4EY1LvSUHhEnOeAJQ7Wn75ukHb4v7pDqzxfBawBs2S6PsjGe2bbi+JHYD70q
+hD6vaY5IabhZrLMb+roTSUYDcuK0Zto1ZwPzVhnM7NKhC4s/bxYPRbFC2X8ksAkr
+Cei0I7W4xREOa9dKDMUgZ3L3JaRhyJ7t/9yECpGO7wr1FQIDAQABoz4wPDAbBgNV
+HREEFDASghBtb25kby10ZXN0LWFwcDA2MB0GA1UdDgQWBBS15LQ7W3McxpQqs7jc
+6Du2WRZh3zANBgkqhkiG9w0BAQUFAAOCAQEAHEnPzf5XIfbwN5wwtxWJE4bF7RPM
+I/heNwj3LbuJj/x0WhVWL6cGys5LF1haaAfftzmn0u7yEloQhVDYTuh6uA9VWPql
+4yYc+eliurL+ZuDNVOCRRXHNNCUAZ3RpkkdqeAEd0Pm3lGkerNe8Fq3OCEN2L+gw
+tv1eB5mKea+c193BTsh3w3QKSrBWaJ7ztp06LM0I9Pf6z1PVHxDLoFssaaJeR6I3
+i3IFP/2mqzIJ/wcDZM1ZZB/iHvBGUtACPOWhzair4J7jxbLZg83GcFA9uTl1v3RZ
+snJSQ/YlB4ldg4xiZo0aKDvUVZqlhkCcwEKNcNrwiXxMtkx0ekUmiHv5SA==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>