diff --git a/CHANGELOG.md b/CHANGELOG.md index 588d4b4e..247e5dee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Hermes Web UI -- Changelog +## [v0.50.128] — 2026-04-21 + +### Fixed +- **`"` no longer mangles to `"` inside code blocks** — the autolink pass in `renderMd()` was operating inside `
` blocks because they weren't stashed before the pass ran. When a code block contained a URL adjacent to `"` (the HTML-escaped form of `"`), the autolink regex captured the entity suffix and `esc()` double-encoded it, producing `"` in the rendered HTML and copy buffer. Fixed by adding `
` blocks to `_al_stash` so the autolink regex never touches code-block content. Reported and fixed by @starship-s. (#801)
+
 ## [v0.50.127] — 2026-04-21
 
 ### Fixed
diff --git a/static/ui.js b/static/ui.js
index dfb89b50..1256782f 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -636,9 +636,9 @@ function renderMd(raw){
   const SAFE_TAGS=/^<\/?(strong|em|code|pre|h[1-6]|ul|ol|li|table|thead|tbody|tr|th|td|hr|blockquote|p|br|a|img|div|span)([\s>]|$)/i;
   s=s.replace(/<\/?[a-z][^>]*>/gi,tag=>SAFE_TAGS.test(tag)?tag:esc(tag));
   // Autolink: convert plain URLs to clickable links.
-  // Stash existing  tags first so we never re-link a URL already inside href="...".
+  // Stash ,  and 
 blocks so autolink never runs inside them.
   const _al_stash=[];
-  s=s.replace(/(]*>[\s\S]*?<\/a>|]*>)/g,m=>{_al_stash.push(m);return `\x00B${_al_stash.length-1}\x00`;});
+  s=s.replace(/(]*>[\s\S]*?<\/a>|]*>|]*>[\s\S]*?<\/pre>)/g,m=>{_al_stash.push(m);return `\x00B${_al_stash.length-1}\x00`;});
   s=s.replace(/(https?:\/\/[^\s<>"'\)\]]+)/g,(url)=>{
     // Strip trailing punctuation that was likely not part of the URL
     const trail=url.match(/[.,;:!?)]$/)?url.slice(-1):'';
diff --git a/tests/test_quote_entity_mangling.py b/tests/test_quote_entity_mangling.py
new file mode 100644
index 00000000..db4a6ba3
--- /dev/null
+++ b/tests/test_quote_entity_mangling.py
@@ -0,0 +1,302 @@
+r"""
+Regression tests for the quote-entity mangling bug in renderMd().
+
+Root cause: the _al_stash before the outer autolink pass only stashed  and
+ tags.  
 blocks produced by the fenced-code-block pass were NOT
+stashed, so the autolink regex operated inside them.  When a code block
+contained a URL followed by " (the esc() form of "), the autolink regex
+captured the trailing entity as part of the URL; esc(clean) then
+double-escaped the & into &, yielding &quot; in the rendered HTML and
+in the copy buffer.
+
+Fix: extend _al_stash regex to also stash ]*>[\s\S]*?<\/pre>
+blocks so the outer autolink scanner never touches code-block content.
+"""
+import html as _html
+import pathlib
+import re
+import subprocess
+
+REPO_ROOT = pathlib.Path(__file__).parent.parent
+UI_JS_PATH = REPO_ROOT / "static" / "ui.js"
+UI_JS = UI_JS_PATH.read_text(encoding="utf-8")
+
+
+# ── helpers: Python mirror of the relevant renderMd() segment ────────────────
+
+def esc(s):
+    return _html.escape(str(s), quote=True)
+
+
+def _render_code_block(md):
+    """Simulate the fenced-code-block pass (renderMd lines ~537-541)."""
+    def repl(m):
+        lang = (m.group(1) or "").strip().lower()
+        code = re.sub(r'\n$', '', m.group(2))
+        h = f'
{esc(lang)}
' if lang else '' + lang_attr = f' class="language-{esc(lang)}"' if lang else '' + return f'{h}
{esc(code)}
' + return re.sub(r'```([\w+-]*)\n?([\s\S]*?)```', repl, md) + + +SAFE_TAGS_RE = re.compile( + r'^]|$)', re.I +) + + +def _safe_tags_pass(s): + return re.sub( + r']*>', + lambda m: m.group() if SAFE_TAGS_RE.match(m.group()) else esc(m.group()), + s, + ) + + +def _autolink(url): + trail = url[-1] if url[-1] in '.,;:!?)' else '' + clean = url[:-1] if trail else url + return f'
{esc(clean)}{trail}' + + +def _al_stash_and_autolink(s, fixed=True): + """Simulate the _al_stash + autolink + restore pass. + + fixed=True → uses the patched regex that also stashes
…
+ fixed=False → uses the original buggy regex (only and ) + """ + al_stash = [] + + def stash_fn(m): + al_stash.append(m.group(0)) + return f'\x00B{len(al_stash)-1}\x00' + + if fixed: + pattern = r'(]*>[\s\S]*?|]*>|]*>[\s\S]*?
)' + else: + pattern = r'(]*>[\s\S]*?|]*>)' + + s = re.sub(pattern, stash_fn, s) + s = re.sub(r'(https?://[^\s<>"\'\)\]]+)', lambda m: _autolink(m.group(1)), s) + s = re.sub(r'\x00B(\d+)\x00', lambda m: al_stash[int(m.group(1))], s) + return s + + +def render_fixed(md): + s = _render_code_block(md) + s = _safe_tags_pass(s) + s = _al_stash_and_autolink(s, fixed=True) + return s + + +def render_buggy(md): + s = _render_code_block(md) + s = _safe_tags_pass(s) + s = _al_stash_and_autolink(s, fixed=False) + return s + + +def strip_tags(html): + """Return text content of HTML (tags removed, entities preserved).""" + return re.sub(r'<[^>]+>', '', html) + + +# ── Source-level checks ─────────────────────────────────────────────────────── + +class TestAlStashSourceFix: + + def test_al_stash_includes_pre_pattern(self): + """_al_stash regex must stash
…
blocks to protect code from autolink.""" + al_stash_idx = UI_JS.index('const _al_stash=[]') + al_stash_block = UI_JS[al_stash_idx : al_stash_idx + 300] + assert ']*> " + "pattern so code blocks are protected from the outer autolink scanner" + ) + + def test_al_stash_pre_regex_uses_lazy_dotall(self): + """_al_stash must use [\\s\\S]*? (lazy dotall) for the
 branch."""
+        al_stash_idx = UI_JS.index('const _al_stash=[]')
+        al_stash_block = UI_JS[al_stash_idx : al_stash_idx + 300]
+        # The pattern 
[\s\S]*?<\/pre> must appear in the stash line
+        assert r'[\s\S]*?' in al_stash_block, (
+            "_al_stash 
 branch must use [\\s\\S]*? for multi-line matching"
+        )
+        assert r'<\/pre>' in al_stash_block or '
' in al_stash_block, ( + "_al_stash must close the
 branch with 
" + ) + + def test_al_stash_still_covers_a_and_img(self): + """_al_stash must continue to stash and (regression guard for #487b).""" + al_stash_idx = UI_JS.index('const _al_stash=[]') + al_stash_block = UI_JS[al_stash_idx : al_stash_idx + 300] + assert ' tags" + ) + assert ' tags" + ) + + def test_js_syntax_valid(self): + """ui.js must pass node --check after the fix.""" + result = subprocess.run( + ['node', '--check', str(UI_JS_PATH)], + capture_output=True, text=True, + ) + assert result.returncode == 0, f"node --check failed:\n{result.stderr}" + + +# ── Behaviour: code blocks with quoted URLs ─────────────────────────────────── + +class TestCodeBlockQuotedUrlFixed: + + _MD_SIMPLE = '```\nhttps://example.com/path?q="hello"\n```' + _MD_PYTHON = '```python\nurl = "https://api.example.com/v1?token=\\"abc\\""\n```' + _MD_BASH = '```bash\ncurl -H \'Accept: application/json\' "https://api.example.com/"\n```' + + def test_no_amp_quot_in_code_block_url(self): + """Code block with a quoted URL must not produce &quot; in output.""" + result = render_fixed(self._MD_SIMPLE) + assert '&quot;' not in result, ( + f"&quot; found in rendered output — quote entity double-escaped:\n{result}" + ) + + def test_no_a_tag_injected_inside_pre(self): + """The autolink pass must NOT inject tags inside
 blocks."""
+        result = render_fixed(self._MD_SIMPLE)
+        # Extract the 
…
portion + pre_match = re.search(r'
[\s\S]*?
', result) + assert pre_match, "No
 block found in rendered output"
+        pre_content = pre_match.group(0)
+        assert ' tag injected inside 
 block:\n{pre_content}"
+        )
+
+    def test_copy_text_shows_correct_url(self):
+        """textContent equivalent of code block must contain the literal URL without mangling."""
+        result = render_fixed(self._MD_SIMPLE)
+        text = strip_tags(result)
+        # Entity-decode to simulate browser textContent
+        text = _html.unescape(text)
+        assert 'https://example.com/path?q="hello"' in text, (
+            f"URL with quotes corrupted in text content:\n{text!r}"
+        )
+
+    def test_python_code_block_not_mangled(self):
+        """Python code block with double-quoted URL strings must not be mangled."""
+        result = render_fixed(self._MD_PYTHON)
+        assert '&quot;' not in result, (
+            f"&quot; found in Python code block output:\n{result}"
+        )
+        pre_match = re.search(r'
[\s\S]*?
', result) + assert pre_match and '
inside
 (proves test catches it)."""
