Resolves SWAMIDOPS-711

4 files changed, 53 insertions, 3 deletions

diff --git a/swamid-2.0/hvplay.hv.se.xml b/swamid-2.0/hvplay.hv.se.xml
new file mode 100644
index 00000000..aefe1a06
--- /dev/null
+++ b/swamid-2.0/hvplay.hv.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://hvplay.hv.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">HV play</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HV play</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Detta är Högskolan Västs play tjänst</mdui:Description>
+        <mdui:Description xml:lang="en">This is University West's streaming service</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIB9jCCAV+gAwIBAgIUH+3Y9nVSGRcoWLCmgaYcPvxgARUwDQYJKoZIhvcNAQEFBQAwKTEVMBMGA1UEAwwMaHZwbGF5Lmh2LnNlMRAwDgYDVQQKDAdrYWx0dXJhMB4XDTE4MDUyMzE1MDU1NloXDTE5MDUyMzE1MDU1NlowKTEVMBMGA1UEAwwMaHZwbGF5Lmh2LnNlMRAwDgYDVQQKDAdrYWx0dXJhMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPHCWE0QINMYd+AORqBR15D9TxWtiggCt/wIu085evqc4KDz/Oey0yGHSRiNWY2bJELBV4bbzj4P0Mg4bIo1yXQ+4PtCeAmEYxdd2QV9xDIMnwNBAoq7eGXPMEgXoN1uYWnfBpSLGR72Fir4Q2XMN6e2gjcn4kDuG0goEfdQxm/wIDAQABoxswGTAXBgNVHREEEDAOggxodnBsYXkuaHYuc2UwDQYJKoZIhvcNAQEFBQADgYEAJo1h2OQOg8x2MD5HONjHZ9psUmlqYOf2d+ELWckf9RBmo0qugofwrNqqh0v37Tir2XnBQyG1dTvdxi07glaKS5Pp93x7YERIKCWAQOR6L9ZK4QewcmJINxedT3JNvaYTAXEVPfyut9v5j0uFz0LgcfWChr5ppVELa9O4Sbzusik=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIB9jCCAV+gAwIBAgIUH+3Y9nVSGRcoWLCmgaYcPvxgARUwDQYJKoZIhvcNAQEFBQAwKTEVMBMGA1UEAwwMaHZwbGF5Lmh2LnNlMRAwDgYDVQQKDAdrYWx0dXJhMB4XDTE4MDUyMzE1MDU1NloXDTE5MDUyMzE1MDU1NlowKTEVMBMGA1UEAwwMaHZwbGF5Lmh2LnNlMRAwDgYDVQQKDAdrYWx0dXJhMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPHCWE0QINMYd+AORqBR15D9TxWtiggCt/wIu085evqc4KDz/Oey0yGHSRiNWY2bJELBV4bbzj4P0Mg4bIo1yXQ+4PtCeAmEYxdd2QV9xDIMnwNBAoq7eGXPMEgXoN1uYWnfBpSLGR72Fir4Q2XMN6e2gjcn4kDuG0goEfdQxm/wIDAQABoxswGTAXBgNVHREEEDAOggxodnBsYXkuaHYuc2UwDQYJKoZIhvcNAQEFBQADgYEAJo1h2OQOg8x2MD5HONjHZ9psUmlqYOf2d+ELWckf9RBmo0qugofwrNqqh0v37Tir2XnBQyG1dTvdxi07glaKS5Pp93x7YERIKCWAQOR6L9ZK4QewcmJINxedT3JNvaYTAXEVPfyut9v5j0uFz0LgcfWChr5ppVELa9O4Sbzusik=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hvplay.hv.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://hvplay.hv.se/user/authenticate" index="0"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">HV Play</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">HV Play</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://hvplay.hv.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>NORDUnet</md:GivenName>
+    <md:SurName>SAML Admin</md:SurName>
+    <md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/play.hv.se.xml b/swamid-2.0/play.hv.se.xml
index fad97ee0..6cfed1b6 100644
--- a/swamid-2.0/play.hv.se.xml
+++ b/swamid-2.0/play.hv.se.xml
@@ -11,8 +11,8 @@
   <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">HV play</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HV play</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">HV play (gammal)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">HV play (old)</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Detta är Högskolan Västs play tjänst</mdui:Description>
         <mdui:Description xml:lang="en">This is University West's streaming service</mdui:Description>
       </mdui:UIInfo>
@@ -36,7 +36,7 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.hv.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="en">HV Play</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">HV Play </md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HV Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.hv.se</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-2.0/play.kau.se.xml b/swamid-2.0/play.kau.se.xml
index 60729fc9..c93fc6c8 100644
--- a/swamid-2.0/play.kau.se.xml
+++ b/swamid-2.0/play.kau.se.xml
@@ -14,6 +14,7 @@
         <mdui:DisplayName xml:lang="en">Kau play</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Detta är Karlstads universitets play tjänst</mdui:Description>
         <mdui:Description xml:lang="en">This is Karlstad University's streaming service</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://play.kau.se/Om</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index efb26f86..b81f996b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -708,4 +708,5 @@
   <xi:include href="swamid-2.0/lis.ladok.test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/luplay.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml"/>
+  <xi:include href="swamid-2.0/hvplay.hv.se.xml"/>
 </md:EntitiesDescriptor>