Merge branch 'master' of git.swamid.se:swamid-metadatamd-2024-03-04-v06

2 files changed, 88 insertions, 0 deletions

diff --git a/metadata/site/mds.swamid.se/index.html b/metadata/site/mds.swamid.se/index.html
index 633a6153..d1f29c36 100644
--- a/metadata/site/mds.swamid.se/index.html
+++ b/metadata/site/mds.swamid.se/index.html
@@ -46,6 +46,7 @@ These are metadata feeds to be consumed by SWAMID members and relying parties:
 <p>
 <dl class="dl-horizontal">
 	<dt><a href="SWAMID_FederationDefaults.zip"><b>SWAMID_FederationDefaults.zip</b></a></dt><dd>The "Federation Defaults" is files provided by SWAMID that helps you configure ADFS Toolkit for our federation. It also contain the specific SWAMID-versions of the Entity Categories which includes Swedish-specific attributes like norEduPersonNIN, etc.</dd>
+    <dt><a href="swamid-transitive-ds.json"><b>Discovery JSON</b></a></dt><dd>All entitites in SWAMID QA as JSON - for discovery services. See <a href="https://wiki.sunet.se/x/YQAWCw">the wiki</a> for more information.</dd>
 </dl>
 
 <h2>Contact</h2>
diff --git a/metadata/swamid-2.0/ni-test.sunet.se-saml2-metadata-.xml b/metadata/swamid-2.0/ni-test.sunet.se-saml2-metadata-.xml
new file mode 100644
index 00000000..1133d420
--- /dev/null
+++ b/metadata/swamid-2.0/ni-test.sunet.se-saml2-metadata-.xml
@@ -0,0 +1,87 @@
+<?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-test.sunet.se/saml2/metadata/">
+  <md:Extensions>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2024-03-04T14:15:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">NI-TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="en">NI network inventory</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://github.com/NORDUnet/ni/blob/master/README.md</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.vr.se/om-webbplatsen/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="32" width="32" xml:lang="en">https://github.com/NORDUnet/ni/blob/master/src/niweb/niweb/assets/img/NOCLook.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="sv">NI-TEST</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">NI nätverk inventerare</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://github.com/NORDUnet/ni/blob/master/README.md</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="32" width="32">https://github.com/NORDUnet/ni/blob/master/src/niweb/niweb/assets/img/NOCLook.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.vr.se/om-webbplatsen/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUFuL99CKkJ1IB/m5jFWf8iXMkxyMwDQYJKoZIhvcNAQELBQAwGzEZMBcGA1UEAwwQbmktdGVzdC5zdW5ldC5zZTAeFw0yNDAzMDQxMjU4MzhaFw0zNDAzMDIxMjU4MzhaMBsxGTAXBgNVBAMMEG5pLXRlc3Quc3VuZXQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCckBFDLAhNxHhmzUjWFH8EmbC8IjEwYgycrba8fuMEpfN32YRIRNj5JMMKBxbpau/8BUzcsAu3IOD+RIcU/xd3Q58J7VIsepf6pBVstT1u9Hd7KYp3n1TLGbNNmY6zC2M6xdDp1MgbJi8h6Wj748GOaFCiPUQ2h/KZdwSn0miMAGz7GfBsBH5K9FJQNtZTA0crMQ1EOcsSBvElOtsnSHmTfR+ts/VgOQa0pBikybo2CUPYKW3nuBLXnxgoOirOIFYlPDEW4FOxJs4umvGhSCMms+vo65IcbQu5lXLNk1c7uebH7DjbEouGHnqS0cYWKtLXhI3IBXom2QCyg3RH9WiOl0qRl39YE6Qifm2fR1aza231aMb+lGf/WQAmHWhzyQRSo+ciEOUqHYFRPMRnM2qeb4m4dtaG2/7r1eVUmgyi7qOOQiq0gL97Fv0q73K6TuT7zFA3fBcgbw/n+XGwg+KKdIGT8aRSxgagMdOmWcKLnZKT4SYxT/4RBlrQk+E5Yl64H/0ENh5jGL45xG6jo3jP5Tg7bz2daAB3OUC+OnY+mwQIzr0hm24FHI0Lfl9AWjJAcy0MqvNc0mfihBr3p/HegmEdJJr/gToU0NfiNvIauoME7tSsNQBo+vVTgCaW8yopvoawL/caqZU8EXn6IOrVxyFxVtsRBaYxQ8sj7VgyKQIDAQABo1MwUTAdBgNVHQ4EFgQU3TewIaMQNxQcRVEp5A0vzzV3CR8wHwYDVR0jBBgwFoAU3TewIaMQNxQcRVEp5A0vzzV3CR8wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAHDheTNcuTKEafZFAYJjjTiU4DDYnF5pp0P6FgV3z2MV4qIGKKKt8wiu2IknxiVsGEF8gT2sBf5DYjDBP6MC1PvblAVcS3P5qlIYd0Pjib9ORNuj6t5UTrKRxRJuRgcGclPl/Jk+k4n5Z3bOpzY7u2dDguE5kN8Zkmgh67fiXUUfoNhYVFtKLPdILZSKdEJfUQewWGTkrHsnn6AgpxvWl6uR18em/ixUuRl/5+aqagKbd6EXYFU4Li+McmTwk23aJmU/iesKFSw0Qpe08QfkW8WNWxOxJBGwhxMEtijTMaMbigTk83FGMVcylaIqPGvHfAdb6s4QKF7cPS3PRfU99FN9LyYhV5cMqEeUy/E52IMVCsn3M9KXwHKWOFurj1h1V3R5lIyaae/eXQWSbHKfz0SPm6q57P3PIll7j59xbUaAonMPuQRrNoH7N0ZQ91SPmEAObQr6UVlTBhrgpg1IyBxIKmmGeTmXLqO1oYfjSt9uSpe+bp360uwmxCmiPXEcYGTvuEW9sJ7ZmDHj/FTtKI8E4oVXEwoykkTi0CZD3q7tsR6OjjGiQF75FTzC3VfztLrYxA7yxPf3gram9ZSzjmm1aCLqt9EjcrLpI3RDGuNL+cnKHTkicui1wpEzquw+3kzjGxvSznBnoLfZlIczJZw+E1YRYcAzPfT//WxJ1AhU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFFzCCAv+gAwIBAgIUFuL99CKkJ1IB/m5jFWf8iXMkxyMwDQYJKoZIhvcNAQELBQAwGzEZMBcGA1UEAwwQbmktdGVzdC5zdW5ldC5zZTAeFw0yNDAzMDQxMjU4MzhaFw0zNDAzMDIxMjU4MzhaMBsxGTAXBgNVBAMMEG5pLXRlc3Quc3VuZXQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCckBFDLAhNxHhmzUjWFH8EmbC8IjEwYgycrba8fuMEpfN32YRIRNj5JMMKBxbpau/8BUzcsAu3IOD+RIcU/xd3Q58J7VIsepf6pBVstT1u9Hd7KYp3n1TLGbNNmY6zC2M6xdDp1MgbJi8h6Wj748GOaFCiPUQ2h/KZdwSn0miMAGz7GfBsBH5K9FJQNtZTA0crMQ1EOcsSBvElOtsnSHmTfR+ts/VgOQa0pBikybo2CUPYKW3nuBLXnxgoOirOIFYlPDEW4FOxJs4umvGhSCMms+vo65IcbQu5lXLNk1c7uebH7DjbEouGHnqS0cYWKtLXhI3IBXom2QCyg3RH9WiOl0qRl39YE6Qifm2fR1aza231aMb+lGf/WQAmHWhzyQRSo+ciEOUqHYFRPMRnM2qeb4m4dtaG2/7r1eVUmgyi7qOOQiq0gL97Fv0q73K6TuT7zFA3fBcgbw/n+XGwg+KKdIGT8aRSxgagMdOmWcKLnZKT4SYxT/4RBlrQk+E5Yl64H/0ENh5jGL45xG6jo3jP5Tg7bz2daAB3OUC+OnY+mwQIzr0hm24FHI0Lfl9AWjJAcy0MqvNc0mfihBr3p/HegmEdJJr/gToU0NfiNvIauoME7tSsNQBo+vVTgCaW8yopvoawL/caqZU8EXn6IOrVxyFxVtsRBaYxQ8sj7VgyKQIDAQABo1MwUTAdBgNVHQ4EFgQU3TewIaMQNxQcRVEp5A0vzzV3CR8wHwYDVR0jBBgwFoAU3TewIaMQNxQcRVEp5A0vzzV3CR8wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAHDheTNcuTKEafZFAYJjjTiU4DDYnF5pp0P6FgV3z2MV4qIGKKKt8wiu2IknxiVsGEF8gT2sBf5DYjDBP6MC1PvblAVcS3P5qlIYd0Pjib9ORNuj6t5UTrKRxRJuRgcGclPl/Jk+k4n5Z3bOpzY7u2dDguE5kN8Zkmgh67fiXUUfoNhYVFtKLPdILZSKdEJfUQewWGTkrHsnn6AgpxvWl6uR18em/ixUuRl/5+aqagKbd6EXYFU4Li+McmTwk23aJmU/iesKFSw0Qpe08QfkW8WNWxOxJBGwhxMEtijTMaMbigTk83FGMVcylaIqPGvHfAdb6s4QKF7cPS3PRfU99FN9LyYhV5cMqEeUy/E52IMVCsn3M9KXwHKWOFurj1h1V3R5lIyaae/eXQWSbHKfz0SPm6q57P3PIll7j59xbUaAonMPuQRrNoH7N0ZQ91SPmEAObQr6UVlTBhrgpg1IyBxIKmmGeTmXLqO1oYfjSt9uSpe+bp360uwmxCmiPXEcYGTvuEW9sJ7ZmDHj/FTtKI8E4oVXEwoykkTi0CZD3q7tsR6OjjGiQF75FTzC3VfztLrYxA7yxPf3gram9ZSzjmm1aCLqt9EjcrLpI3RDGuNL+cnKHTkicui1wpEzquw+3kzjGxvSznBnoLfZlIczJZw+E1YRYcAzPfT//WxJ1AhU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ni-test.sunet.se/saml2/ls/"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni-test.sunet.se/saml2/ls/post/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ni-test.sunet.se/saml2/acs/" index="1"/>
+  </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="en">https://www.sunet.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>maria</md:GivenName>
+    <md:EmailAddress>mailto:mariah@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>maria</md:GivenName>
+    <md:EmailAddress>mailto:mariah@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>maria</md:GivenName>
+    <md:EmailAddress>mailto:mariah@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>IT Security Office</md:GivenName>
+    <md:EmailAddress>mailto:mariah@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>