From a0388339b39fc2783366e2fba3cf683268a56789 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Mon, 19 Jun 2023 09:04:09 +0200
Subject: SWAM-6, Avveckla mfa-check.swamid.se

---
 .../swamid-2.0/mfa-check.swamid.se-shibboleth.xml  | 156 ---------------------
 metadata/swamid-sp-2.0.mxml                        |   1 -
 2 files changed, 157 deletions(-)
 delete mode 100644 metadata/swamid-2.0/mfa-check.swamid.se-shibboleth.xml

diff --git a/metadata/swamid-2.0/mfa-check.swamid.se-shibboleth.xml b/metadata/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
deleted file mode 100644
index 629a1a0b..00000000
--- a/metadata/swamid-2.0/mfa-check.swamid.se-shibboleth.xml
+++ /dev/null
@@ -1,156 +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://mfa-check.swamid.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-03-19T17:31:59Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <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-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <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-sha256"/>
-    <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/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <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.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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/haka.funet.fi" index="3"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2" index="2"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2" index="5"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/loopback" index="9"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/md.nordu.net" index="7"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io" index="6"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net-ADFS" index="10"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/skolfederation" index="4"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test" index="8"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test-ADFS" index="11"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/haka.funet.fi"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/kalmar2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/loopback"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/md.nordu.net"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/nightly.pyff.io"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/nordu.net-ADFS"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/skolfederation"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/DS/swamid-test-ADFS"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/box-idp.nordu.net"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/box-idp.sunet.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/eduid"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/eduid-dev"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/feide"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/idp.funet.fi"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/necs.sll.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/openidp"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/socialproxy"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://mfa-check.swamid.se/Shibboleth.sso/Login/unitedid"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SWAMIDs MFA IdP-test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWAMID MFA IdP certification tester</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Verktyg för att testa om en IdP har stöd för MFA</mdui:Description>
-        <mdui:Description xml:lang="en">MFA IdP certification testing tool</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mfa-check.swamid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mfa-check.swamid.se</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="100" width="115">https://release-check.swamid.se/swamid-logo-2-100x115.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>mfa-check.swamid.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=mfa-check.swamid.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEADCCAmigAwIBAgIJAOFBwOSVzcRxMA0GCSqGSIb3DQEBCwUAMB4xHDAaBgNV
-BAMTE21mYS1jaGVjay5zd2FtaWQuc2UwHhcNMTgwMzE5MTUyNjU3WhcNMjgwMzE2
-MTUyNjU3WjAeMRwwGgYDVQQDExNtZmEtY2hlY2suc3dhbWlkLnNlMIIBojANBgkq
-hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAxC1TObwn0hNG1n3ut5qRbFmkdBGS7KSZ
-lGrw+eHiUrihLUiQe9953+JwludTIh0AAFcn++uttaxI7zXHqFv4AnmVbKmKPgWv
-o3alW1DApZYLqyD48HEFtGvwhy/k5QbdPbc3eNzFyWyy4U9gJSHyojFk2ts+L6Eu
-YmQ3XWUpzeUYgM6PjZZY3GKGlFGuMDs2oZVJPcldwge2DM7KBgUTLY+Oym1zLa3G
-STHFNR1Etr987PtFyTkqv6nWXGb60aVm6iWVFYhpBNQucSIUFBmnWWoGCNag7C7L
-I9NZBLqQbj9KL/C3ApPAXyIM0fvg8ddD/J8/o+RmUZlGJmc6fPBgwK8AfrbtOwQP
-T4jy8UGDLcywkWOX1KlMkuHTVppwFLlO/W8SufrzkqgJ+ps8sOYFjQxBh+aOOp3M
-XCcxYkZHSftzzTngiebHxDgb8ZIRCR/LYHOSd7pwtbfkBGrOLHi6vPr0uu1H9PGQ
-WHSIVkfhaRZbKcRU9xlS67Iss496MEP3AgMBAAGjQTA/MB4GA1UdEQQXMBWCE21m
-YS1jaGVjay5zd2FtaWQuc2UwHQYDVR0OBBYEFIHYrpNd2RpoMTQh42sHJ7pHlUmP
-MA0GCSqGSIb3DQEBCwUAA4IBgQBCOZlfACODVvZHQ506qaxew/rqxsuffTe4HWjd
-M1LLhi1lN3SXhnfi4eW+jQk6ROoj+8AsUzyimLXBK8CKo1iuYwBaJ0asPlwGEUC0
-TQfjE8RbclZkhtpI4knLJgQl5Di9qJB1VB3rLjM9HKXIgyzKDWGjLMMz4iGW/ZmC
-vihMpqOjBDng82r0Qp1ZI3ByikJ49msIB5iQFyXZYNf8iHLoG5Sb2dK4DIKvOg2S
-A1YIRBT+OwkFh3kL3qfQjSqK/uAkMLq6I2URzTa1Np8rlec4S0lISxHTlVg2L7WW
-YPmMj/QXztnb6sjhjgGzt/9D5G3M3elIEkwLSU6YDeUaTauX0Ssj21ZnT5lOCqdC
-SndOtwDgcsxXOoho8MsCRdPlMn/ROiMJwodbTakQKSbEXbg+XatbOw1AVmiUHgak
-wLA3I1NYNdoyC1wPDgTiEZCIfhOuBttCA8jAUv9k5q1P1pQhqCp5FuzLKAudkeJ0
-hNW9Egqc9F3KxXMAxHb63SajnOY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mfa-check.swamid.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mfa-check.swamid.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mfa-check.swamid.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mfa-check.swamid.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mfa-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mfa-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">MFA IdP certification testing tool</md:ServiceName>
-      <md:ServiceName xml:lang="sv">SWAMIDs MFA IdP-test</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">MFA IdP certification testing tool</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Verktyg för att testa om en IdP har stöd för MFA</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SWAMID</md:Company>
-    <md:GivenName>SWAMID Operations</md:GivenName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SWAMID Operations</md:GivenName>
-    <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SWAMID Operations</md:GivenName>
-    <md:EmailAddress>mailto:operations@swamid.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>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-sp-2.0.mxml b/metadata/swamid-sp-2.0.mxml
index 9b3ae420..2d41886d 100644
--- a/metadata/swamid-sp-2.0.mxml
+++ b/metadata/swamid-sp-2.0.mxml
@@ -243,7 +243,6 @@
   <xi:include href="swamid-2.0/metadata.lab.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/metadata.qa.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/metadata.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/mfa-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mfa.release-check.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mica.cohorts.medsci.test.uu.se-Shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mica.cohorts.medsci.uu.se-Shibboleth.sso.xml"/>
-- 
cgit v1.2.3