Resolves SWAMID-3053

3 files changed, 15 insertions, 91 deletions

diff --git a/swamid-2.0/play.kth.se-external-kaltura.com.xml b/swamid-2.0/play.kth.se-external-kaltura.com.xml
deleted file mode 100644
index 5bae44a6..00000000
--- a/swamid-2.0/play.kth.se-external-kaltura.com.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://play.kth.se/external/kaltura.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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>
-        <mdui:DisplayName xml:lang="sv">KTH Play</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Play</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Videoportal vid KTH</mdui:Description>
-        <mdui:Description xml:lang="en">Video portal at KTH</mdui:Description>
-        <mdui:Logo height="166" width="166">https://saml.sys.kth.se/idp/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEjCCAfqgAwIBAgIJAK195gtIeoCnMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
-BAMTC3BsYXkua3RoLnNlMB4XDTE0MTAyOTA5MjgyOFoXDTI0MTAyNjA5MjgyOFow
-FjEUMBIGA1UEAxMLcGxheS5rdGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC1EWaeEQViRtUt+Rocl/5n4+9G0WMfpbRy74vEY0yZDTtC6O1NB/5l
-tws/3Mlx/EBIasszeJh5cXBbzE803KRy8nCJcE+8dFJWXPWHiW7QfqRfdS5pq20q
-q1cXpBptVkt/Xf5cU10Nv8HncwqW8BI8W50nOJtC7vdm8Q2MojZijPVc8dV/Klar
-JRxU5+hwHOcuCTQ4NUDVimQfUsDZUq9HN/vfNoErrSMhrcOFYzAIfrH02XmENviq
-127MsiIRn+pbpBRQTkenVbjFKYixbaLN8cP0v9xiVQF5zOn/qvgiKAKQdWIZ+BXG
-YNwxU89vEUku00307pXbKsUHGgZLV2FfAgMBAAGjYzBhMEAGA1UdEQQ5MDeCC3Bs
-YXkua3RoLnNlhihodHRwczovL3BsYXkua3RoLnNlL2V4dGVybmFsL2thbHR1cmEu
-Y29tMB0GA1UdDgQWBBR5t6n0EslcO73PHaCd2O0AKVKMjzANBgkqhkiG9w0BAQsF
-AAOCAQEAWvLPZDw0sNsZjlhLtL9b2R+ZSdroJ9B2kSaZRsRM7obSulHxyjXEUdoG
-IKsRmUcNsPyPAFU3JctWEgSH3MVV1D23OflfVB3frbZeIzX65h4xeeABfUpQlonB
-wxpM2hA8VBj+CHSHY3n9U5LNN+/OhuXDHVowV4qfqN8UgeJV5pHb3kmgJSZmk3iJ
-hQeOvTkgoB+Co5E2wicXUX/LLNlldIyLofjlXeXvE1qwyICg/7chKiVTJHd77qyf
-CMjv9XK4ujIYPDLmwHLmWNK1ETL8tajP/NvJh0sS6Ni1djONPN7YAs+BokqN1aRx
-jyfJSjzHuZ9xMjMF/qdblGtl222vyg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEjCCAfqgAwIBAgIJAK195gtIeoCnMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV
-BAMTC3BsYXkua3RoLnNlMB4XDTE0MTAyOTA5MjgyOFoXDTI0MTAyNjA5MjgyOFow
-FjEUMBIGA1UEAxMLcGxheS5rdGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC1EWaeEQViRtUt+Rocl/5n4+9G0WMfpbRy74vEY0yZDTtC6O1NB/5l
-tws/3Mlx/EBIasszeJh5cXBbzE803KRy8nCJcE+8dFJWXPWHiW7QfqRfdS5pq20q
-q1cXpBptVkt/Xf5cU10Nv8HncwqW8BI8W50nOJtC7vdm8Q2MojZijPVc8dV/Klar
-JRxU5+hwHOcuCTQ4NUDVimQfUsDZUq9HN/vfNoErrSMhrcOFYzAIfrH02XmENviq
-127MsiIRn+pbpBRQTkenVbjFKYixbaLN8cP0v9xiVQF5zOn/qvgiKAKQdWIZ+BXG
-YNwxU89vEUku00307pXbKsUHGgZLV2FfAgMBAAGjYzBhMEAGA1UdEQQ5MDeCC3Bs
-YXkua3RoLnNlhihodHRwczovL3BsYXkua3RoLnNlL2V4dGVybmFsL2thbHR1cmEu
-Y29tMB0GA1UdDgQWBBR5t6n0EslcO73PHaCd2O0AKVKMjzANBgkqhkiG9w0BAQsF
-AAOCAQEAWvLPZDw0sNsZjlhLtL9b2R+ZSdroJ9B2kSaZRsRM7obSulHxyjXEUdoG
-IKsRmUcNsPyPAFU3JctWEgSH3MVV1D23OflfVB3frbZeIzX65h4xeeABfUpQlonB
-wxpM2hA8VBj+CHSHY3n9U5LNN+/OhuXDHVowV4qfqN8UgeJV5pHb3kmgJSZmk3iJ
-hQeOvTkgoB+Co5E2wicXUX/LLNlldIyLofjlXeXvE1qwyICg/7chKiVTJHd77qyf
-CMjv9XK4ujIYPDLmwHLmWNK1ETL8tajP/NvJh0sS6Ni1djONPN7YAs+BokqN1aRx
-jyfJSjzHuZ9xMjMF/qdblGtl222vyg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.kth.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.kth.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH Play (Kaltura)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Play (Kaltura)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://corp.kaltura.com/</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-2.0/play.kth.se-external-kaltura.nordu.net.xml b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
index f0d8fd1a..db8abbb8 100644
--- a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
+++ b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
@@ -16,9 +16,13 @@
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">KTH Play</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">KTH Play</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Videoportal vid KTH</mdui:Description>
-        <mdui:Description xml:lang="en">Video portal at KTH</mdui:Description>
+        <mdui:Description xml:lang="sv">KTH Play (NORDUnet Kaltura Service)</mdui:Description>
+        <mdui:Description xml:lang="en">KTH Play (NORDUnet Kaltura Service)</mdui:Description>
         <mdui:Logo height="166" width="166">https://saml.sys.kth.se/idp/images/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://intra.kth.se/utbildning/e-larande/video-for-larande/kth-play-kaltura</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://intra.kth.se/en/utbildning/e-larande/video-for-larande/kth-play-kaltura</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.nordu.net/sites/default/files/article_attachments/Kaltura%20privacy%20policy%20-%20final.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.nordu.net/sites/default/files/article_attachments/Kaltura%20privacy%20policy%20-%20final.pdf</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
@@ -44,8 +48,16 @@
     <md:OrganizationDisplayName xml:lang="en">MediaSpace</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://kaf-canvas-308.kaltura.nordu.net</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:e-learning@kth.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 7e3e8628..c01e37ad 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -222,7 +222,6 @@
   <xi:include href="swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml"/>
   <xi:include href="swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml"/>
   <xi:include href="swamid-2.0/play.umu.se.xml"/>
-  <xi:include href="swamid-2.0/play.kth.se-external-kaltura.com.xml"/>
   <xi:include href="swamid-2.0/account-utv.hh.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kib-shib.hosted.exlibrisgroup.com-shib.xml"/>
   <xi:include href="swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml"/>