+        buggy = render_buggy(self._MD_SIMPLE)
+        pre_match = re.search(r'
[\s\S]*?
', buggy) + assert pre_match and '
inside
 — test validity check failed"
+        )
+
+
+# ── Behaviour: non-code autolink is unaffected ───────────────────────────────
+
+class TestNonCodeAutolinkUnaffected:
+
+    def test_bare_url_in_paragraph_still_autolinks(self):
+        """A plain URL in running text must still be wrapped in  by the fixed pipeline."""
+        result = render_fixed("Visit https://example.com for more info.")
+        assert ' tag."""
+        result = render_fixed("See https://foo.com and https://bar.com")
+        assert result.count('= 2, (
+            f"Expected 2 autolinks, got {result.count(' block must appear verbatim in the output."""
+        md = '```python\nprint("hello")\n```'
+        result = render_fixed(md)
+        assert '
' in result, "No 
 block in output"
+        assert '
' in result, "Unclosed
 in output"
+        # The code must still contain the escaped quote
+        assert '"' in result or 'hello' in result, (
+            f"Code block content lost after stash/restore:\n{result}"
+        )
+
+    def test_code_block_and_bare_url_in_same_message(self):
+        """A message with both a code block and a bare URL must autolink only the URL."""
+        md = "```\nhttps://internal.example.com?token=\"abc\"\n```\n\nSee https://docs.example.com"
+        result = render_fixed(md)
+        # The bare URL in text should be linked
+        assert '[\s\S]*?
', result) + assert pre_match and ' inside a code block must be HTML-escaped, not executed.""" + result = render_fixed('```\n\n```') + assert '