paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

string_validation: Make check_stream_topic merely check, not alter.

Browse Source 
Co-authored-by: Shlok Patel <shlokcpatel2001@gmail.com>
This commit is contained in:
Alex Vandiver
2022-01-11 12:54:50 -08:00
parent 1cdb93f6aa
commit 58c8eebda2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/addressee.py
View File

@@ -147,7 +147,8 @@ class Addressee:
@staticmethod @staticmethod
def for_stream(stream: Stream, topic: str) -> "Addressee": def for_stream(stream: Stream, topic: str) -> "Addressee":
topic = check_stream_topic(topic) topic = topic.strip()
check_stream_topic(topic)
return Addressee( return Addressee(
msg_type="stream", msg_type="stream",
stream=stream, stream=stream,
@@ -156,7 +157,8 @@ class Addressee:
@staticmethod @staticmethod
def for_stream_name(stream_name: str, topic: str) -> "Addressee": def for_stream_name(stream_name: str, topic: str) -> "Addressee":
topic = check_stream_topic(topic) topic = topic.strip()
check_stream_topic(topic)
return Addressee( return Addressee(
msg_type="stream", msg_type="stream",
stream_name=stream_name, stream_name=stream_name,
@@ -165,7 +167,8 @@ class Addressee:
@staticmethod @staticmethod
def for_stream_id(stream_id: int, topic: str) -> "Addressee": def for_stream_id(stream_id: int, topic: str) -> "Addressee":
topic = check_stream_topic(topic) topic = topic.strip()
check_stream_topic(topic)
return Addressee( return Addressee(
msg_type="stream", msg_type="stream",
stream_id=stream_id, stream_id=stream_id,

7
zerver/lib/string_validation.py
View File

@@ -22,14 +22,11 @@ def check_stream_name(stream_name: str) -> None:
) )
def check_stream_topic(topic: str) -> str: def check_stream_topic(topic: str) -> None:
assert topic is not None if topic.strip() == "":
topic = topic.strip()
if topic == "":
raise JsonableError(_("Topic can't be empty")) raise JsonableError(_("Topic can't be empty"))
for character in topic: for character in topic:
unicodeCategory = unicodedata.category(character) unicodeCategory = unicodedata.category(character)
if unicodeCategory in ["Cc", "Cs", "Cn"]: if unicodeCategory in ["Cc", "Cs", "Cn"]:
raise JsonableError(_("Invalid characters in topic!")) raise JsonableError(_("Invalid characters in topic!"))
return topic