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

4 files changed, 52 insertions, 2 deletions

diff --git a/swamid-2.0/play.ki.se.xml b/swamid-2.0/play.ki.se.xml
new file mode 100644
index 00000000..3b25c331
--- /dev/null
+++ b/swamid-2.0/play.ki.se.xml
@@ -0,0 +1,47 @@
+<?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://play.ki.se">
+  <md:Extensions>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">KI play</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">KI play</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Karolinska Institutets play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is Karolinska Institutet's streaming service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOAuwzW//Ec5MA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAlNWMRIwEAYDVQQIEwlTdG9ja2hvbG0xDjAMBgNVBAcTBVNvbG5hMR4wHAYDVQQKExVLYXJvbGluc2thIEluc3RpdHV0ZXQxEzARBgNVBAMTCnBsYXkua2kuc2UwHhcNMTYxMjA4MTYxMjM5WhcNMjYxMjA4MTYxMjM5WjBmMQswCQYDVQQGEwJTVjESMBAGA1UECBMJU3RvY2tob2xtMQ4wDAYDVQQHEwVTb2xuYTEeMBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MRMwEQYDVQQDEwpwbGF5LmtpLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuKQ23sS3pBVVmfiFrVTfRlLSvQ4Mi+lG9S5h1e+hDkilv+zzOe90xJ3NQ+lhyv2G+MuxBrSVNtBNxDGeembGJ0+oy2pBAKYFa4ZGTD8xxU9OMiGF5Pulk/UTiWUYtb+SKm6xT4JESCERXiX5MES6e3J5HvrId5bDoidkXF/5MJTm7EqEeeuswYvZRtwIynapM/obPikyZc/Ypb89sOawofFL5fgUN1SUvgf5j9eqdfamv61GyPqXsk/YdLTEQXxiEYPSEt3noqOd81B18bOCgrDWEbIGeVxv/mOxWWCdKt+gR9a9Y91ETYvBs0H4QnCJDhKwLlqmPD2V4D0YyDLFIwIDAQABo4HLMIHIMB0GA1UdDgQWBBQJSNmIy3UAP5I2Vpce6runW6q97jCBmAYDVR0jBIGQMIGNgBQJSNmIy3UAP5I2Vpce6runW6q97qFqpGgwZjELMAkGA1UEBhMCU1YxEjAQBgNVBAgTCVN0b2NraG9sbTEOMAwGA1UEBxMFU29sbmExHjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRldDETMBEGA1UEAxMKcGxheS5raS5zZYIJAOAuwzW//Ec5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAANMuHcy6/l6glJ8yYsx7f8kKRvydTUDVLym/kKTdMoI1OgXQndPtihO5rSoFJVvFF7Pvz5M9ZDbDic6Xbcuxrd9XUGOGuzGmYrjl2d+iKm4smDasJ+UBg3Vr5bEN/3FdWS3Pgy5BdkW5YRdPj408y+OjSUIt6bZoG7hXNyFgxwjN8hCONFOMJ0eFhiaCBOKSf6xVn/xgU+YjwNgl0berezT5YAhvADYhFe1Zm+rdxVXBQghbZtLqJQb6vloD4Zx+CAB6LSbBhaI2PwG2fQsxsMsYL4or7Ok1lnMAMPTbEPwLBLDjSXMWrz9D3v5CGvqHiiM7l0LFSI7gr6gIBc0Npw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOAuwzW//Ec5MA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAlNWMRIwEAYDVQQIEwlTdG9ja2hvbG0xDjAMBgNVBAcTBVNvbG5hMR4wHAYDVQQKExVLYXJvbGluc2thIEluc3RpdHV0ZXQxEzARBgNVBAMTCnBsYXkua2kuc2UwHhcNMTYxMjA4MTYxMjM5WhcNMjYxMjA4MTYxMjM5WjBmMQswCQYDVQQGEwJTVjESMBAGA1UECBMJU3RvY2tob2xtMQ4wDAYDVQQHEwVTb2xuYTEeMBwGA1UEChMVS2Fyb2xpbnNrYSBJbnN0aXR1dGV0MRMwEQYDVQQDEwpwbGF5LmtpLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuKQ23sS3pBVVmfiFrVTfRlLSvQ4Mi+lG9S5h1e+hDkilv+zzOe90xJ3NQ+lhyv2G+MuxBrSVNtBNxDGeembGJ0+oy2pBAKYFa4ZGTD8xxU9OMiGF5Pulk/UTiWUYtb+SKm6xT4JESCERXiX5MES6e3J5HvrId5bDoidkXF/5MJTm7EqEeeuswYvZRtwIynapM/obPikyZc/Ypb89sOawofFL5fgUN1SUvgf5j9eqdfamv61GyPqXsk/YdLTEQXxiEYPSEt3noqOd81B18bOCgrDWEbIGeVxv/mOxWWCdKt+gR9a9Y91ETYvBs0H4QnCJDhKwLlqmPD2V4D0YyDLFIwIDAQABo4HLMIHIMB0GA1UdDgQWBBQJSNmIy3UAP5I2Vpce6runW6q97jCBmAYDVR0jBIGQMIGNgBQJSNmIy3UAP5I2Vpce6runW6q97qFqpGgwZjELMAkGA1UEBhMCU1YxEjAQBgNVBAgTCVN0b2NraG9sbTEOMAwGA1UEBxMFU29sbmExHjAcBgNVBAoTFUthcm9saW5za2EgSW5zdGl0dXRldDETMBEGA1UEAxMKcGxheS5raS5zZYIJAOAuwzW//Ec5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAANMuHcy6/l6glJ8yYsx7f8kKRvydTUDVLym/kKTdMoI1OgXQndPtihO5rSoFJVvFF7Pvz5M9ZDbDic6Xbcuxrd9XUGOGuzGmYrjl2d+iKm4smDasJ+UBg3Vr5bEN/3FdWS3Pgy5BdkW5YRdPj408y+OjSUIt6bZoG7hXNyFgxwjN8hCONFOMJ0eFhiaCBOKSf6xVn/xgU+YjwNgl0berezT5YAhvADYhFe1Zm+rdxVXBQghbZtLqJQb6vloD4Zx+CAB6LSbBhaI2PwG2fQsxsMsYL4or7Ok1lnMAMPTbEPwLBLDjSXMWrz9D3v5CGvqHiiM7l0LFSI7gr6gIBc0Npw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.ki.se/user/logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.ki.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">KI play</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">KI play</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.ki.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-externals-1.0/metadata.lst b/swamid-externals-1.0/metadata.lst
index a3419d77..5289445e 100644
--- a/swamid-externals-1.0/metadata.lst
+++ b/swamid-externals-1.0/metadata.lst
@@ -4,5 +4,6 @@ http://spaces.internet2.edu/Shibboleth.sso/Metadata spaces.internet2.edu.crt
 
 # Old OpenSSL at md1/md2
 #https://login.terena.org/wayf/module.php/saml/sp/metadata.php/default-sp?output=xml
