Resolves SWAMIDOPS-328

2 files changed, 0 insertions, 167 deletions

diff --git a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
deleted file mode 100644
index 5c809c51..00000000
--- a/swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://swamid-idp.sys.kth.se/idp/shibboleth">
-  <md:Extensions>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">kth.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (old)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för KTH</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for KTH</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.kth.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.kth.se/en</mdui:InformationURL>
-        <mdui:Logo height="166" width="166">https://swamid-idp.sys.kth.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">stockholm</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kth.se</mdui:DomainHint>
-        <mdui:IPHint>130.237.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.64.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.80.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.84.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.202.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.206.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.209.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.210.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.212.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.216.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.218.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.220.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.224.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.228.0/22</mdui:IPHint>
-        <mdui:IPHint>130.237.232.0/21</mdui:IPHint>
-        <mdui:IPHint>130.237.249.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.250.0/23</mdui:IPHint>
-        <mdui:IPHint>130.237.255.0/24</mdui:IPHint>
-        <mdui:IPHint>130.229.128.0/18</mdui:IPHint>
-        <mdui:IPHint>193.10.37.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.38.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.39.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:1::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.346123,18.072305</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUJ4PH4+fFgJRXkeDT5AU2kjzM0cowDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRc2FtbC00LnN5cy5rdGguc2UwHhcNMTcwNjIyMDczODEz
-WhcNMzcwNjIyMDczODEzWjAcMRowGAYDVQQDDBFzYW1sLTQuc3lzLmt0aC5zZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBIQk0f0/zwbuKef9yce9G5
-lJyQOD39lkECVSoNQ25vUNKguBxyfSC2Uq4eJFSrXc8gdLa/TEYkxNWuw0ZM3yoV
-RGnn6NPVspuhDjinVoCaCHTJgtLe0udwCZt/7tybNRwpFzo1T7kV2LxMXBuWfRa8
-d7trgvspDxQ0WX8TsBVVkjtDPJdxuuvEPFkNG4OiGmPyLLJNkSn08zjHPCAxnKyA
-Gyh3Jb0aKUHDcPtVlWaTj66FNxJGPDoNk9RD1VpwxoNhnQR1GvIYwH5GmMVusmHa
-vdHk8p+AJCg+bUWQ4mWUAWwJ9S+oBivLazTX14FHkaoUF+m+ozhxOfa949ltxuMC
-AwEAAaNpMGcwHQYDVR0OBBYEFEW2LuId9XeR96veOJMfyc9DjMQzMEYGA1UdEQQ/
-MD2CEXNhbWwtNC5zeXMua3RoLnNlhihodHRwczovL3NhbWwtNC5zeXMua3RoLnNl
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAZOBsZ8Alq4aWn/zwS
-T9AQ5D7sXLLYwUCdIaGwLzdvpzs7Aia/zjADJ7KliR5mMJS50ropXLyMTxaJMwUD
-tV1HB/QZgw5XhB7X6I8Eh/G3q58i6j/RszYcPBmMIo3y8K7vy4T7IDP+ZoUwwyeL
-MUtRH+bCvLNt590HF64RKBsN6ZNIOM2YzaZfpv1gq1qHgufcAzhkuBvM3bKx5bTt
-Ccusy7b2EZtNam0pk0BK2lSH7DZ4+QvNkGHEGbk2rQOTDBK2ZufEwAzdCNGrdUcD
-d0IuBl2HMWiq0mt8mqdlUCQeXX/kMOy5q1DbCcBF+e5wMUCyYUjjnOT0fJbRPkv5
-YXMM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAMeF2Eb50rNqMQWtJEyyMMEH+nqEMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXNhbWwtNC5zeXMua3RoLnNlMB4XDTE3MDYyMjA3Mzgx
-MloXDTM3MDYyMjA3MzgxMlowHDEaMBgGA1UEAwwRc2FtbC00LnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlCYHg/Itth1UJ6vmLxlFQ
-xAUECSPV1Y27FGwgr+N1wglS4+cqzJPp1GGStLh+i3PDBIUJvMege1TtDiaVhDjw
-vbnNZ4VFu+WMTuQLeENEltvrFPa6S15BxX7DiYpjwTeFsVFq65jyXIJkqpXb8xgm
-W58n8IKgKmGeXO35FaPERt/X1DZ6X9T3U4M6xqVJk0OdXgOM1zrJBtYt0FHXIs9z
-VzwRdKkSSJ2AATbuCS1T7uq9mmNkKNbIqu3PLwdTG58sPW+AxUziy0VadS8JbniB
-ZVpWpTxaseZ9xULjcGSizBaYJRUpn8p4pj6c8QlKQ7iq2SiYMtq5NYOISTJajfVB
-AgMBAAGjaTBnMB0GA1UdDgQWBBTst6dJnCK+d/E/G3S+a9c2TjmwHDBGBgNVHREE
-PzA9ghFzYW1sLTQuc3lzLmt0aC5zZYYoaHR0cHM6Ly9zYW1sLTQuc3lzLmt0aC5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlo2sKxnAKSTjYyrj
-/KIsNp3IQbRYKPxLyCfW5y1o1dJwHhBaIz/+6nervahlvTHjmTbYyqIfUGziILrG
-xTXsAvwrxy1HQSqKJO7Hr/VOaTHjPWeMfW/WkSIW4pZS2kCPZPQv2MxQ6dw4/o25
-KP2JJalcYYWvAim34o63lYhZoeCWPngBdOPnx8ncz5+Z9yObcdGDYhHkplkYzmM6
-4vUZf8AP9eV+hRu0jmmgsosUkIdiL0PeZyP+vJ0r3dMr37JkC/5uapKZrlV1i2bf
-Cu1uZ/z8tUO1ojulAaITsh6reYg5dkJCHk3Od0OMWPYKy7xOCYVf5YpyU5eaBdma
-q5GBOQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAP4GLDKBcWbPcHKABSqI1SsdpHXDMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXNhbWwtNC5zeXMua3RoLnNlMB4XDTE3MDYyMjA3Mzgx
-M1oXDTM3MDYyMjA3MzgxM1owHDEaMBgGA1UEAwwRc2FtbC00LnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW+aDtkaYiQfSs3k36Wfs7
-2fLCaKITIP8NemLP1/6gyKIY+i9w17zRJEdiMDgBUSzehmMrUPzgFbNMHT3BXAeT
-TGoUsUXwLGWZ5Z5CabExTDqR8VZ8fuxI5+r+P214HDuDKpNQV/rLZfkVLL0Z4gRk
-qBQcVZl8bKMvdCH5RP2BqhpNmsDpZnOVH1Hkb8dE0dgYr/vTENeT8nIa4Oviz9fM
-6l7KcrQeoi5LH4nLHbu5WGB9oCJ7NDJyv0JatYp0uWGWZgvFBXXnktfiA6ZxpT0Y
-sgZt4ci24shRHPlgrhQdamFBWdngIQ98Ssh7WFqxH+qHjsSWQoDOSns9Qra55YoZ
-AgMBAAGjaTBnMB0GA1UdDgQWBBQA5ffyrlSWchr8TjoOKpwR97OWCDBGBgNVHREE
-PzA9ghFzYW1sLTQuc3lzLmt0aC5zZYYoaHR0cHM6Ly9zYW1sLTQuc3lzLmt0aC5z
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAKFSYdy0fQXBPKZVF
-QsITY7svWg9vBS/Oa6mX49wi5feSGiB1dpC4IKR8oApD4aOur/XtWHNByun0RMeQ
-RIHMDYQhKJ77+/pmMGDFvbcWwM3cx3bf+HFR0fXsQ7lpLJAGY3ggdBneIvuBJ9H6
-cMP9ZKbaRAEkWg/WVjmx9of1T8tpRJSF4ZA20BZgYBVGNTgZfXNPb93EagykUpyb
-swSa7l0xNWgLWusFWFMxnB/SEAKGvcRqnNcwHD5GEeLhcoPXJDQ+oapGa481oj0z
-Y6owwlQG4c9jo42ax9akMTb22C4ANRGVXODBA7kftyKkE+xXB6EZuPY65jC15yWT
-f0LwMg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml-4.sys.kth.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-4.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-4.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH) (old)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology (old)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
-    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
-    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>KTH IT-Support</md:SurName>
-    <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6600</md:TelephoneNumber>
-  </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@kth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 41d24bfe..02a664de 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,6 +16,5 @@
   <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
   <xi:include href="swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.hv.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/swamid-idp.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
 </md:EntitiesDescriptor>