Skip to content

Adjust error responses for application display #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adjust error responses for application display #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions flask_oidc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,12 @@ def _process_callback(self, statefield):
then redirect to the originally requested page.
"""
# retrieve session and callback variables
if 'error' in request.args:
error = request.args['error']
error_description = request.args['error_description']
logger.debug(error + "\n" + error_description)
return True, self._oidc_error(error + "\n" + error_description)

try:
session_csrf_token = session.get('oidc_csrf_token')

Expand All @@ -705,13 +711,13 @@ def _process_callback(self, statefield):
except (KeyError, ValueError):
logger.debug("Can't retrieve CSRF token, state, or code",
exc_info=True)
return True, self._oidc_error()
return True, self._oidc_error("Can't retrieve CSRF token, state, or code")

# check callback CSRF token passed to IdP
# against session CSRF token held by user
if csrf_token != session_csrf_token:
logger.debug("CSRF token mismatch")
return True, self._oidc_error()
return True, self._oidc_error("CSRF token mismatch")

# make a request to IdP to exchange the auth code for OAuth credentials
flow = self._flow_for_request()
Expand All @@ -725,7 +731,7 @@ def _process_callback(self, statefield):
"You must log in with an account from the {0} domain."
.format(current_app.config['OIDC_GOOGLE_APPS_DOMAIN']),
self.WRONG_GOOGLE_APPS_DOMAIN)
return True, self._oidc_error()
return True, self._oidc_error("Invalid ID token")

# store credentials by subject
# when Google is the IdP, the subject is their G+ account number
Expand All @@ -736,7 +742,7 @@ def _process_callback(self, statefield):
response = self.extra_data_serializer.loads(state[statefield])
except BadSignature:
logger.error('State field was invalid')
return True, self._oidc_error()
return True, self._oidc_error('State field was invalid')

# set a persistent signed cookie containing the ID token
# and redirect to the final destination
Expand Down