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

auth: Improve JsonableError in get_..._jwt_authentication_request.

Browse Source
This commit is contained in:
Mateusz Mandera
2023-01-29 23:57:09 +01:00
committed by Tim Abbott
parent 6c638a1057
commit c9c255b3a8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/tests/test_auth_backends.py
View File

@@ -5445,7 +5445,9 @@ class TestJWTLogin(ZulipTestCase):
with self.settings(JWT_AUTH_KEYS={"acme": {"key": "key", "algorithms": ["HS256"]}}): with self.settings(JWT_AUTH_KEYS={"acme": {"key": "key", "algorithms": ["HS256"]}}):
data = {"json_web_token": "not relevant"} data = {"json_web_token": "not relevant"}
result = self.client_post("/accounts/login/jwt/", data) result = self.client_post("/accounts/login/jwt/", data)
self.assert_json_error_contains(result, "Auth key for this subdomain not found", 400) self.assert_json_error_contains(
result, "JWT authentication is not enabled for this organization", 400
)
def test_login_failure_when_key_is_missing(self) -> None: def test_login_failure_when_key_is_missing(self) -> None:
with self.settings(JWT_AUTH_KEYS={"zulip": {"key": "key", "algorithms": ["HS256"]}}): with self.settings(JWT_AUTH_KEYS={"zulip": {"key": "key", "algorithms": ["HS256"]}}):

2
zerver/views/auth.py
View File

@@ -483,7 +483,7 @@ def get_email_and_realm_from_jwt_authentication_request(
key = settings.JWT_AUTH_KEYS[realm.subdomain]["key"] key = settings.JWT_AUTH_KEYS[realm.subdomain]["key"]
algorithms = settings.JWT_AUTH_KEYS[realm.subdomain]["algorithms"] algorithms = settings.JWT_AUTH_KEYS[realm.subdomain]["algorithms"]
except KeyError: except KeyError:
raise JsonableError(_("Auth key for this subdomain not found")) raise JsonableError(_("JWT authentication is not enabled for this organization"))
try: try:
json_web_token = request.POST["json_web_token"] json_web_token = request.POST["json_web_token"]