paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

webhooks/jira: Decode topics on our end.

Browse Source 
The problem addressed in 006e47198c
resurfaces with topics when a user provides a custom topic in the
webhook URL.
This commit is contained in:
Eeshan Garg
2018-12-03 21:29:39 -03:30
committed by Tim Abbott
parent 7d0d4b5eec
commit 901100bebf
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/webhooks/common.py
View File

@@ -67,7 +67,7 @@ def check_send_webhook_message(
request: HttpRequest, user_profile: UserProfile, request: HttpRequest, user_profile: UserProfile,
topic: str, body: str, stream: Optional[str]=REQ(default=None), topic: str, body: str, stream: Optional[str]=REQ(default=None),
user_specified_topic: Optional[str]=REQ("topic", default=None), user_specified_topic: Optional[str]=REQ("topic", default=None),
unquote_stream: Optional[bool]=False unquote_url_parameters: Optional[bool]=False
) -> None: ) -> None:
if stream is None: if stream is None:
@@ -78,12 +78,14 @@ def check_send_webhook_message(
# Some third-party websites (such as Atlassian's JIRA), tend to # Some third-party websites (such as Atlassian's JIRA), tend to
# double escape their URLs in a manner that escaped space characters # double escape their URLs in a manner that escaped space characters
# (%20) are never properly decoded. We work around that by making sure # (%20) are never properly decoded. We work around that by making sure
# that the stream name is decoded on our end. # that the URL parameters are decoded on our end.
if unquote_stream: if unquote_url_parameters:
stream = unquote(stream) stream = unquote(stream)
if user_specified_topic is not None: if user_specified_topic is not None:
topic = user_specified_topic topic = user_specified_topic
if unquote_url_parameters:
topic = unquote(topic)
try: try:
check_send_stream_message(user_profile, request.client, check_send_stream_message(user_profile, request.client,

8
zerver/webhooks/jira/tests.py
View File

@@ -66,6 +66,14 @@ class JiraHookTests(WebhookTestCase):
self.assertEqual(msg.content, expected_message) self.assertEqual(msg.content, expected_message)
self.assertEqual(msg.topic_name(), expected_topic) self.assertEqual(msg.topic_name(), expected_topic)
def test_created_with_topic_with_spaces_double_escaped(self) -> None:
self.url = self.build_webhook_url(topic=quote(quote('alerts test')))
expected_topic = "alerts test"
expected_message = """Leo Franchi **created** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) priority Major, assigned to **no one**:
> New bug with hook"""
self.send_and_test_stream_message('created_v1', expected_topic, expected_message)
def test_created_with_unicode(self) -> None: def test_created_with_unicode(self) -> None:
expected_topic = u"BUG-15: New bug with à hook" expected_topic = u"BUG-15: New bug with à hook"
expected_message = u"""Leo Franchià **created** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) priority Major, assigned to **no one**: expected_message = u"""Leo Franchià **created** [BUG-15](http://lfranchi.com:8080/browse/BUG-15) priority Major, assigned to **no one**:

2
zerver/webhooks/jira/view.py
View File

@@ -243,5 +243,5 @@ def api_jira_webhook(request: HttpRequest, user_profile: UserProfile,
check_send_webhook_message(request, user_profile, check_send_webhook_message(request, user_profile,
subject, content, subject, content,
unquote_stream=True) unquote_url_parameters=True)
return json_success() return json_success()