From f1c5c76ec52587e3209a7b3c13562fa79b89c779 Mon Sep 17 00:00:00 2001 From: mokaddem Date: Tue, 29 Oct 2019 15:42:58 +0100 Subject: [PATCH] chg: [login/diagnostic] Added catch if a secure cookie can't be set --- diagnostic.py | 4 ++-- server.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/diagnostic.py b/diagnostic.py index c042547..99d7caf 100755 --- a/diagnostic.py +++ b/diagnostic.py @@ -443,8 +443,8 @@ def check_server_dynamic_enpoint(spinner): if '/login' in r_login.url: o = urlparse(r_login.url) query = parse_qs(o.query) - error_message = query.get('auth_error_message', ['Unknown error'])[0] - return_text = error_message + error_message = query.get('auth_error_message', ['Redirected to `loging` caused by an unknown error'])[0] + return_text = 'Redirected to `loging` caused by: {}'.format(error_message) return (False, return_text) # Connection seems to be successful, checking if we receive data from event-stream diff --git a/server.py b/server.py index 76228ad..37317ef 100755 --- a/server.py +++ b/server.py @@ -177,7 +177,7 @@ def unauthorized(): ))) response.set_cookie('redirectCount', '0', secure=False, httponly=True) else: - response = make_response(redirect(url_for('login'))) + response = make_response(redirect(url_for('login', auth_error=True, auth_error_message='Unauthorized. Review your cookie settings'))) response.set_cookie('redirectCount', str(redirectCount+1), secure=False, httponly=True) return response