Skip to content

🎉 Make social auth exceptions configurable #13596

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

Merged
merged 11 commits into from
Nov 10, 2025
Merged

🎉 Make social auth exceptions configurable #13596

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8a715dd
:tada: Make social auth exceptions configurable
manuel-sommer Nov 3, 2025
2d1a604
update
manuel-sommer Nov 3, 2025
87da405
Merge branch 'bugfix' into make_social_auth_exception_configurable
manuel-sommer Nov 3, 2025
54b91ea
fix
manuel-sommer Nov 3, 2025
026b398
Merge branch 'bugfix' into make_social_auth_exception_configurable
manuel-sommer Nov 3, 2025
a6d8c40
Merge branch 'bugfix' into make_social_auth_exception_configurable
manuel-sommer Nov 4, 2025
f1e4985
Merge branch 'bugfix' into make_social_auth_exception_configurable
manuel-sommer Nov 5, 2025
bfeecdd
update
manuel-sommer Nov 5, 2025
f86bc3a
Merge branch 'bugfix' into make_social_auth_exception_configurable
manuel-sommer Nov 6, 2025
7c7b9ef
Merge branch 'bugfix' into make_social_auth_exception_configurable
manuel-sommer Nov 9, 2025
2c06e6e
udpate
manuel-sommer Nov 9, 2025
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
12 changes: 6 additions & 6 deletions dojo/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,23 +83,23 @@ def __call__(self, request):
class CustomSocialAuthExceptionMiddleware(SocialAuthExceptionMiddleware):
def process_exception(self, request, exception):
if isinstance(exception, requests.exceptions.RequestException):
messages.error(request, "Please use the standard login below.")
messages.error(request, settings.SOCIAL_AUTH_EXCEPTION_MESSAGE["SOCIAL_AUTH_EXCEPTION_MESSAGE_REQUEST_EXCEPTION"])
return redirect("/login?force_login_form")
if isinstance(exception, AuthCanceled):
messages.warning(request, "Social login was canceled. Please try again or use the standard login.")
messages.warning(request, settings.SOCIAL_AUTH_EXCEPTION_MESSAGE["SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_CANCELED"])
return redirect("/login?force_login_form")
if isinstance(exception, AuthFailed):
messages.error(request, "Social login failed. Please try again or use the standard login.")
messages.error(request, settings.SOCIAL_AUTH_EXCEPTION_MESSAGE["SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FAILED"])
return redirect("/login?force_login_form")
if isinstance(exception, AuthForbidden):
messages.error(request, "You are not authorized to log in via this method. Please contact support or use the standard login.")
messages.error(request, settings.SOCIAL_AUTH_EXCEPTION_MESSAGE["SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FORBIDDEN"])
return redirect("/login?force_login_form")
if isinstance(exception, AuthTokenError):
messages.error(request, "Social login failed due to an invalid or expired token. Please try again or use the standard login.")
messages.error(request, settings.SOCIAL_AUTH_EXCEPTION_MESSAGE["SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_TOKEN_ERROR"])
return redirect("/login?force_login_form")
if isinstance(exception, TypeError) and "'NoneType' object is not iterable" in str(exception):
logger.warning("OIDC login error: NoneType is not iterable")
messages.error(request, "An unexpected error occurred during social login. Please use the standard login.")
messages.error(request, settings.SOCIAL_AUTH_EXCEPTION_MESSAGE["SOCIAL_AUTH_EXCEPTION_MESSAGE_NONE_TYPE"])
return redirect("/login?force_login_form")
logger.error(f"Unhandled exception during social login: {exception}")
return super().process_exception(request, exception)
Expand Down
15 changes: 15 additions & 0 deletions dojo/settings/settings.dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@
DD_SOCIAL_AUTH_GITHUB_ENTERPRISE_KEY=(str, ""),
DD_SOCIAL_AUTH_GITHUB_ENTERPRISE_SECRET=(str, ""),
DD_SOCIAL_AUTH_USERNAME_IS_FULL_EMAIL=(bool, True),
DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_REQUEST_EXCEPTION=(str, "Please use the standard login below."),
DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_CANCELED=(str, "Social login was canceled. Please try again or use the standard login."),
DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FAILED=(str, "Social login failed. Please try again or use the standard login."),
DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FORBIDDEN=(str, "You are not authorized to log in via this method. Please contact support or use the standard login."),
DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_NONE_TYPE=(str, "An unexpected error occurred during social login. Please use the standard login."),
DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_TOKEN_ERROR=(str, "Social login failed due to an invalid or expired token. Please try again or use the standard login."),
DD_SAML2_ENABLED=(bool, False),
# Allows to override default SAML authentication backend. Check https://djangosaml2.readthedocs.io/contents/setup.html#custom-user-attributes-processing
DD_SAML2_AUTHENTICATION_BACKENDS=(str, "djangosaml2.backends.Saml2Backend"),
Expand Down Expand Up @@ -649,6 +655,15 @@ def generate_url(scheme, double_slashes, user, password, host, port, path, param
if value := env("DD_SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT"):
SOCIAL_AUTH_OIDC_LOGIN_BUTTON_TEXT = value

SOCIAL_AUTH_EXCEPTION_MESSAGE = {
"SOCIAL_AUTH_EXCEPTION_MESSAGE_REQUEST_EXCEPTION": env("DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_REQUEST_EXCEPTION"),
"SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_CANCELED": env("DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_CANCELED"),
"SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FAILED": env("DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FAILED"),
"SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FORBIDDEN": env("DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_FORBIDDEN"),
"SOCIAL_AUTH_EXCEPTION_MESSAGE_NONE_TYPE": env("DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_NONE_TYPE"),
"SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_TOKEN_ERROR": env("DD_SOCIAL_AUTH_EXCEPTION_MESSAGE_AUTH_TOKEN_ERROR"),
}

AUTH0_OAUTH2_ENABLED = env("DD_SOCIAL_AUTH_AUTH0_OAUTH2_ENABLED")
SOCIAL_AUTH_AUTH0_KEY = env("DD_SOCIAL_AUTH_AUTH0_KEY")
SOCIAL_AUTH_AUTH0_SECRET = env("DD_SOCIAL_AUTH_AUTH0_SECRET")
Expand Down