Resolved SWAMID-2534

4 files changed, 0 insertions, 120 deletions

diff --git a/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml b/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
deleted file mode 100644
index 2fef11db..00000000
--- a/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,64 +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="http://ADFS2.gu.se/adfs/services/trust">
-  <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:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQM06GzTwZGKBOy3O+UkukDTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBBREZTMi5ndS5zZTAeFw0xNzEyMDcwOTUyMDZaFw0yMjEyMDgwOTUyMDZaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIEFERlMyLmd1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5JAY9DJKYcs81xFYsMK8OKDUvH65G96QBgLphPniK5USaRHm9WJiqDNlN4mqWTxZ0KWmL+msOeET4w8QFc9RMT8roGwTuJjxjfOSq7qqQawdyCk6BXbWx9t2gXJpyI6MLGu+hLlBBZG8EXx7deFiGWq0XAauSC9a4TYpPuAmFdHouP9MTAZPgRnrYtRgzpKx9VV1Hxx8g2uIhKB5tcJuN/TunafzffvAYL7u4zK1OgnHuc/JP2zG66QmMcAujA8TRn/CMwgVzCZn+Wqutb/VJ8ieMXKCTCE+V1bG6/SD2ahZiPKp/5yrDqCmOHPUrxzfGhjeTFQxeE+QLg2fUJqBTQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAn/Z/dissmo6rg5oesZFt+IoPQIC1n5sGXuXJOgxowErjuRFKtuuQZaSqs53KYmYkhgCdG0dt7oirB2yLae17V7z+3eU4gOJmQmMqE7QVxrxQa7tHAjCNHNIo4rMtoZ7p6/6lLqcbcsuqh35m/Zp5Kbd8dvkJbBw6yP+mIuU0HbeMdegigmiOXpXlEm/n9vKOcy8F0dwoN1OV9yKrkhAmbzaEG05zjzILieWtpnQTPJRgFxePRlA9mGxfwRMai4EGYIowq17r9Xmvy/sIC7oUmq4hA59tXt7DGT9LxAzz5qPWNQ2yy3UZ8LIu6+sq4JHTsziIHmBIeT+HT+mnjnbLC</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQPMl2RnOtP6xBlIJBZ/C1yjANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBBREZTMi5ndS5zZTAeFw0xNzEyMDcwOTUyMDdaFw0yMjEyMDgwOTUyMDdaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIEFERlMyLmd1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqaWV/pBJYm/6adoiGM3jFvLui4FQemawNYeXKm9CHKeWYKIQPVLyMCAptjXIvAbOBROPlK+6sJ2uhPamPEI99Xsd0PQ+CTutnEGbK38bK5+TgkHNGLeiBMXySCDRohDsFDEFX2Jiwajy7g/JxagH68GuSwKGQ2M7NCBpcfHWVC8nSiCdnzjBVdPwN0Fq3NY0BOqp0bFcr8GEhgJibWO3mfP9r2GUnGDovkpVPNfwaIpyAAl3s4Cy3DP+V7WHgpcaDWeIld9RnGm9x9XvAv6icP00WV8TanK0oZo1XHAxHSW1yc0mcI35FQRQ+GjIhJVYGDx4cNVD1gwA9kN1p+UP9QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCgWPSNaE0wg6dEF8xpcNZdSPjLWGMtk7N8U7OwvE2Hxfz9p/Pk97c2G3ei56kiF9Lu91N/yjQXw0I3/bDqkNFe6BODFHb1drQBaQwQ/xWh5bizpCWJkSYS672yQgu4xQReT8TEE+OG1r3stt3d01UPIEJGSj3i8qWWPwWZSxkIhRP6lOgOSLevJnqVRaeWsUmocHNdJxfFTHPEA9Bx6wplufdJGtL9cxUOif2xcYDGG+9vVgDeeApseFQ9a22RLnJkMcC/XmBYBSZrmk8r37uOipUvM/AuCTOHekQseaIEu+TiHw1bVnehSEGAZPGTFWa41TbzacRnaQrZiKthVeeO</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs2.gu.se/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs2.gu.se/adfs/ls/"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs2.gu.se/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs2.gu.se/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="sv">Göteborgs universitet</OrganizationName>
-    <OrganizationName xml:lang="en">University of Gothenburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Göteborgs universitet (ADFS)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Gothenburg (ADFS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.gu.se/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://www.gu.se/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
-    <Company>University of Gothenburg</Company>
-    <SurName>GU SAML admins</SurName>
-    <EmailAddress>mailto:gukonto@gu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>University of Gothenburg</Company>
-    <SurName>GU SAML admins</SurName>
-    <EmailAddress>mailto:gukonto@gu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <Company>University of Gothenburg</Company>
-    <SurName>GU Helpdesk</SurName>
-    <EmailAddress>mailto:support@gu.se</EmailAddress>
-    <TelephoneNumber>+46 31 786 2020</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <GivenName>GU Incident Response Team</GivenName>
-    <EmailAddress>mailto:irt@gu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 2d4f457d..00000000
--- a/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,54 +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://spadfs.it.gu.se/simplesaml/module.php/saml/sp/metadata.php/default-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://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SND Sharepoint</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">SND Sharepoint</mdui:Description>
-        <mdui:DisplayName xml:lang="en">SND Sharepoint</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SND Sharepoint</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://snd.gu.se/sv</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://snd.gu.se/en</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDuzCCAqOgAwIBAgIJAP0+4OMhN0c+MA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNVBAYTAlNFMRMwEQYDVQQHDApHb3RoZW5idXJnMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEdvdGhlbmJ1cmcxEzARBgNVBAsMCklULUVuaGV0ZW4xGDAWBgNVBAMMD3NwYWRmcy5pdC5ndS5zZTAeFw0xODA0MjMxMDE4NTNaFw0yODA0MjIxMDE4NTNaMHQxCzAJBgNVBAYTAlNFMRMwEQYDVQQHDApHb3RoZW5idXJnMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEdvdGhlbmJ1cmcxEzARBgNVBAsMCklULUVuaGV0ZW4xGDAWBgNVBAMMD3NwYWRmcy5pdC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMruvwqjW6R5L6VV2e5dEqUq7QnzSTYSEjdtzz+odUp2ROWoHlHqWKb3/IF/w16TIBvlw7IinuiPgaZoQ23O0b07XM/3KkYgHBQSJtGSmB6IGwLD39Th92thsNFO0qO3OKyF5xtVXjfB60lhSsqUrm9NyCmvcfjpyjgGR1eh3QzAmzzgK9hRqKGA8f/6N5mKbuWh6PDNBPLQbwTAqy/mhiQzZa8wYoM/I3B19KxBtl+ez5SMl002m8wWYz+Bnd1rCDl+kWaMoj1YOzlG4kVPdwHehGRyx+jnNdJYhmF24/VoTlt98dbbUGqfoiMulpP9qzx40iB6MbtROBC3/UjQskUCAwEAAaNQME4wHQYDVR0OBBYEFE13XSrQndOpI/x4DhofjCb76kawMB8GA1UdIwQYMBaAFE13XSrQndOpI/x4DhofjCb76kawMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACfU62CXqkTlOCTgg+rQGp08R08OS/FuYnpylPJs+JiriVYnGi+bztqWzyGOilnIX7Qa3ihuYcmltPw83Q3GJcvwZgrCADgguypMdpP8LaoaIQXHd8ALxcTx581ar9KA+zCCf0o9BdwEdGetqQ5OEzPEnXxGIDtlNDQjLebiKO27u8F5cH5ppJQGhinuHP+YpTQmCVyyifFA0FSDztAZV6L938hoekIqbjR3WOJC6cr2Rkpvmslxt++iBc7Y846IoU8X2ngzAKoxNkKchk1IyCVLyT/0Py03+7xpuAhtBStn+YXE+l4ymYJtLe2ZlU5yKNFmt4A3HrBQgnjdBIZdYj8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDuzCCAqOgAwIBAgIJAP0+4OMhN0c+MA0GCSqGSIb3DQEBCwUAMHQxCzAJBgNVBAYTAlNFMRMwEQYDVQQHDApHb3RoZW5idXJnMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEdvdGhlbmJ1cmcxEzARBgNVBAsMCklULUVuaGV0ZW4xGDAWBgNVBAMMD3NwYWRmcy5pdC5ndS5zZTAeFw0xODA0MjMxMDE4NTNaFw0yODA0MjIxMDE4NTNaMHQxCzAJBgNVBAYTAlNFMRMwEQYDVQQHDApHb3RoZW5idXJnMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEdvdGhlbmJ1cmcxEzARBgNVBAsMCklULUVuaGV0ZW4xGDAWBgNVBAMMD3NwYWRmcy5pdC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMruvwqjW6R5L6VV2e5dEqUq7QnzSTYSEjdtzz+odUp2ROWoHlHqWKb3/IF/w16TIBvlw7IinuiPgaZoQ23O0b07XM/3KkYgHBQSJtGSmB6IGwLD39Th92thsNFO0qO3OKyF5xtVXjfB60lhSsqUrm9NyCmvcfjpyjgGR1eh3QzAmzzgK9hRqKGA8f/6N5mKbuWh6PDNBPLQbwTAqy/mhiQzZa8wYoM/I3B19KxBtl+ez5SMl002m8wWYz+Bnd1rCDl+kWaMoj1YOzlG4kVPdwHehGRyx+jnNdJYhmF24/VoTlt98dbbUGqfoiMulpP9qzx40iB6MbtROBC3/UjQskUCAwEAAaNQME4wHQYDVR0OBBYEFE13XSrQndOpI/x4DhofjCb76kawMB8GA1UdIwQYMBaAFE13XSrQndOpI/x4DhofjCb76kawMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACfU62CXqkTlOCTgg+rQGp08R08OS/FuYnpylPJs+JiriVYnGi+bztqWzyGOilnIX7Qa3ihuYcmltPw83Q3GJcvwZgrCADgguypMdpP8LaoaIQXHd8ALxcTx581ar9KA+zCCf0o9BdwEdGetqQ5OEzPEnXxGIDtlNDQjLebiKO27u8F5cH5ppJQGhinuHP+YpTQmCVyyifFA0FSDztAZV6L938hoekIqbjR3WOJC6cr2Rkpvmslxt++iBc7Y846IoU8X2ngzAKoxNkKchk1IyCVLyT/0Py03+7xpuAhtBStn+YXE+l4ymYJtLe2ZlU5yKNFmt4A3HrBQgnjdBIZdYj8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spadfs.it.gu.se/simplesaml/module.php/saml/sp/saml2-logout.php/sharepoint"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spadfs.it.gu.se/simplesaml/module.php/saml/sp/saml2-acs.php/sharepoint" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spadfs.it.gu.se/simplesaml/module.php/saml/sp/saml1-acs.php/sharepoint" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spadfs.it.gu.se/simplesaml/module.php/saml/sp/saml2-acs.php/sharepoint" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spadfs.it.gu.se/simplesaml/module.php/saml/sp/saml1-acs.php/sharepoint/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Göteborgs universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>Galeus</md:SurName>
-    <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index f9c19c26..582bac97 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -8,7 +8,6 @@
   <xi:include href="swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.antagning.se-aws-idp.xml"/>
-  <xi:include href="swamid-2.0/adfs2.gu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 9dc44bce..5b8775ba 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -528,7 +528,6 @@
   <xi:include href="swamid-2.0/test-hh.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/confluence.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/test-du.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/du.hr.evry.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/gerrit.cs.lth.se-shibboleth.xml"/>