From 112d460f63167b0518669a264d9c179fb15af882 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Mon, 3 Oct 2022 10:09:16 +0200
Subject: Updated sunet.instructure.com

Singed-off by Minette
---
 swamid-2.0/sunet.instructure.com-saml2.xml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/swamid-2.0/sunet.instructure.com-saml2.xml b/swamid-2.0/sunet.instructure.com-saml2.xml
index 60d4eb5b..81d9deaf 100644
--- a/swamid-2.0/sunet.instructure.com-saml2.xml
+++ b/swamid-2.0/sunet.instructure.com-saml2.xml
@@ -7,8 +7,6 @@
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -19,10 +17,12 @@
         <mdui:DisplayName xml:lang="en">Canvas</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Canvas för Sunet</mdui:Description>
         <mdui:Description xml:lang="en">Canvas for Sunet</mdui:Description>
-        <mdui:Logo height="46" width="192" xml:lang="sv">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
-        <mdui:Logo height="46" width="192" xml:lang="en">https://www.canvaslms.com/img/logo/instructure.png</mdui:Logo>
+        <mdui:Logo height="46" width="192" xml:lang="sv">https://www.instructure.com/themes/custom/themekit/logo.svg</mdui:Logo>
+        <mdui:Logo height="46" width="192" xml:lang="en">https://www.instructure.com/themes/custom/themekit/logo.svg</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/LMS/Sunet+LMS</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/LMS/Sunet+LMS</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.vr.se/english/information-on-processing-of-personal-data.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.vr.se/behandling-av-personuppgifter.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
@@ -54,7 +54,7 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
+        <ns1:KeySize xmlns:ns1="http://www.w3.org/2001/04/xmlenc#">128</ns1:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
@@ -93,12 +93,21 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
     <md:AssertionConsumerService Location="https://sunet.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="3" isDefault="false"/>
     <md:AttributeConsumingService index="5">
       <md:ServiceName xml:lang="en">Canvas</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Canvas</md:ServiceName>
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" FriendlyName="mail" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" FriendlyName="displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.42" FriendlyName="givenName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">https://www.vr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.vr.se/english.html</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="support">
     <md:SurName>Sunet NOC</md:SurName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
@@ -111,4 +120,8 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:info@instructure.com</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Security Response Team</md:GivenName>
+    <md:EmailAddress>mailto:abuse@sunet.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3