Updated idp.dev.eduid + removed 2 old unused idp:s

3 files changed, 14 insertions, 157 deletions

diff --git a/swamid-2.0/idp-fre-1.eduid.se-idp.xml b/swamid-2.0/idp-fre-1.eduid.se-idp.xml
deleted file mode 100644
index c0d390a5..00000000
--- a/swamid-2.0/idp-fre-1.eduid.se-idp.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp-fre-1.eduid.se/idp.xml">
-  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:Scope regexp="false">eduid.se</ns1:Scope>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
-ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0
-WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr
-Ov5RyA+j4c5qtxgX30eT1mSS+xxd1UYy78jIR42QnvmwZRAw3XGzCT4u+41u+4KP
-ZuzsNmueFruQ/FUj5YvYJdo9LKDXnhqj7GrOYwVKRx3TtV+76IXbY+OQF5mNXNdn
-qFepNt6ukBGqdWjEi6fslbjVwCkRwN9gFm/f0xshITr79MEsmEbm97n8+TxNWx9o
-Vx2cIGHVKur+iBR0ntY71jXCGb/0drVlogMluXUssMV9fZSP0W1HnlI2vNQrVA6p
-0hzRsi+kGGAXn0/u1rhfJ7G6/Tz43OqhVqH5BeKs+0v/AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBANfLG7xG2d2bc8ib/XCMly48KEPYqNXIeDIHPR8MpEZrdCph4TUz
-Y96pEbhM3Onn7iZTAqk7QUfVzj3qH35H8FG6XJuUlpeo11c94dsS6+euamdf+9qZ
-ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx
-N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/
-6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu
-97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIICtjCCAZ4CCQCcz/piVprfwDANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJp
-ZHAtZnJlLTEuZWR1aWQuc2UwHhcNMTMwNDA0MTM0NDQ0WhcNMjMwNDAyMTM0NDQ0
-WjAdMRswGQYDVQQDExJpZHAtZnJlLTEuZWR1aWQuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZYoiNY7wsKOg0HuPEIOmFt4sNOPANo1WXOEAi4gdr
-Ov5RyA+j4c5qtxgX30eT1mSS+xxd1UYy78jIR42QnvmwZRAw3XGzCT4u+41u+4KP
-ZuzsNmueFruQ/FUj5YvYJdo9LKDXnhqj7GrOYwVKRx3TtV+76IXbY+OQF5mNXNdn
-qFepNt6ukBGqdWjEi6fslbjVwCkRwN9gFm/f0xshITr79MEsmEbm97n8+TxNWx9o
-Vx2cIGHVKur+iBR0ntY71jXCGb/0drVlogMluXUssMV9fZSP0W1HnlI2vNQrVA6p
-0hzRsi+kGGAXn0/u1rhfJ7G6/Tz43OqhVqH5BeKs+0v/AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBANfLG7xG2d2bc8ib/XCMly48KEPYqNXIeDIHPR8MpEZrdCph4TUz
-Y96pEbhM3Onn7iZTAqk7QUfVzj3qH35H8FG6XJuUlpeo11c94dsS6+euamdf+9qZ
-ZP0uQyvYepSdQWCeBljDUxp/u6h9NdKpcwK9AvfBVCTNR0gdFNfADi1QtdAtW3Wx
-N4TxcEV9YT6QopkdXKR+Vx+Bp8iM3ij+epA5M87hrrHUFd9s324x2ktl1cx0znS/
-6VT121qX752B4lzzych/glgqUaSZe6/iFq2LYxK5qPZAViEy6by4lYghzdKPjAvu
-97NSksdDvmueTb8t8S2G2CqPc3Wus+M6yQw=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/slo/soap"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/slo/post"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/slo/redirect"/>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-fre-1.eduid.se/sso/redirect"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-fre-1.eduid.se/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp-fre-1.eduid.se/sso/art"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-fre-1.eduid.se/sso/ecp"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">eduID TEST</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID TEST</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>eduID</ns0:GivenName>
-    <ns0:SurName>developers</ns0:SurName>
-    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
index 063a87a3..15ff70e3 100644
--- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
+++ b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.dev.eduid.se/idp.xml">
+  <ns0:Extensions>
+    <attr:EntityAttributes xmlns:attr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa</saml:AttributeValue>
+        <saml:AttributeValue>http://www.swamid.se/policy/authentication/swamid-al2-mfa-hi</saml:AttributeValue>
+      </saml: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-support">
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+      </samla:Attribute>
+    </attr:EntityAttributes>
+  </ns0:Extensions>
   <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <ns0:Extensions>
       <ns1:Scope regexp="false">eduid.se</ns1:Scope>
