diff options
Diffstat (limited to 'swamid-2.0')
-rw-r--r-- | swamid-2.0/metadata.lab.swamid.se-shibboleth.xml | 16 | ||||
-rw-r--r-- | swamid-2.0/metadata.swamid.se-shibboleth.xml | 23 |
2 files changed, 20 insertions, 19 deletions
diff --git a/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml b/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml index 9340bf0d..a1c54a0d 100644 --- a/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml +++ b/swamid-2.0/metadata.lab.swamid.se-shibboleth.xml @@ -23,6 +23,7 @@ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"> <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category"> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> + <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> @@ -35,10 +36,10 @@ <mdui:Description xml:lang="en">This is a service for handling Metdadata for entities in SWAMID.</mdui:Description> <mdui:InformationURL xml:lang="sv">https://metadata.swamid.se/</mdui:InformationURL> <mdui:InformationURL xml:lang="en">https://metadata.swamid.se/</mdui:InformationURL> - <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL> - <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL> <mdui:Logo height="100" width="115" xml:lang="en">https://metadata.swamid.se/swamid-logo-2-100x115.png</mdui:Logo> <mdui:Logo height="100" width="115" xml:lang="sv">https://metadata.swamid.se/swamid-logo-2-100x115.png</mdui:Logo> + <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Metadata+admin+tool+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Metadata+admin+tool+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL> </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor use="signing"> @@ -124,18 +125,19 @@ q6dUsY0AZixwYw== <md:AttributeConsumingService index="1"> <md:ServiceName xml:lang="en">Metadata admin for SWAMID</md:ServiceName> <md:ServiceName xml:lang="sv">Metadata admin for SWAMID</md:ServiceName> + <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> + <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" 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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> - <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> </md:AttributeConsumingService> </md:SPSSODescriptor> <md:Organization> <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName> <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName> <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName> + <md:OrganizationDisplayName xml:lang="sv">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName> <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL> <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL> </md:Organization> @@ -143,11 +145,11 @@ q6dUsY0AZixwYw== <md:GivenName>SWAMID Operations</md:GivenName> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> </md:ContactPerson> - <md:ContactPerson contactType="technical"> + <md:ContactPerson contactType="support"> <md:GivenName>SWAMID Operations</md:GivenName> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> </md:ContactPerson> - <md:ContactPerson contactType="support"> + <md:ContactPerson contactType="technical"> <md:GivenName>SWAMID Operations</md:GivenName> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> </md:ContactPerson> diff --git a/swamid-2.0/metadata.swamid.se-shibboleth.xml b/swamid-2.0/metadata.swamid.se-shibboleth.xml index d0fe7fd2..8fe83518 100644 --- a/swamid-2.0/metadata.swamid.se-shibboleth.xml +++ b/swamid-2.0/metadata.swamid.se-shibboleth.xml @@ -29,21 +29,17 @@ </md:Extensions> <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> - <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://metadata.swamid.se/Shibboleth.sso/Login"/> - <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://metadata.swamid.se/Shibboleth.sso/Login" index="1"/> - <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://metadata.swamid.se/Shibboleth.sso/DS/seamless-access"/> - <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://metadata.swamid.se/Shibboleth.sso/DS/seamless-access" index="2"/> <mdui:UIInfo> <mdui:DisplayName xml:lang="sv">SWAMID Metadatahanterare</mdui:DisplayName> - <mdui:DisplayName xml:lang="en">SWAMID Metadatahandler</mdui:DisplayName> - <mdui:Description xml:lang="sv">Detta är en tjänst avsedd för systemadministratörer som vill hantera sin metadata i SWAMID.</mdui:Description> - <mdui:Description xml:lang="en">This is a service for administrators to handle their metadata in SWAMID.</mdui:Description> + <mdui:DisplayName xml:lang="en">SWAMID Metadata admin tool</mdui:DisplayName> + <mdui:Description xml:lang="sv">Detta är en tjänst för att hantera metadata för entiteter i SWAMID.</mdui:Description> + <mdui:Description xml:lang="en">This is a service for handling Metdadata for entities in SWAMID.</mdui:Description> <mdui:InformationURL xml:lang="sv">https://metadata.swamid.se/</mdui:InformationURL> <mdui:InformationURL xml:lang="en">https://metadata.swamid.se/</mdui:InformationURL> - <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL> - <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Entity+Category+Release+Check+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL> <mdui:Logo xml:lang="en" height="100" width="115">https://metadata.swamid.se/swamid-logo-2-100x115.png</mdui:Logo> <mdui:Logo xml:lang="sv" height="100" width="115">https://metadata.swamid.se/swamid-logo-2-100x115.png</mdui:Logo> + <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/SWAMID/SWAMID+Metadata+admin+tool+-+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL> + <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/SWAMID/SWAMID+Metadata+admin+tool+-+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL> </mdui:UIInfo> </md:Extensions> <md:KeyDescriptor use="signing"> @@ -139,9 +135,12 @@ pB/vkMnJTcA2+qTB7X2SVXqYpm/llShFwhEDO5jIyioNh20hI7+RftE+qOM= <md:AttributeConsumingService index="1"> <md:ServiceName xml:lang="en">Metadata for SWAMID</md:ServiceName> <md:ServiceName xml:lang="sv">Metadata for SWAMID</md:ServiceName> - <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="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" 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="givenName" Name="urn:oid:2.5.4.42" 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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/> </md:AttributeConsumingService> </md:SPSSODescriptor> <md:Organization> @@ -152,7 +151,7 @@ pB/vkMnJTcA2+qTB7X2SVXqYpm/llShFwhEDO5jIyioNh20hI7+RftE+qOM= <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL> <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL> </md:Organization> - <md:ContactPerson contactType="technical"> + <md:ContactPerson contactType="administrative"> <md:GivenName>SWAMID Operations</md:GivenName> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> </md:ContactPerson> @@ -160,7 +159,7 @@ pB/vkMnJTcA2+qTB7X2SVXqYpm/llShFwhEDO5jIyioNh20hI7+RftE+qOM= <md:GivenName>SWAMID Operations</md:GivenName> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> </md:ContactPerson> - <md:ContactPerson contactType="administrative"> + <md:ContactPerson contactType="technical"> <md:GivenName>SWAMID Operations</md:GivenName> <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress> </md:ContactPerson> |