new toylan

1 files changed, 79 insertions, 20 deletions

diff --git a/swamid-1.0/toylan3.umdc.umu.se.xml b/swamid-1.0/toylan3.umdc.umu.se.xml
index 1b1294a2..eafbffe3 100644
--- a/swamid-1.0/toylan3.umdc.umu.se.xml
+++ b/swamid-1.0/toylan3.umdc.umu.se.xml
@@ -1,24 +1,83 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://toylan3.umdc.umu.se/shibboleth">
-  <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="_e4707f5b9bdd07aef8c5d53c716ffaef" entityID="https://toylan3.umdc.umu.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://toylan3.umdc.umu.se/Shibboleth.sso/DS/ds.swamid.se" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>toylan3.umdc.umu.se</ds:KeyName>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDmTCCAoGgAwIBAgIBATANBgkqhkiG9w0BAQQFADA3MREwDwYDVQQKEwhUZXN0U2hpYjEiMCAGA1UEAxMZVGVzdFNoaWIgU2VydmljZSBQcm92aWRlcjAeFw0wNzAzMDgxNTM3MjZaFw0wOTAzMDgxNDM3MjZaMFUxETAPBgNVBAoTCFRlc3RTaGliMSIwIAYDVQQLExlUZXN0U2hpYiBTZXJ2aWNlIFByb3ZpZGVyMRwwGgYDVQQDExN0b3lsYW4zLnVtZGMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfM9MoLpJxjRj5uRYnNGLZA8fme2UjKKvmONqPC1l+N1HStnlvwh/kfT4GQUK6JE2CgCqLlUJFBO1B3G5CRPI1A+P4ZKfM6P8JxQxhi7cy/2EwkPVyWwYhdkblLpUHG9fAQ1Db2Ly3DHvEeRhwJvTFWbszK1qQYkLEBOfeH96oQh/sR8PeIWl29VrGv8iBl9eYEMV+N9EXpv+RA/4OoHw5gKvxEaisXudvjPcqTfzi+05jUqtIWvTkhqLyLEFqGqwozbY6/xqKHOAMEGjL0Xiz4TnXBEtBLCIFAJUKhh5nNzD0IQdyfsIVt+dvGQ5dWulG/7lQEEfOp2eHnM1/BGbwIDAQABo4GRMIGOMB0GA1UdDgQWBBRkimJZ51LPqunOKtZDS5D1+ZGarDBfBgNVHSMEWDBWgBRkimJZ51LPqunOKtZDS5D1+ZGarKE7pDkwNzERMA8GA1UEChMIVGVzdFNoaWIxIjAgBgNVBAMTGVRlc3RTaGliIFNlcnZpY2UgUHJvdmlkZXKCAQEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAWtfBvtBEnBv55fG1204OmkimhP8p9M77Us6a3hwkXYLd1vKh+tA6XfPeKdHOZtLQoaUqa9j5xl6sbvGDhOrH4YOJCMheDICEolBRku0MyI5PJRMTlIE4Wu3B/v9p+J3jMeFgX0ZSH01EqeVuwtI1SiaLditmVYm//T19Q5ByArp0ccT+L6ly+p0BMnkDILJusTW8kRYTrk63kC8SepIQUNdQo7af1t5jtBn6o0+xx23QlQ13tx5WBbdT4AHaKZ/4NXEwvVCmr+myQKY0FH13453cRRwLleAQPHOkGO81eAo/9DPv6Udbjx4QBMYlObRQRzMLz3kjuGkhemYpVSu78A==</ds:X509Certificate>
+          <ds:X509SubjectName>CN=toylan3.umdc.umu.se,OU=TestShib Service Provider,O=TestShib</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDmTCCAoGgAwIBAgIBATANBgkqhkiG9w0BAQQFADA3MREwDwYDVQQKEwhUZXN0
+U2hpYjEiMCAGA1UEAxMZVGVzdFNoaWIgU2VydmljZSBQcm92aWRlcjAeFw0wNzAz
+MDgxNTM3MjZaFw0wOTAzMDgxNDM3MjZaMFUxETAPBgNVBAoTCFRlc3RTaGliMSIw
+IAYDVQQLExlUZXN0U2hpYiBTZXJ2aWNlIFByb3ZpZGVyMRwwGgYDVQQDExN0b3ls
+YW4zLnVtZGMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+xfM9MoLpJxjRj5uRYnNGLZA8fme2UjKKvmONqPC1l+N1HStnlvwh/kfT4GQUK6JE
+2CgCqLlUJFBO1B3G5CRPI1A+P4ZKfM6P8JxQxhi7cy/2EwkPVyWwYhdkblLpUHG9
+fAQ1Db2Ly3DHvEeRhwJvTFWbszK1qQYkLEBOfeH96oQh/sR8PeIWl29VrGv8iBl9
+eYEMV+N9EXpv+RA/4OoHw5gKvxEaisXudvjPcqTfzi+05jUqtIWvTkhqLyLEFqGq
+wozbY6/xqKHOAMEGjL0Xiz4TnXBEtBLCIFAJUKhh5nNzD0IQdyfsIVt+dvGQ5dWu
+lG/7lQEEfOp2eHnM1/BGbwIDAQABo4GRMIGOMB0GA1UdDgQWBBRkimJZ51LPqunO
+KtZDS5D1+ZGarDBfBgNVHSMEWDBWgBRkimJZ51LPqunOKtZDS5D1+ZGarKE7pDkw
+NzERMA8GA1UEChMIVGVzdFNoaWIxIjAgBgNVBAMTGVRlc3RTaGliIFNlcnZpY2Ug
+UHJvdmlkZXKCAQEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAWtfB
+vtBEnBv55fG1204OmkimhP8p9M77Us6a3hwkXYLd1vKh+tA6XfPeKdHOZtLQoaUq
+a9j5xl6sbvGDhOrH4YOJCMheDICEolBRku0MyI5PJRMTlIE4Wu3B/v9p+J3jMeFg
+X0ZSH01EqeVuwtI1SiaLditmVYm//T19Q5ByArp0ccT+L6ly+p0BMnkDILJusTW8
+kRYTrk63kC8SepIQUNdQo7af1t5jtBn6o0+xx23QlQ13tx5WBbdT4AHaKZ/4NXEw
+vVCmr+myQKY0FH13453cRRwLleAQPHOkGO81eAo/9DPv6Udbjx4QBMYlObRQRzML
+z3kjuGkhemYpVSu78A==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.umu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>UMDAC</Company>
-    <GivenName>Tommy</GivenName>
-    <SurName>Larsson</SurName>
-    <EmailAddress>tommy.larsson@umdac.umu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>toylan3.umdc.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=toylan3.umdc.umu.se,OU=TestShib Service Provider,O=TestShib</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDmTCCAoGgAwIBAgIBATANBgkqhkiG9w0BAQQFADA3MREwDwYDVQQKEwhUZXN0
+U2hpYjEiMCAGA1UEAxMZVGVzdFNoaWIgU2VydmljZSBQcm92aWRlcjAeFw0wNzAz
+MDgxNTM3MjZaFw0wOTAzMDgxNDM3MjZaMFUxETAPBgNVBAoTCFRlc3RTaGliMSIw
+IAYDVQQLExlUZXN0U2hpYiBTZXJ2aWNlIFByb3ZpZGVyMRwwGgYDVQQDExN0b3ls
+YW4zLnVtZGMudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+xfM9MoLpJxjRj5uRYnNGLZA8fme2UjKKvmONqPC1l+N1HStnlvwh/kfT4GQUK6JE
+2CgCqLlUJFBO1B3G5CRPI1A+P4ZKfM6P8JxQxhi7cy/2EwkPVyWwYhdkblLpUHG9
+fAQ1Db2Ly3DHvEeRhwJvTFWbszK1qQYkLEBOfeH96oQh/sR8PeIWl29VrGv8iBl9
+eYEMV+N9EXpv+RA/4OoHw5gKvxEaisXudvjPcqTfzi+05jUqtIWvTkhqLyLEFqGq
+wozbY6/xqKHOAMEGjL0Xiz4TnXBEtBLCIFAJUKhh5nNzD0IQdyfsIVt+dvGQ5dWu
+lG/7lQEEfOp2eHnM1/BGbwIDAQABo4GRMIGOMB0GA1UdDgQWBBRkimJZ51LPqunO
+KtZDS5D1+ZGarDBfBgNVHSMEWDBWgBRkimJZ51LPqunOKtZDS5D1+ZGarKE7pDkw
+NzERMA8GA1UEChMIVGVzdFNoaWIxIjAgBgNVBAMTGVRlc3RTaGliIFNlcnZpY2Ug
+UHJvdmlkZXKCAQEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAWtfB
+vtBEnBv55fG1204OmkimhP8p9M77Us6a3hwkXYLd1vKh+tA6XfPeKdHOZtLQoaUq
+a9j5xl6sbvGDhOrH4YOJCMheDICEolBRku0MyI5PJRMTlIE4Wu3B/v9p+J3jMeFg
+X0ZSH01EqeVuwtI1SiaLditmVYm//T19Q5ByArp0ccT+L6ly+p0BMnkDILJusTW8
+kRYTrk63kC8SepIQUNdQo7af1t5jtBn6o0+xx23QlQ13tx5WBbdT4AHaKZ/4NXEw
+vVCmr+myQKY0FH13453cRRwLleAQPHOkGO81eAo/9DPv6Udbjx4QBMYlObRQRzML
+z3kjuGkhemYpVSu78A==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://toylan3.umdc.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+
+</md:EntityDescriptor>
\ No newline at end of file