Resolves SWAMIDOPS-8299

2 files changed, 0 insertions, 127 deletions

diff --git a/swamid-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-2.0/idp.irf.se-idp-shibboleth.xml
deleted file mode 100644
index ff589283..00000000
--- a/swamid-2.0/idp.irf.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.irf.se/idp/shibboleth">
-  <Extensions>
-    <attr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:attr="urn:oasis:names:tc:SAML:metadata: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>
-    </attr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik (gammal)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
-        <mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>irf.se</mdui:DomainHint>
-        <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
-        <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCDCCAfCgAwIBAgIJAOTXvdZcGqcaMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCnd3dy5pcmYuc2UwHhcNMTQwNDExMTIyMzI4WhcNMTcwNDEwMTIyMzI4WjAV
-MRMwEQYDVQQDEwp3d3cuaXJmLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5j6+1LkPONXRnBX/hijB9EDb8+jg1NpNDEq4kPpxIo+2zPgR8GVqWwND
-NXZZNZWvgb52cCm4ofyOK8p2eOIi5CXJoEhCU1k3LVfaAms+1j02/JpQkKatr8RC
-ONxIvbs45H440KbuK+nmhQI1hRcZ8bB8FadX9EInEWjrxGZNyMlsMnfRLS/BGmc3
-htF8BSNd01XiCy5R6X5OufIlyKHoo/fAcDv1zJlLb4r07PlzbCtfKFIrE7w/KBB8
-fKLkMKI1KRO7FgLET3xf5GH7ZY2N8Y4+fwBf70rHzsh1Grsjk/ZJUOu+2jcxMW1R
-L5/pp229zplUBywYgz2HTxceQNZF4QIDAQABo1swWTA4BgNVHREEMTAvggp3d3cu
-aXJmLnNlhiFodHRwczovL3d3dy5pcmYuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFNIFWvl057NJOMck/J+lUMXn5jKfMA0GCSqGSIb3DQEBBQUAA4IBAQDdA72P
-RuVvpMliAJYK/qTSy9HJH1rptUQcON5SRGY8H9nlJ268FSxf06Hp+2qqqglE/nmA
-fb7Viy/3o2WbnQVLznXoG3mjrRHWMXXniqLryFPcC9/yH4Mz2HBmeDzZyftUgUk2
-PEewRy7hbFCLpItGerJQlaFcyoLG8qR4d+v1ruOSSK/p1Bobk5AhxfSh05TmAKko
-bezn0NFgAFP5ezEjK9uZ2N+vmQbbirVqYslNn/9kK6G+pXQQsBegliIcqNKj7iST
-WKAfSLfPK6//KWPOPnZrpaAuyIMxrM/2/adK6Ko0mjM8D6sIUhT3zcfbq4M/m8vv
-XCYbfP8E3cs4MB+K
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irf.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.irf.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irf.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">irf.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCDCCAfCgAwIBAgIJAOTXvdZcGqcaMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCnd3dy5pcmYuc2UwHhcNMTQwNDExMTIyMzI4WhcNMTcwNDEwMTIyMzI4WjAV
-MRMwEQYDVQQDEwp3d3cuaXJmLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5j6+1LkPONXRnBX/hijB9EDb8+jg1NpNDEq4kPpxIo+2zPgR8GVqWwND
-NXZZNZWvgb52cCm4ofyOK8p2eOIi5CXJoEhCU1k3LVfaAms+1j02/JpQkKatr8RC
-ONxIvbs45H440KbuK+nmhQI1hRcZ8bB8FadX9EInEWjrxGZNyMlsMnfRLS/BGmc3
-htF8BSNd01XiCy5R6X5OufIlyKHoo/fAcDv1zJlLb4r07PlzbCtfKFIrE7w/KBB8
-fKLkMKI1KRO7FgLET3xf5GH7ZY2N8Y4+fwBf70rHzsh1Grsjk/ZJUOu+2jcxMW1R
-L5/pp229zplUBywYgz2HTxceQNZF4QIDAQABo1swWTA4BgNVHREEMTAvggp3d3cu
-aXJmLnNlhiFodHRwczovL3d3dy5pcmYuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFNIFWvl057NJOMck/J+lUMXn5jKfMA0GCSqGSIb3DQEBBQUAA4IBAQDdA72P
-RuVvpMliAJYK/qTSy9HJH1rptUQcON5SRGY8H9nlJ268FSxf06Hp+2qqqglE/nmA
-fb7Viy/3o2WbnQVLznXoG3mjrRHWMXXniqLryFPcC9/yH4Mz2HBmeDzZyftUgUk2
-PEewRy7hbFCLpItGerJQlaFcyoLG8qR4d+v1ruOSSK/p1Bobk5AhxfSh05TmAKko
-bezn0NFgAFP5ezEjK9uZ2N+vmQbbirVqYslNn/9kK6G+pXQQsBegliIcqNKj7iST
-WKAfSLfPK6//KWPOPnZrpaAuyIMxrM/2/adK6Ko0mjM8D6sIUhT3zcfbq4M/m8vv
-XCYbfP8E3cs4MB+K
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IRF</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik (gammal)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics (old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.irf.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>Swedish Institute of Space Physics</Company>
-    <SurName>Mats Luspa</SurName>
-    <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
-    <TelephoneNumber>+4698079000</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>Swedish Institute of Space Physics</Company>
-    <SurName>Mats Luspa</SurName>
-    <EmailAddress>mailto:matsl@irf.se</EmailAddress>
-    <TelephoneNumber>+4698079022</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Swedish Institute of Space Physics</Company>
-    <SurName>Mats Luspa</SurName>
-    <EmailAddress>mailto:matsl@irf.se</EmailAddress>
-    <TelephoneNumber>+4698079022</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 53b74e46..1bff349d 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -9,7 +9,6 @@
   <xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.ki.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.irf.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunidp.miun.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.mdh.se-idp-shibboleth.xml"/>