From 73bb02854e048e5f9d4f2a31ae4aad0161c2d16b Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Thu, 1 Sep 2022 06:44:55 +0000
Subject: SWAMID-1256 update ni.sunet.se-saml2-metadata-

---
 swamid-2.0/ni.sunet.se-saml2-metadata-.xml | 112 +++++++++++++++++++++++++++++
 swamid-2.0/ni.sunet.se-saml2-metadata.xml  |  81 ---------------------
 2 files changed, 112 insertions(+), 81 deletions(-)
 create mode 100644 swamid-2.0/ni.sunet.se-saml2-metadata-.xml
 delete mode 100644 swamid-2.0/ni.sunet.se-saml2-metadata.xml

(limited to 'swamid-2.0')

diff --git a/swamid-2.0/ni.sunet.se-saml2-metadata-.xml b/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
new file mode 100644
index 00000000..87fd5b3d
--- /dev/null
+++ b/swamid-2.0/ni.sunet.se-saml2-metadata-.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ni.sunet.se/saml2/metadata/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-15T14:29:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes>
+      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</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="sv">SUNET Network Inventory</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SUNET Network Inventory</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Tjänst för att dokumentera SUNET nätverket</mdui:Description>
+        <mdui:Description xml:lang="en">Service used for documenting the SUNET network</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/pages/viewpage.action?pageId=123470072</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/pages/viewpage.action?pageId=123470072</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/sunetops/SUNET+Network+Inventory</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/sunetops/SUNET+Network+Inventory</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAOqFC7U2KpC4MA0GCSqGSIb3DQEBCwUAMDMxCzAJBgNV
+BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEUMBIGA1UEAwwLbmkuc3VuZXQuc2UwHhcN
+MTYwMjA5MTQ0MDUzWhcNMjYwMjA2MTQ0MDUzWjAzMQswCQYDVQQGEwJTRTEOMAwG
+A1UECgwFU1VORVQxFDASBgNVBAMMC25pLnN1bmV0LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAvPF6Z27GVHJAPvx3dodR7YFOnNpqdZFjdWeFki2/
+MtmDOSzlljPutKmV/AV8u3IDv34s3tZtuKM+gF4br0RJtVhO/gH6RoUy2HiXE3Y1
+nNKRu7ddsD6XnFST5g+LvD85lCQrleBqeAxI2QJwhvTRuyfnmyZXyvRT97dcLakG
+NzedscuKCdD+tewnycoityq/OCC+a37nvT23lIPt5cPSBqcDyvyHkp0A1xJNVKOT
++FcuL0MI0o6YqtUT4g09DQ+bE6dmEojXBn7RCSxNh9QEVsqJOOwrNRC7PxBS95IJ
+FZIubfTL7tbz4EwFum6wkge8vePr8kKzVE6qygNPFE69ewIDAQABo1AwTjAdBgNV
+HQ4EFgQUxw8dTde6b1pwN4NJXvQ+9rqSMBUwHwYDVR0jBBgwFoAUxw8dTde6b1pw
+N4NJXvQ+9rqSMBUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAiZrf
+MdLBOGIh/gLK8bOQp3fOD4R1dBFjfzNnc9LIrlo14mv01CM0fmyRjfzQ/e3l3qrX
+EkTnrF5w9pRuBm/LR8DNAbByS1gQ7fPDXzRIiSLDaRQGKh7JcObL/+pSeyfP15hV
+SsZ9CioD2fa96JA1DSXjXSDilwdWC35AGlpCcbj5Hl0QAQ2kn0u44gzNiEpywiC4
+/lybDYpTKJCuok2S0DwfOBps58T1yrFcDJAhGnvj7HEGsrW/GDfwcGflkrxlfGr0
+aRl22guR2G2MeQtvNn+JuYRmrJbW8xi5mXCQkps2TvQfiVLHAzCIpXUZANpnS582
+2fn7/8dMTID4P7xD+w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAOqFC7U2KpC4MA0GCSqGSIb3DQEBCwUAMDMxCzAJBgNV
+BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEUMBIGA1UEAwwLbmkuc3VuZXQuc2UwHhcN
+MTYwMjA5MTQ0MDUzWhcNMjYwMjA2MTQ0MDUzWjAzMQswCQYDVQQGEwJTRTEOMAwG
+A1UECgwFU1VORVQxFDASBgNVBAMMC25pLnN1bmV0LnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAvPF6Z27GVHJAPvx3dodR7YFOnNpqdZFjdWeFki2/
+MtmDOSzlljPutKmV/AV8u3IDv34s3tZtuKM+gF4br0RJtVhO/gH6RoUy2HiXE3Y1
+nNKRu7ddsD6XnFST5g+LvD85lCQrleBqeAxI2QJwhvTRuyfnmyZXyvRT97dcLakG
+NzedscuKCdD+tewnycoityq/OCC+a37nvT23lIPt5cPSBqcDyvyHkp0A1xJNVKOT
++FcuL0MI0o6YqtUT4g09DQ+bE6dmEojXBn7RCSxNh9QEVsqJOOwrNRC7PxBS95IJ
+FZIubfTL7tbz4EwFum6wkge8vePr8kKzVE6qygNPFE69ewIDAQABo1AwTjAdBgNV
+HQ4EFgQUxw8dTde6b1pwN4NJXvQ+9rqSMBUwHwYDVR0jBBgwFoAUxw8dTde6b1pw
+N4NJXvQ+9rqSMBUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAiZrf
+MdLBOGIh/gLK8bOQp3fOD4R1dBFjfzNnc9LIrlo14mv01CM0fmyRjfzQ/e3l3qrX
+EkTnrF5w9pRuBm/LR8DNAbByS1gQ7fPDXzRIiSLDaRQGKh7JcObL/+pSeyfP15hV
+SsZ9CioD2fa96JA1DSXjXSDilwdWC35AGlpCcbj5Hl0QAQ2kn0u44gzNiEpywiC4
+/lybDYpTKJCuok2S0DwfOBps58T1yrFcDJAhGnvj7HEGsrW/GDfwcGflkrxlfGr0
+aRl22guR2G2MeQtvNn+JuYRmrJbW8xi5mXCQkps2TvQfiVLHAzCIpXUZANpnS582
+2fn7/8dMTID4P7xD+w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.sunet.se/saml2/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.sunet.se/saml2/acs/" index="1"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">SUNET Network Inventory</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SUNET Network Inventory</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <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">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>NORDUnet A/S</md:Company>
+    <md:GivenName>Markus</md:GivenName>
+    <md:SurName>Krogh</md:SurName>
+    <md:EmailAddress>mailto:markus@nordu.net</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SUNET NOC</md:GivenName>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>SUNET NOC</md:Company>
+    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>SUNET CERT</md:GivenName>
+    <md:EmailAddress>mailto:cert@cert.sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/ni.sunet.se-saml2-metadata.xml b/swamid-2.0/ni.sunet.se-saml2-metadata.xml
deleted file mode 100644
index 686c473a..00000000
--- a/swamid-2.0/ni.sunet.se-saml2-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://ni.sunet.se/saml2/metadata/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-02-15T14:29:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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="sv">SUNET Network Inventory</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET Network Inventory</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Tjänst för att dokumentera SUNET nätverket</mdui:Description>
-        <mdui:Description xml:lang="en">Service used for documenting the SUNET network</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAOqFC7U2KpC4MA0GCSqGSIb3DQEBCwUAMDMxCzAJBgNV
-BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEUMBIGA1UEAwwLbmkuc3VuZXQuc2UwHhcN
-MTYwMjA5MTQ0MDUzWhcNMjYwMjA2MTQ0MDUzWjAzMQswCQYDVQQGEwJTRTEOMAwG
-A1UECgwFU1VORVQxFDASBgNVBAMMC25pLnN1bmV0LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAvPF6Z27GVHJAPvx3dodR7YFOnNpqdZFjdWeFki2/
-MtmDOSzlljPutKmV/AV8u3IDv34s3tZtuKM+gF4br0RJtVhO/gH6RoUy2HiXE3Y1
-nNKRu7ddsD6XnFST5g+LvD85lCQrleBqeAxI2QJwhvTRuyfnmyZXyvRT97dcLakG
-NzedscuKCdD+tewnycoityq/OCC+a37nvT23lIPt5cPSBqcDyvyHkp0A1xJNVKOT
-+FcuL0MI0o6YqtUT4g09DQ+bE6dmEojXBn7RCSxNh9QEVsqJOOwrNRC7PxBS95IJ
-FZIubfTL7tbz4EwFum6wkge8vePr8kKzVE6qygNPFE69ewIDAQABo1AwTjAdBgNV
-HQ4EFgQUxw8dTde6b1pwN4NJXvQ+9rqSMBUwHwYDVR0jBBgwFoAUxw8dTde6b1pw
-N4NJXvQ+9rqSMBUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAiZrf
-MdLBOGIh/gLK8bOQp3fOD4R1dBFjfzNnc9LIrlo14mv01CM0fmyRjfzQ/e3l3qrX
-EkTnrF5w9pRuBm/LR8DNAbByS1gQ7fPDXzRIiSLDaRQGKh7JcObL/+pSeyfP15hV
-SsZ9CioD2fa96JA1DSXjXSDilwdWC35AGlpCcbj5Hl0QAQ2kn0u44gzNiEpywiC4
-/lybDYpTKJCuok2S0DwfOBps58T1yrFcDJAhGnvj7HEGsrW/GDfwcGflkrxlfGr0
-aRl22guR2G2MeQtvNn+JuYRmrJbW8xi5mXCQkps2TvQfiVLHAzCIpXUZANpnS582
-2fn7/8dMTID4P7xD+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDOTCCAiGgAwIBAgIJAOqFC7U2KpC4MA0GCSqGSIb3DQEBCwUAMDMxCzAJBgNV
-BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEUMBIGA1UEAwwLbmkuc3VuZXQuc2UwHhcN
-MTYwMjA5MTQ0MDUzWhcNMjYwMjA2MTQ0MDUzWjAzMQswCQYDVQQGEwJTRTEOMAwG
-A1UECgwFU1VORVQxFDASBgNVBAMMC25pLnN1bmV0LnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAvPF6Z27GVHJAPvx3dodR7YFOnNpqdZFjdWeFki2/
-MtmDOSzlljPutKmV/AV8u3IDv34s3tZtuKM+gF4br0RJtVhO/gH6RoUy2HiXE3Y1
-nNKRu7ddsD6XnFST5g+LvD85lCQrleBqeAxI2QJwhvTRuyfnmyZXyvRT97dcLakG
-NzedscuKCdD+tewnycoityq/OCC+a37nvT23lIPt5cPSBqcDyvyHkp0A1xJNVKOT
-+FcuL0MI0o6YqtUT4g09DQ+bE6dmEojXBn7RCSxNh9QEVsqJOOwrNRC7PxBS95IJ
-FZIubfTL7tbz4EwFum6wkge8vePr8kKzVE6qygNPFE69ewIDAQABo1AwTjAdBgNV
-HQ4EFgQUxw8dTde6b1pwN4NJXvQ+9rqSMBUwHwYDVR0jBBgwFoAUxw8dTde6b1pw
-N4NJXvQ+9rqSMBUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAiZrf
-MdLBOGIh/gLK8bOQp3fOD4R1dBFjfzNnc9LIrlo14mv01CM0fmyRjfzQ/e3l3qrX
-EkTnrF5w9pRuBm/LR8DNAbByS1gQ7fPDXzRIiSLDaRQGKh7JcObL/+pSeyfP15hV
-SsZ9CioD2fa96JA1DSXjXSDilwdWC35AGlpCcbj5Hl0QAQ2kn0u44gzNiEpywiC4
-/lybDYpTKJCuok2S0DwfOBps58T1yrFcDJAhGnvj7HEGsrW/GDfwcGflkrxlfGr0
-aRl22guR2G2MeQtvNn+JuYRmrJbW8xi5mXCQkps2TvQfiVLHAzCIpXUZANpnS582
-2fn7/8dMTID4P7xD+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni.sunet.se/saml2/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni.sunet.se/saml2/acs/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SUNET Network Inventory</md:ServiceName>
-      <md:RequestedAttribute Name="eduPersonPrincipalName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet A/S</md:Company>
-    <md:GivenName>Markus</md:GivenName>
-    <md:SurName>Krogh</md:SurName>
-    <md:EmailAddress>mailto:markus@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
-- 
cgit v1.2.3