Added fix to de-dupe SWAMID entities in metadata

Renamed file to correct name standard
Added URL rewrite for %2F in entityids in import of interfederations

1 files changed, 102 insertions, 0 deletions

diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
new file mode 100644
index 00000000..6ee867bf
--- /dev/null
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -0,0 +1,102 @@
+<?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://login.idp.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>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">eduID</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">eduID</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
+        <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
+        <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+        <mdui:Logo xml:lang="en" height="146" width="144">https://www.eduid.se/img/logo/logo_144x146.png </mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
+      </mdui:UIInfo>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
+MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
+EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
+AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
+eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
+G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
+dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
+F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
+JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
+fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
+Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
+5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
+ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
+cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
+q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
+eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
+FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
+iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
+RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
+MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
+EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
+AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
+eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
+G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
+dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
+F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
+JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
+fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
+Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
+5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
+ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
+cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
+q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
+eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
+FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
+iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
+</ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
+    <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.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://login.idp.eduid.se/sso/redirect"/>
+    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
+  </ns0:IDPSSODescriptor>
+  <ns0:Organization>
+    <ns0:OrganizationName xml:lang="en">eduID</ns0:OrganizationName>
+    <ns0:OrganizationDisplayName xml:lang="en">eduID</ns0:OrganizationDisplayName>
+    <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
+  </ns0:Organization>
+  <ns0:ContactPerson contactType="administrative">
+    <ns0:Company>eduID</ns0:Company>
+    <ns0:SurName>Valter Nordh</ns0:SurName>
+    <ns0:EmailAddress>valter@sunet.se</ns0:EmailAddress>
+    <ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="technical">
+    <ns0:Company>eduID</ns0:Company>
+    <ns0:SurName>SUNET eduID team</ns0:SurName>
+    <ns0:EmailAddress>eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
+  </ns0:ContactPerson>
+  <ns0:ContactPerson contactType="support">
+    <ns0:Company>eduID</ns0:Company>
+    <ns0:SurName>eduID Support</ns0:SurName>
+    <ns0:EmailAddress>support@eduid.se</ns0:EmailAddress>
+  </ns0:ContactPerson>
+</ns0:EntityDescriptor>