paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend: Handle GitHub authentication failure.

Browse Source 
In case of AuthFailed exception return None.
This commit is contained in:
Umair Khan
2017-02-28 15:58:03 +05:00
committed by Tim Abbott
parent f140810ad9
commit 802de53ede
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/tests/test_auth_backends.py
View File

@@ -508,6 +508,18 @@ class GitHubAuthBackendTest(ZulipTestCase):
result = self.client_get('/accounts/login/social/github') result = self.client_get('/accounts/login/social/github')
self.assertIn(reverse('social:begin', args=['github']), result.url) self.assertIn(reverse('social:begin', args=['github']), result.url)
def test_github_complete(self):
# type: () -> None
from social_django import utils
utils.BACKENDS = ('zproject.backends.GitHubAuthBackend',)
with mock.patch('social_core.backends.oauth.BaseOAuth2.process_error',
side_effect=AuthFailed('Not found')):
result = self.client_get(reverse('social:complete', args=['github']))
self.assertEqual(result.status_code, 302)
self.assertIn('login', result.url)
utils.BACKENDS = settings.AUTHENTICATION_BACKENDS
class ResponseMock(object): class ResponseMock(object):
def __init__(self, status_code, data): def __init__(self, status_code, data):
# type: (int, Any) -> None # type: (int, Any) -> None

12
zproject/backends.py
View File

@@ -178,6 +178,14 @@ class SocialAuthMixin(ZulipAuthMixin):
return redirect_and_log_into_subdomain(realm, full_name, email_address) return redirect_and_log_into_subdomain(realm, full_name, email_address)
def auth_complete(self, *args, **kwargs):
# type: (*Any, **Any) -> Optional[HttpResponse]
try:
# Call the auth_complete method of BaseOAuth2 is Python Social Auth
return super(SocialAuthMixin, self).auth_complete(*args, **kwargs) # type: ignore
except AuthFailed:
return None
class ZulipDummyBackend(ZulipAuthMixin): class ZulipDummyBackend(ZulipAuthMixin):
""" """
Used when we want to log you in but we don't know which backend to use. Used when we want to log you in but we don't know which backend to use.
@@ -425,7 +433,11 @@ class GitHubAuthBackend(SocialAuthMixin, GithubOAuth2):
org_name = settings.SOCIAL_AUTH_GITHUB_ORG_NAME org_name = settings.SOCIAL_AUTH_GITHUB_ORG_NAME
if (team_id is None and org_name is None): if (team_id is None and org_name is None):
try:
user_profile = GithubOAuth2.do_auth(self, *args, **kwargs) user_profile = GithubOAuth2.do_auth(self, *args, **kwargs)
except AuthFailed:
logging.info("User authentication failed.")
user_profile = None
elif (team_id): elif (team_id):
backend = GithubTeamOAuth2(self.strategy, self.redirect_uri) backend = GithubTeamOAuth2(self.strategy, self.redirect_uri)