Resolved SWAMID-241

2 files changed, 47 insertions, 0 deletions

diff --git a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
new file mode 100644
index 00000000..d14c8835
--- /dev/null
+++ b/swamid-2.0/diskus-demo.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-demo.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="false" 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>MIIFAzCCAuugAwIBAgIJAONjaHZu0gBEMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNVBAMTFGRpc2t1cy1kZW1vLnViLnV1LnNlMB4XDTE3MTAwNTE0MTgwNVoXDTI3MTAwMzE0MTgwNVowHzEdMBsGA1UEAxMUZGlza3VzLWRlbW8udWIudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC7TVocn7onWp4lnTIBFETrHkW3FWi78t/vqaRu/FodUpJFXCSjvYUKNcsX0krwA8sDsZxOxQnlbyY2BE0byA/fe9bz43BDhJ30FJPFQlC+1oNJbTchYIEtr84GzxThZJ4EAh0AE7X+4NjJOsLmjUeDU5cQhVZwmvNEFA9R4LBoJaGksXYGSGIpEVu0sUmDBVjz+1Z1HL1Kyogim4mDDhIdDYIvAT5TzQyNCfRtrk+hr/L38/8mvlkEIRpipBVveQR+PaQxK1/3NGNoLaxJ4IbJvUP+iQifeL1/yR/UwBeEHRhyO+QFEvgGArFidGvlhI5XgO6O1v2tzwd5T9biIbnP1uQL4cq88cKfYUiynkrDFU6kTAHyzCKTlYQJlzEdm7VwJshkyY+hOxEh7XEqmWBRDZDrs40ZqBBU4mm0QPKBtpnEESzxqipK93ZSpxmXRaPkEBJnQFGgCFkAR6DCjH6WU4b0YvW91EWyo9SMNn+rVLuAn9OcUfXIe5And13tzFkXVGYOK3yBa4vB5Wdc8NNhNizjsVVxeeR3DXeOXWOzbm3+0hqX911jM/x/6ObGBjfNSKKGLZseeXyd3pKKPLhAKX4NkyyX2oCg+0+p3e5v+SUZWu4iyYrL67RVV5r4IcTAfksvm943tRPrcXBOMP+iOQo+tgD4ohgBeDLfeyZF1QIDAQABo0IwQDAfBgNVHREEGDAWghRkaXNrdXMtZGVtby51Yi51dS5zZTAdBgNVHQ4EFgQUO8e0nyEavzg32Fnb66bjvKwm+YEwDQYJKoZIhvcNAQELBQADggIBAHES+bIaGmfdxEcq45fbP1vfFHpLjLKXH7vXRu4E85fiwx6Z3oWIF31e+lNyYjfQ45dslo9t5qG4qPg4mLVivw9NkmjpO2zWc5RhNsrjStp8Mawc3PHTMAkmOc+O9sm1hZA4BzEiW5AjjwipAFx1CzftybTJZO+4L7AGeFy1ykVVhlKTBEpybJdgCoB4Y+ZeWht6dBs7SbkP92hyNWlNPMiCOJKUIXptI5F2f7WNKuAUQ4a3j4/S/T3P3mr4A82lLR9vlt7QuTnp05PzAKsuWMT22o/Xvp5a0y2Q3IMcO2TL7nsX3jXVvNSFRXSvgRrcGjqNFJJqoeXMXrdOf6i4fxSFQ1QU7Cl1Z8NVRobMNfi25qpQHx9oUjoadnCK/fv8pNoXx75RiaRF5iz7G6wUZn9HzonVK6+RVFGbuJH3UcRX4IC/QVa5Ut8b4c9cveqKFMCi2FZF/aFkUAwqx4TzERkDFXbojV6Vyw0o0tLZTLXhn1uWG57OGQ78BJVZ247INbyOumPukIxDGWXsLDedfA/iVQqjD3VkGSxkS21elrvzHYhOgI7mTMCG3zOjusPcXH5zegYh0Q27F+2w4Pphak3EyELViMTIP5MuDNXfU6j0g6pMfVWkTbN/QqrfsT+ElXbZmfz5ETINyZtApewYTsa2Ew/c4S/aXeAEJ5x75WsZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://diskus-demo.ub.uu.se/saml/sls"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:emailAddress</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://diskus-demo.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.ud.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Fredrik Lysen</md:GivenName>
+    <md:EmailAddress>fredrik.lysen@ub.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Helpdesk</md:GivenName>
+    <md:EmailAddress>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 108b6f6a..44f2388b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -671,4 +671,5 @@
   <xi:include href="swamid-2.0/itslearning.com.xml"/>
   <xi:include href="swamid-2.0/test.itslearning.com.xml"/>
   <xi:include href="swamid-2.0/test-rkh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
+  <xi:include href="swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml"/>
 </md:EntitiesDescriptor>