diff options
author | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2013-06-16 20:25:53 +0200 |
commit | b217869b73c7ceb7653972740e0f796cf9bbd383 (patch) | |
tree | ca10c13dc56d3c1665f5e89759e91ede7489bffc /swamid-1.0/swamid.user.uu.se.xml | |
parent | 5b14805f2ecc3b89ea0ff9b08a8714a3b895347e (diff) | |
parent | c5391135cbba3c20214e9e44c433925931df1453 (diff) |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
Conflicts:
swamid-1.0/shib-idp-1.oru.se.xml
Diffstat (limited to 'swamid-1.0/swamid.user.uu.se.xml')
-rw-r--r-- | swamid-1.0/swamid.user.uu.se.xml | 172 |
1 files changed, 71 insertions, 101 deletions
diff --git a/swamid-1.0/swamid.user.uu.se.xml b/swamid-1.0/swamid.user.uu.se.xml index 985eea70..819cc499 100644 --- a/swamid-1.0/swamid.user.uu.se.xml +++ b/swamid-1.0/swamid.user.uu.se.xml @@ -1,41 +1,35 @@ -<EntityDescriptor entityID="https://swamid.user.uu.se/idp/shibboleth" - 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"> - - <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">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> - <ds:X509Data> - <ds:X509Certificate> +<?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://swamid.user.uu.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">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> + <ds:X509Data> + <ds:X509Certificate> MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw @@ -56,44 +50,26 @@ 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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> - - <Extensions> - <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope> - </Extensions> - - <KeyDescriptor> - <ds:KeyInfo> - <ds:X509Data> - <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 protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> + <Extensions> + <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope> + </Extensions> + <KeyDescriptor> + <ds:KeyInfo> + <ds:X509Data> + <ds:X509Certificate> MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1 M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw @@ -114,28 +90,22 @@ 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> - <OrganizationName xml:lang="en">UU</OrganizationName> - <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName> - <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL> - </Organization> - <ContactPerson contactType="technical"> - <Company>Uppsala universitet</Company> - <SurName>AKKA SAML2</SurName> - <EmailAddress>akka-datordrift@its.uu.se</EmailAddress> - </ContactPerson> -</EntityDescriptor> + </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> + <OrganizationName xml:lang="en">UU</OrganizationName> + <OrganizationDisplayName xml:lang="en">Uppsala universitet</OrganizationDisplayName> + <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL> + </Organization> + <ContactPerson contactType="technical"> + <Company>Uppsala universitet</Company> + <SurName>AKKA SAML2</SurName> + <EmailAddress>akka-datordrift@its.uu.se</EmailAddress> + </ContactPerson> +</EntityDescriptor> |