-https://ladok3.its.umu.se/swamid-md/terena.org-sp.xml
+# Already in eduGAIN via http://mds.edugain.org
+#https://ladok3.its.umu.se/swamid-md/terena.org-sp.xml
 
diff --git a/swamid-externals-2.0/metadata.lst b/swamid-externals-2.0/metadata.lst
index 2f551fe2..20336476 100644
--- a/swamid-externals-2.0/metadata.lst
+++ b/swamid-externals-2.0/metadata.lst
@@ -4,7 +4,8 @@
 
 # Old OpenSSL at md1/md2
 #https://login.terena.org/wayf/module.php/saml/sp/metadata.php/default-sp?output=xml
-https://ladok3.its.umu.se/swamid-md/terena.org-sp.xml
+# Already in eduGAIN via http://mds.edugain.org
+#https://ladok3.its.umu.se/swamid-md/terena.org-sp.xml
 
 https://kantarainitiative.org/shibboleth/metadata.xml
 #https://callback-test.inloggning.se/authify/metadata/?fed_name=swamidfederation e-identitet-swamid.crt
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9203e368..b91d3d2e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -626,4 +626,5 @@
   <xi:include href="swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/indico.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edumeta.sae.kau.se.xml"/>
+  <xi:include href="swamid-2.0/play.ki.se.xml"/>
 </md:EntitiesDescriptor>