Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

fix(backend): require Discord server managers for bot setup (#13092)

Bentlybbfdbc3ba9fc
diff --git a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter.py b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter.py
index 18e14446a1..9dfaca7e9f 100644
--- a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter.py
+++ b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter.py
@@ -189,15 +189,7 @@ class DiscordAdapter(PlatformAdapter):
@self._client.event
async def on_message(message: discord.Message) -> None:
- # Always skip our own messages — without this we'd loop forever
- # answering our own replies. Other bots are fine: in channels
- # we still require an @mention, in threads we still require an
- # explicit subscription, so the existing gates already bound the
- # blast radius of bot-to-bot interactions.
- if (
- self._client.user is not None
- and message.author.id == self._client.user.id
- ):
+ if self._should_ignore_message(message):
return
if self._on_message_callback is None:
return
@@ -229,6 +221,11 @@ class DiscordAdapter(PlatformAdapter):
)
await self._on_message_callback(ctx, self)
+ def _should_ignore_message(self, message: discord.Message) -> bool:
+ return (
+ self._client.user is not None and message.author.id == self._client.user.id
+ )
+
def _is_mentioned(self, message: discord.Message) -> bool:
if message.guild is None:
return True # DMs always count
diff --git a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter_test.py b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter_test.py
index a3a61a00a7..9bf1ccb9f9 100644
--- a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter_test.py
+++ b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/adapter_test.py
@@ -135,6 +135,29 @@ class TestChannelType:
# ── _is_mentioned ──────────────────────────────────────────────────────
+class TestShouldIgnoreMessage:
+ def test_ignores_own_message(self):
+ adapter, _ = _bare_adapter(bot_id=1000)
+ msg = _message("hi", [])
+ msg.author = MagicMock(id=1000, bot=True)
+
+ assert adapter._should_ignore_message(msg) is True
+
+ def test_allows_other_bot_message(self):
+ adapter, _ = _bare_adapter(bot_id=1000)
+ msg = _message("hi", [])
+ msg.author = MagicMock(id=2000, bot=True)
+
+ assert adapter._should_ignore_message(msg) is False
+
+ def test_allows_human_message(self):
+ adapter, _ = _bare_adapter(bot_id=1000)
+ msg = _message("hi", [])
+ msg.author = MagicMock(id=2000, bot=False)
+
+ assert adapter._should_ignore_message(msg) is False
+
+
class TestIsMentioned:
def test_dm_always_counts_as_mentioned(self):
adapter, _ = _bare_adapter(bot_id=1000)
diff --git a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands.py b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands.py
index 5fcbb62fb6..5b65994724 100644
--- a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands.py
+++ b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands.py
@@ -24,6 +24,7 @@ def register(tree: app_commands.CommandTree, api: BotBackend) -> None:
name="setup",
description="Link this server to an AutoGPT account for AutoPilot",
)
+ @app_commands.default_permissions(manage_guild=True)
async def setup_command(interaction: discord.Interaction) -> None:
await _handle_setup(interaction, api)
@@ -48,6 +49,14 @@ async def _handle_setup(interaction: discord.Interaction, api: BotBackend) -> No
)
return
+ if not interaction.permissions.manage_guild:
+ await interaction.response.send_message(
+ "Only members with the Manage Server permission can link this "
+ "server to an AutoGPT account.",
+ ephemeral=True,
+ )
+ return
+
await interaction.response.defer(ephemeral=True)
try:
result = await api.create_link_token(
diff --git a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands_test.py b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands_test.py
index c390173fd9..12bdc72eae 100644
--- a/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands_test.py
+++ b/autogpt_platform/backend/backend/copilot/bot/adapters/discord/commands_test.py
@@ -14,11 +14,12 @@ from ...bot_backend import LinkTokenResult
from .commands import _handle_help, _handle_setup, _handle_unlink
-def _interaction(*, guild: bool = True) -> MagicMock:
+def _interaction(*, guild: bool = True, manage_guild: bool = True) -> MagicMock:
interaction = MagicMock()
interaction.response.send_message = AsyncMock()
interaction.response.defer = AsyncMock()
interaction.followup.send = AsyncMock()
+ interaction.permissions = MagicMock(manage_guild=manage_guild)
if guild:
# MagicMock treats `name` as a constructor kwarg for the mock's repr,
# not as an attribute — so set it after construction.
@@ -55,6 +56,18 @@ class TestHandleSetup:
interaction.response.send_message.assert_awaited_once()
api.create_link_token.assert_not_awaited()
+ @pytest.mark.asyncio
+ async def test_non_admin_guild_invocation_is_rejected(self):
+ interaction = _interaction(manage_guild=False)
+ api = _api_with_token()
+ await _handle_setup(interaction, api)
+
+ interaction.response.send_message.assert_awaited_once()
+ assert interaction.response.send_message.await_args.kwargs["ephemeral"] is True
+ assert "Manage Server" in interaction.response.send_message.await_args.args[0]
+ interaction.response.defer.assert_not_awaited()
+ api.create_link_token.assert_not_awaited()
+
@pytest.mark.asyncio
async def test_guild_invocation_creates_token_and_posts_button(self):
interaction = _interaction()