diff --git a/swamid-2.0/pilot.idp.eduid.se-idp.xml b/swamid-2.0/pilot.idp.eduid.se-idp.xml
deleted file mode 100644
index ff1e5deb..00000000
--- a/swamid-2.0/pilot.idp.eduid.se-idp.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:mace:shibboleth:metadata:1.0" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://pilot.idp.eduid.se/idp.xml">
-  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:Scope regexp="false">pilot.eduid.se</ns1:Scope>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor use="encryption">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
-MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0
-MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG
-SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR
-GPXGZg978+sJsesZamPR7wnxqYnXng+lCrKO3xEtrLE1JxzrEGY4xUMtnVOJmwgZ
-G8+TVmppZsmIu/sQd0+uF+fFAc9BgYx+xL/KEpJLDM/BaoQnt5AIz1L8iG3L6hur
-D8/79EN4Bp8tNG1WcX5Y8TjNk+4V9kd/GGZKaABH79aq2gD5W3F/j/A66b/qByq2
-LrbCZi1C9ED8X3oFeKXAQd/r82koj8ErKAaPfQXa6oxBn+hFwJ53bC4ixW84gOlI
-oAZovK7uAE9xBoJOoW86rGRfFhJy7Jl41JqsjbOXGwKG0Ze4i00yJskiNWDiZh5n
-ZgxnTY9vu1JMEIoVEhdaoeuXThUidFcHUKoGgfq8iQHIh9ehqhFpAgMBAAGjQDA+
-MAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUOJHQvHUg
-3gPXPmJFWbX+GzVCxWEwDQYJKoZIhvcNAQELBQADggExAIqLh7pcjkYAr3n3msYf
-PRasAPR+5OIdi7DSDNpPaPQnlSTGz0XwesxUvwhTuir7SDuqOzhoTW07jM8p8GQI
-1cxdaHxnaxF+O5iNkU5Pgx0XhyktXfGeB4uhB33bULN0SfpgaEyyXbOGTRz06Th4
-3AW90cP+5odC/z+yHhcOHq4VcdOg3jZZtTBghQ08u3i7cJLIG5Auc0PZb37hgLRy
-lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg
-1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y
-p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif
-7js=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIDXjCCAhagAwIBAgIEUpw56jANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDExUy
-MDEzMTIwMi5pZHAuZWR1aWQuc2UwHhcNMTMxMjAyMDc0MjM2WhcNMTYxMjAxMDc0
-MzI5WjAgMR4wHAYDVQQDExUyMDEzMTIwMi5pZHAuZWR1aWQuc2UwggFSMA0GCSqG
-SIb3DQEBAQUAA4IBPwAwggE6AoIBMQDBUWjILLi4wc4It2A1IJHOx1ho87XAYYqR
-GPXGZg978+sJsesZamPR7wnxqYnXng+lCrKO3xEtrLE1JxzrEGY4xUMtnVOJmwgZ
-G8+TVmppZsmIu/sQd0+uF+fFAc9BgYx+xL/KEpJLDM/BaoQnt5AIz1L8iG3L6hur
-D8/79EN4Bp8tNG1WcX5Y8TjNk+4V9kd/GGZKaABH79aq2gD5W3F/j/A66b/qByq2
-LrbCZi1C9ED8X3oFeKXAQd/r82koj8ErKAaPfQXa6oxBn+hFwJ53bC4ixW84gOlI
-oAZovK7uAE9xBoJOoW86rGRfFhJy7Jl41JqsjbOXGwKG0Ze4i00yJskiNWDiZh5n
-ZgxnTY9vu1JMEIoVEhdaoeuXThUidFcHUKoGgfq8iQHIh9ehqhFpAgMBAAGjQDA+
-MAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwegADAdBgNVHQ4EFgQUOJHQvHUg
-3gPXPmJFWbX+GzVCxWEwDQYJKoZIhvcNAQELBQADggExAIqLh7pcjkYAr3n3msYf
-PRasAPR+5OIdi7DSDNpPaPQnlSTGz0XwesxUvwhTuir7SDuqOzhoTW07jM8p8GQI
-1cxdaHxnaxF+O5iNkU5Pgx0XhyktXfGeB4uhB33bULN0SfpgaEyyXbOGTRz06Th4
-3AW90cP+5odC/z+yHhcOHq4VcdOg3jZZtTBghQ08u3i7cJLIG5Auc0PZb37hgLRy
-lAKHUrahuhbPDQhFjBwBX6rmRlDlMqNLhDdmlNPxg6xUbNpJIi6OnG/YpVRjbgcg
-1JUccanKdjA79iR/QeMGaJHmBm/iVTmq4XQSaeBi3nfkTrxZdHD+UsP7TXorwD9Y
-p5fHVO1o2XawoMuliRxlRkSbfW79b1XeKXBkV93clVkWc4M2VxBAsaT6yEwOLdif
-7js=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pilot.idp.eduid.se/slo/soap"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/slo/post"/>
-    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/slo/redirect"/>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pilot.idp.eduid.se/sso/redirect"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pilot.idp.eduid.se/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pilot.idp.eduid.se/sso/art"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">eduID PILOT</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">eduID PILOT</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>eduID</ns0:GivenName>
-    <ns0:SurName>developers</ns0:SurName>
-    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>