Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
slack_message_conversion: Handle invalid attachment title links.
PieterCK0c9efadbd85e
diff --git a/zerver/data_import/slack_message_conversion.py b/zerver/data_import/slack_message_conversion.pyindex 7ac0636e47d..3a57b764f6a 100644--- a/zerver/data_import/slack_message_conversion.py+++ b/zerver/data_import/slack_message_conversion.py@@ -413,8 +413,12 @@ def render_attachment(attachment: WildValue) -> str:if attachment.get("title"):title = attachment["title"].tame(check_string)if attachment.get("title_link"):- title_link = attachment["title_link"].tame(check_url)- pieces.append(f"## [{title}]({title_link})")+ try:+ title_link = attachment["title_link"].tame(check_url)+ title_text = f"## [{title}]({title_link})"+ except ValidationError:+ title_text = f"## {title}"+ pieces.append(title_text)else:pieces.append(f"## {title}")if attachment.get("pretext"):diff --git a/zerver/tests/test_slack_message_conversion.py b/zerver/tests/test_slack_message_conversion.pyindex cc43ffc0f6f..c4a552bee43 100644--- a/zerver/tests/test_slack_message_conversion.py+++ b/zerver/tests/test_slack_message_conversion.py@@ -7,9 +7,11 @@ from typing_extensions import overridefrom zerver.data_import.slack_message_conversion import (convert_to_zulip_markdown,get_user_full_name,+ render_attachment,)from zerver.lib import mdifffrom zerver.lib.test_classes import ZulipTestCase+from zerver.lib.validator import wrap_wild_valueclass SlackMessageConversion(ZulipTestCase):@@ -105,6 +107,12 @@ class SlackMessageConversion(ZulipTestCase):self.assertEqual(text, message)self.assertEqual(mentioned_users, [])+ def test_render_attachment_invalid_title_link(self) -> None:+ attachment = wrap_wild_value(+ "attachment", {"title": "Sample title.", "title_link": "https://"}+ )+ self.assertEqual(render_attachment(attachment), "## Sample title.")+def test_has_link(self) -> None:slack_user_map: dict[str, int] = {}diff --git a/zerver/webhooks/slack_incoming/fixtures/attachment_relative_title_link.json b/zerver/webhooks/slack_incoming/fixtures/attachment_relative_title_link.jsonnew file mode 100644index 00000000000..3fc05295c18--- /dev/null+++ b/zerver/webhooks/slack_incoming/fixtures/attachment_relative_title_link.json@@ -0,0 +1,9 @@+{+ "attachments": [+ {+ "title": "Sample title.",+ "title_link": "/#/alerts?receiver=default",+ "text": "Sample text."+ }+ ]+}diff --git a/zerver/webhooks/slack_incoming/tests.py b/zerver/webhooks/slack_incoming/tests.pyindex 00339f70ade..c5ee2899d8f 100644--- a/zerver/webhooks/slack_incoming/tests.py+++ b/zerver/webhooks/slack_incoming/tests.py@@ -368,6 +368,20 @@ Sample footer.expected_message,)+ def test_attachment_relative_title_link(self) -> None:+ expected_topic_name = ""+ expected_message = """+## Sample title.++Sample text.+ """.strip()++ self.check_webhook(+ "attachment_relative_title_link",+ expected_topic_name,+ expected_message,+ )+def test_attachment_pieces_all_null(self) -> None:self.check_webhook("attachment_pieces_all_null", expect_noop=True)