Resolves SWAMIDOPS-7521

3 files changed, 52 insertions, 59 deletions

diff --git a/swamid-2.0/play.hig.se-shibboleth.xml b/swamid-2.0/play.hig.se-shibboleth.xml
deleted file mode 100644
index 1a5c616b..00000000
--- a/swamid-2.0/play.hig.se-shibboleth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.hig.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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://play.hig.se/Shibboleth.sso/DS/ds.sunet.se"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://play.hig.se/Shibboleth.sso/DS/ds.sunet.se" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>play.hig.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=play.hig.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9TCCAd2gAwIBAgIJAM00i3CivywHMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC3BsYXkuaGlnLnNlMB4XDTEyMDYxNTA5MTQ1M1oXDTIyMDYxMzA5MTQ1M1ow
-FjEUMBIGA1UEAxMLcGxheS5oaWcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDPpUPRvP1BxcoAW14lRY5vuKSh08SiqcwLApd6xXRumfXpSpsqHyQS
-mh2CnUbGv0Xgb3P3eHtKCBYb7VS8ApUGxaXuPIgtaVMuxDuiBYI7xHg48Hmq4D0+
-gbxW7EhCZvbm5cMI2fEVxgQaZu1RlbcQUM2CDoewGnRxJA9jk9hLiYd4TNLyMB4+
-FJ1s4D/dO/jXAmrurA3q6qwRpLrFQdMD5tLCXBIU4UKeORlXz2SP6/8eSQpCsByP
-rVvNCKPYxrvXtYny+mi+R7PBNyGtetryi/7hVd8uYpuhmNsNUe3UFpp5aVgJKBGs
-MVI/MWzYWQTcEnwLhsz+AXlsHbvqif3PAgMBAAGjRjBEMCMGA1UdEQQcMBqCC3Bs
-YXkuaGlnLnNlhgtwbGF5LmhpZy5zZTAdBgNVHQ4EFgQUu7gujpU5av1mawTpT2rX
-xipolAkwDQYJKoZIhvcNAQEFBQADggEBABAXQmMZvNsrnt3dywpqtKIzy/AUWl41
-Ad2RUkgAgDP9yitLdg4y8UFRUmxRBGpvIHNxRXpG78NdPnK8kWcsJJdIymYvMSKP
-aFchw1mGVhHjq3mqr5BpozKUmG6iUTjHwSYU45/xpLegq1Vurrw7MbWYi3dQpYGz
-/rwNwS3r/NYCq1AFrK5BX5NjbtD3cdFbxfWuhnkpyz+0m8NOKzUvn5i0RPQj93fZ
-q+A5E/qna6TB7CuElru7zDRjUwBbaVILb2l01wySFsgA/rr7RgkoniG2mdZ9Dg/z
-xFyfdykN+11Rs4Ycb/obyh6r3/hJUeLIZQ88iuyiIDf/8DN1I5Tvduc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.hig.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.hig.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.hig.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.hig.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.hig.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://play.hig.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.hig.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.hig.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.hig.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.hig.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://play.hig.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://play.hig.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://play.hig.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://play.hig.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://play.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/play.hig.se.xml b/swamid-2.0/play.hig.se.xml
new file mode 100644
index 00000000..76b4f7d5
--- /dev/null
+++ b/swamid-2.0/play.hig.se.xml
@@ -0,0 +1,51 @@
+<?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.hig.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="en">University of Gävle Play service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Högskolan i Gävle Playtjänst</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service is for presentation of videos from University of Gävle.</mdui:Description>
+        <mdui:Description xml:lang="sv">Denna tjänst används för presentationer av video från Högskolan i Gävle.</mdui:Description>
+        <mdui:Logo height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="94" width="83">https://webkonto.student.hig.se/head/logga3.png</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="94" width="83">https://webkonto.student.hig.se/head/loggaengelska.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDszCCApugAwIBAgIJAPbLXlBNnE0MMA0GCSqGSIb3DQEBCwUAMHAxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlHYXZsZWJvcmcxHDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgR2F2bGUxFDASBgNVBAMMC3BsYXkuaGlnLnNlMRkwFwYJKoZIhvcNAQkBFgpuYXRAaGlnLnNlMB4XDTE1MDEyMTEzMjIzNVoXDTI1MDEyMDEzMjIzNVowcDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCUdhdmxlYm9yZzEcMBoGA1UECgwTVW5pdmVyc2l0eSBvZiBHYXZsZTEUMBIGA1UEAwwLcGxheS5oaWcuc2UxGTAXBgkqhkiG9w0BCQEWCm5hdEBoaWcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC187zhKVr3uBoZNRYdZ3UfHLtv7/AradvyLzyvTKjJwx4BSJDWIXFaa5rS2y+u8ICzObdJXCBcLcUksn8dn4RBH7TV0Z2SYIdgZ5cRPCngzaM24Wm3QR2v9GkCs6pgg+ZUTiGW4zhzE2amxtb3E7XK6OAMyOMHK1WcDzlJncZAY0WUVt9y6UBgQcqNNJ6+9mmwEOYODS50yszYSUU4jPKUpV0mVd5sMqizVox/9bKYh/v+OdjAKx2NymTiAD5SfpJcW3KU+7sQzlJPSsteNoDfjJJ4RsDm13ozw+3sNPAeu3AH1KEMqwUroSuQfWLbmku9GBUHAZFH/V1E7DH355DZAgMBAAGjUDBOMB0GA1UdDgQWBBRTV6Bx7oEm7pCFNxKGMhzocsxqODAfBgNVHSMEGDAWgBRTV6Bx7oEm7pCFNxKGMhzocsxqODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAjd1Q+6Nxf9kWfixb/luYnPrBS0a0IfkbExnt855jIpEOT71a4ck8HhZ2jlOJk/C3RyGbSBnLcHHMwh8gtVw8mXz7gNf1DY4gQXz+GLE3/uSMTLLu/L3/o/PL2iux5yNlJWsYe7sws01cPE7hTiC6cxyP9Md2dhZmqZZTfyySRTSCywN8R56V77tfKfcyUDejZaNA7R0NJ2THs68Z0S667Ayl47jQei2iWock9NhP4H8tuLsd2R+5oqmppIRDDUBH10+XqOAWYqw9cp58srRBISD2VJ3qma+/jBf9gRuo7K4J+XsXCJ3qjNji1o/Z3RlMFyd1O0HYZ+xHTpCUAQUAa</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDszCCApugAwIBAgIJAPbLXlBNnE0MMA0GCSqGSIb3DQEBCwUAMHAxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlHYXZsZWJvcmcxHDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgR2F2bGUxFDASBgNVBAMMC3BsYXkuaGlnLnNlMRkwFwYJKoZIhvcNAQkBFgpuYXRAaGlnLnNlMB4XDTE1MDEyMTEzMjIzNVoXDTI1MDEyMDEzMjIzNVowcDELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCUdhdmxlYm9yZzEcMBoGA1UECgwTVW5pdmVyc2l0eSBvZiBHYXZsZTEUMBIGA1UEAwwLcGxheS5oaWcuc2UxGTAXBgkqhkiG9w0BCQEWCm5hdEBoaWcuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC187zhKVr3uBoZNRYdZ3UfHLtv7/AradvyLzyvTKjJwx4BSJDWIXFaa5rS2y+u8ICzObdJXCBcLcUksn8dn4RBH7TV0Z2SYIdgZ5cRPCngzaM24Wm3QR2v9GkCs6pgg+ZUTiGW4zhzE2amxtb3E7XK6OAMyOMHK1WcDzlJncZAY0WUVt9y6UBgQcqNNJ6+9mmwEOYODS50yszYSUU4jPKUpV0mVd5sMqizVox/9bKYh/v+OdjAKx2NymTiAD5SfpJcW3KU+7sQzlJPSsteNoDfjJJ4RsDm13ozw+3sNPAeu3AH1KEMqwUroSuQfWLbmku9GBUHAZFH/V1E7DH355DZAgMBAAGjUDBOMB0GA1UdDgQWBBRTV6Bx7oEm7pCFNxKGMhzocsxqODAfBgNVHSMEGDAWgBRTV6Bx7oEm7pCFNxKGMhzocsxqODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAjd1Q+6Nxf9kWfixb/luYnPrBS0a0IfkbExnt855jIpEOT71a4ck8HhZ2jlOJk/C3RyGbSBnLcHHMwh8gtVw8mXz7gNf1DY4gQXz+GLE3/uSMTLLu/L3/o/PL2iux5yNlJWsYe7sws01cPE7hTiC6cxyP9Md2dhZmqZZTfyySRTSCywN8R56V77tfKfcyUDejZaNA7R0NJ2THs68Z0S667Ayl47jQei2iWock9NhP4H8tuLsd2R+5oqmppIRDDUBH10+XqOAWYqw9cp58srRBISD2VJ3qma+/jBf9gRuo7K4J+XsXCJ3qjNji1o/Z3RlMFyd1O0HYZ+xHTpCUAQUAa</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.hig.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.hig.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Högskolan i Gävle</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Högskolan i Gävle</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://play.hig.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-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 56133ac8..399f27ea 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -225,7 +225,7 @@
   <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-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/play.hig.se.xml"/>
   <xi:include href="swamid-2.0/maps.slu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.hb.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/betafoo.nordu.net-saml2-metadata.xml"/>