diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-09-13 20:57:00 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-09-13 20:57:00 +0200 |
| commit | 57d69b983ac225952c0e7aa9ac7825d1c702f62d (patch) | |
| tree | 0b3586dc0077eb641703de3b9798e28a1323c974 | |
| parent | 2e74d18a86c67ec7ed2cfe8daa320822b858077c (diff) | |
| parent | 4ac473e43cdf6cb6a9ce3460a997d745ee147496 (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
| -rw-r--r-- | swamid-1.0/jabber.nordu.net.xml | 15 | ||||
| -rw-r--r-- | swamid-kalmar-1.0.mxml | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/swamid-1.0/jabber.nordu.net.xml b/swamid-1.0/jabber.nordu.net.xml index 99d9047a..0aa3a8b2 100644 --- a/swamid-1.0/jabber.nordu.net.xml +++ b/swamid-1.0/jabber.nordu.net.xml @@ -2,6 +2,9 @@ <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://jabber.nordu.net/shibboleth"> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol"> + <md:Extensions> + <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://jabber.nordu.net/Shibboleth.sso/DS/nordu.net" index="1"/> + </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:KeyName>jabber.nordu.net</ds:KeyName> @@ -66,6 +69,14 @@ zvTzeciRKJ9UNf9ibAJGF7jz/GP5r+yUgizdV0wyikyUa8VNyrSeExBUVg== <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jabber.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/POST" index="5"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jabber.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/> + <md:AttributeConsumingService index="0"> + <md:ServiceName xml:lang="en">Jabber at NORDUnet</md:ServiceName> + <md:ServiceDescription xml:lang="en">Jabber at NORDUnet</md:ServiceDescription> + <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/> + <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:0.9.2342.19200300.100.1.3"/> + <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.42"/> + <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:2.5.4.4"/> + <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/> + </md:AttributeConsumingService> </md:SPSSODescriptor> - -</md:EntityDescriptor>
\ No newline at end of file +</md:EntityDescriptor> diff --git a/swamid-kalmar-1.0.mxml b/swamid-kalmar-1.0.mxml index a46d62f3..b7539385 100644 --- a/swamid-kalmar-1.0.mxml +++ b/swamid-kalmar-1.0.mxml @@ -15,4 +15,5 @@ <xi:include href="swamid-1.0/hbidp.hb.se.xml"/> <xi:include href="swamid-1.0/nordunet.tv.xml"/> <xi:include href="swamid-1.0/mailfilter.nordu.net.xml"/> + <xi:include href="swamid-1.0/jabber.nordu.net.xml"/> </md:EntitiesDescriptor> |