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

auth: Convert GoogleMobileOAuth2Backend to accept a realm object.

Browse Source
This commit is contained in:
Tim Abbott
2017-11-21 12:23:07 -08:00
parent 37acfb4e90
commit a7d51127fb
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/tests/test_auth_backends.py
View File

@@ -224,14 +224,15 @@ class AuthBackendTest(ZulipTestCase):
with mock.patch('apiclient.sample_tools.client.verify_id_token', return_value=payload): with mock.patch('apiclient.sample_tools.client.verify_id_token', return_value=payload):
self.verify_backend(backend, self.verify_backend(backend,
good_kwargs=dict(realm_subdomain="zulip"), good_kwargs=dict(realm=get_realm("zulip")),
bad_kwargs=dict(realm_subdomain='acme')) bad_kwargs=dict(realm=get_realm('invalid')))
# Verify valid_attestation parameter is set correctly # Verify valid_attestation parameter is set correctly
unverified_payload = dict(email_verified=False) unverified_payload = dict(email_verified=False)
with mock.patch('apiclient.sample_tools.client.verify_id_token', return_value=unverified_payload): with mock.patch('apiclient.sample_tools.client.verify_id_token',
return_value=unverified_payload):
ret = dict() # type: Dict[str, str] ret = dict() # type: Dict[str, str]
result = backend.authenticate(return_data=ret) result = backend.authenticate(realm=get_realm("zulip"), return_data=ret)
self.assertIsNone(result) self.assertIsNone(result)
self.assertFalse(ret["valid_attestation"]) self.assertFalse(ret["valid_attestation"])
@@ -239,13 +240,13 @@ class AuthBackendTest(ZulipTestCase):
with mock.patch('apiclient.sample_tools.client.verify_id_token', with mock.patch('apiclient.sample_tools.client.verify_id_token',
return_value=nonexistent_user_payload): return_value=nonexistent_user_payload):
ret = dict() ret = dict()
result = backend.authenticate(return_data=ret) result = backend.authenticate(realm=get_realm("zulip"), return_data=ret)
self.assertIsNone(result) self.assertIsNone(result)
self.assertTrue(ret["valid_attestation"]) self.assertTrue(ret["valid_attestation"])
with mock.patch('apiclient.sample_tools.client.verify_id_token', with mock.patch('apiclient.sample_tools.client.verify_id_token',
side_effect=AppIdentityError): side_effect=AppIdentityError):
ret = dict() ret = dict()
result = backend.authenticate(return_data=ret) result = backend.authenticate(realm=get_realm("zulip"), return_data=ret)
self.assertIsNone(result) self.assertIsNone(result)
@override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',)) @override_settings(AUTHENTICATION_BACKENDS=('zproject.backends.ZulipLDAPAuthBackend',))

4
zerver/views/auth.py
View File

@@ -645,8 +645,10 @@ def api_fetch_api_key(request, username=REQ(), password=REQ()):
# type: (HttpRequest, str, str) -> HttpResponse # type: (HttpRequest, str, str) -> HttpResponse
return_data = {} # type: Dict[str, bool] return_data = {} # type: Dict[str, bool]
if username == "google-oauth2-token": if username == "google-oauth2-token":
subdomain = get_subdomain(request)
realm = get_realm(subdomain)
user_profile = authenticate(google_oauth2_token=password, user_profile = authenticate(google_oauth2_token=password,
realm_subdomain=get_subdomain(request), realm=realm,
return_data=return_data) return_data=return_data)
else: else:
if not ldap_auth_enabled(realm=get_realm_from_request(request)): if not ldap_auth_enabled(realm=get_realm_from_request(request)):

6
zproject/backends.py
View File

@@ -375,8 +375,10 @@ class GoogleMobileOauth2Backend(ZulipAuthMixin):
""" """
def authenticate(self, google_oauth2_token: str=None, realm_subdomain: str=None, def authenticate(self, google_oauth2_token: str=None, realm: Optional[Realm]=None,
return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]: return_data: Optional[Dict[str, Any]]=None) -> Optional[UserProfile]:
if realm is None:
return None
if return_data is None: if return_data is None:
return_data = {} return_data = {}
@@ -396,7 +398,7 @@ class GoogleMobileOauth2Backend(ZulipAuthMixin):
if user_profile.realm.deactivated: if user_profile.realm.deactivated:
return_data["inactive_realm"] = True return_data["inactive_realm"] = True
return None return None
if not user_matches_subdomain(realm_subdomain, user_profile): if not user_matches_subdomain(realm.subdomain, user_profile):
return_data["invalid_subdomain"] = True return_data["invalid_subdomain"] = True
return None return None
if not google_auth_enabled(realm=user_profile.realm): if not google_auth_enabled(realm=user_profile.realm):