From cdd983578677829ee65c77cb8b4de3de47b08076 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Wed, 15 Nov 2017 11:02:47 +0100
Subject: Resolves SWAMIDOPS-318

---
 swamid-2.0/diskus.ub.uu.se-saml-metadata.xml | 46 ++++++++++++++++++++++++++++
 swamid-sp-2.0.mxml                           |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 swamid-2.0/diskus.ub.uu.se-saml-metadata.xml

diff --git a/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml b/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
new file mode 100644
index 00000000..5b179809
--- /dev/null
+++ b/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://diskus.ub.uu.se/saml/metadata">
+  <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" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="false" 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">Diskus digital signage</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Diskus digital skyltning</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Web content management system for digital signage</mdui:Description>
+        <mdui:Description xml:lang="sv">Hanterar digital skyltning.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.ub.uu.se/x/LTd_AQ</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://wiki.ub.uu.se/x/LTd_AQ</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE9DCCAtygAwIBAgIJAO/Ytbc8o7viMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNVBAMTD2Rpc2t1cy51Yi51dS5zZTAeFw0xNzExMTUwODAwNDRaFw0yNzExMTMwODAwNDRaMBoxGDAWBgNVBAMTD2Rpc2t1cy51Yi51dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALPVjoATw2+BlQxvtZs673gfdNGjZjL9WVnUaghlGBVsxFJUPSlZC7pEpb8uyS0Wqp53IvnALyWgKdY/LCJ9PcZ4E5iMtml2tWEYApxJ72dNe/8s0OHoBtOqXZBNKvsuYjmakaG5130O5hinYuLQT1Rm0IWFJ9gsdk8q2SiuYkYm5nz7STrHU66dQAnCdLiITFgwR+u/I6zQnokhfc/+Y8Vj2ag5VpCk/cdx1rHY0vgM7d23GyLId0Ydwio6llmsKDf2NOkvO+w1UDmkApPy5CH8xjo0R3rK2fnSe1h6oKQwmA1dQlcqUXgUOmv9Ki+ru11FrV2ysxbugDPhoXsz+kHTIqUHfEoLOYIyZa07WlvW47IXe/CDKbuC58LDw1oI39+U3k1DwhHYioJDnfEhjAySjqkjt64jB3Y6WlQx+Yn7slASs03UjRWHQ6zGmNBJ763Vo7RB7ajj4aeQMUppvt1ajz7vOCkg6GyT9fA0qrOPZyadvLwkRvbt31u9utjqbAcyhKKqbVh9V6tWtaabnPVQGhYsVdP0KclSEOEs2tXTf/Ya2Fg7hUOBvMPJKPtjzlNXykpumDpEe3j5rALoMw2MUDwKIIbD3OUTH4nkpfH9z7aPFXeXsu9ULAF4EhL1vJgcmd1DRAex6GBOHpEVDvHmNmGnOBvD+CLCMzguLIcrAgMBAAGjPTA7MBoGA1UdEQQTMBGCD2Rpc2t1cy51Yi51dS5zZTAdBgNVHQ4EFgQU8+XjWmdfAAhqLv61/aNH3rRVft8wDQYJKoZIhvcNAQELBQADggIBAAl0W38CIvZlfspAvonyw8PSbFfO2nB/eyGuWL9bj6YTKZe0lkXL3EhLx4pHkYgYeP+pX/ZK5LtHkhFASSa5tEpFJlZ4YxRNnr9zFiw+t041dNVVgPCFxR0lw0PSAXaFfBUgFTa9s2jS8C3C9RI13sPeDMJKMPK0Yafeo3Rxs7t2/jRX9Ys7yNLBuJFdgcEKYvCKijVC6L9nAEiN/b3PJfCJP5LmMr5SAEOmXLad0mzX/DxA9WJprQJPSrNW+K2mf7Mbpk7I3zchkWPhOlSJvhJW4QVZm2uUiciXP2P8NGgUFGcCZEHdgArDFbonYKK6JEFlrL85K3Ez+vkh6OGOVb/IUMYoQ2kBcUbYwrs5uTUYLptOKwka00IAx5Gm9owoHyh5RUeljBJYEc3OLeVuCvLfRx07H34oINr8kYf9CgMFjOn/3ZPmKvzU6QTAXdmjL3/iG/h20Dmr7+ITHobqbP1AWnn5B1rRt/NFK39KvCQ3fvDJyJKLmzvEacB45/4C1nGaSaKhxad10Ehb5d2lmWeE4lFCUAwJJ8hisLPRs7mPbfmuetjwDiuhZss24MgQlSF7FAdCio7KXE88j+Fwd22r9UTqj7pr2gM+jMKLQoZnhCdWo3jvycfDouahYWLkrjEh7bVOhjZevQYBwaU0hBQKE5BsGIflybR995JdKrpk</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://diskus.ub.uu.se/saml/sls"/>
+    <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://diskus.ub.uu.se/saml/acs" index="1"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala University Library</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ub.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tommy Hellberg</md:GivenName>
+    <md:EmailAddress>mailto:tommy.hellberg@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 81646973..e93e2f14 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -658,4 +658,5 @@
   <xi:include href="swamid-2.0/us.cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/client200-151.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/client200-190.its.umu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/diskus.ub.uu.se-saml-metadata.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3