From 1955d7ff0e401121225ab42d9cc4c5b0bcee1102 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 2 Oct 2013 21:15:07 +0200
Subject:
https://callback-prod.inloggning.se/authify/metadata/?fed_name=swamidfederation
into swamid-interfederations-2.0
---
.../elegitimation2.inloggning.se.xml | 5 +-
swamid-interfederations-2.0/swamid.user.uu.se.xml | 120 ++++++++-------------
2 files changed, 47 insertions(+), 78 deletions(-)
diff --git a/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml b/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
index e3d94c07..a4f7657e 100644
--- a/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
+++ b/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/metadata.php/virtual_sp_for_swamid_uu">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/metadata.php/virtual_sp_for_swamid_uu">
<md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+ <md:Extensions>
+ <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/discoresp.php"/>
+ </md:Extensions>
<md:KeyDescriptor use="signing">
<ds:KeyInfo>
<ds:X509Data>
diff --git a/swamid-interfederations-2.0/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
index 51ca9a72..2b484779 100644
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ b/swamid-interfederations-2.0/swamid.user.uu.se.xml
@@ -1,41 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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#">
+<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
+ <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -52,30 +24,27 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
- </ds:X509Certificate>
+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#">
+ </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
+ <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
@@ -92,26 +61,23 @@ HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
- </ds:X509Certificate>
+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="sv">Uppsala Universitet</OrganizationDisplayName>
- <OrganizationDisplayName xml:lang="en">Uppsala University</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>
+ </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>
--
cgit v1.2.3