diff options
| -rw-r--r-- | swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml | 56 | ||||
| -rw-r--r-- | swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml | 53 |
2 files changed, 80 insertions, 29 deletions
diff --git a/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml index 9b93e19b..b967efff 100644 --- a/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml +++ b/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml @@ -7,16 +7,23 @@ <mdattr:EntityAttributes> <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> <mdui:UIInfo> - <mdui:DisplayName xml:lang="en">SweClarin</mdui:DisplayName> - <mdui:DisplayName xml:lang="sv">SweClarin</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Swe-Clarin</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Swe-Clarin</mdui:DisplayName> <mdui:InformationURL xml:lang="en">https://sweclarin.se/eng/about</mdui:InformationURL> <mdui:InformationURL xml:lang="sv">https://www.sweclarin.se/swe/om</mdui:InformationURL> + <mdui:Description xml:lang="en">Swe-Clarin is an unit in Nationella språkbanken, a National Research Infrastructure for Languge Technology</mdui:Description> + <mdui:Description xml:lang="sv">Swe-Clarin är en enhet i Nationella språkbanken, en nationell forskningsinfrastruktur för språkteknologi</mdui:Description> + <mdui:Logo xml:lang="en" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo> + <mdui:Logo xml:lang="sv" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo> + <mdui:PrivacyStatementURL xml:lang="en">https://repo.spraakbanken.gu.se/xmlui/page/privacypolicy</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://repo.spraakbanken.gu.se/xmlui/page/privacypolicy</mdui:PrivacyStatementURL> </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor use="signing"> @@ -39,10 +46,49 @@ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.sweclarin.se/sp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sweclarin.se/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.sweclarin.se/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/> + <md:AttributeConsumingService index="1"> + <md:ServiceName xml:lang="en">Swe-Clarin</md:ServiceName> + <md:ServiceName xml:lang="sv">Swe-Clarin</md:ServiceName> + <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/> + <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> + <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> + </md:AttributeConsumingService> </md:SPSSODescriptor> + <md:Organization> + <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName> + <md:OrganizationName xml:lang="sv">Göteborgs universitet</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="en">Department of Swedish, Multilingualism, Language Technology University of Gothenburg</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Institutionen för svenska, flerspråkighet och språkteknologi, Göteborgs universitet</md:OrganizationDisplayName> + <md:OrganizationURL xml:lang="en">https://spraakbanken.gu.se/eng/</md:OrganizationURL> + <md:OrganizationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</md:OrganizationURL> + </md:Organization> <md:ContactPerson contactType="technical"> - <md:GivenName>Pablo</md:GivenName> - <md:SurName>Millet</md:SurName> - <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress> + <md:GivenName>Leif-Jöran</md:GivenName> + <md:SurName>Olsson</md:SurName> + <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="administrative"> + <md:GivenName>Lars</md:GivenName> + <md:SurName>Borin</md:SurName> + <md:EmailAddress>mailto:sb-info@svenska.gu.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson contactType="support"> + <md:GivenName>Leif-Jöran</md:GivenName> + <md:SurName>Olsson</md:SurName> + <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security"> + <md:GivenName>Leif-Jöran</md:GivenName> + <md:SurName>Olsson</md:SurName> + <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress> </md:ContactPerson> </md:EntityDescriptor> diff --git a/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml index f6df5f70..b8ff0c92 100644 --- a/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml +++ b/swamid-edugain/sp.spraakbanken.gu.se-shibboleth.xml @@ -6,9 +6,8 @@ </mdrpi:RegistrationInfo> <mdattr:EntityAttributes> <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> + <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/> @@ -31,14 +30,16 @@ <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> <mdui:UIInfo> - <mdui:DisplayName xml:lang="sv">Språkbanken</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">Språkbanken</mdui:DisplayName> - <mdui:Description xml:lang="sv">Språkbanken är en forskningsenhet vid Institutionen för svenska språket, Göteborgs universitet.</mdui:Description> - <mdui:Description xml:lang="en">Språkbanken (the Swedish Language Bank) is a nationally and internationally acknowledged research unit at the Department of Swedish, University of Gothenburg</mdui:Description> + <mdui:DisplayName xml:lang="sv">Språkbanken Text</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Språkbanken Text</mdui:DisplayName> + <mdui:Description xml:lang="sv">Språkbanken Text är en forskningsenhet vid Institutionen för svenska, flerspråkighet och språkteknologi, Göteborgs universitet.</mdui:Description> + <mdui:Description xml:lang="en">Språkbanken Text is a nationally and internationally acknowledged research unit at the Department of Swedish, Multilinguality, Language Technology, University of Gothenburg</mdui:Description> <mdui:InformationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</mdui:InformationURL> <mdui:InformationURL xml:lang="en">https://spraakbanken.gu.se/eng/</mdui:InformationURL> <mdui:Logo xml:lang="sv" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo> <mdui:Logo xml:lang="en" height="146" width="256">https://sp.spraakbanken.gu.se/logo-small.png</mdui:Logo> + <mdui:PrivacyStatementURL xml:lang="en">https://repo.spraakbanken.gu.se/xmlui/page/privacypolicy</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://repo.spraakbanken.gu.se/xmlui/page/privacypolicy</mdui:PrivacyStatementURL> </mdui:UIInfo> <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/DS/Login"/> <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/DS/Login" index="1"/> @@ -69,8 +70,7 @@ jJ/LCxMnNdmERg9Knn+fvYwDqAbvt5lvI0YjKHwyU/TVx4uAx/Yn0A62ZlXs1SxS quocDzbyT+8G/2hgINlcXMeffSNIxF0Bnqr7t0twwmz3jEXljt/5Xmawk63+sKnk XY2YJNAZj6iK43EuFEAVfDchxTI02c8/1RpjTipSSLbV7jzrUoz8wuY7zlLSrODG - B1l+7GujpIQqv3B1RJA3m+G632LPFkBZgFM= - </ds:X509Certificate> + B1l+7GujpIQqv3B1RJA3m+G632LPFkBZgFM=</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/> @@ -95,27 +95,27 @@ <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML/POST" index="5"/> <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.spraakbanken.gu.se/Shibboleth.sso/SAML/Artifact" index="6"/> <md:AttributeConsumingService index="1"> - <md:ServiceName xml:lang="en">Språkbanken</md:ServiceName> - <md:ServiceName xml:lang="sv">Språkbanken</md:ServiceName> - <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/> + <md:ServiceName xml:lang="en">Språkbanken Text</md:ServiceName> + <md:ServiceName xml:lang="sv">Språkbanken Text</md:ServiceName> + <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/> + <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> - <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> - <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/> + <md:RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" 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:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> - <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/> + <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/> </md:AttributeConsumingService> </md:SPSSODescriptor> <md:Organization> - <md:OrganizationName xml:lang="sv">Språkbanken</md:OrganizationName> - <md:OrganizationName xml:lang="en">Språkbanken</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="sv">Språkbanken</md:OrganizationDisplayName> - <md:OrganizationDisplayName xml:lang="en">Språkbanken</md:OrganizationDisplayName> + <md:OrganizationName xml:lang="sv">Göteborgs universitet</md:OrganizationName> + <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName> + <md:OrganizationDisplayName xml:lang="sv">Institutionen för svenska, flerspråkighet och språkteknologi, Göteborgs universitet</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="en">Department of Swedish, Multilingualism, Language Technology University of Gothenburg</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</md:OrganizationURL> <md:OrganizationURL xml:lang="en">https://spraakbanken.gu.se/eng/</md:OrganizationURL> </md:Organization> @@ -125,13 +125,18 @@ <md:EmailAddress>mailto:sb-info@svenska.gu.se</md:EmailAddress> </md:ContactPerson> <md:ContactPerson contactType="technical"> - <md:GivenName>Carl-Johan</md:GivenName> - <md:SurName>Schenström</md:SurName> + <md:GivenName>Leif-Jöran</md:GivenName> + <md:SurName>Olsson</md:SurName> <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress> </md:ContactPerson> <md:ContactPerson contactType="support"> - <md:GivenName>Carl-Johan</md:GivenName> - <md:SurName>Schenström</md:SurName> + <md:GivenName>Leif-Jöran</md:GivenName> + <md:SurName>Olsson</md:SurName> + <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress> + </md:ContactPerson> + <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security"> + <md:GivenName>Leif-Jöran</md:GivenName> + <md:SurName>Olsson</md:SurName> <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress> </md:ContactPerson> </md:EntityDescriptor> |