Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
drafts: Check that the sender can access the recipients of a DM draft.
Sahil Batra1127d4cd3cc1
diff --git a/zerver/lib/drafts.py b/zerver/lib/drafts.pyindex 010005f352d..fedc5db0a82 100644--- a/zerver/lib/drafts.py+++ b/zerver/lib/drafts.py@@ -15,7 +15,10 @@ from typing_extensions import ParamSpecfrom zerver.lib.addressee import get_user_profiles_by_idsfrom zerver.lib.exceptions import JsonableError, ResourceNotFoundErrorfrom zerver.lib.message import normalize_body, truncate_topic-from zerver.lib.recipient_users import recipient_for_user_profiles+from zerver.lib.recipient_users import (+ check_sender_can_access_recipients,+ recipient_for_user_profiles,+)from zerver.lib.streams import access_stream_by_idfrom zerver.lib.timestamp import timestamp_to_datetimefrom zerver.lib.typed_endpoint import RequiredStringConstraint@@ -77,6 +80,11 @@ def further_validated_draft_dict(recipient_id = stream.recipient_idelif draft_dict.type == "private" and len(to) != 0:to_users = get_user_profiles_by_ids(set(to), user_profile.realm)+ # Since recipient_for_user_profiles creates the+ # DirectMessageGroup object, and thus Subscription objects+ # granting the sender access to the recipients, we need to+ # check access before calling it.+ check_sender_can_access_recipients(user_profile, to_users)try:recipient_id = recipient_for_user_profiles(to_users, False, None, user_profile).idexcept ValidationError as e: # nocoveragediff --git a/zerver/tests/test_drafts.py b/zerver/tests/test_drafts.pyindex ecff4e60aad..d096687b90c 100644--- a/zerver/tests/test_drafts.py+++ b/zerver/tests/test_drafts.py@@ -5,6 +5,7 @@ from typing import Anyimport orjsonfrom zerver.lib.test_classes import ZulipTestCase+from zerver.lib.users import check_can_access_userfrom zerver.models import Draft@@ -281,6 +282,44 @@ class DraftCreationTests(ZulipTestCase):]self.create_and_check_drafts_for_error(draft_dicts, "Invalid user ID 99999999999999")+ def test_create_personal_message_draft_for_inaccessible_users(self) -> None:+ self.set_up_db_for_testing_user_access()+ polonius = self.example_user("polonius")+ # Polonius shares a channel subscription with Hamlet, but has+ # no way to access Othello.+ hamlet = self.example_user("hamlet")+ othello = self.example_user("othello")++ draft_dict = {+ "type": "private",+ "to": [othello.id],+ "topic": "",+ "content": "What if we made it possible to sync drafts in Zulip?",+ "timestamp": 1595479019,+ }+ payload = {"drafts": orjson.dumps([draft_dict]).decode()}+ resp = self.api_post(polonius, "/api/v1/drafts", payload)+ self.assert_json_error(resp, "You do not have permission to access some of the recipients.")++ draft_dict["to"] = [hamlet.id, othello.id]+ payload = {"drafts": orjson.dumps([draft_dict]).decode()}+ resp = self.api_post(polonius, "/api/v1/drafts", payload)+ self.assert_json_error(resp, "You do not have permission to access some of the recipients.")++ self.assertFalse(Draft.objects.filter(user_profile=polonius).exists())+ # Creating those drafts would have created a+ # DirectMessageGroup, and with it Subscription objects that+ # grant Polonius access to Othello; verify that didn't happen.+ self.assertFalse(check_can_access_user(othello, polonius))++ # Drafts addressed only to users Polonius can access still work.+ draft_dict["to"] = [hamlet.id]+ payload = {"drafts": orjson.dumps([draft_dict]).decode()}+ resp = self.api_post(polonius, "/api/v1/drafts", payload)+ self.assert_json_success(resp)+ draft = Draft.objects.get(user_profile=polonius)+ self.assertEqual(draft.to_dict()["to"], [hamlet.id])+def test_create_draft_with_null_bytes(self) -> None:draft_dicts = [{@@ -351,6 +390,35 @@ class DraftEditTests(ZulipTestCase):new_draft_dict.pop("id")self.assertEqual(new_draft_dict, draft_dict)+ def test_edit_draft_to_add_inaccessible_user(self) -> None:+ self.set_up_db_for_testing_user_access()+ polonius = self.example_user("polonius")+ hamlet = self.example_user("hamlet")+ othello = self.example_user("othello")++ draft_dict = {+ "type": "private",+ "to": [hamlet.id],+ "topic": "",+ "content": "The API should be good",+ "timestamp": 1595505700,+ }+ resp = self.api_post(+ polonius, "/api/v1/drafts", {"drafts": orjson.dumps([draft_dict]).decode()}+ )+ self.assert_json_success(resp)+ draft_id = orjson.loads(resp.content)["ids"][0]++ draft_dict["to"] = [hamlet.id, othello.id]+ resp = self.api_patch(+ polonius, f"/api/v1/drafts/{draft_id}", {"draft": orjson.dumps(draft_dict).decode()}+ )+ self.assert_json_error(resp, "You do not have permission to access some of the recipients.")++ draft = Draft.objects.get(id=draft_id, user_profile=polonius)+ self.assertEqual(draft.to_dict()["to"], [hamlet.id])+ self.assertFalse(check_can_access_user(othello, polonius))+def test_edit_non_existent_draft(self) -> None:hamlet = self.example_user("hamlet")