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): check a webhook delivery's signature before loading its owner's credentials (#15965)

Nicholas Tindle3c74723fb283
diff --git a/autogpt_platform/backend/backend/api/features/integrations/router.py b/autogpt_platform/backend/backend/api/features/integrations/router.py
index 0cbe9c9301..0030463c80 100644
--- a/autogpt_platform/backend/backend/api/features/integrations/router.py
+++ b/autogpt_platform/backend/backend/api/features/integrations/router.py
@@ -1255,15 +1255,6 @@ async def webhook_ingress_generic(
)
user_id = webhook.user_id
- try:
- credentials = (
- await creds_manager.get(user_id, webhook.credentials_id)
- if webhook.credentials_id
- else None
- )
- except NotFoundError as e:
- logger.warning(f"Webhook payload received for unknown webhook #{webhook_id}")
- raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(e))
# Run provider signature verification (no-op for providers whose protocol
# has no signing scheme). 403 on failure; not 404 — that would leak
@@ -1286,6 +1277,17 @@ async def webhook_ingress_generic(
logger.info(f"Dropping webhook #{webhook_id} delivery: owner is banned")
return
+ # Only after the signature: loading can refresh the owner's OAuth token.
+ try:
+ credentials = (
+ await creds_manager.get(user_id, webhook.credentials_id)
+ if webhook.credentials_id
+ else None
+ )
+ except NotFoundError as e:
+ logger.warning(f"Webhook payload received for unknown webhook #{webhook_id}")
+ raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail=str(e))
+
payload, event_type = await webhook_manager.validate_payload(
webhook, request, credentials
)
diff --git a/autogpt_platform/backend/backend/api/features/integrations/webhook_ingress_test.py b/autogpt_platform/backend/backend/api/features/integrations/webhook_ingress_test.py
index cb2b7b783f..e48493321c 100644
--- a/autogpt_platform/backend/backend/api/features/integrations/webhook_ingress_test.py
+++ b/autogpt_platform/backend/backend/api/features/integrations/webhook_ingress_test.py
@@ -13,7 +13,8 @@ signature checks to each manager's `verify_signature`. This file pins:
* Unsigned Compass and legacy Slant3D subscriptions pass through; Slant3D v2 verifies signatures.
* A webhook registered under one provider can't be processed via a different
provider's ingress path (the manager is selected from the URL provider).
-* `verify_signature` runs before `validate_payload` (call ordering).
+* `verify_signature` runs before `validate_payload` and before the owner's
+ credentials are loaded (call ordering).
"""
import base64
@@ -589,6 +590,65 @@ class TestVerificationOrder:
mock_manager.verify_signature.assert_awaited_once()
mock_manager.validate_payload.assert_not_called()
+ @pytest.mark.parametrize("signature_ok", [False, True])
+ def test_credentials_load_only_after_the_signature_passes(self, signature_ok: bool):
+ """Loading can refresh the owner's OAuth token, so an unsigned delivery
+ must not get that far; a signed one still gets them for its payload."""
+ webhook = _make_webhook(ProviderName.GITHUB)
+ webhook.credentials_id = "creds-1"
+ credentials = MagicMock()
+
+ mock_manager = MagicMock()
+ mock_manager.verify_signature = AsyncMock(
+ side_effect=(
+ None
+ if signature_ok
+ else fastapi.HTTPException(status_code=403, detail="nope")
+ )
+ )
+ mock_manager.validate_payload = AsyncMock(return_value=({}, "evt"))
+
+ with ExitStack() as stack:
+ _, creds_manager, *_ = [
+ stack.enter_context(p) for p in _patch_ingress(webhook)
+ ]
+ creds_manager.get = AsyncMock(return_value=credentials)
+ stack.enter_context(
+ patch(
+ "backend.api.features.integrations.router.get_webhook_manager",
+ return_value=mock_manager,
+ )
+ )
+ resp = _post("github")
+
+ if not signature_ok:
+ assert resp.status_code == 403
+ creds_manager.get.assert_not_called()
+ return
+ assert resp.status_code == 200, resp.text
+ creds_manager.get.assert_awaited_once_with(USER_ID, "creds-1")
+ assert mock_manager.validate_payload.await_args.args[2] is credentials
+
+ def test_a_banned_owners_credentials_are_not_loaded(self):
+ webhook = _make_webhook(ProviderName.COMPASS)
+ webhook.credentials_id = "creds-1"
+ with ExitStack() as stack:
+ _, creds_manager, *_ = [
+ stack.enter_context(p) for p in _patch_ingress(webhook)
+ ]
+ creds_manager.get = AsyncMock(return_value=MagicMock())
+ for p in _stub_registry(_manager(ProviderName.COMPASS)) + [
+ patch(
+ "backend.api.features.integrations.router.is_user_banned",
+ AsyncMock(return_value=True),
+ )
+ ]:
+ stack.enter_context(p)
+ resp = _post("compass")
+
+ assert resp.status_code == 200
+ creds_manager.get.assert_not_called()
+
async def test_preset_trigger_refuses_foreign_owner(mocker):
"""A webhook only runs triggers owned by its owner: a preset owned by a