Resolves SWAMIDOPS-7557 Metadata för play.umu.se.

Fix spelling mistake in SWAMIDOPS-7545

4 files changed, 51 insertions, 85 deletions

diff --git a/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
index 8f9bbd04..bdfa1d42 100644
--- a/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
+++ b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
@@ -31,8 +31,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/frontwalkersp/artifact" index="3"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="sv">Rentedo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rentedo</md:OrganizationDisplayName>
+    <md:OrganizationName xml:lang="sv">Retendo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Retendo</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
diff --git a/swamid-2.0/play.umu.se.xml b/swamid-2.0/play.umu.se.xml
new file mode 100644
index 00000000..8a492361
--- /dev/null
+++ b/swamid-2.0/play.umu.se.xml
@@ -0,0 +1,48 @@
+<?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.umu.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:AttributeValue>http://refeds.org/category/research-and-scholarship</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">UMU Play, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">UMU Play, Umeå University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">UMU Play video portal vid Umeå universitet</mdui:Description>
+        <mdui:Description xml:lang="en">UMU Play video portal at Umeå University</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIJAIoUz6JSRz7EMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQIDAZTd2VkZW4xDTALBgNVBAcMBFVtZWExGDAWBgNVBAoMD1VtZWEgVW5pdmVyc2l0eTEUMBIGA1UEAwwLcGxheS51bXUuc2UwHhcNMTUwMjEyMDY1MjA5WhcNMjUwMjExMDY1MjA5WjBdMQswCQYDVQQGEwJTRTEPMA0GA1UECAwGU3dlZGVuMQ0wCwYDVQQHDARVbWVhMRgwFgYDVQQKDA9VbWVhIFVuaXZlcnNpdHkxFDASBgNVBAMMC3BsYXkudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncB0YkNkabHsTyCRHHczvRaKvEEkCP1XUXFafUxLmJeqtB8ievnIWukva9X4iuHQ1klKudkozbiWOUsgZN1Ksx67qd1Fjsm2Roa0KD6Y2DqgPWccDzGzAsGnuKwVUzrCnICEqD2HIt+pNcZbQChaWUvDLQ/JDQxLMjDqRG/5Yock6NiFLAVKfhhtrNXF9NwkDeFGoga2dziAPEfkqwsI7z+mkhCoafUcNFPeMg/UmFkhxOe7b3c/wz5/I3ZtS1JKEN2kquuHOz+9Z9+U/+19/GcnIdMSdru0Y0JXQNUyNSgPXDPkk4MBsK5lF3BAUxft10U5cYDYGExFmyQqiowOHQIDAQABo1AwTjAdBgNVHQ4EFgQUKeozNFgvElSCRACeq9FGAQhTk+wwHwYDVR0jBBgwFoAUKeozNFgvElSCRACeq9FGAQhTk+wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAJD6RafPc2wykWvbqp7TZREhFqBMZyCIlJR6WKNlAoQ2rJ6g4tnaZ2MM0WO33myobZrqV6dSGXyxqEdBoug+pFq6PsPfZmt81c+uK0KrPcFbm2yj+l0Zym4fwYQEAV/URwy9nmyGu7DoJ1FdQjT6LNyK6zLQBBZzqm6T1BvIIysa/0EshgJzYHI6rE4mYcZRlzrucXvgQN5+zto1yZ4qYhwamt5KxJ0hBC+BvCYSu5GOqRfsg8gDPJmibo1BUBzn9mWTCrQh3EQrj3Sfd4Q1WaeQ9q1FgQNSCBcOIQZYz4KhJYuXabNLGiBdIYwbpTzA9W9yRAjV40NQUBD5OCgZMAg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjTCCAnWgAwIBAgIJAIoUz6JSRz7EMA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNVBAYTAlNFMQ8wDQYDVQQIDAZTd2VkZW4xDTALBgNVBAcMBFVtZWExGDAWBgNVBAoMD1VtZWEgVW5pdmVyc2l0eTEUMBIGA1UEAwwLcGxheS51bXUuc2UwHhcNMTUwMjEyMDY1MjA5WhcNMjUwMjExMDY1MjA5WjBdMQswCQYDVQQGEwJTRTEPMA0GA1UECAwGU3dlZGVuMQ0wCwYDVQQHDARVbWVhMRgwFgYDVQQKDA9VbWVhIFVuaXZlcnNpdHkxFDASBgNVBAMMC3BsYXkudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncB0YkNkabHsTyCRHHczvRaKvEEkCP1XUXFafUxLmJeqtB8ievnIWukva9X4iuHQ1klKudkozbiWOUsgZN1Ksx67qd1Fjsm2Roa0KD6Y2DqgPWccDzGzAsGnuKwVUzrCnICEqD2HIt+pNcZbQChaWUvDLQ/JDQxLMjDqRG/5Yock6NiFLAVKfhhtrNXF9NwkDeFGoga2dziAPEfkqwsI7z+mkhCoafUcNFPeMg/UmFkhxOe7b3c/wz5/I3ZtS1JKEN2kquuHOz+9Z9+U/+19/GcnIdMSdru0Y0JXQNUyNSgPXDPkk4MBsK5lF3BAUxft10U5cYDYGExFmyQqiowOHQIDAQABo1AwTjAdBgNVHQ4EFgQUKeozNFgvElSCRACeq9FGAQhTk+wwHwYDVR0jBBgwFoAUKeozNFgvElSCRACeq9FGAQhTk+wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAJD6RafPc2wykWvbqp7TZREhFqBMZyCIlJR6WKNlAoQ2rJ6g4tnaZ2MM0WO33myobZrqV6dSGXyxqEdBoug+pFq6PsPfZmt81c+uK0KrPcFbm2yj+l0Zym4fwYQEAV/URwy9nmyGu7DoJ1FdQjT6LNyK6zLQBBZzqm6T1BvIIysa/0EshgJzYHI6rE4mYcZRlzrucXvgQN5+zto1yZ4qYhwamt5KxJ0hBC+BvCYSu5GOqRfsg8gDPJmibo1BUBzn9mWTCrQh3EQrj3Sfd4Q1WaeQ9q1FgQNSCBcOIQZYz4KhJYuXabNLGiBdIYwbpTzA9W9yRAjV40NQUBD5OCgZMAg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.umu.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.umu.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Umeå universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.umu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/www.play.umu.se-shibboleth.xml b/swamid-2.0/www.play.umu.se-shibboleth.xml
deleted file mode 100644
index c05044d6..00000000
--- a/swamid-2.0/www.play.umu.se-shibboleth.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.play.umu.se/shibboleth">
-  <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:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://www.play.umu.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>play.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=play.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJkObDfCTqSCMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3BsYXkudW11LnNlMB4XDTEyMDUyODEwMjg0MloXDTIyMDUyNjEwMjg0Mlow
-FjEUMBIGA1UEAxMLcGxheS51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC7JIywtAOlvlPI2Fhxu5lJu6tJmBdcm1qkpm4W7kKgOPmhvDiF0RnE
-RISt6pkFMV4vqGwvfQ37yqzIUBNxX82F2ok8mhLmKGOxgWcdQ6R37XdTTQfGVPM+
-prK6TA+0oGjvsVc3H7ytoKr9wS2n/tVcMhiTJtWVA9EGpHGg2F3u4cOUmTsBdOMp
-iDzmr7OwZTv0XyeSCGojzeDo/PqaEZsNDsG1cJlaRdQ7qgi8iRhP1i94Tw7kDmco
-+xGSpNZFwLZT0W+yi4q/GiZrbFeycvehAPzkVydpb6fYpZ1wsFXYGtFsKjhd20Rl
-QQ5hFpaBWAtYXNK8mCJ26Yw1esVVQjk/AgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
-YXkudW11LnNlhgtwbGF5LnVtdS5zZTAdBgNVHQ4EFgQU3R3jvWuDOcpZFkp741nw
-GIQsgP8wDQYJKoZIhvcNAQEFBQADggEBAJy9pCZjMdUeqFf1PykaPS3/x2AIaGDg
-WHelY4dEFNGB/cIX38h73CHOzk/l7SQwKdETPUlTZOuUED7RknS1QHwCesnUhHyZ
-zBSil0Qk/hCBtejPORHaWKsXTiN2iGeR2Kqh0y08S29In2MEZY+1lJRPwKAdBjAD
-UfW4qed2mTCkrDJGRxKfEj7OTUp8+Zjk+8mhlie6KdWN6O3LL7KGIDmefjhuvaSN
-RsZgWmKx9/MHsLkU1opdR9QJs8/mRpsMNoiFdBcoPv44OMuwEqJvSynge6GMOfNw
-LfULDFRxeDlyaxgD0s66OCLxachVt6b18FLPbnHRJxLYzFpZyoLLPKg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>play.umu.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=play.umu.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAJkObDfCTqSCMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3BsYXkudW11LnNlMB4XDTEyMDUyODEwMjg0MloXDTIyMDUyNjEwMjg0Mlow
-FjEUMBIGA1UEAxMLcGxheS51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC7JIywtAOlvlPI2Fhxu5lJu6tJmBdcm1qkpm4W7kKgOPmhvDiF0RnE
-RISt6pkFMV4vqGwvfQ37yqzIUBNxX82F2ok8mhLmKGOxgWcdQ6R37XdTTQfGVPM+
-prK6TA+0oGjvsVc3H7ytoKr9wS2n/tVcMhiTJtWVA9EGpHGg2F3u4cOUmTsBdOMp
-iDzmr7OwZTv0XyeSCGojzeDo/PqaEZsNDsG1cJlaRdQ7qgi8iRhP1i94Tw7kDmco
-+xGSpNZFwLZT0W+yi4q/GiZrbFeycvehAPzkVydpb6fYpZ1wsFXYGtFsKjhd20Rl
-QQ5hFpaBWAtYXNK8mCJ26Yw1esVVQjk/AgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
-YXkudW11LnNlhgtwbGF5LnVtdS5zZTAdBgNVHQ4EFgQU3R3jvWuDOcpZFkp741nw
-GIQsgP8wDQYJKoZIhvcNAQEFBQADggEBAJy9pCZjMdUeqFf1PykaPS3/x2AIaGDg
-WHelY4dEFNGB/cIX38h73CHOzk/l7SQwKdETPUlTZOuUED7RknS1QHwCesnUhHyZ
-zBSil0Qk/hCBtejPORHaWKsXTiN2iGeR2Kqh0y08S29In2MEZY+1lJRPwKAdBjAD
-UfW4qed2mTCkrDJGRxKfEj7OTUp8+Zjk+8mhlie6KdWN6O3LL7KGIDmefjhuvaSN
-RsZgWmKx9/MHsLkU1opdR9QJs8/mRpsMNoiFdBcoPv44OMuwEqJvSynge6GMOfNw
-LfULDFRxeDlyaxgD0s66OCLxachVt6b18FLPbnHRJxLYzFpZyoLLPKg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.play.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.play.umu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.play.umu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.play.umu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.play.umu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.play.umu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.play.umu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.play.umu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.play.umu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.play.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.play.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.play.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b706d829..006637e7 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -223,7 +223,6 @@
   <xi:include href="swamid-2.0/pingpong.chalmers.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/cambro-test-26.umdc.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/www.play.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
   <xi:include href="swamid-2.0/play.hig.se.xml"/>
   <xi:include href="swamid-2.0/maps.slu.se-shibboleth.xml"/>
@@ -351,4 +350,5 @@
   <xi:include href="swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml"/>
   <xi:include href="swamid-2.0/student.mit-ik.ladok.se-student-frontend-sp.xml"/>
   <xi:include href="swamid-2.0/student.mit.ladok.se-student-frontend-sp.xml"/>
+  <xi:include href="swamid-2.0/play.umu.se.xml"/>
 </md:EntitiesDescriptor>