Resolves SWAMID-2170

1 files changed, 51 insertions, 44 deletions

diff --git a/swamid-2.0/sse.instructure.com-saml2.xml b/swamid-2.0/sse.instructure.com-saml2.xml
index 005247cd..c1461baa 100644
--- a/swamid-2.0/sse.instructure.com-saml2.xml
+++ b/swamid-2.0/sse.instructure.com-saml2.xml
@@ -4,29 +4,29 @@
     <md:KeyDescriptor use="encryption">
       <dsig:KeyInfo>
         <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
-IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
-MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
-xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
-JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
-PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
-pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
-GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
-A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
-DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
-mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
-BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
-XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
-1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
-Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
+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">
@@ -36,29 +36,29 @@ SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
     <md:KeyDescriptor use="signing">
       <dsig:KeyInfo>
         <dsig:X509Data>
-          <dsig:X509Certificate>MIIEKzCCAxOgAwIBAgIJAPuxHXVDuOfZMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
+          <dsig:X509Certificate>MIIEMDCCAxigAwIBAgIJAPBXgeztn8U2MA0GCSqGSIb3DQEBCwUAMIGsMQswCQYD
 VQQGEwJVUzENMAsGA1UECAwEVXRhaDEXMBUGA1UEBwwOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoMEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsMCk9wZXJhdGlvbnMx
-IDAeBgNVBAMMF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE3MDQwODIxMDQwNVoXDTE5MDQyMjIx
-MDQwNVowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIDARVdGFoMRcwFQYDVQQHDA5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UECgwQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CwwKT3BlcmF0aW9uczEgMB4GA1UEAwwXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDOokl8TPWm4LL6rqEnPjL0t5QWw76WOTA9JzLJ
-xjKwtIWlGAlyRQ+gEmD5vaFAzoYl62BIm2yCy+EdUR9D/3X9Hq+22ysy7pWj8rda
-JeQ1XAX2xMlphZhMHnKdKBfDxLMaIEKQg942xBTkY3yeDsc8YezR0sSBToumQs23
-PVnIq7u1U+UAry0Q33ovmJRV50kQk3Qccl6omSDXezUIB+LYqI2ghoIo/+XfHaPe
-pHWj3XnXKBGtlDIpUbgVIbqdHcsE9uRHK6YfeiWqX+fW0h8rcn5z3cj5awzYJ8kk
-GKACS6TNccfFCouMoKskBB4ot2WBuIKEyJNqg7kn/wlCzsoHAgMBAAGjUDBOMB0G
-A1UdDgQWBBQ3lOrDsVPyDFZyZhjbbLZpdStYODAfBgNVHSMEGDAWgBQ3lOrDsVPy
-DFZyZhjbbLZpdStYODAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBy
-mkrTdaGCS5wSswAKwHmrTdZQdD4ksXszvQKZEiLtenoDyE7JomCME1a5BaGuDjaD
-BbVEO8StAEjQeCoGCkW0tkqBfgwSNGaIZp7SXcMSHN866D1r7whwjAXSehVSf1LS
-XYyMh2wcgbKVZB71EP8hIG37fl5dcCZJ+qhnExTf+EXgf3MwuE3eTnuiXem2F0lz
-1Vj8vkef+qr9wdSHoZ/L9Xje03wYSAT0J2KlbkUZNb/me6ZxeOWMWbCsYu4+OBfc
-Wi+n2KDSFd6xI4DLm0685DP4hzlycGDiUmOHrt/ZpZEVBs1d/ooxfZhs6dCEUyUn
-SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
+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>
@@ -67,6 +67,13 @@ SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
     <md:AssertionConsumerService Location="https://sse.staging.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="false"/>
     <md:AssertionConsumerService Location="https://sse.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="2" isDefault="false"/>
     <md:AssertionConsumerService Location="https://sse.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:RequestedAttribute Name="email"/>
+      <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:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Gottfried</md:GivenName>