SWAMID-2155: Updated metadata for ni.nordu.net

2 files changed, 43 insertions, 5 deletions

diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
index 5ab144f6..f2b8bd2b 100644
--- a/swamid-2.0/ni.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata-.xml
@@ -6,12 +6,42 @@
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
       <samla:Attribute 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 AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Network Inventory NORDUnet</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Network Inventory</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.nordu.net/display/NI/Presentation</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://nordu.net/privacy-policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIUS6VrZkfgqu/Xhntqv+QD0lKncQ4wDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMbmkubm9yZHUubmV0MB4XDTIyMTIwMjEwMDMxOVoXDTMy
+MTEyOTEwMDMxOVowFzEVMBMGA1UEAwwMbmkubm9yZHUubmV0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoix/NbBiBbbL34rnxVCLfn/B6Kw3MaVhglul
+hjz4CoaG2RKkHwPPjodW/JnUvqWBKEZDl81TMH/NP0a5idHUFskybPS39dTV4vPV
+u3IPXX8O0v0UybZz8Vg971Kuf3HSfqa2dxmh9ZV4P5rxx1Gg46svCMvblAYJ8A/K
+dJ/Q51StpQzqoq27goYArwUwOyzy4sNomMlVzWxp4ODo2m9itqUBj4KfKK6yQtiG
+KWYtvS0y7rf6ZrxdW1lX1tY8zIHVGdP1pFhc8vcaOIf8+6fWvvhKw0/0zvtFLuPc
+8Pkl/XCY+kgFkvQOTqXdGe5XMroP3PBOIAQO7dr62vO7kHM0xwIDAQABo1MwUTAd
+BgNVHQ4EFgQUzxv8bG8Re0PDh8oVCJLZbZJ3hiUwHwYDVR0jBBgwFoAUzxv8bG8R
+e0PDh8oVCJLZbZJ3hiUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AQEAcDsKFjf5cOj4r+WUX5YabyYPBPFbMphpey4YOg8NZzqudNOR0lzBBHVzBdWj
+yXnLL+dOBUBapE/OXFD6e6J5g7rM9sJhQOj4CJnN3WYBE/3TNecv1wXLxwUOzsYZ
+zYS2BonaDIY9tCDrXvsO8ctjdCt6GtFmmY0iIhr8LnDPqrv6ql/PNwqh4Aqln3tK
+VRABhG9Y7pfvtmhL2IVDKij1ZtZ0NyCG6FzXuTDhZjD6TbJymxSCUn/deq62lW+5
+BcqneS/UNWaTJxzX0VtW8D0u3nOIR7IqyZ+lQAAVXEK/igIogFkJUrCDqV6SjyTi
+lHFHSZWekFvXeqCFNLjtWOiByw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
@@ -30,8 +60,7 @@ ZX+yVo16pG7uxzWu88w9urMpjlRMBV9xT7oE+7xuOppeSJbQpjxfYCArq/VD+Qr/
 WjzMRZMjN4LkL+s6m0f4ASItLF5MBXmStmxl5ZE0UajyR08i87sg9QcTVXBpyirr
 iRfdxDA4R+g0xwEZhpg2HbKRHeP8Uy/8SrOLYMFsblex5vc/96eZCOc88FlH1ydk
 zj16pWsjoYc1j+cnJBREpOJCeotrkBKte+OL1J5ku6e3qoQ+4Oyrsu4qhU/8geIo
-GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==
-</ds:X509Certificate>
+GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -43,10 +72,19 @@ GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.nordu.net</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Lundberg</md:SurName>
     <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>NORDUnet</md:Company>
+    <md:EmailAddress>mailto:sei@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index be0f579e..558d6b45 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -278,7 +278,7 @@
   <xi:include href="swamid-2.0/nextcloud.fysik.su.se-apps-user_saml-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/nfg.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml"/>
-  <xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata.xml"/>
+  <xi:include href="swamid-2.0/ni.nordu.net-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata-.xml"/>
   <xi:include href="swamid-2.0/noec.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/nyaanvandarstod.uhr.se-shibboleth.xml"/>