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

4 files changed, 58 insertions, 0 deletions

diff --git a/swamid-2.0/sso.ifmsa.se-login-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sso.ifmsa.se-login-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..be485bfb
--- /dev/null
+++ b/swamid-2.0/sso.ifmsa.se-login-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,29 @@
+<?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://sso.ifmsa.se/login/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAPUaUO5bRa64MA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjMyMDMxWhcNMjcwNTAzMjMyMDMxWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqEKGL1JENpM37DWbR+tGv/EIJBJsMkaBPmV/j191k3d213Y1NuEAl3tEtpFto0lL8iugd5yx0Kp03tFI91HZxChwekKdw4+VIQnIuSDFklvm/FxnjDC4OXVObqq0MNbrQkzW495WJm9QjB+mYWgd+raJcYc8JWXs59Rk8xGUaecGZ+7s/a9sOqQjso8ZLmpghkqv22i6AAYzZW9TH6Dzv0uDKXazYSyq7ZwdbYSkrlRoGllyp2x0fqXg2NfHO/6UolIlywthik+yjIe6wk/u3Z06+ecq6IZR5XfwCl3saZOaDiAANbgFfOQ9JVKLeaAXZx41QJthxY88hjmhoYQS4wIDAQABo1AwTjAdBgNVHQ4EFgQUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwHwYDVR0jBBgwFoAUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWlTkZLI9gAG92PrOE7U2ycEeHwRyktFyZXrazOhE+SUbJCqLvG4GyJWhN3FNy+OhpQfdwIg+WPMjnKekfDfpLpRR4QFAbuirwJfq9euZyL2fFO/nzNTYygpDgqmp/1OyflqodXjdhUvCWtGXwvpGgfexn5SslQdxLfEIaebP0XxrzqPBDY7pMyzpuq6LPgdse6T28U0jVcFScx/n0ZO/Lwc0tAFS8MSmMb4P+/T3mwNXrRuux3VguXHp3NGdr1c0whRd3Z3YewwTLGSKfENbu5aoGqHb5fMNXZEZmbmirM5EnuN1HX2wMEa3f97z1OwR4FqNFlpfp1MgZI13Xq2LGQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAPUaUO5bRa64MA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjMyMDMxWhcNMjcwNTAzMjMyMDMxWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqEKGL1JENpM37DWbR+tGv/EIJBJsMkaBPmV/j191k3d213Y1NuEAl3tEtpFto0lL8iugd5yx0Kp03tFI91HZxChwekKdw4+VIQnIuSDFklvm/FxnjDC4OXVObqq0MNbrQkzW495WJm9QjB+mYWgd+raJcYc8JWXs59Rk8xGUaecGZ+7s/a9sOqQjso8ZLmpghkqv22i6AAYzZW9TH6Dzv0uDKXazYSyq7ZwdbYSkrlRoGllyp2x0fqXg2NfHO/6UolIlywthik+yjIe6wk/u3Z06+ecq6IZR5XfwCl3saZOaDiAANbgFfOQ9JVKLeaAXZx41QJthxY88hjmhoYQS4wIDAQABo1AwTjAdBgNVHQ4EFgQUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwHwYDVR0jBBgwFoAUOWCfIfmnkbMwdZ/xxgK8Wyu+BVUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWlTkZLI9gAG92PrOE7U2ycEeHwRyktFyZXrazOhE+SUbJCqLvG4GyJWhN3FNy+OhpQfdwIg+WPMjnKekfDfpLpRR4QFAbuirwJfq9euZyL2fFO/nzNTYygpDgqmp/1OyflqodXjdhUvCWtGXwvpGgfexn5SslQdxLfEIaebP0XxrzqPBDY7pMyzpuq6LPgdse6T28U0jVcFScx/n0ZO/Lwc0tAFS8MSmMb4P+/T3mwNXrRuux3VguXHp3NGdr1c0whRd3Z3YewwTLGSKfENbu5aoGqHb5fMNXZEZmbmirM5EnuN1HX2wMEa3f97z1OwR4FqNFlpfp1MgZI13Xq2LGQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ifmsa.se/login/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ifmsa.se/login/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.ifmsa.se/login/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.ifmsa.se/login/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.ifmsa.se/login/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Admin</md:GivenName>
+    <md:SurName>IFMSA-Sweden</md:SurName>
+    <md:EmailAddress>admin@ifmsa.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml b/swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..5ac3157f
--- /dev/null
+++ b/swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml
@@ -0,0 +1,27 @@
+<?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://sso.ifmsa.se/login/saml2/idp/metadata.php">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAKcEVGR1HMdpMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjIyNTIyWhcNMjcwNTAzMjIyNTIyWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw35QCfj3CbZjt7raQbKEVRwf9tWAzeyoPMLNZaRa3cPS0T5+5FRnOn7zjRy9GlGLxcD3PpzmibI7V6WBf1ZvZVZTez9lS790mrrSL+B2YdCZNH/y/+yGoiqZGNs6xKXsqk8K9OisnhLL8FGZQjVv4WO7KAmkY3VsbNDwUn/ouKyW4AzmZEGMqvPcJ+6dDQ+uyHqMhsglNYqFpZEA5JrRDntYr5wL7wQNDZKaudDhDUzX4heMGUzC4F2vpIX9vGtWUVNm83Yg2E91tJMN94hoL749xNRhPJ1BexK35OKwmz/Y/1z+H19GSLKT23Xcn6E9EXhoad8D8YyeTzH2TIbbAQIDAQABo1AwTjAdBgNVHQ4EFgQUlnGgbMY/gpR+pPIyZIWv5287d/0wHwYDVR0jBBgwFoAUlnGgbMY/gpR+pPIyZIWv5287d/0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAjRovrWI9/FrYJNcLk9TEnHrg9OkvnBK8zq4aS7uSUJqrIryqCwuMSNyo/JIdMd9kG7UCzW5cYououtpHrRKi+rIJUIjAn9irMa0LGfFn9/2HvyRHIU/sjZ0yWd1JFI5cA/hmDX0GMAIlLDD9VP0la90qfUseV3MnoQMpaw/nM5tXCxyHtgDV5FRW0liCaMUTONn0b1pyapwx1ymWnXKHkK4PjRMmRchW1T2doh8qRjsIBGTiBqSJ4IDzdgYWu+lbZs0JQDpJLFoRntR5dp0ggI8TiSv32OmlaOhzyv08aX8SRUC5kCDxpWl2c7OUT/JODRlRDTRrsWQSNIijBz+wOQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAKcEVGR1HMdpMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxFTATBgNVBAMMDHNzby5pZm1zYS5zZTEdMBsGCSqGSIb3DQEJARYOYWRtaW5AaWZtc2Euc2UwHhcNMTcwNTAzMjIyNTIyWhcNMjcwNTAzMjIyNTIyWjCBjzELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMRUwEwYDVQQKDAxJRk1TQS1Td2VkZW4xCzAJBgNVBAsMAklUMRUwEwYDVQQDDAxzc28uaWZtc2Euc2UxHTAbBgkqhkiG9w0BCQEWDmFkbWluQGlmbXNhLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw35QCfj3CbZjt7raQbKEVRwf9tWAzeyoPMLNZaRa3cPS0T5+5FRnOn7zjRy9GlGLxcD3PpzmibI7V6WBf1ZvZVZTez9lS790mrrSL+B2YdCZNH/y/+yGoiqZGNs6xKXsqk8K9OisnhLL8FGZQjVv4WO7KAmkY3VsbNDwUn/ouKyW4AzmZEGMqvPcJ+6dDQ+uyHqMhsglNYqFpZEA5JrRDntYr5wL7wQNDZKaudDhDUzX4heMGUzC4F2vpIX9vGtWUVNm83Yg2E91tJMN94hoL749xNRhPJ1BexK35OKwmz/Y/1z+H19GSLKT23Xcn6E9EXhoad8D8YyeTzH2TIbbAQIDAQABo1AwTjAdBgNVHQ4EFgQUlnGgbMY/gpR+pPIyZIWv5287d/0wHwYDVR0jBBgwFoAUlnGgbMY/gpR+pPIyZIWv5287d/0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAjRovrWI9/FrYJNcLk9TEnHrg9OkvnBK8zq4aS7uSUJqrIryqCwuMSNyo/JIdMd9kG7UCzW5cYououtpHrRKi+rIJUIjAn9irMa0LGfFn9/2HvyRHIU/sjZ0yWd1JFI5cA/hmDX0GMAIlLDD9VP0la90qfUseV3MnoQMpaw/nM5tXCxyHtgDV5FRW0liCaMUTONn0b1pyapwx1ymWnXKHkK4PjRMmRchW1T2doh8qRjsIBGTiBqSJ4IDzdgYWu+lbZs0JQDpJLFoRntR5dp0ggI8TiSv32OmlaOhzyv08aX8SRUC5kCDxpWl2c7OUT/JODRlRDTRrsWQSNIijBz+wOQ==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ifmsa.se/login/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ifmsa.se/login/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Admin</md:GivenName>
+    <md:SurName>IFMSA-Sweden</md:SurName>
+    <md:EmailAddress>admin@ifmsa.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 843cf755..9c5f0588 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -59,4 +59,5 @@
   <xi:include href="swamid-2.0/idp.test.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/idp.hv.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.rkh.se-adfs-services-trust.xml"/>
+  <xi:include href="swamid-2.0/sso.ifmsa.se-login-saml2-idp-metadata.php.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index df736529..f6c98f42 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -65,4 +65,5 @@
   <xi:include href="swamid-2.0/devrb.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml"/>
   <xi:include href="swamid-2.0/stipendier-test.its.uu.se-stipendium.xml"/>
+  <xi:include href="swamid-2.0/sso.ifmsa.se-login-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </EntitiesDescriptor>