resolves SWAMIDOPS-6080

1 files changed, 72 insertions, 45 deletions

diff --git a/swamid-1.0/mondo-test.su.se.xml b/swamid-1.0/mondo-test.su.se.xml
index 261bc6dd..5408ff7a 100644
--- a/swamid-1.0/mondo-test.su.se.xml
+++ b/swamid-1.0/mondo-test.su.se.xml
@@ -1,49 +1,76 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mondo-test.su.se">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_37dd2c51c235ad9f7ba0c16206b30a68" entityID="https://mondo-test.su.se/Shibboleth.sso">
+
+  <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"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>mondo-test-sp02</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEsjCCA5qgAwIBAgILAQAAAAABIUUxzL4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MDUxNTE1NTc0MVoXDTEyMDUxNTE1NTc0MVowXTELMAkGA1UEBhMCU0UxEjAQBgNV
-BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEZ
-MBcGA1UEAxMQbW9uZG8tdGVzdC5zdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJLliN6BlbwODLLqrKKinMLs+JUxx9txqN2D2lo4kelyrtth+ZG8
-Zg7T3WzSdG4xwVR3BevSCqZm510krOuimpEyv2QUgTA8L/YR6Yo+PmY5jsHKGc61
-KvJlSkFrw3lj3T1J0O4hvasiW49NQBHX1gi87Bxt3zl7EunoOIjSaIL0UzShXW1B
-p0R0it6ndts78KICX51WEcNLVFQ++rI2T/h2x+W9+Z20Zt0+RBdWMqSxlwNHddX+
-ZhoagPP2/gjRfenkeacK7SAVtQTxNQGMy43HOThX3f6gK/ylYOgQlY8mbG8sC2lI
-sgK3m1yZA2RUZgCLed+jXkBYa60qEDvwuTMCAwEAAaOCAW8wggFrMFAGA1UdIARJ
-MEcwRQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNp
-Z24ubmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0j
-BBgwFoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFNstF/yndS81Vd1X
-AvYCzfOGn02RMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2ln
-bi5uZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcw
-AoYzaHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9u
-YWwuY3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHREEFDAS
-ghBtb25kby10ZXN0LnN1LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAO+pKROFkAf3Ky
-YfRkZ1meYiVKXQP1kFJQIPPIv61k6yWElUPIty3lkzCDXBs6cnSDXq4nP7HteRMS
-aHFfPpvT8PR2Sfyesltk+BzSJtk4/vPCFyyIsslvok7XYvPE5cnBQRuZ59RAoZtL
-mf5Fjc1McChU6yqfw5KHVOOsqsqQ+DNAlc7uhQHdetFzf9zvb9n4gehd2/ny4zOa
-+ehIVuNLxJ9O1TxNniiTnd3BdNeVmt1CkVqk6Jcw6C2fj8QnU5yizWrjXBrsf/jw
-BTmMKHliUumiqOBb7biTS+u/dyrPSowGxZ24ie69pFRVeWOhQUhGedsOtBkmleR5
-TzIJ8ITD</ds:X509Certificate>
+          <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>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mondo-test.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Stockholm university</Company>
-    <SurName>IT och Media</SurName>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
-    <TelephoneNumber>+46 8 161999</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
+    </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:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mondo-test.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mondo-test.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mondo-test.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mondo-test.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo-test.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mondo-test.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mondo-test.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mondo-test.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo-test.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mondo-test.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mondo-test.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/POST" index="7"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file