mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-28 23:11:37 +08:00
8a1e247c6c
Follow-up to the allowed_channels wildcard fix in the preceding commit. The same '*' literal trap affected two other Discord channel config lists: - DISCORD_IGNORED_CHANNELS: '*' was stored as the literal string in the ignored set, and the intersection check never matched real channel IDs, so '*' was a no-op instead of silencing every channel. - DISCORD_FREE_RESPONSE_CHANNELS: same shape — '*' never matched, so the bot still required a mention everywhere. Add a '*' short-circuit to both checks, matching the allowed_channels semantics. Extend tests/gateway/test_discord_allowed_channels.py with regression coverage for all three lists. Refs: #14920
105 lines
4.4 KiB
Python
105 lines
4.4 KiB
Python
"""Regression guard for #14920: wildcard "*" in Discord channel config lists.
|
|
|
|
Setting ``allowed_channels: "*"``, ``free_response_channels: "*"``, or
|
|
``ignored_channels: "*"`` in config (or their ``DISCORD_*_CHANNELS`` env var
|
|
equivalents) must behave as a wildcard — i.e. the bot responds in every
|
|
channel (or is silenced in every channel, for the ignored list). Previously
|
|
the literal string "*" was placed into a set and compared against numeric
|
|
channel IDs via set-intersection, which always produced an empty set and
|
|
caused every message to be silently dropped (for ``allowed_channels``) or
|
|
every ``free_response`` / ``ignored`` check to fail open.
|
|
"""
|
|
|
|
import unittest
|
|
|
|
|
|
def _channel_is_allowed(channel_id: str, allowed_channels_raw: str) -> bool:
|
|
"""Replicate the channel-allow-list check from discord.py on_message."""
|
|
if not allowed_channels_raw:
|
|
return True
|
|
allowed_channels = {ch.strip() for ch in allowed_channels_raw.split(",") if ch.strip()}
|
|
if "*" in allowed_channels:
|
|
return True
|
|
return bool({channel_id} & allowed_channels)
|
|
|
|
|
|
def _channel_is_ignored(channel_id: str, ignored_channels_raw: str) -> bool:
|
|
"""Replicate the ignored-channel check from discord.py on_message."""
|
|
ignored_channels = {
|
|
ch.strip() for ch in ignored_channels_raw.split(",") if ch.strip()
|
|
}
|
|
return "*" in ignored_channels or bool({channel_id} & ignored_channels)
|
|
|
|
|
|
def _channel_is_free_response(channel_id: str, free_channels_raw: str) -> bool:
|
|
"""Replicate the free-response-channel check from discord.py on_message."""
|
|
free_channels = {
|
|
ch.strip() for ch in free_channels_raw.split(",") if ch.strip()
|
|
}
|
|
return "*" in free_channels or bool({channel_id} & free_channels)
|
|
|
|
|
|
class TestDiscordAllowedChannelsWildcard(unittest.TestCase):
|
|
"""Wildcard and channel-list behaviour for DISCORD_ALLOWED_CHANNELS."""
|
|
|
|
def test_wildcard_allows_any_channel(self):
|
|
"""'*' should allow messages from any channel ID."""
|
|
self.assertTrue(_channel_is_allowed("1234567890", "*"))
|
|
|
|
def test_wildcard_in_list_allows_any_channel(self):
|
|
"""'*' mixed with other entries still allows any channel."""
|
|
self.assertTrue(_channel_is_allowed("9999999999", "111,*,222"))
|
|
|
|
def test_exact_match_allowed(self):
|
|
"""Channel ID present in the explicit list is allowed."""
|
|
self.assertTrue(_channel_is_allowed("1234567890", "1234567890,9876543210"))
|
|
|
|
def test_non_matching_channel_blocked(self):
|
|
"""Channel ID absent from the explicit list is blocked."""
|
|
self.assertFalse(_channel_is_allowed("5555555555", "1234567890,9876543210"))
|
|
|
|
def test_empty_allowlist_allows_all(self):
|
|
"""Empty DISCORD_ALLOWED_CHANNELS means no restriction."""
|
|
self.assertTrue(_channel_is_allowed("1234567890", ""))
|
|
|
|
def test_whitespace_only_entry_ignored(self):
|
|
"""Entries that are only whitespace are stripped and ignored."""
|
|
self.assertFalse(_channel_is_allowed("1234567890", " , "))
|
|
|
|
|
|
class TestDiscordIgnoredChannelsWildcard(unittest.TestCase):
|
|
"""Wildcard and channel-list behaviour for DISCORD_IGNORED_CHANNELS."""
|
|
|
|
def test_wildcard_silences_every_channel(self):
|
|
"""'*' in ignored_channels silences the bot everywhere."""
|
|
self.assertTrue(_channel_is_ignored("1234567890", "*"))
|
|
|
|
def test_empty_ignored_list_silences_nothing(self):
|
|
self.assertFalse(_channel_is_ignored("1234567890", ""))
|
|
|
|
def test_exact_match_is_ignored(self):
|
|
self.assertTrue(_channel_is_ignored("111", "111,222"))
|
|
|
|
def test_non_match_not_ignored(self):
|
|
self.assertFalse(_channel_is_ignored("333", "111,222"))
|
|
|
|
|
|
class TestDiscordFreeResponseChannelsWildcard(unittest.TestCase):
|
|
"""Wildcard and channel-list behaviour for DISCORD_FREE_RESPONSE_CHANNELS."""
|
|
|
|
def test_wildcard_makes_every_channel_free_response(self):
|
|
"""'*' in free_response_channels exempts every channel from mention-required."""
|
|
self.assertTrue(_channel_is_free_response("1234567890", "*"))
|
|
|
|
def test_wildcard_in_list_applies_everywhere(self):
|
|
self.assertTrue(_channel_is_free_response("9999999999", "111,*,222"))
|
|
|
|
def test_exact_match_is_free_response(self):
|
|
self.assertTrue(_channel_is_free_response("111", "111,222"))
|
|
|
|
def test_non_match_not_free_response(self):
|
|
self.assertFalse(_channel_is_free_response("333", "111,222"))
|
|
|
|
def test_empty_list_no_free_response(self):
|
|
self.assertFalse(_channel_is_free_response("111", ""))
|