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

2 files changed, 45 insertions, 1 deletions

diff --git a/swamid-2.0/sp.haikom.com-saml-kph-test.xml b/swamid-2.0/sp.haikom.com-saml-kph-test.xml
new file mode 100644
index 00000000..dc497669
--- /dev/null
+++ b/swamid-2.0/sp.haikom.com-saml-kph-test.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.haikom.com/saml/kph-test">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets visitkortsportal (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University business cards portal (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets visitkortsportal används för beställning av visitkort.</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University business cards portal is used for ordering business cards.</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/Redirect" index="2" isDefault="false"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HaiKom AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HaiKom</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.haikom.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>HaiKom</md:Company>
+    <md:EmailAddress>mailto:support@haikom.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
index 079941c1..c8b4940f 100644
--- a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -625,7 +625,6 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webproxysrv.uniarts.se/adfs/ls/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/" index="2"/>
   </SPSSODescriptor>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>