0f76689076
`hermes send MESSAGE` hands surrogateescape-decoded argv straight to send_message_tool; a lone surrogate then crashes the UTF-8 marshal inside platform SDK request bodies (feishu/lark) and the message is silently lost after the retries. Every send_message caller (model tool call, `hermes send`, dashboard console) enters _handle_send, so scrub there — before media extraction, the session mirror and the platform sender see the text. Model output delivered by the gateway/cron is already scrubbed by finalize_turn / the gateway reply boundary. Fixes #113799
61 lines
2.1 KiB
Python
61 lines
2.1 KiB
Python
"""Outbound send bodies must not carry lone surrogate code points (#113799).
|
|
|
|
``hermes send MESSAGE`` passes argv through surrogateescape decoding on macOS
|
|
shells; a lone surrogate then crashes the UTF-8 marshal inside platform SDK
|
|
request bodies (feishu/lark) and the message is lost after the retries.
|
|
``_handle_send`` is the entry for every send_message caller (model tool call,
|
|
``hermes send``, dashboard console), so scrubbing there closes the class.
|
|
"""
|
|
|
|
import asyncio
|
|
import json
|
|
import re
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock, patch
|
|
|
|
from gateway.config import Platform
|
|
from tools.send_message_tool import send_message_tool
|
|
|
|
_SURROGATE_RE = re.compile(r"[\ud800-\udfff]")
|
|
|
|
|
|
def _run_async_immediately(coro):
|
|
return asyncio.run(coro)
|
|
|
|
|
|
def _make_config():
|
|
telegram_cfg = SimpleNamespace(enabled=True, token="***", extra={})
|
|
return SimpleNamespace(
|
|
platforms={Platform.TELEGRAM: telegram_cfg},
|
|
get_home_channel=lambda _platform: None,
|
|
)
|
|
|
|
|
|
def _send(message):
|
|
send_mock = AsyncMock(return_value={"success": True})
|
|
with patch("gateway.config.load_gateway_config", return_value=_make_config()), \
|
|
patch("tools.interrupt.is_interrupted", return_value=False), \
|
|
patch("model_tools._run_async", side_effect=_run_async_immediately), \
|
|
patch("tools.send_message_tool._send_to_platform", new=send_mock), \
|
|
patch("gateway.mirror.mirror_to_session", return_value=True):
|
|
result = json.loads(
|
|
send_message_tool({"action": "send", "target": "telegram:12345", "message": message})
|
|
)
|
|
return result, send_mock
|
|
|
|
|
|
def test_lone_surrogates_are_scrubbed_before_the_platform_send():
|
|
result, send_mock = _send("警报 \ud800\udfff done")
|
|
|
|
assert result["success"] is True
|
|
delivered = send_mock.await_args.args[3]
|
|
assert not _SURROGATE_RE.search(delivered)
|
|
assert delivered == "警报 \ufffd\ufffd done"
|
|
|
|
|
|
def test_surrogate_free_message_is_sent_unchanged():
|
|
result, send_mock = _send("all clean: 你好 \U0001f44d")
|
|
|
|
assert result["success"] is True
|
|
assert send_mock.await_args.args[3] == "all clean: 你好 \U0001f44d"
|