fix(mattermost): address second round of review feedback

- Send pairing code response (not empty message) for denied DMs
- Resolve actual channel type in action events before permission check
- Use word-boundary regex in _is_mentioned to avoid partial matches
- Use safe_filename for download path sanitization
- Add tests: denied DM pairing, denied action event, is_mentioned boundary
This commit is contained in:
Kenneth Zhao
2026-07-06 12:14:57 +08:00
committed by Xubin Ren
parent 76877036f7
commit f9806cc60f
2 changed files with 101 additions and 9 deletions
+79
View File
@@ -11,6 +11,7 @@ import pytest
from nanobot.bus.events import OutboundMessage
from nanobot.bus.queue import MessageBus
from nanobot.pairing import PAIRING_CODE_META_KEY
from nanobot.channels.mattermost import (
MATTERMOST_MAX_MESSAGE_LEN,
MattermostChannel,
@@ -669,6 +670,7 @@ async def test_thread_session_key():
async def test_action_event():
channel, fake = _make_channel()
channel._self_id = "bot_id"
fake.set_get_response("/api/v4/channels/c1", {"id": "c1", "type": "O"})
with patch.object(channel, "_handle_message", AsyncMock()) as mock_handle:
ws_msg = {
"event": "action",
@@ -688,6 +690,25 @@ async def test_action_event():
)
@pytest.mark.asyncio
async def test_action_event_denied_dm():
channel, fake = _make_channel({"dm": {"policy": "allowlist", "allowFrom": ["u_other"]}})
channel._self_id = "bot_id"
fake.set_get_response("/api/v4/channels/c1", {"id": "c1", "type": "D"})
with patch.object(channel, "_handle_message", AsyncMock()) as mock_handle:
ws_msg = {
"event": "action",
"data": {
"user_id": "u1",
"channel_id": "c1",
"context": {"selected_option": "Approve"},
},
"broadcast": {},
}
await channel._handle_ws_message(ws_msg)
mock_handle.assert_not_awaited()
# ---------------------------------------------------------------------------
# Post deleted event
# ---------------------------------------------------------------------------
@@ -742,6 +763,64 @@ async def test_dm_allowlist_with_username_match():
assert await channel._is_allowed("u2", "dm_chan", "dm") is False
# ---------------------------------------------------------------------------
# Denied DM sends pairing code (not empty message)
# ---------------------------------------------------------------------------
@pytest.mark.asyncio
async def test_denied_dm_sends_pairing_not_empty_inbound():
channel, fake = _make_channel({"dm": {"policy": "allowlist", "allowFrom": ["u_allowed"]}})
channel._self_id = "botuserid123"
channel._self_username = "nanobot"
ws_msg = {
"event": "posted",
"data": {
"channel_type": "D",
"post": json.dumps({
"id": "p1", "user_id": "u_denied",
"channel_id": "dm_chan", "message": "hello", "root_id": "",
}),
},
"broadcast": {"channel_id": "dm_chan", "team_id": ""},
}
inbound_events = []
channel.bus.publish_inbound = AsyncMock(side_effect=lambda e: inbound_events.append(e))
with patch.object(channel, "send", AsyncMock()) as mock_send:
await channel._handle_ws_message(ws_msg)
mock_send.assert_awaited_once()
sent = mock_send.call_args[0][0]
assert sent.channel == "mattermost"
assert sent.chat_id == "dm_chan"
assert "pairing" in sent.content.lower() or "code" in sent.content.lower()
assert PAIRING_CODE_META_KEY in (sent.metadata or {})
assert len(inbound_events) == 0
# ---------------------------------------------------------------------------
# Bot mention boundary
# ---------------------------------------------------------------------------
def test_is_mentioned_exact():
channel, fake = _make_channel({"groupPolicy": "mention"})
channel._self_username = "nanobot"
assert channel._is_mentioned("hello @nanobot how are you") is True
assert channel._is_mentioned("hello @nanobotty") is False
assert channel._is_mentioned("@nanobot_extra") is False
assert channel._is_mentioned("plain text") is False
def test_is_mentioned_no_username():
channel, fake = _make_channel({"groupPolicy": "mention"})
channel._self_username = None
assert channel._is_mentioned("hello @nanobot") is False
# ---------------------------------------------------------------------------
# split_message helper
# ---------------------------------------------------------------------------