From 7e6a7bd6f8922e48d391bdbc85988030b89f0129 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Mon, 28 May 2018 11:37:42 +0200
Subject: Resolves SWAMIDOPS-717

---
 swamid-2.0/auth.asiaportal.info.xml                          |  5 +++++
 ...tarainitiative.org-confluence-plugins-servlet-samlsso.xml | 12 ++++++++++++
 swamid-2.0/secure.urkund.com-shibboleth.xml                  |  8 ++++++++
 ...saml-module.php-saml-sp-metadata.php-media-network-sp.xml |  5 +++++
 4 files changed, 30 insertions(+)

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/auth.asiaportal.info.xml b/swamid-2.0/auth.asiaportal.info.xml
index 99b738c9..665fce8a 100644
--- a/swamid-2.0/auth.asiaportal.info.xml
+++ b/swamid-2.0/auth.asiaportal.info.xml
@@ -41,6 +41,11 @@
       <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Nordic Institute of Asian Studies</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NIAS - Nordic Institute of Asian Studies</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.nias.ku.dk</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Administrator</md:GivenName>
     <md:EmailAddress>mailto:bib@nias.ku.dk</md:EmailAddress>
diff --git a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
index 3f3def10..c2e5177e 100644
--- a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
+++ b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kantarainitiative.org/confluence/plugins/servlet/samlsso">
   <md:SPSSODescriptor WantAssertionsSigned="true" 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">Kantara Initiative</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Kantara Initiative is the global consortium improving trustworthy use of identity and personal data through innovation, standardization and good practice.</mdui:Description>
+        <mdui:Logo xml:lang="en" height="76" width="220">https://kantarainitiative.org/confluence/download/attachments/2293776/global.gif</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
@@ -47,4 +54,9 @@ PMS4rjAWc41dsrr8CuH3t/NKbvDc9Rn6U+qLGttLcJ1Jlpw2i3fPGGJ+osSsX9+h3KUdLv9j7zJB
     <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://kantarainitiative.org/confluence/plugins/servlet/samlsso" index="0"/>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kantara Initiative Inc</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kantara Initiative Inc</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://kantarainitiative.org</md:OrganizationURL>
+  </md:Organization>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/secure.urkund.com-shibboleth.xml b/swamid-2.0/secure.urkund.com-shibboleth.xml
index 0a29e7a5..48198556 100644
--- a/swamid-2.0/secure.urkund.com-shibboleth.xml
+++ b/swamid-2.0/secure.urkund.com-shibboleth.xml
@@ -95,6 +95,14 @@ gEln3A==
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Prio Infocenter AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Prio Infocenter AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.urkund.com/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.urkund.com/sv/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Witasp</md:SurName>
diff --git a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
index 31b13c35..ef7edd32 100644
--- a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -48,6 +48,11 @@
       <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Danish e-Infrastructure Cooperation (DeIC)</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.deic.dk</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Administrator</md:GivenName>
     <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
-- 
cgit v1.2.3