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

Ensure that the pointer is valid before saving it.

Browse Source 
Trac #1716

Fix the tests to use real message IDs for the pointer. One helper didn't
use the pointer ID it was passed at all, so the test didn't actually test
what it was supposed to before.

(imported from commit 457bcdb04a6c3873e224b68cd9d79c9a26612010)
This commit is contained in:
Kevin Mehall
2013-08-19 15:05:23 -04:00
parent 054ccabf16
commit 8a741ed3d4
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
zerver/tests.py
View File

@@ -665,9 +665,10 @@ class PointerTest(AuthedTestCase):
""" """
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1) self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, -1)
result = self.client.post("/json/update_pointer", {"pointer": 1}) msg_id = self.send_message("othello@zulip.com", "Verona", Recipient.STREAM).id
result = self.client.post("/json/update_pointer", {"pointer": msg_id})
self.assert_json_success(result) self.assert_json_success(result)
self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, 1) self.assertEqual(get_user_profile_by_email("hamlet@zulip.com").pointer, msg_id)
def test_api_update_pointer(self): def test_api_update_pointer(self):
""" """
@@ -676,11 +677,12 @@ class PointerTest(AuthedTestCase):
email = "hamlet@zulip.com" email = "hamlet@zulip.com"
api_key = self.get_api_key(email) api_key = self.get_api_key(email)
self.assertEqual(get_user_profile_by_email(email).pointer, -1) self.assertEqual(get_user_profile_by_email(email).pointer, -1)
msg_id = self.send_message("othello@zulip.com", "Verona", Recipient.STREAM).id
result = self.client.post("/api/v1/update_pointer", {"email": email, result = self.client.post("/api/v1/update_pointer", {"email": email,
"api-key": api_key, "api-key": api_key,
"pointer": 1}) "pointer": msg_id})
self.assert_json_success(result) self.assert_json_success(result)
self.assertEqual(get_user_profile_by_email(email).pointer, 1) self.assertEqual(get_user_profile_by_email(email).pointer, msg_id)
def test_missing_pointer(self): def test_missing_pointer(self):
""" """
@@ -1877,7 +1879,7 @@ class GetProfileTest(AuthedTestCase):
def common_update_pointer(self, email, pointer): def common_update_pointer(self, email, pointer):
self.login(email) self.login(email)
result = self.client.post("/json/update_pointer", {"pointer": 1}) result = self.client.post("/json/update_pointer", {"pointer": pointer})
self.assert_json_success(result) self.assert_json_success(result)
def common_get_profile(self, email): def common_get_profile(self, email):
@@ -1910,15 +1912,22 @@ class GetProfileTest(AuthedTestCase):
""" """
Ensure get_profile returns a proper pointer id after the pointer is updated Ensure get_profile returns a proper pointer id after the pointer is updated
""" """
id1 = self.send_message("othello@zulip.com", "Verona", Recipient.STREAM).id
id2 = self.send_message("othello@zulip.com", "Verona", Recipient.STREAM).id
json = self.common_get_profile("hamlet@zulip.com") json = self.common_get_profile("hamlet@zulip.com")
self.common_update_pointer("hamlet@zulip.com", 1) self.common_update_pointer("hamlet@zulip.com", id2)
json = self.common_get_profile("hamlet@zulip.com") json = self.common_get_profile("hamlet@zulip.com")
self.assertEqual(json["pointer"], 1) self.assertEqual(json["pointer"], id2)
self.common_update_pointer("hamlet@zulip.com", 0) self.common_update_pointer("hamlet@zulip.com", id1)
json = self.common_get_profile("hamlet@zulip.com") json = self.common_get_profile("hamlet@zulip.com")
self.assertEqual(json["pointer"], 1) self.assertEqual(json["pointer"], id2) # pointer does not move backwards
result = self.client.post("/json/update_pointer", {"pointer": 99999999})
self.assert_json_error(result, "Invalid message ID")
class GetPublicStreamsTest(AuthedTestCase): class GetPublicStreamsTest(AuthedTestCase):

8
zerver/views.py
View File

@@ -716,6 +716,14 @@ def update_pointer_backend(request, user_profile,
if pointer <= user_profile.pointer: if pointer <= user_profile.pointer:
return json_success() return json_success()
try:
UserMessage.objects.get(
user_profile=user_profile,
message__id=pointer
)
except UserMessage.DoesNotExist:
raise JsonableError("Invalid message ID")
prev_pointer = user_profile.pointer prev_pointer = user_profile.pointer
user_profile.pointer = pointer user_profile.pointer = pointer
user_profile.save(update_fields=["pointer"]) user_profile.save(update_fields=["pointer"])