Resolves SWAMID-3396

3 files changed, 0 insertions, 82 deletions

diff --git a/swamid-2.0/ensky.lhs.se-shibboleth.xml b/swamid-2.0/ensky.lhs.se-shibboleth.xml
deleted file mode 100644
index e2b5a0b0..00000000
--- a/swamid-2.0/ensky.lhs.se-shibboleth.xml
+++ /dev/null
@@ -1,28 +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://ensky.lhs.se/shibboleth">
-  <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>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGzCCAoSgAwIBAgIBADANBgkqhkiG9w0BAQQFADBtMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHzAdBgNVBAoTFlN0b2NraG9sbXMgdW5pdmVyc2l0ZXQxFTATBgNVBAMTDGVuc2t5Lmxocy5zZTAeFw0wODAxMDQxMzMyMjdaFw0wOTAxMDMxMzMyMjdaMG0xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEVMBMGA1UEAxMMZW5za3kubGhzLnNlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2CiFF4kFxQldm58ws8hL5xZ+g9eJ+MyM51AstGYvu1RTcorlVtIZNcGSQQxdKZyh0sSxo7UYrKq5OqByycIxiya5jo7lwVrKZnd7Tto7RThgxiO6G6i3G36osvZiZpFGYgETSVQjh1XknN5n9samtrEqM6p1ASsW8iLmpcjJ0vwIDAQABo4HKMIHHMB0GA1UdDgQWBBSmAaEu+Tmvy3zW9M0oTdY68IlS+TCBlwYDVR0jBIGPMIGMgBSmAaEu+Tmvy3zW9M0oTdY68IlS+aFxpG8wbTELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR8wHQYDVQQKExZTdG9ja2hvbG1zIHVuaXZlcnNpdGV0MRUwEwYDVQQDEwxlbnNreS5saHMuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQClgcpD+e9rYZ7Uk43AJ+Xbg/h7M8kMPzzTnikIGNIR1t+ArCoRxX/YchJ1LtCFEkOBC16HKewBxKoslypESqSOsVMyr3z/TUDvEBUaNbHLmwuD616gZK1Vb9FYAQWHmXBNeWJl09476pMXW3u9MTRL+FXFMjt7IiwIysrEcHht3Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ensky.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Stockholm university</Company>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/moodle.lhs.se-shibboleth.xml b/swamid-2.0/moodle.lhs.se-shibboleth.xml
deleted file mode 100644
index 253e4062..00000000
--- a/swamid-2.0/moodle.lhs.se-shibboleth.xml
+++ /dev/null
@@ -1,52 +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://moodle.lhs.se/shibboleth">
-  <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>
-  </md:Extensions>
-  <SPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIErDCCA5SgAwIBAgILAQAAAAABHGXBykcwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
-MDkxNTExMjUxMVoXDTExMDkxNTExMjUxMVowWjELMAkGA1UEBhMCU0UxEjAQBgNV
-BAcTCVN0b2NraG9sbTEfMB0GA1UEChMWU3RvY2tob2xtcyB1bml2ZXJzaXRldDEW
-MBQGA1UEAxMNbW9vZGxlLmxocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANqTklz0t3Gnkq1va4uPbxMZwOJJV1QwOrGBrCx24gSvSJWrhptcFyMw
-pll8QMneR+Pb7I4wm2YaI5rxLwtBruRdgLtxuOo3LSvhzwTZXzQtC4ouCQ1EAAHT
-ytXj6+TiC0r2s3qiWMwEvspR/VaGTGDjzoEHIM40ynsxsx3LFAFJjBpzGH8Si6IB
-mJqvXAkvuesphyLGvc8c2aTvd3Zg4GL5WR0ep2DuZo1dkpuZHUZlXmS4JVpn2yZa
-HVN/CdLP60jqxvh85HLBk9DZQ0sD3dgAgy1bV/hajO0OzYuV+VQd7kvG5wTKrlUs
-41RaZMLZGZ43t94LCtQZ5IKLZl6BQ6sCAwEAAaOCAWwwggFoMFAGA1UdIARJMEcw
-RQYHKoZIsT4BADA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3Lmdsb2JhbHNpZ24u
-bmV0L3JlcG9zaXRvcnkvY3BzLmNmbTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgw
-FoAUZWWjPdc7EaMKByU3yUJKW3Z3UOEwHQYDVR0OBBYEFKgqzUsMQGdA4hivyxsK
-few6RFQvMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5u
-ZXQvZWR1Y2F0aW9uYWwuY3JsME8GCCsGAQUFBwEBBEMwQTA/BggrBgEFBQcwAoYz
-aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLm5ldC9jYWNlcnQvZWR1Y2F0aW9uYWwu
-Y3J0MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHREEETAPgg1t
-b29kbGUubGhzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAsV0oNI80/L2tdAlf+ICR2
-YlEwgnkFtJGLRYZJ2uCojETA353C0NKd+IxMNuJkg7vO8fhtQbSyULRKp/XzekBx
-883u9zHDDFQOYYoTz0iLDq+6Cvx/t/b+EDO3yKt7kTRzV3idcNyygDCRAV8h2tUF
-gnZIWa5zCh0iOc5VJBW+Rupb6g9z7IYyjYopkl9ZGhwg8NwFa4qvEwwJcPgktiN/
-E0lpMFhmAzGdKZww+axLvL0lBxrPiFn747K4iJ6tc+oCCtn852zXLd/IsMY3oUWM
-t7tgUUB+rUENHrqryPN6AJ6QZR6UIWE6J6biQJVmXQldKGrGrMEnRecGyokj9kqi</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">SU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Stockholm university</Company>
-    <SurName>helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index cd6b8186..8fb9ceed 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -58,7 +58,6 @@
   <xi:include href="swamid-2.0/dedserv79.levonline.com-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mondo.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/mondo-test.su.se-shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/ensky.lhs.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/beta.augustus.se.xml"/>
   <xi:include href="swamid-2.0/www.sub.su.se.xml"/>
   <xi:include href="swamid-2.0/samsok.libris.kb.se-shibboleth.xml"/>
@@ -67,7 +66,6 @@
   <xi:include href="swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml"/>
   <xi:include href="swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.lhs.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/moodle.lhs.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.cambro.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/cambro-utv1.umdc.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kurser.math.su.se-shibboleth.xml"/>