Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

antispam: Serialize the challenge with the widget's field names.

Alex Vandiverb0d728445fcd
diff --git a/zerver/tests/test_realm_creation.py b/zerver/tests/test_realm_creation.py
index 9fbe06b30c8..54f78ac67ab 100644
--- a/zerver/tests/test_realm_creation.py
+++ b/zerver/tests/test_realm_creation.py
@@ -186,7 +186,7 @@ class DemoCreationTest(ZulipTestCase):
result = self.client_get("/json/antispam_challenge")
data = self.assert_json_success(result)
self.assertEqual(data["algorithm"], "SHA-256")
- self.assertEqual(data["max_number"], 500000)
+ self.assertEqual(data["maxNumber"], 500000)
self.assertIn("signature", data)
self.assertIn("challenge", data)
self.assertIn("salt", data)
@@ -1198,7 +1198,7 @@ class RealmCreationTest(ZulipTestCase):
result = self.client_get("/json/antispam_challenge")
data = self.assert_json_success(result)
self.assertEqual(data["algorithm"], "SHA-256")
- self.assertEqual(data["max_number"], 500000)
+ self.assertEqual(data["maxNumber"], 500000)
self.assertIn("signature", data)
self.assertIn("challenge", data)
self.assertIn("salt", data)
diff --git a/zerver/views/antispam.py b/zerver/views/antispam.py
index 3e1df8db368..425ff366e32 100644
--- a/zerver/views/antispam.py
+++ b/zerver/views/antispam.py
@@ -38,7 +38,7 @@ def get_challenge(
*session_challenges,
(challenge.challenge, expires.timestamp()),
]
- return json_success(request, data=challenge.__dict__)
+ return json_success(request, data=challenge.to_dict())
except Exception: # nocoverage
logging.exception("Error while generating challenge")
raise JsonableError(_("Failed to generate challenge"))