From 33c6a5884c77777e11677a34d75025ff5d393455 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Mon, 22 Nov 2021 16:35:57 +0100
Subject: SWAMID-506, Added CoCo to uppsala.instructure.com

---
 swamid-2.0/uppsala.instructure.com-saml2.xml | 37 ++++++++++++++++++----------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/swamid-2.0/uppsala.instructure.com-saml2.xml b/swamid-2.0/uppsala.instructure.com-saml2.xml
index ba016184..4efc3dc9 100644
--- a/swamid-2.0/uppsala.instructure.com-saml2.xml
+++ b/swamid-2.0/uppsala.instructure.com-saml2.xml
@@ -9,6 +9,7 @@
         <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>
   </md:Extensions>
@@ -19,12 +20,14 @@
         <mdui:DisplayName xml:lang="sv">Lärplattformen Canvas</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&amp;l=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=690597107&amp;l=sv</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -46,17 +49,17 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
+        <ns1:KeySize xmlns:ns1="http://www.w3.org/2001/04/xmlenc#">128</ns1:KeySize>
       </md:EncryptionMethod>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <dsig:KeyInfo xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-        <dsig:X509Data>
-          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
 GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
 MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
@@ -78,15 +81,23 @@ U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
 5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
 buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
 8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
-BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
-        </dsig:X509Data>
-      </dsig:KeyInfo>
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Location="https://uppsala.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
     <md:AssertionConsumerService Location="https://uppsala.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
     <md:AssertionConsumerService Location="https://uppsala.staging.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="false"/>
     <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: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"/>
+      <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="en">Uppsala University</md:OrganizationName>
-- 
cgit v1.2.3