From e54f56d9104f9ecf201ac817de47472744eb790b Mon Sep 17 00:00:00 2001 From: ajp_anton Date: Wed, 21 Oct 2026 22:08:51 +0000 Subject: [PATCH] Protect link URLs from Telegram inline formatting --- linkki-tiedotus/linkki_poster/formatting.py | 30 ++++++++++---- linkki-tiedotus/tests/test_formatting.py | 43 +++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/linkki-tiedotus/linkki_poster/formatting.py b/linkki-tiedotus/linkki_poster/formatting.py index 8e84882..12db082 100644 --- a/linkki-tiedotus/linkki_poster/formatting.py +++ b/linkki-tiedotus/linkki_poster/formatting.py @@ -95,7 +95,18 @@ def markdown_subset_to_html(markdown_text: str) -> str: escaped_text = _map_blockquotes(escaped_text) escaped_text = _map_headings(escaped_text) escaped_text = _map_lists(escaped_text) - escaped_text = _map_standard_links(escaped_text) + escaped_text, link_token_values = _stash_standard_links(escaped_text) + escaped_text = _map_inline_styles(escaped_text) + for token, value in link_token_values.items(): + escaped_text = escaped_text.replace(token, value) + for token, value in escape_token_values.items(): + escaped_text = escaped_text.replace(token, value) + for token, value in code_token_values.items(): + escaped_text = escaped_text.replace(token, value) + return escaped_text + + +def _map_inline_styles(escaped_text: str) -> str: escaped_text = _map_style_pairs(escaped_text, r"\|\|([\s\S]+?)\|\|", "tg-spoiler") escaped_text = _map_style_pairs(escaped_text, r"\*\*(.+?)\*\*", "b") escaped_text = _map_style_pairs(escaped_text, r"__(.+?)__", "b") @@ -103,10 +114,6 @@ def markdown_subset_to_html(markdown_text: str) -> str: escaped_text = _map_style_pairs(escaped_text, r"~~(.+?)~~", "s") escaped_text = _map_style_pairs(escaped_text, r"(? str: return "\u00a0" * (level * 4) -def _map_standard_links(text: str) -> str: +def _stash_standard_links(text: str) -> tuple[str, dict[str, str]]: + token_values: dict[str, str] = {} + def repl(match: re.Match[str]) -> str: label = match.group(1) url = match.group(2) - return f'{label}' + # URL labels and destinations are literal, not inline Markdown. + if label != url and not re.match(r"[a-z][a-z0-9+.-]*://", label, re.IGNORECASE): + label = _map_inline_styles(label) + token = f"ZZLINK{len(token_values)}ZZ" + token_values[token] = f'{label}' + return token - return re.sub(r"\[([^\]]+)\]\(([^)\s]+)\)", repl, text) + return re.sub(r"\[([^\]]+)\]\(([^)\s]+)\)", repl, text), token_values def _map_style_pairs(text: str, pattern: str, html_tag: str) -> str: diff --git a/linkki-tiedotus/tests/test_formatting.py b/linkki-tiedotus/tests/test_formatting.py index c61f039..2146497 100644 --- a/linkki-tiedotus/tests/test_formatting.py +++ b/linkki-tiedotus/tests/test_formatting.py @@ -1,3 +1,7 @@ +import html + +import pytest + from linkki_poster.formatting import ( CAPTION_LIMIT, estimate_caption_length, @@ -123,3 +127,42 @@ def test_apostrophes_are_not_escaped_in_headings_or_plain_text() -> None: assert "'" not in heading assert "'" not in plain_heading_char assert "'" not in bold + + + +@pytest.mark.parametrize("url", [ + "https://example.org/ril_gaala", + "https://example.org/a__b++c~~d||e*f", + "https://example.org/event?name=ril_gaala&language=fi", +]) +def test_url_labels_and_destinations_are_not_parsed_as_styles(url: str) -> None: + rendered = render_template(parse_markdown_template(f"[{url}]({url})"), {}) + assert rendered == f'{html.escape(url, quote=False)}' + + +def test_url_label_remains_literal_when_destination_differs() -> None: + rendered = render_template(parse_markdown_template( + "[https://example.org/a_b_c](https://example.org/register)", + ), {}) + assert rendered == 'https://example.org/a_b_c' + + +def test_formatted_link_label_and_surrounding_styles_still_work() -> None: + rendered = render_template(parse_markdown_template( + "_Read [**bold** ++underlined++](https://example.org/a_b_c) now_", + ), {}) + assert rendered == 'Read bold underlined now' + + +def test_url_underscore_does_not_consume_later_italic_marker() -> None: + rendered = render_template(parse_markdown_template( + "[Register](https://example.org/ril_gaala) and _italic_", + ), {}) + assert rendered == 'Register and italic' + + +def test_escaped_link_markers_are_restored_inside_protected_links() -> None: + rendered = render_template(parse_markdown_template( + r"[https://example.org/ril\_gaala](https://example.org/ril\_gaala)", + ), {}) + assert rendered == 'https://example.org/ril_gaala'