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.
Merge commit from fork
Reinier van der Leer1cb6a5faab70
diff --git a/autogpt_platform/backend/backend/api/features/integrations/router.py b/autogpt_platform/backend/backend/api/features/integrations/router.pyindex 29104d35de..6ca19461fe 100644--- a/autogpt_platform/backend/backend/api/features/integrations/router.py+++ b/autogpt_platform/backend/backend/api/features/integrations/router.py@@ -717,6 +717,14 @@ async def _execute_webhook_preset_trigger(logger.debug(f"Preset #{preset.id} is inactive")return+ # A webhook only ever runs triggers owned by the webhook owner+ if preset.user_id != webhook.user_id:+ logger.warning(+ f"Refusing to trigger preset #{preset.id} (owner #{preset.user_id}) "+ f"from webhook #{webhook.id} owned by user #{webhook.user_id}"+ )+ return+graph = await get_graph(preset.graph_id, preset.graph_version, user_id=webhook.user_id)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.pyindex e9851e7106..403bf3bab0 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@@ -478,3 +478,27 @@ class TestVerificationOrder:assert resp.status_code == 403mock_manager.verify_signature.assert_awaited_once()mock_manager.validate_payload.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+ different user must not enqueue execution under the webhook owner's context+ (GHSA-4m2w-qfr5-9f3v). Guards against a foreign preset bound before the+ create/set-webhook ownership checks were in place."""+ from backend.api.features.integrations import router as ingress_router++ add_exec = mocker.patch.object(+ ingress_router, "add_graph_execution", new_callable=AsyncMock+ )+ get_graph = mocker.patch.object(ingress_router, "get_graph", new_callable=AsyncMock)++ webhook = _make_webhook(ProviderName.GITHUB) # owned by USER_ID+ foreign_preset = MagicMock(id="preset-x", user_id="attacker", is_active=True)++ await ingress_router._execute_webhook_preset_trigger(+ foreign_preset, webhook, WEBHOOK_ID, "pull_request", {}+ )++ # Bailed out before touching the graph or enqueuing anything.+ get_graph.assert_not_awaited()+ add_exec.assert_not_awaited()diff --git a/autogpt_platform/backend/backend/api/features/library/db.py b/autogpt_platform/backend/backend/api/features/library/db.pyindex 9b106d2aba..621899cdcf 100644--- a/autogpt_platform/backend/backend/api/features/library/db.py+++ b/autogpt_platform/backend/backend/api/features/library/db.py@@ -1904,6 +1904,8 @@ async def get_preset(async def create_preset(user_id: str,preset: library_model.LibraryAgentPresetCreatable,+ *,+ webhook_id: str | None = None,) -> library_model.LibraryAgentPreset:"""Creates a new AgentPreset for a user.@@ -1911,6 +1913,9 @@ async def create_preset(Args:user_id: The ID of the user creating the preset.preset: The preset data used for creation.+ webhook_id: Internal-only; not part of the public request model. Only+ trusted callers (the setup-trigger flow, legacy migration) pass a+ webhook they provisioned for the caller.Returns:The newly created LibraryAgentPreset.@@ -1921,12 +1926,25 @@ async def create_preset(logger.debug(f"Creating preset ({repr(preset.name)}) for user #{user_id}",)- # Resource-follows-parent tenancy: a preset lives in the same org/team- # as the graph it runs, regardless of the caller's active org. Resolved- # here (not threaded by callers) so the invariant can't be forgotten.- graph_row = await prisma.models.AgentGraph.prisma().find_first(- where={"id": preset.graph_id, "version": preset.graph_version},+ # A preset may only reference a graph the caller can access (own / store /+ # library); get_graph() enforces that and a foreign/unknown graph is None.+ # The preset then inherits the graph's org/team (resource-follows-parent),+ # resolved here so callers can't forget it.+ graph = await graph_db.get_graph(+ preset.graph_id, preset.graph_version, user_id=user_id)+ if not graph:+ raise NotFoundError(+ f"Graph #{preset.graph_id} v{preset.graph_version} "+ "not found or not accessible"+ )++ # Refuse to attach a webhook the caller doesn't own+ if webhook_id:+ webhook = await integrations_db.get_webhook(webhook_id)+ if webhook.user_id != user_id:+ raise NotFoundError(f"Webhook #{webhook_id} not found")+create_input = prisma.types.AgentPresetCreateInput(userId=user_id,name=preset.name,@@ -1934,7 +1952,7 @@ async def create_preset(agentGraphId=preset.graph_id,agentGraphVersion=preset.graph_version,isActive=preset.is_active,- webhookId=preset.webhook_id,+ webhookId=webhook_id,InputPresets={"create": [prisma.types.AgentNodeExecutionInputOutputCreateWithoutRelationsInput( # noqa@@ -1947,10 +1965,10 @@ async def create_preset(]},)- if graph_row and graph_row.organizationId:- create_input["organizationId"] = graph_row.organizationId- if graph_row and graph_row.teamId:- create_input["teamId"] = graph_row.teamId+ if graph.organization_id:+ create_input["organizationId"] = graph.organization_id+ if graph.team_id:+ create_input["teamId"] = graph.team_idnew_preset = await prisma.models.AgentPreset.prisma().create(data=create_input,include=AGENT_PRESET_INCLUDE,@@ -2102,6 +2120,12 @@ async def set_preset_webhook(if not current or current.userId != user_id:raise NotFoundError(f"Preset #{preset_id} not found")+ # Refuse to attach a webhook the caller doesn't own+ if webhook_id:+ webhook = await integrations_db.get_webhook(webhook_id)+ if webhook.user_id != user_id:+ raise NotFoundError(f"Webhook #{webhook_id} not found")+updated = await prisma.models.AgentPreset.prisma().update(where={"id": preset_id},data=(diff --git a/autogpt_platform/backend/backend/api/features/library/db_test.py b/autogpt_platform/backend/backend/api/features/library/db_test.pyindex 577d0e3ff9..6268d7a5c0 100644--- a/autogpt_platform/backend/backend/api/features/library/db_test.py+++ b/autogpt_platform/backend/backend/api/features/library/db_test.py@@ -854,17 +854,6 @@ async def test_fetch_execution_counts_uses_group_by(mocker):async def test_create_preset_inherits_graph_org(mocker):"""A preset lives in the same org/team as the graph it runs(resource-follows-parent), regardless of the caller's active org."""- graph_row = prisma.models.AgentGraph(- id="graph-1",- version=2,- name="Org Graph",- userId="test-user",- isActive=True,- createdAt=datetime.now(),- visibility=prisma.enums.ResourceVisibility.PRIVATE,- organizationId="org-of-graph",- teamId="team-of-graph",- )created_row = prisma.models.AgentPreset(id="preset-1",userId="test-user",@@ -880,10 +869,14 @@ async def test_create_preset_inherits_graph_org(mocker):InputPresets=[],)- mock_graph_client = AsyncMock()- mock_graph_client.find_first.return_value = graph_rowmocker.patch.object(- prisma.models.AgentGraph, "prisma", return_value=mock_graph_client+ db.graph_db,+ "get_graph",+ new=AsyncMock(+ return_value=MagicMock(+ organization_id="org-of-graph", team_id="team-of-graph"+ )+ ),)mock_preset_client = AsyncMock()mock_preset_client.create.return_value = created_row@@ -914,15 +907,6 @@ async def test_create_preset_inherits_graph_org(mocker):async def test_create_preset_tenantless_graph_creates_untagged(mocker):"""Graphs predating org tagging have no org — the preset create mustnot write organizationId/teamId keys at all (backfill sweep owns them)."""- graph_row = prisma.models.AgentGraph(- id="graph-1",- version=2,- name="Legacy Graph",- userId="test-user",- isActive=True,- createdAt=datetime.now(),- visibility=prisma.enums.ResourceVisibility.PRIVATE,- )created_row = prisma.models.AgentPreset(id="preset-2",userId="test-user",@@ -938,10 +922,10 @@ async def test_create_preset_tenantless_graph_creates_untagged(mocker):InputPresets=[],)- mock_graph_client = AsyncMock()- mock_graph_client.find_first.return_value = graph_rowmocker.patch.object(- prisma.models.AgentGraph, "prisma", return_value=mock_graph_client+ db.graph_db,+ "get_graph",+ new=AsyncMock(return_value=MagicMock(organization_id=None, team_id=None)),)mock_preset_client = AsyncMock()mock_preset_client.create.return_value = created_row@@ -967,6 +951,177 @@ async def test_create_preset_tenantless_graph_creates_untagged(mocker):assert "teamId" not in create_data+async def test_create_preset_rejects_inaccessible_graph(mocker):+ """A caller can't create a preset bound to a graph they can't access:+ get_graph() returns None → NotFoundError, no row written (GHSA-4m2w-qfr5-9f3v)."""+ mocker.patch.object(db.graph_db, "get_graph", new=AsyncMock(return_value=None))+ mock_preset_client = AsyncMock()+ mocker.patch.object(+ prisma.models.AgentPreset, "prisma", return_value=mock_preset_client+ )++ with pytest.raises(NotFoundError):+ await db.create_preset(+ user_id="attacker",+ preset=library_model.LibraryAgentPresetCreatable(+ inputs={},+ credentials={},+ graph_id="victim-graph",+ graph_version=1,+ name="x",+ description="",+ is_active=True,+ ),+ )++ mock_preset_client.create.assert_not_called()+++async def test_create_preset_rejects_foreign_webhook(mocker):+ """A caller can't bind another user's webhook to their preset:+ NotFoundError, no row written (GHSA-4m2w-qfr5-9f3v)."""+ mocker.patch.object(+ db.graph_db,+ "get_graph",+ new=AsyncMock(return_value=MagicMock(organization_id=None, team_id=None)),+ )+ get_webhook_mock = AsyncMock(return_value=MagicMock(user_id="victim"))+ mocker.patch.object(db.integrations_db, "get_webhook", new=get_webhook_mock)+ mock_preset_client = AsyncMock()+ mocker.patch.object(+ prisma.models.AgentPreset, "prisma", return_value=mock_preset_client+ )++ with pytest.raises(NotFoundError):+ await db.create_preset(+ user_id="attacker",+ preset=library_model.LibraryAgentPresetCreatable(+ inputs={},+ credentials={},+ graph_id="graph-1",+ graph_version=1,+ name="x",+ description="",+ is_active=True,+ ),+ webhook_id="victim-webhook",+ )++ get_webhook_mock.assert_awaited_once_with("victim-webhook")+ mock_preset_client.create.assert_not_called()+++async def test_create_preset_accepts_own_webhook(mocker):+ """Binding the caller's OWN webhook is allowed and persisted."""+ created_row = prisma.models.AgentPreset(+ id="preset-own-wh",+ userId="owner",+ name="My Preset",+ description="",+ agentGraphId="graph-1",+ agentGraphVersion=1,+ isActive=True,+ isDeleted=False,+ visibility=prisma.enums.ResourceVisibility.PRIVATE,+ createdAt=datetime.now(),+ updatedAt=datetime.now(),+ InputPresets=[],+ )+ mocker.patch.object(+ db.graph_db,+ "get_graph",+ new=AsyncMock(return_value=MagicMock(organization_id=None, team_id=None)),+ )+ mocker.patch.object(+ db.integrations_db,+ "get_webhook",+ new=AsyncMock(return_value=MagicMock(user_id="owner")),+ )+ mock_preset_client = AsyncMock()+ mock_preset_client.create.return_value = created_row+ mocker.patch.object(+ prisma.models.AgentPreset, "prisma", return_value=mock_preset_client+ )++ await db.create_preset(+ user_id="owner",+ preset=library_model.LibraryAgentPresetCreatable(+ inputs={},+ credentials={},+ graph_id="graph-1",+ graph_version=1,+ name="My Preset",+ description="",+ is_active=True,+ ),+ webhook_id="own-webhook",+ )++ create_data = mock_preset_client.create.call_args.kwargs["data"]+ assert create_data["webhookId"] == "own-webhook"+++async def test_creatable_preset_model_has_no_webhook_id_field():+ """The public create request model must not expose `webhook_id`; a+ webhook-triggered preset may only be made via setup-trigger+ (GHSA-4m2w-qfr5-9f3v)."""+ assert "webhook_id" not in library_model.LibraryAgentPresetCreatable.model_fields++ # A client that smuggles `webhook_id` into the JSON body has it ignored,+ # not persisted onto the preset.+ parsed = library_model.LibraryAgentPresetCreatable.model_validate(+ {+ "graph_id": "graph-1",+ "graph_version": 1,+ "inputs": {},+ "credentials": {},+ "name": "x",+ "description": "",+ "webhook_id": "victim-webhook",+ }+ )+ assert not hasattr(parsed, "webhook_id")+++async def test_set_preset_webhook_rejects_foreign_webhook(mocker):+ """set_preset_webhook must reject a webhook owned by another user+ (GHSA-4m2w-qfr5-9f3v)."""+ existing = prisma.models.AgentPreset(+ id="preset-1",+ userId="owner",+ name="p",+ description="",+ agentGraphId="graph-1",+ agentGraphVersion=1,+ isActive=True,+ isDeleted=False,+ visibility=prisma.enums.ResourceVisibility.PRIVATE,+ createdAt=datetime.now(),+ updatedAt=datetime.now(),+ InputPresets=[],+ )+ mock_preset_client = AsyncMock()+ mock_preset_client.find_unique.return_value = existing+ mocker.patch.object(+ prisma.models.AgentPreset, "prisma", return_value=mock_preset_client+ )+ mocker.patch.object(+ db.integrations_db,+ "get_webhook",+ new=AsyncMock(return_value=MagicMock(user_id="attacker")),+ )++ with pytest.raises(NotFoundError):+ await db.set_preset_webhook("owner", "preset-1", "foreign-webhook")++ mock_preset_client.update.assert_not_called()++@pytest.mark.asyncioasync def test_create_library_agent_tags_adders_org():"""Library entries are the ADDING user's bookmarks: explicit org/teamdiff --git a/autogpt_platform/backend/backend/api/features/library/model.py b/autogpt_platform/backend/backend/api/features/library/model.pyindex 16d2ce1709..5dc79fc73a 100644--- a/autogpt_platform/backend/backend/api/features/library/model.py+++ b/autogpt_platform/backend/backend/api/features/library/model.py@@ -436,6 +436,10 @@ class LibraryAgentResponse(pydantic.BaseModel):class LibraryAgentPresetCreatable(pydantic.BaseModel):"""Request model used when creating a new preset for a library agent.++ A preset's webhook is never caller-specified here; webhook-triggered presets+ are created through ``POST /presets/setup-trigger``, which provisions a+ webhook owned by the caller server-side."""graph_id: str@@ -449,8 +453,6 @@ class LibraryAgentPresetCreatable(pydantic.BaseModel):is_active: bool = True- webhook_id: Optional[str] = None-class LibraryAgentPresetCreatableFromGraphExecution(pydantic.BaseModel):"""@@ -506,8 +508,22 @@ class LibraryAgentPreset(LibraryAgentPresetCreatable):organization_id: str | None = Noneteam_id: str | None = None+ # Read-only in responses; set server-side via the setup-trigger flow only.+ webhook_id: Optional[str] = Nonewebhook: "Webhook | None"+ @pydantic.field_serializer("webhook")+ def _redact_webhook_signing_material(+ self, webhook: "Webhook | None", info: pydantic.FieldSerializationInfo+ ):+ # Never expose a webhook's signing secret / provider webhook id to API+ # clients; callers only need the ingress URL and non-sensitive metadata.+ if webhook is None:+ return None+ return webhook.model_dump(+ mode=info.mode, exclude={"secret", "provider_webhook_id"}+ )+@classmethoddef from_db(cls, preset: prisma.models.AgentPreset) -> "LibraryAgentPreset":from backend.data.integrations import Webhookdiff --git a/autogpt_platform/backend/backend/api/features/library/model_test.py b/autogpt_platform/backend/backend/api/features/library/model_test.pyindex cf62b671a4..79a0c4942d 100644--- a/autogpt_platform/backend/backend/api/features/library/model_test.py+++ b/autogpt_platform/backend/backend/api/features/library/model_test.py@@ -101,3 +101,52 @@ async def test_agent_preset_from_db(test_user_id: str):assert agent.name == "Test Agent"assert agent.description == "Test agent description"assert agent.inputs == {"input1": {"type": "string", "value": "test value"}}+++def test_preset_serialization_redacts_webhook_signing_material():+ """A serialized preset must never leak the webhook's signing secret or+ provider webhook id (GHSA-4m2w-qfr5-9f3v), while still exposing the ingress+ URL and non-sensitive metadata the frontend needs."""+ from backend.data.integrations import Webhook+ from backend.integrations.providers import ProviderName++ webhook = Webhook(+ id="wh-1",+ user_id="u1",+ provider=ProviderName.GITHUB,+ credentials_id="cred-1",+ webhook_type="repo",+ resource="owner/repo",+ events=["pull_request"],+ config={},+ secret="super-secret-signing-key",+ provider_webhook_id="gh-provider-123",+ )+ preset = library_model.LibraryAgentPreset(+ id="preset-1",+ user_id="u1",+ created_at=datetime.datetime.now(),+ updated_at=datetime.datetime.now(),+ graph_id="g1",+ graph_version=1,+ inputs={},+ credentials={},+ name="p",+ description="",+ is_active=True,+ webhook_id="wh-1",+ webhook=webhook,+ )++ dumped = preset.model_dump(mode="json")+ assert dumped["webhook"] is not None+ assert "secret" not in dumped["webhook"]+ assert "provider_webhook_id" not in dumped["webhook"]+ # Non-sensitive fields callers rely on are preserved.+ assert dumped["webhook"]["id"] == "wh-1"+ assert dumped["webhook"]["url"]++ # The secret must not leak through JSON string serialization either.+ serialized = preset.model_dump_json()+ assert "super-secret-signing-key" not in serialized+ assert "gh-provider-123" not in serializeddiff --git a/autogpt_platform/backend/backend/api/features/library/triggers.py b/autogpt_platform/backend/backend/api/features/library/triggers.pyindex c5a3133e3a..0e98ac2ac1 100644--- a/autogpt_platform/backend/backend/api/features/library/triggers.py+++ b/autogpt_platform/backend/backend/api/features/library/triggers.py@@ -91,9 +91,9 @@ async def setup_triggered_preset(description=description,inputs=trigger_config_with_credentials,credentials=agent_credentials,- webhook_id=new_webhook.id,is_active=True,),+ webhook_id=new_webhook.id,)diff --git a/autogpt_platform/backend/backend/integrations/webhooks/utils.py b/autogpt_platform/backend/backend/integrations/webhooks/utils.pyindex 7429751f9a..e4017f15cd 100644--- a/autogpt_platform/backend/backend/integrations/webhooks/utils.py+++ b/autogpt_platform/backend/backend/integrations/webhooks/utils.py@@ -196,7 +196,8 @@ async def migrate_legacy_triggered_graphs():if not is_credentials_field_name(field_name)}- # Create a triggered preset for the graph+ # Create a triggered preset for the graph, attaching the graph+ # owner's existing node webhook.await create_preset(graph.user_id,LibraryAgentPresetCreatable(@@ -206,9 +207,9 @@ async def migrate_legacy_triggered_graphs():credentials=preset_credentials,name=graph.name,description=graph.description,- webhook_id=trigger_node.webhook_id,is_active=True,),+ webhook_id=trigger_node.webhook_id,)# Detach webhook from the graph node