Merge branch 'master' of md-master.swamid.se:swamid-metadata

3 files changed, 102 insertions, 11 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 095fcf30..d29969cc 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -181,4 +181,5 @@
   <xi:include href="swamid-1.0/www2.teol.uu.se.xml"/>
   <xi:include href="swamid-1.0/www2.student.teol.uu.se.xml"/>
   <xi:include href="swamid-1.0/www.student.teol.uu.se.xml"/>
+  <xi:include href="swamid-1.0/sutest.dsv.su.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml b/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
index 5c916d83..cbd4b813 100644
--- a/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
+++ b/swamid-1.0/shibboleth.testd.ladok.umu.se-shibboleth-idp.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp">
+<EntityDescriptor entityID="https://shibboleth.testd.ladok.umu.se/shibboleth-idp"
+                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
 
@@ -17,20 +20,28 @@ MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
             </ds:KeyInfo>
         </KeyDescriptor>
         
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
 
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
                                    
         <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
 
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/Shibboleth/SSO"/>
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://shibboleth.testd.ladok.umu.se/idp/profile/Shibboleth/SSO" />
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST/SSO" />
 
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
         
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.testd.ladok.umu.se:444/idp/profile/SAML2/Redirect/SSO"/>
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://shibboleth.testd.ladok.umu.se/idp/profile/SAML2/Redirect/SSO" />
     </IDPSSODescriptor>
 
     <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
@@ -49,13 +60,15 @@ MIIB1DCCAX6gAwIBAgIJAP97cr5YctCQMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNVBAMTHXNoaWJib2xl
             </ds:KeyInfo>
         </KeyDescriptor>
 
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
         
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://shibboleth.testd.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
         
         <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
         <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
         
     </AttributeAuthorityDescriptor>
     
-</EntityDescriptor>
+</EntityDescriptor>    
diff --git a/swamid-1.0/sutest.dsv.su.se.xml b/swamid-1.0/sutest.dsv.su.se.xml
new file mode 100644
index 00000000..92764a28
--- /dev/null
+++ b/swamid-1.0/sutest.dsv.su.se.xml
@@ -0,0 +1,77 @@
+
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_449d2d8dcb068c7b2bc25079e127fce6" entityID="https://sutest.dsv.su.se/shibboleth">
+
+  <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://sutest.dsv.su.se/Shibboleth.sso/DS/DSV" 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://sutest.dsv.su.se/Shibboleth.sso/DS/SU" 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://sutest.dsv.su.se/Shibboleth.sso/DS/SWAMID" index="3"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sutest.dsv.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sutest.dsv.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANFaQko5QEDsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHN1dGVzdC5kc3Yuc3Uuc2UwHhcNMTEwNjE0MTUxMDI5WhcNMjEwNjExMTUx
+MDI5WjAbMRkwFwYDVQQDExBzdXRlc3QuZHN2LnN1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA9dKcFUqB+h9m4Ce2+30IxJWbSuCup9EQIWDD15Ni
+u7LgB5v1lmPJvz3dNAO8oLGZc2GZ1MGC4LMTjOsOxyVBI3kK+sstXZ5HCcEXHGnN
+dawOEwMpAge81J/SU4py7fxb028I7CxBnyVTD0nQeaXYl8TwA9/Wi0fqdQrOpNY4
+Hmd2izAT3+lPSWplNYQRdiZpDmpJ5Kpe0fqvwYk7IZ0yAePBVlmNMUO7Um6ONjM8
+RiD/F0Kvl2TycXa3fHZWP5QhF8Ovkg2l+bpbr78Nvj/oqY3jGAXnCnK2qoYmb6/N
+82kJ+53n55a/2YWS71Co2L6GcdXK9RD6J6GIO5F99VLFHwIDAQABoz4wPDAbBgNV
+HREEFDASghBzdXRlc3QuZHN2LnN1LnNlMB0GA1UdDgQWBBQsUNUB8MuUgg3w4rVX
+HCQfNaFJbDANBgkqhkiG9w0BAQUFAAOCAQEATmRML430Yi9BjDHVyEpYY3mEZkYT
+LhoFdN1yC8E37VG7ilUh/rI/BSvCrxt8KSZQ+5OusLq+4jVrNsESXD7PHDFAmQZ9
+5DMGnlZnYHbi9s2Eck8Na/c/jxza0gxaXG0IGmgYkVvcbHZ4HVNM1XOrn/EbtayE
+TRrcLGU0e+HjsbcULaB40DPyKJTPJrp+77H7560BQZXylxoDpTNuiKE7lvygoSbu
+HvZVD47jmfXvB9EmZnrzECl2gYKn3BJSbXFcvFnd8346qDw0p8mOxmiFu+5GRO7d
+Ipamop1r0dxsmADb5Z3TF29YvB5OuZFPPwLKKg1tX9Nw+9199lffGUhEPg==
+</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>sutest.dsv.su.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sutest.dsv.su.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIC9zCCAd+gAwIBAgIJANFaQko5QEDsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
+BAMTEHN1dGVzdC5kc3Yuc3Uuc2UwHhcNMTEwNjE0MTUxMDI5WhcNMjEwNjExMTUx
+MDI5WjAbMRkwFwYDVQQDExBzdXRlc3QuZHN2LnN1LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA9dKcFUqB+h9m4Ce2+30IxJWbSuCup9EQIWDD15Ni
+u7LgB5v1lmPJvz3dNAO8oLGZc2GZ1MGC4LMTjOsOxyVBI3kK+sstXZ5HCcEXHGnN
+dawOEwMpAge81J/SU4py7fxb028I7CxBnyVTD0nQeaXYl8TwA9/Wi0fqdQrOpNY4
+Hmd2izAT3+lPSWplNYQRdiZpDmpJ5Kpe0fqvwYk7IZ0yAePBVlmNMUO7Um6ONjM8
+RiD/F0Kvl2TycXa3fHZWP5QhF8Ovkg2l+bpbr78Nvj/oqY3jGAXnCnK2qoYmb6/N
+82kJ+53n55a/2YWS71Co2L6GcdXK9RD6J6GIO5F99VLFHwIDAQABoz4wPDAbBgNV
+HREEFDASghBzdXRlc3QuZHN2LnN1LnNlMB0GA1UdDgQWBBQsUNUB8MuUgg3w4rVX
+HCQfNaFJbDANBgkqhkiG9w0BAQUFAAOCAQEATmRML430Yi9BjDHVyEpYY3mEZkYT
+LhoFdN1yC8E37VG7ilUh/rI/BSvCrxt8KSZQ+5OusLq+4jVrNsESXD7PHDFAmQZ9
+5DMGnlZnYHbi9s2Eck8Na/c/jxza0gxaXG0IGmgYkVvcbHZ4HVNM1XOrn/EbtayE
+TRrcLGU0e+HjsbcULaB40DPyKJTPJrp+77H7560BQZXylxoDpTNuiKE7lvygoSbu
+HvZVD47jmfXvB9EmZnrzECl2gYKn3BJSbXFcvFnd8346qDw0p8mOxmiFu+5GRO7d
+Ipamop1r0dxsmADb5Z3TF29YvB5OuZFPPwLKKg1tX9Nw+9199lffGUhEPg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sutest.dsv.su.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sutest.dsv.su.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sutest.dsv.su.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sutest.dsv.su.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sutest.dsv.su.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sutest.dsv.su.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sutest.dsv.su.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sutest.dsv.su.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sutest.dsv.su.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sutest.dsv.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file