Merge branch 'master' of md-master.swamid.se:swamid-metadata

2 files changed, 0 insertions, 204 deletions

diff --git a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
deleted file mode 100644
index 6510f13a..00000000
--- a/swamid-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +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.it.gu.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 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>
-    </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">gu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet (gammal)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gothenburg (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="50" width="344">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="376">https://www.gu.se/digitalAssets/1374/1374690_lo_gu_left.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
-MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
-wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
-L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
-Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
-9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
-KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
-hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
-jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
-V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
-MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
-CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
-MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.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.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.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">gu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUGLU4YqWFYHboh+F+iLNYkBw8XNAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMB4XDTA5MDgyNDExMzA1OFoXDTI5
-MDgyNDExMzA1OFowFzEVMBMGA1UEAxMMaWRwLml0Lmd1LnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEApOVkzaHuTCe+7lf79UnQ5iQ/8OLbJpwOxPTF
-wEPIHbMMU/aCVnxoZnwNApblqvpP2uOsQvh8d0uDv2iVC5BMN0ff9M+9rN7D/gAo
-L+w8CmWiHRudKyZLu8Gu89SGxyQ59AVCbJzGaEE9h/CmMYHCj/ONJ8mtjG9uw6u+
-Vj+L8PHXsPHQsLvcl3/D7duIYH/xHRbPzXS0imux+r/OcSCR3aCPCx3uuAfVPxGS
-9Y/ifynV586V3szIM7O15SeXKenFMKjQhzA23ZPcHhDSxWnVGUDWFDRDNAXfD7BF
-KRBCaUlWZvczqsV3eGtW8XgOmuW/7yJT5REfrrSLOKprAK8yoQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuaXQuZ3Uuc2WGI2h0dHBzOi8vaWRwLml0Lmd1LnNlL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKDUl7ZRxhQ1/HRmVbFd+NbwxmzANBgkq
-hkiG9w0BAQUFAAOCAQEAXfaYlHQj4KRaJmMbWFV0XyNUlHNio8010vLv3t6WztlZ
-jZFL/hTQIFhmYEA04Davdk+1/1JvcRePSpg2VCxT/QwHyOR3eimmQ6FKXWls/zO/
-V01sJrlLdf/53pzXYsVSOf50UK+GtrSB3hhzrFmeaBALOysGqk2h2/UdYISXxa/e
-MyQ/aOI5u+0Wlq2RdIXF8MrtnwBTRhNXLcXYzz4fPsdjd4TmmJLQLXLmFLE/IA+/
-CP9nuvekzvPla7AXlXPwPvbUunwZIZkN3aHzMY/08FKIYRLb9VmqInKXw8tIBSqG
-MoX9SCDPBh2j39QZupTaPkylXDshurod7B2XtXdHPg==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.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">GU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet (gammal)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Gothenburg (old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <Company>University of Gothenburg</Company>
-    <SurName>Lena Ström</SurName>
-    <EmailAddress>mailto:lena.strom@gu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <Company>University of Gothenburg</Company>
-    <SurName>Pablo Millet</SurName>
-    <EmailAddress>mailto:pablo.millet@gu.se</EmailAddress>
-    <TelephoneNumber>+46707104070</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>University of Gothenburg</Company>
-    <SurName>GU-Support</SurName>
-    <EmailAddress>mailto:support@gu.se</EmailAddress>
-    <TelephoneNumber>+46317862020</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml
deleted file mode 100644
index 3c0c759e..00000000
--- a/swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,79 +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://idptest.test.it.gu.se/idp/shibboleth">
-  <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">gu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAMzlV6IV/VX2recEXh63q+uHSZXJMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5pdC5ndS5zZTAeFw0xMTAxMTcx
-MjIwMzhaFw0zMTAxMTcxMjIwMzhaMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5p
-dC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALbHwbkil+/L
-NFd+GGixGQXU5qE0ehYj0VOF/aJGVIqktXPD5Pki8O2ToyLFHmJggZh/Gztnatmu
-fIHyyqN3I9GkKKYe0Pp037dHUsb2b2VtIncZajUMbsfPv+rDciuo7XJsAv7bXYfS
-9HKwUIvQ5XYfSodaMxv/+ETSTNq7aeCWNN7N6mhLqpYtOkQzy2zvSKQDQeqlkm2Z
-zY+OUdvKOvDWEuSm5pD5puXMKo0d+0tcyCjJylWIcygYFzWnc6vl78uLddiHahIR
-nCx7roQRgsNy7OnXw0IizaTh1z275eu0oYZSrDvXB0yn7Ffi052EaUrhcZvi4Yw6
-Pt7PO9zCjBcCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwdGVzdC50ZXN0Lml0Lmd1
-LnNlhixodHRwczovL2lkcHRlc3QudGVzdC5pdC5ndS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUcxJxIxr7AQdRpROfMhqx6lbFGxYwDQYJKoZIhvcNAQEFBQAD
-ggEBAE4vp449wY+C/vVRTyvX71Lzlrt+Ddv3ONIejgjBRJbf51K9AGzUtJdXffyM
-Sxro3y/XbEPpBagDrRj2YDkjYINODUULM3BQKkG3DVf8/C27dxFOcm7oGpSRsxAH
-QcNA/cE7UeNpMvBnsDs2vwHBfaLWVhYF/IORHyyTEQ29IUXdgPusMArYLwxBpHU8
-Zuo5aVjXywIP/1PAnnx1/DJ2+3w9ZikqgcJkLNCqbA0w8wSSap8ItKgA1XZnMEjw
-uQLGuCOUO1cwGMeLDC2NSoiRG4VFWeSK1TaxWrorLp6X0B/A9gFIdULMHGRP+sou
-yGhhtAniGS37iPTX33D0GyJ0d4U=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.test.it.gu.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://idptest.test.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.test.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.test.it.gu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.test.it.gu.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">gu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAMzlV6IV/VX2recEXh63q+uHSZXJMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5pdC5ndS5zZTAeFw0xMTAxMTcx
-MjIwMzhaFw0zMTAxMTcxMjIwMzhaMCAxHjAcBgNVBAMTFWlkcHRlc3QudGVzdC5p
-dC5ndS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALbHwbkil+/L
-NFd+GGixGQXU5qE0ehYj0VOF/aJGVIqktXPD5Pki8O2ToyLFHmJggZh/Gztnatmu
-fIHyyqN3I9GkKKYe0Pp037dHUsb2b2VtIncZajUMbsfPv+rDciuo7XJsAv7bXYfS
-9HKwUIvQ5XYfSodaMxv/+ETSTNq7aeCWNN7N6mhLqpYtOkQzy2zvSKQDQeqlkm2Z
-zY+OUdvKOvDWEuSm5pD5puXMKo0d+0tcyCjJylWIcygYFzWnc6vl78uLddiHahIR
-nCx7roQRgsNy7OnXw0IizaTh1z275eu0oYZSrDvXB0yn7Ffi052EaUrhcZvi4Yw6
-Pt7PO9zCjBcCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwdGVzdC50ZXN0Lml0Lmd1
-LnNlhixodHRwczovL2lkcHRlc3QudGVzdC5pdC5ndS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUcxJxIxr7AQdRpROfMhqx6lbFGxYwDQYJKoZIhvcNAQEFBQAD
-ggEBAE4vp449wY+C/vVRTyvX71Lzlrt+Ddv3ONIejgjBRJbf51K9AGzUtJdXffyM
-Sxro3y/XbEPpBagDrRj2YDkjYINODUULM3BQKkG3DVf8/C27dxFOcm7oGpSRsxAH
-QcNA/cE7UeNpMvBnsDs2vwHBfaLWVhYF/IORHyyTEQ29IUXdgPusMArYLwxBpHU8
-Zuo5aVjXywIP/1PAnnx1/DJ2+3w9ZikqgcJkLNCqbA0w8wSSap8ItKgA1XZnMEjw
-uQLGuCOUO1cwGMeLDC2NSoiRG4VFWeSK1TaxWrorLp6X0B/A9gFIdULMHGRP+sou
-yGhhtAniGS37iPTX33D0GyJ0d4U=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.test.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.test.it.gu.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>
-</EntityDescriptor>