https://callback-prod.inloggning.se/authify/metadata/?fed_name=swamidfederation into swamid-interfederations-2.0

3 files changed, 91 insertions, 101 deletions

diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index b6cdfb71..5bf22f77 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -109,6 +109,7 @@
 <xi:include href="swamid-interfederations-2.0/idp.dhbw-vs.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.dir.garr.it.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.dlr.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpext.test.ek.sll.se.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.feide.no.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.fh-offenburg.de.xml"/>
diff --git a/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml b/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml
new file mode 100644
index 00000000..a3c739d0
--- /dev/null
+++ b/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://idpext.test.ek.sll.se/neas">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZTCCA02gAwIBAgIJAJp4wLfm2XW/MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlNFMRIw
+EAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMMTYyMzIxMDAw
+MDE2MRAwDgYDVQQLEwdTTEx0ZXN0MR4wHAYDVQQDExVpZHBleHQudGVzdC5lay5zbGwuc2UwHhcN
+MTIxMjA2MDk0MDU4WhcNMTQxMjA2MDk0MDU4WjB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3Rv
+Y2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UE
+CxMHU0xMdGVzdDEeMBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4ibxWfMWcVv/5cdFNS5FZxTrZBJu61myC+SiW0Nkrws3J/2uve4b
+eRig27f7hhr2+tGQeWW2uifmco2ajkqcutXtSfxqtVWRvUuq7GIog1aeNH17Qtq4+QEIxVXfmRJm
+/jVT0ihz6JsN/S6St8Pt937oeDetryvpGvV4tJ54/vUYos0i1shcoDr6jUujQ/aHoN48MkymvDD6
+m4v5FJgAUCaeRVFzKwaXsd172ZoA2NFSLPxkCOrm2Nm1SvZfPtFdfLCmgsElwXWnbtfVD8LdUsTs
+DWGcOkEWA14qbeVcK81xUW/xsvT36p0Wdy8zd1CqIabSc5F3S4ney1+yDQPNiwIDAQABo4HlMIHi
+MB0GA1UdDgQWBBTBxmnEBJq8D6hVP9U6fhESjbtsPzCBsgYDVR0jBIGqMIGngBTBxmnEBJq8D6hV
+P9U6fhESjbtsP6GBg6SBgDB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYD
+VQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UECxMHU0xMdGVzdDEe
+MBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlggkAmnjAt+bZdb8wDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAjr8rhk0FxZwSxZAGh916cwVEp9SDUcQcoPbY9TYbQe2XVMXBImNo
+PTkkbgFlxILxdq6ZOeKwsjTV4ON/jLVX/TJ9OzolKBfMpfLNf5DiBvG7BfSlbuTA/jEwC7qLHDmk
+3vC3gLSkWbE++2E2aOmKjDD7Rp7CSpHSM11FkF9CWdqAYV0f3YcCHQMEadOGNDeXRWhJH9e/ejT1
+BKtI7OLnXC7ceugbqIjbZANpiNT9YHtZcCtKU9C4iV6G4OEK0+Y9Pr5RS2gULAyDDYR3BzUOcZTI
+yaELvrGIDisdW7WILf3THNVuigw03ZuLjxql/Wo59WtttVngV+LrAs+UeQq9JA==</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>5abdb300f7ff38ef47e4966bd82dd209c7eef117</ds:KeyName>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpext.test.ek.sll.se/neas/SAMLConsumer" index="2"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">SLL</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SLL</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.sll.se/</md:OrganizationURL>
+  </md:Organization>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
index 322db378..a347f79e 100644
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ b/swamid-interfederations-2.0/swamid.user.uu.se.xml
@@ -1,44 +1,13 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.user.uu.se/idp/shibboleth">
-<md:Extensions>
-<mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-<mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</md:Extensions>
-
-    <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-            <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-  	       <mdui:DisplayName xml:lang="sv">Uppsala universitet</mdui:DisplayName>
-               <mdui:DisplayName xml:lang="en">Uppsala University</mdui:DisplayName>
-               <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-               <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-               <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
-               <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
-               <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
-            </mdui:UIInfo>
-            <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-               <mdui:DomainHint>uu.se</mdui:DomainHint>
-               <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-               <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-               <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-               <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-               <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-               <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-               <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-               <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint> 
-               <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint> 
-               <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-            </mdui:DiscoHints>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid.user.uu.se/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -55,40 +24,27 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
 Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
 lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
 L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.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://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
+2DlT+A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
 BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
 ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -105,31 +61,23 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
 Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
 lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
 L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-        <OrganizationName xml:lang="en">UU</OrganizationName> 
-        <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName> 
-        <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL> 
-    </Organization>
-<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-        <Company>Uppsala universitet</Company> 
-        <SurName>AKKA SAML2</SurName> 
-        <EmailAddress>akka-datordrift@its.uu.se</EmailAddress> 
-    </ContactPerson>
+2DlT+A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>AKKA SAML2</md:SurName>
+    <md:EmailAddress>akka-datordrift@its.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>