diff options
| -rw-r--r-- | swamid-2.0/indico.test.uu.se-shibboleth.xml | 2 | ||||
| -rw-r--r-- | swamid-2.0/indico.uu.se-shibboleth.xml | 2 | ||||
| -rw-r--r-- | swamid-2.0/uppsala.instructure.com-saml2.xml | 24 |
3 files changed, 13 insertions, 15 deletions
diff --git a/swamid-2.0/indico.test.uu.se-shibboleth.xml b/swamid-2.0/indico.test.uu.se-shibboleth.xml index 48337c7a..719d487e 100644 --- a/swamid-2.0/indico.test.uu.se-shibboleth.xml +++ b/swamid-2.0/indico.test.uu.se-shibboleth.xml @@ -22,8 +22,6 @@ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> <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.swamid.se/category/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/research-and-education</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> diff --git a/swamid-2.0/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml index 344108e5..ecf51e72 100644 --- a/swamid-2.0/indico.uu.se-shibboleth.xml +++ b/swamid-2.0/indico.uu.se-shibboleth.xml @@ -22,8 +22,6 @@ <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/> <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.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> diff --git a/swamid-2.0/uppsala.instructure.com-saml2.xml b/swamid-2.0/uppsala.instructure.com-saml2.xml index b33cc611..5d81eca4 100644 --- a/swamid-2.0/uppsala.instructure.com-saml2.xml +++ b/swamid-2.0/uppsala.instructure.com-saml2.xml @@ -6,9 +6,6 @@ </mdrpi:RegistrationInfo> <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.swamid.se/category/research-and-education</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue> - <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> @@ -16,8 +13,8 @@ <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> <md:Extensions> <mdui:UIInfo> - <mdui:DisplayName xml:lang="en">Learning Management System - Canvas</mdui:DisplayName> - <mdui:DisplayName xml:lang="sv">Lärplattformen Canvas</mdui:DisplayName> + <mdui:DisplayName xml:lang="en">Learning Management System - Studium</mdui:DisplayName> + <mdui:DisplayName xml:lang="sv">Lärplattformen Studium</mdui:DisplayName> <mdui:Description xml:lang="sv">Lärplattform vid Uppsala universitet</mdui:Description> <mdui:Description xml:lang="en">Learning Management System at Uppsala university</mdui:Description> <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=690597107&l=en</mdui:PrivacyStatementURL> @@ -93,8 +90,8 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate> <md:AssertionConsumerService Location="https://uppsala.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="2" isDefault="false"/> <md:AssertionConsumerService Location="https://uppsala.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="3" isDefault="false"/> <md:AttributeConsumingService index="1"> - <md:ServiceName xml:lang="en">Learning Management System - Canvas</md:ServiceName> - <md:ServiceName xml:lang="sv">Lärplattformen Canvas</md:ServiceName> + <md:ServiceName xml:lang="en">Learning Management System - Studium</md:ServiceName> + <md:ServiceName xml:lang="sv">Lärplattformen Studium</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="givenName" Name="urn:oid:2.5.4.42" 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"/> @@ -106,17 +103,22 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate> <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName> <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName> <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL> - <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL> + <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL> + <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL> </md:Organization> <md:ContactPerson contactType="technical"> <md:Company>Uppsala universitet</md:Company> - <md:SurName>Canvas</md:SurName> + <md:SurName>Studium</md:SurName> <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress> </md:ContactPerson> <md:ContactPerson contactType="administrative"> <md:Company>Uppsala universitet</md:Company> - <md:SurName>Canvas</md:SurName> + <md:SurName>Studium</md:SurName> <md:EmailAddress>mailto:itsupport@uu.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>Uppsala University Computer Security Incident Response Team</md:GivenName> + <md:EmailAddress>mailto:security@uu.se</md:EmailAddress> + <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber> + </md:ContactPerson> </md:EntityDescriptor> |