remove fidus-test and include an apparend (?) co-co override

3 files changed, 1 insertions, 107 deletions

diff --git a/sp-with-coco-errors b/sp-with-coco-errors
index 96333f34..393922d6 100644
--- a/sp-with-coco-errors
+++ b/sp-with-coco-errors
@@ -14,3 +14,4 @@ swamid-2.0/staging.cloudmore.com-shibboleth.xml
 swamid-2.0/us.cloudmore.com-shibboleth.xml
 swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
 swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
+swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
diff --git a/swamid-2.0/fidus-test.skolverket.se-sp.xml b/swamid-2.0/fidus-test.skolverket.se-sp.xml
deleted file mode 100644
index 79deb400..00000000
--- a/swamid-2.0/fidus-test.skolverket.se-sp.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://fidus-test.skolverket.se/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <ns0:SPSSODescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns2:DiscoveryResponse xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://fidus-test.skolverket.se/Saml2SP/disco" index="1"/>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="signing">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFXjCCA0agAwIBAgIJAJX842aaffviMA0GCSqGSIb3DQEBCwUAMEQxEDAOBgNV
-BAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29sdmVya2V0
-MQswCQYDVQQGEwJTRTAeFw0xODExMjYwOTUxNDNaFw0xODEyMjYwOTUxNDNaMEQx
-EDAOBgNVBAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29s
-dmVya2V0MQswCQYDVQQGEwJTRTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALf9eTZK9EOUBAPUEm2Oza6QtHpQT9b3VmTopi+N8d2uBPX9WL+iLhcr3oFJ
-5+1oB5dj9tDkuu2w2g1OWe5amQdyGzr8YibPYbh07ei+s+2oU042FoBaK7gV66Fc
-ai+6/mdc6lrqSmL0SK2w8XzAISTUhia1fVK90CI4PK5+N/u2vzB1ul6c+4dbr7y5
-O7dE6mITouuiGplwrnVjxRqL23vGdt5giefRPf5Djsc2Zl4e9zgnbvjoIdKGdM8F
-KLutiX86sboLXatV5G5TT43KHcxi4AUyxRtX838N+MBNU2kIwD727+S/DgB2F144
-heeW2ST81i2/0HAjuTOj9fDW0bKpZ0bj7JO8HqF1Y4Jkl2Ez5O1/tMM6fo37dT1N
-JtyopZ63dk9B/X/odhr3A1T/c5QIz7C2fhjSBOHX4pRrT1vCMRswxok1oOreTkMK
-wELM9CyNpcMN5x430C/DrRbSXUQ2hLS3l06GzKsjq8B5ewOX8Non5sDR4IULLjXy
-Avvw7hnDcSJQTuxMcIW5aVFIRXH7cvuvKjdXBnTKIsCBGiYCvXsfhw12r9R9DOUN
-g/Z+uMI2tnP2uOcb9QG0NpegQ4wn/exJOVRnm5QCWUHTA8iVVgDHdncU8lPYDqBy
-Kls4pnvod8cqgnoa4ThSmVT/mcvBDSJDvFmxlKJBj3ygLJF5AgMBAAGjUzBRMB0G
-A1UdDgQWBBRenjk70e7YbdeI3KiI+yVv+EE0NjAfBgNVHSMEGDAWgBRenjk70e7Y
-bdeI3KiI+yVv+EE0NjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IC
-AQB6d+FSkQ+CRSEnZjWzeL4yYFdjqzOaqlyPhlEC2O3t/eleN6pNQL9t3S9TdTS0
-PW5vIF0vVz9SkCFV3C+KeBmUSq6RUqp4jYkV/b5ywKSy6FGEH0xHZ13oiOPZGB97
-TRQ0mDU8f3FnchfCx4nOcy4/CaKS0LcDcDYtyAFTVE28o8NvomxuDKrBS1rGiYcw
-1dpKFS8zbYmEnlcavGeg0o5JQ9hyg7ZKn/0Xbif8ma3/imOfN7Q7WqrHImgFjulN
-pqBuLL9ea7fzl6ppakxRu1UsaKkB2uPjpKijjZVuary43+43o5HY7ikzgpkiXe0C
-UbSXx4iFY/ZsOb+gQIJF+9J4kMEViTrEzs8PSyMXIN8BWt48A1Tui5y16YXpzvGU
-Av/068rP2aSmrYanMyVzgxpmjC/dir3pN+MVglZb2475z5IvyGovdlscCONBEB0b
-Ls4KzNser0XQPiEcfsoDlESd0wfPDDH5xVB4pQ11bjgEJEwuWRKb0Py+CiRhsqKU
-CPt3BBSuLvEhcEHoHH1GISRWFpTnjvXRxn8T08a7YUZhZE51Sxc/ER+pUS62EC+p
-GDP6jfZIJzi0D36OOqRn+PViuo9gnjd6q3I3JsEPko74lPYwEvPlnt6llVQ4y6t/
-Q/e+DgEBGep0+PhFu8/GWnDWM7AQtnged7eNW6zUX5uyhQ==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="encryption">
-      <ns1:KeyInfo xmlns:ns1="http://www.w3.org/2000/09/xmldsig#">
-        <ns1:X509Data>
-          <ns1:X509Certificate>MIIFXjCCA0agAwIBAgIJAJX842aaffviMA0GCSqGSIb3DQEBCwUAMEQxEDAOBgNV
-BAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29sdmVya2V0
-MQswCQYDVQQGEwJTRTAeFw0xODExMjYwOTUxNDNaFw0xODEyMjYwOTUxNDNaMEQx
-EDAOBgNVBAMMB2JhY2tlbmQxDjAMBgNVBAsMBUZJRFVTMRMwEQYDVQQKDApTa29s
-dmVya2V0MQswCQYDVQQGEwJTRTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALf9eTZK9EOUBAPUEm2Oza6QtHpQT9b3VmTopi+N8d2uBPX9WL+iLhcr3oFJ
-5+1oB5dj9tDkuu2w2g1OWe5amQdyGzr8YibPYbh07ei+s+2oU042FoBaK7gV66Fc
-ai+6/mdc6lrqSmL0SK2w8XzAISTUhia1fVK90CI4PK5+N/u2vzB1ul6c+4dbr7y5
-O7dE6mITouuiGplwrnVjxRqL23vGdt5giefRPf5Djsc2Zl4e9zgnbvjoIdKGdM8F
-KLutiX86sboLXatV5G5TT43KHcxi4AUyxRtX838N+MBNU2kIwD727+S/DgB2F144
-heeW2ST81i2/0HAjuTOj9fDW0bKpZ0bj7JO8HqF1Y4Jkl2Ez5O1/tMM6fo37dT1N
-JtyopZ63dk9B/X/odhr3A1T/c5QIz7C2fhjSBOHX4pRrT1vCMRswxok1oOreTkMK
-wELM9CyNpcMN5x430C/DrRbSXUQ2hLS3l06GzKsjq8B5ewOX8Non5sDR4IULLjXy
-Avvw7hnDcSJQTuxMcIW5aVFIRXH7cvuvKjdXBnTKIsCBGiYCvXsfhw12r9R9DOUN
-g/Z+uMI2tnP2uOcb9QG0NpegQ4wn/exJOVRnm5QCWUHTA8iVVgDHdncU8lPYDqBy
-Kls4pnvod8cqgnoa4ThSmVT/mcvBDSJDvFmxlKJBj3ygLJF5AgMBAAGjUzBRMB0G
-A1UdDgQWBBRenjk70e7YbdeI3KiI+yVv+EE0NjAfBgNVHSMEGDAWgBRenjk70e7Y
-bdeI3KiI+yVv+EE0NjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IC
-AQB6d+FSkQ+CRSEnZjWzeL4yYFdjqzOaqlyPhlEC2O3t/eleN6pNQL9t3S9TdTS0
-PW5vIF0vVz9SkCFV3C+KeBmUSq6RUqp4jYkV/b5ywKSy6FGEH0xHZ13oiOPZGB97
-TRQ0mDU8f3FnchfCx4nOcy4/CaKS0LcDcDYtyAFTVE28o8NvomxuDKrBS1rGiYcw
-1dpKFS8zbYmEnlcavGeg0o5JQ9hyg7ZKn/0Xbif8ma3/imOfN7Q7WqrHImgFjulN
-pqBuLL9ea7fzl6ppakxRu1UsaKkB2uPjpKijjZVuary43+43o5HY7ikzgpkiXe0C
-UbSXx4iFY/ZsOb+gQIJF+9J4kMEViTrEzs8PSyMXIN8BWt48A1Tui5y16YXpzvGU
-Av/068rP2aSmrYanMyVzgxpmjC/dir3pN+MVglZb2475z5IvyGovdlscCONBEB0b
-Ls4KzNser0XQPiEcfsoDlESd0wfPDDH5xVB4pQ11bjgEJEwuWRKb0Py+CiRhsqKU
-CPt3BBSuLvEhcEHoHH1GISRWFpTnjvXRxn8T08a7YUZhZE51Sxc/ER+pUS62EC+p
-GDP6jfZIJzi0D36OOqRn+PViuo9gnjd6q3I3JsEPko74lPYwEvPlnt6llVQ4y6t/
-Q/e+DgEBGep0+PhFu8/GWnDWM7AQtnged7eNW6zUX5uyhQ==
-</ns1:X509Certificate>
-        </ns1:X509Data>
-      </ns1:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fidus-test.skolverket.se/Saml2SP/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fidus-test.skolverket.se/Saml2SP/acs/redirect" index="2"/>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
-    <ns0:OrganizationName xml:lang="en">Skolverket</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">Skolverket</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://www.skolverket.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>mailto:daniel.robles@skolverket.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>mailto:daniel.robles@skolverket.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 4c616842..58da366e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -529,7 +529,6 @@
   <xi:include href="swamid-2.0/wikiu.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/wiki2.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/fidus-test.skolverket.se-sp.xml"/>
   <xi:include href="swamid-2.0/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/sso.am.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml"/>
   <xi:include href="swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml"/>