diff options
Diffstat (limited to 'swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml')
| -rw-r--r-- | swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml index 74102223..741271f3 100644 --- a/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml +++ b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml @@ -1,6 +1,6 @@ <?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#" entityID="https://wiki.helsinki.fi/shibboleth"> - <Extensions> +<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.helsinki.fi/shibboleth"> + <md:Extensions> <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.csc.fi/haka"> <mdrpi:RegistrationPolicy xml:lang="en">http://www.csc.fi/english/institutions/haka/instructions/join/eduGAINRegistrationStatement/</mdrpi:RegistrationPolicy> </mdrpi:RegistrationInfo> @@ -9,13 +9,13 @@ <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue> </saml:Attribute> </mdattr:EntityAttributes> - </Extensions> - <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol"> - <Extensions> + </md:Extensions> + <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol"> + <md:Extensions> <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/> - </Extensions> - <KeyDescriptor> - <ds:KeyInfo> + </md:Extensions> + <md:KeyDescriptor> + <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate>MIIE3DCCA8SgAwIBAgIQHvsLUtobn4QCPblS1Go+ZzANBgkqhkiG9w0BAQUFADA2 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg @@ -45,44 +45,44 @@ wK1A8To/939K5dMZ78pJnrWNVWGcU20FitYZx/QtfHR5jmm9xWQyjXxYb90oseqw av3W2z9P6X70jYlPJNL2MEi1L0imk1o/VYmmGl5ngGfO8XuIRkq6f4ozfwpvHcTD</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> - </KeyDescriptor> - <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat> - <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/> - <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/> - <AttributeConsumingService index="1" isDefault="true"> - <ServiceName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</ServiceName> - <ServiceName xml:lang="en">University of Helsinki Wiki Service</ServiceName> - <ServiceDescription xml:lang="en">Tool for group collaboration and web-publishing.</ServiceDescription> - <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> - <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> - <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> - </AttributeConsumingService> - </SPSSODescriptor> - <Organization> - <OrganizationName xml:lang="fi">Helsingin yliopisto</OrganizationName> - <OrganizationName xml:lang="en">University of Helsinki</OrganizationName> - <OrganizationName xml:lang="sv">Helsingfors universitet</OrganizationName> - <OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="en">University of Helsinki</OrganizationDisplayName> - <OrganizationDisplayName xml:lang="sv">Helsingfors universitet</OrganizationDisplayName> - <OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</OrganizationURL> - <OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</OrganizationURL> - <OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</OrganizationURL> - </Organization> - <ContactPerson contactType="administrative"> - <GivenName>Erkki</GivenName> - <SurName>Aalto</SurName> - <EmailAddress>mailto:ok-wiki@helsinki.fi</EmailAddress> - </ContactPerson> - <ContactPerson contactType="technical"> - <GivenName>Janne</GivenName> - <SurName>Peltonen</SurName> - <EmailAddress>mailto:haka-hy@helsinki.fi</EmailAddress> - </ContactPerson> - <ContactPerson contactType="support"> - <GivenName>Erkki</GivenName> - <SurName>Aalto</SurName> - <EmailAddress>mailto:ok-wiki@helsinki.fi</EmailAddress> - </ContactPerson> -</EntityDescriptor> + </md:KeyDescriptor> + <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/> + <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/> + <md:AttributeConsumingService index="1" isDefault="true"> + <md:ServiceName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</md:ServiceName> + <md:ServiceName xml:lang="en">University of Helsinki Wiki Service</md:ServiceName> + <md:ServiceDescription xml:lang="en">Tool for group collaboration and web-publishing.</md:ServiceDescription> + <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> + <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> + <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> + </md:AttributeConsumingService> + </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName> + <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName> + <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL> + <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL> + </md:Organization> + <md:ContactPerson contactType="administrative"> + <md:GivenName>Erkki</md:GivenName> + <md:SurName>Aalto</md:SurName> + <md:EmailAddress>mailto:ok-wiki@helsinki.fi</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="technical"> + <md:GivenName>Janne</md:GivenName> + <md:SurName>Peltonen</md:SurName> + <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="support"> + <md:GivenName>Erkki</md:GivenName> + <md:SurName>Aalto</md:SurName> + <md:EmailAddress>mailto:ok-wiki@helsinki.fi</md:EmailAddress> + </md:ContactPerson> +</md:EntityDescriptor> |