From 27d7386e97b672f28594753689c19d944254d39c Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Tue, 30 Apr 2019 13:52:21 +0200
Subject: Resolved SWAMID-2180

---
 swamid-2.0/uppsala.instructure.com-saml2.xml | 100 +++++++++++++++++++++++++++
 swamid-testing-sp-1.0.mxml                   |   1 +
 2 files changed, 101 insertions(+)
 create mode 100644 swamid-2.0/uppsala.instructure.com-saml2.xml

diff --git a/swamid-2.0/uppsala.instructure.com-saml2.xml b/swamid-2.0/uppsala.instructure.com-saml2.xml
new file mode 100644
index 00000000..ea319a11
--- /dev/null
+++ b/swamid-2.0/uppsala.instructure.com-saml2.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="http://uppsala.instructure.com/saml2">
+  <md:Extensions>
+    <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:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <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: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:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <dsig:KeyInfo>
+        <dsig:X509Data>
+          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
+GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
+MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
+ARYTb3BzQGluc3RydWN0dXJlLmNvbTAeFw0xOTAzMjExNTM5MDRaFw0yOTAzMTgx
+NTM5MDRaMIGsMQswCQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwO
+U2FsdCBMYWtlIENpdHkxGjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYD
+VQQLDApPcGVyYXRpb25zMSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0
+ZTEiMCAGCSqGSIb3DQEJARYTb3BzQGluc3RydWN0dXJlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAPXoYCW9QPrtfn0+WLX43YtM89gLHrnSM0rR
+Tc+0DQ9TUZKKrma80XvwOS3K0hjf7k+mAlarYptwXuPOaS6+LMRgxBRx/iWdugKr
+yWKpwbzZ13v1TnLZ1rc6ThyRuilvKIPD7dP3rv+A1EzYYk9ZGtd5gFSBUtUqFwj1
+76CUaEjCIN8FaogbbppWi/C1kWtPvPY+UeZ4IBJUpj+ect8rbhdVq5FxDErRdAzH
+CIi6xSqlLqmV13rqD4srMtE98d+9Ki2hat3yNz3mmb5aZdiLQk6DosfQmHfNy6JS
+GyVwmAZOPB5ssFuNfQZFK9o6WG5umS/aEN/ssfW/7uM9TDkkKvsCAwEAAaNTMFEw
+HQYDVR0OBBYEFAraQ0414RyifBPG9LflNTiVFF7fMB8GA1UdIwQYMBaAFAraQ041
+4RyifBPG9LflNTiVFF7fMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ggEBAA+AaM/dPLidoPNJlKj9zQ9aTvJIF7MQhfrNkeNkMpGmE0igyZFq6z2WuA5u
+U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
+5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
+buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
+8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
+        </dsig:X509Data>
+      </dsig:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
+        <xenc:KeySize>128</xenc:KeySize>
+      </md:EncryptionMethod>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <dsig:KeyInfo>
+        <dsig:X509Data>
+          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
+VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
+GjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYDVQQLDApPcGVyYXRpb25z
+MSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0ZTEiMCAGCSqGSIb3DQEJ
+ARYTb3BzQGluc3RydWN0dXJlLmNvbTAeFw0xOTAzMjExNTM5MDRaFw0yOTAzMTgx
+NTM5MDRaMIGsMQswCQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwO
+U2FsdCBMYWtlIENpdHkxGjAYBgNVBAoMEUluc3RydWN0dXJlLCBJbmMuMRMwEQYD
+VQQLDApPcGVyYXRpb25zMSAwHgYDVQQDDBdDYW52YXMgU0FNTCBDZXJ0aWZpY2F0
+ZTEiMCAGCSqGSIb3DQEJARYTb3BzQGluc3RydWN0dXJlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAPXoYCW9QPrtfn0+WLX43YtM89gLHrnSM0rR
+Tc+0DQ9TUZKKrma80XvwOS3K0hjf7k+mAlarYptwXuPOaS6+LMRgxBRx/iWdugKr
+yWKpwbzZ13v1TnLZ1rc6ThyRuilvKIPD7dP3rv+A1EzYYk9ZGtd5gFSBUtUqFwj1
+76CUaEjCIN8FaogbbppWi/C1kWtPvPY+UeZ4IBJUpj+ect8rbhdVq5FxDErRdAzH
+CIi6xSqlLqmV13rqD4srMtE98d+9Ki2hat3yNz3mmb5aZdiLQk6DosfQmHfNy6JS
+GyVwmAZOPB5ssFuNfQZFK9o6WG5umS/aEN/ssfW/7uM9TDkkKvsCAwEAAaNTMFEw
+HQYDVR0OBBYEFAraQ0414RyifBPG9LflNTiVFF7fMB8GA1UdIwQYMBaAFAraQ041
+4RyifBPG9LflNTiVFF7fMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ggEBAA+AaM/dPLidoPNJlKj9zQ9aTvJIF7MQhfrNkeNkMpGmE0igyZFq6z2WuA5u
+U2cF/f7jNTBqaaFEbnA8BiRlE/FrTLHIIgP5JX2+n1WmakI/aVbnXICvrVRn84Yt
+5SHdVacI5Whv3RKgRzkpBOb9jgZ+E4keAvtxHUuIMMEtxT/fySwFaRfG0Wit6fxX
+buDiucMWZ+vEY243lO6ORPTiMeMcZGRqA5prwAWyfLzkXW1X5U3GXhWW7ZRmHxkT
+8EwppSeosigJnYIjhrXFsiLU7wplnDD9yfe+ho70ZG3mb2MgfG59ZLTzv3l+Anau
+BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
+        </dsig:X509Data>
+      </dsig:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Location="https://uppsala.test.instructure.com/login/saml/logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"/>
+    <md:AssertionConsumerService Location="https://uppsala.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
+    <md:AssertionConsumerService Location="https://uppsala.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="false"/>
+    <md:AssertionConsumerService Location="https://uppsala.staging.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="2" isDefault="false"/>
+    <md:AssertionConsumerService Location="https://uppsala.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="3" isDefault="false"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <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:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Canvas</md:SurName>
+    <md:EmailAddress>servicedesk@uu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index ce8793fa..a8f13c8e 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -59,4 +59,5 @@
   <xi:include href="swamid-2.0/ladok3-demo-08.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/ladok3-demo-08.its.umu.se-student-sp.xml"/>
   <xi:include href="swamid-2.0/bdh.local-85-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/uppsala.instructure.com-saml2.xml"/>
 </EntitiesDescriptor>
-- 
cgit v1.2.3