From f2a79eb28f34df394d623f1e7fd9781fadccbe15 Mon Sep 17 00:00:00 2001
From: Ximon Eighteen <3304436+ximon18@users.noreply.github.com>
Date: Tue, 12 Jan 2021 21:19:50 +0100
Subject: [PATCH] Test error reporting on authn success but authz LOGIN
 failure.

---
 .../multi_user_openid_connect.js              |  5 ++++
 tests/ui/openid_connect_mock.rs               | 26 ++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/tests/ui/cypress_specs/multi_user_openid_connect.js b/tests/ui/cypress_specs/multi_user_openid_connect.js
index 97514a21..26333b79 100644
--- a/tests/ui/cypress_specs/multi_user_openid_connect.js
+++ b/tests/ui/cypress_specs/multi_user_openid_connect.js
@@ -5,6 +5,7 @@ let readwrite    = { u: 'readwrite@krill' };
 let shorttoken   = { u: 'shorttokenwithoutrefresh@krill' };
 let shortrefresh = { u: 'shorttokenwithrefresh@krill' };
 let badidtoken   = { u: 'non-spec-compliant-idtoken-payload' };
+let badrole      = { u: 'user-with-unknown-role' };
 let ca_name      = 'dummy-ca-name';
 
 let login_test_settings = [
@@ -14,6 +15,7 @@ let login_test_settings = [
   { d: 'readonly',     u: readonly.u,        o: true  },
   { d: 'readwrite',    u: readwrite.u,       o: true },
   { d: 'badidtoken',   u: badidtoken.u,      o: false },
+  { d: 'badrole',      u: badrole.u,         o: false }
 ];
 
 describe('OpenID Connect users', () => {
@@ -59,6 +61,9 @@ describe('OpenID Connect users', () => {
       } else if (ts.d == 'badidtoken') {
         cy.contains('OpenID Connect: Code exchange failed: Failed to parse server response')
         cy.contains('return to the login page')
+      } else if (ts.d == 'badrole') {
+        cy.contains('Your user does not have sufficient rights to perform this action. Please contact your administrator.')
+        cy.contains('return to the login page')
       }
     })
   })
diff --git a/tests/ui/openid_connect_mock.rs b/tests/ui/openid_connect_mock.rs
index c3dd9a98..72c146e9 100644
--- a/tests/ui/openid_connect_mock.rs
+++ b/tests/ui/openid_connect_mock.rs
@@ -25,7 +25,7 @@ impl AdditionalProviderMetadata for CustomAdditionalMetadata {}
 
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
 pub struct CustomAdditionalClaims {
-    role: String,
+    role: Option<String>,
     inc_cas: Option<String>,
     exc_cas: Option<String>,
 }
@@ -76,7 +76,7 @@ type CustomTokenResponse = StandardTokenResponse<CustomIdTokenFields, CoreTokenT
 
 #[derive(Clone, Default)]
 struct KnownUser {
-    role: &'static str,
+    role: Option<&'static str>,
     inc_cas: Option<&'static str>,
     exc_cas: Option<&'static str>,
     token_secs: Option<u32>,
@@ -135,7 +135,7 @@ fn run_mock_openid_connect_server() {
         known_users.insert(
             "admin@krill",
             KnownUser {
-                role: "admin",
+                role: Some("admin"),
                 exc_cas: Some("ta,testbed"),
                 ..Default::default()
             },
@@ -143,7 +143,7 @@ fn run_mock_openid_connect_server() {
         known_users.insert(
             "readonly@krill",
             KnownUser {
-                role: "readonly",
+                role: Some("readonly"),
                 exc_cas: Some("ta,testbed"),
                 ..Default::default()
             },
@@ -151,7 +151,7 @@ fn run_mock_openid_connect_server() {
         known_users.insert(
             "readwrite@krill",
             KnownUser {
-                role: "readwrite",
+                role: Some("readwrite"),
                 exc_cas: Some("ta,testbed"),
                 ..Default::default()
             },
@@ -159,7 +159,7 @@ fn run_mock_openid_connect_server() {
         known_users.insert(
             "shorttokenwithoutrefresh@krill",
             KnownUser {
-                role: "readwrite",
+                role: Some("readwrite"),
                 exc_cas: Some("ta,testbed"),
                 token_secs: Some(1),
                 ..Default::default()
@@ -168,7 +168,7 @@ fn run_mock_openid_connect_server() {
         known_users.insert(
             "shorttokenwithrefresh@krill",
             KnownUser {
-                role: "readwrite",
+                role: Some("readwrite"),
                 exc_cas: Some("ta,testbed"),
                 token_secs: Some(1),
                 refresh: true,
@@ -178,7 +178,15 @@ fn run_mock_openid_connect_server() {
         known_users.insert(
             "non-spec-compliant-idtoken-payload",
             KnownUser {
-                role: "readonly",
+                role: Some("readonly"),
+                exc_cas: Some("ta,testbed"),
+                ..Default::default()
+            },
+        );
+        known_users.insert(
+            "user-with-unknown-role",
+            KnownUser {
+                role: None,
                 exc_cas: Some("ta,testbed"),
                 ..Default::default()
             },
@@ -293,7 +301,7 @@ fn run_mock_openid_connect_server() {
                         SubjectIdentifier::new(session.id.to_string()),
                     ),
                     CustomAdditionalClaims {
-                        role: user.role.to_string(),
+                        role: user.role.map(|role| role.to_string()),
                         inc_cas: user.inc_cas.map_or(None, |v| Some(v.to_string())),
                         exc_cas: user.exc_cas.map_or(None, |v| Some(v.to_string())),
                     },