Skip to content

Commit f14286f

Browse files
committed
fix(security): a prospective trigger fires only in its own project (GHSA-7848-qh48-mx2w)
Review 1 of #981: remember turns a phrase such as TODO: into a keyword_match trigger, and a trigger fired in every project whose first message or query shared a keyword, so caller text still reached other projects. - core.prospective.trigger_in_scope: a trigger fires only in a session whose project root is its target_directory or lies below it, the hooks' own rule; a trigger without a directory reaches no session. - query_methodology and recall apply it before check_trigger. - create_trigger stores the session's project when no directory is given and passes a given one through require_writable_directory. - ingest_document.py is back at the 300-line cap (305 before). Proof: tests_py/handlers/test_ghsa_7848_triggers.py on two git repositories; the two attack tests fail without the change to the two readers. Co-Authored-By: Claude Fable 5.2 <[email protected]> Claude-Session: https://claude.ai/code/session_018kyZYrKg46KKYpvLPXcW4M Signed-off-by: Claude <[email protected]>
1 parent 8f495b8 commit f14286f

9 files changed

Lines changed: 169 additions & 14 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ adheres to [Semantic Versioning](https://semver.org/).
1414
the session's (`CLAUDE_PROJECT_DIR`, else the working directory), unless the user
1515
allows it locally with `CORTEX_CROSS_PROJECT_WRITES=<domain>,…` or `*`. Shared
1616
domains that name no repository stay writable. No tool argument can reopen it.
17+
A prospective trigger, made by `create_trigger` or extracted from a `remember`
18+
text such as `TODO:`, now fires only in a session of the project its directory
19+
belongs to; it fired in every project whose first message or query shared a
20+
keyword. `create_trigger` stores the session's project when no directory is
21+
given and refuses a directory that reaches another project. A trigger stored
22+
without a directory no longer fires.
1723
A write stores the domain the check resolved, never the raw argument: `ingest_prd`
1824
and `ingest_document` kept a name that resolves to the session's project but can
1925
also be another repository family's domain.

‎mcp_server/core/prospective.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import re
88
from datetime import datetime, timezone
99

10+
from mcp_server.shared.project_scope import memory_matches_project
11+
1012
VALID_TRIGGER_TYPES = frozenset(
1113
{
1214
"directory_match",
@@ -124,6 +126,23 @@ def check_trigger(
124126
return False
125127

126128

129+
def trigger_in_scope(trigger: dict, project_root: str | None) -> bool:
130+
"""True when this trigger may fire in a session rooted at project_root.
131+
132+
A trigger carries text a write supplied. It fires only where the hooks
133+
would serve a memory written in the same directory: in a session whose
134+
project root is the trigger's ``target_directory`` or lies below it
135+
(``shared.project_scope.memory_matches_project``). A trigger with no
136+
directory reaches no session; it is not a wildcard for every project.
137+
``directory_match`` is the one type whose condition is itself a
138+
directory, so ``check_trigger`` decides it.
139+
140+
source: GHSA-7848-qh48-mx2w, review 1 of pull request 981"""
141+
if trigger.get("trigger_type") == "directory_match":
142+
return True
143+
return memory_matches_project(trigger.get("target_directory"), False, project_root)
144+
145+
127146
def _matches_time(condition: str, current_time: datetime) -> bool:
128147
"""Check if current_time matches a cron-like time condition."""
129148
m = _TIME_HOUR_RE.match(condition)

‎mcp_server/handlers/_write_scope.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@
1515
1616
Anything else fails with the variable to set, never a silent redirect.
1717
18-
The domain is one of two channels. The SessionStart and auto-recall hooks select
18+
The domain is one of three channels. The SessionStart and auto-recall hooks select
1919
by `directory_context`: a memory is served to a session whose project root is
2020
that directory or lies below it (`shared.project_scope`). So the directory a
2121
write stores, and the one an existing row carries, pass the same rule
2222
(`require_writable_directory`): it must reach no project but the session's.
23+
The third is a prospective trigger, made by `create_trigger` or extracted from a
24+
`remember` text: it fires under that same directory rule
25+
(`core.prospective.trigger_in_scope`), so its text reaches no other project.
2326
"""
2427

2528
from __future__ import annotations

‎mcp_server/handlers/create_trigger.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
from mcp_server.infrastructure.memory_config import get_memory_settings
1919
from mcp_server.infrastructure.memory_store import MemoryStore, get_shared_store
2020
from mcp_server.handlers._tool_meta import IDEMPOTENT_WRITE
21+
from mcp_server.handlers._write_scope import (
22+
require_writable_directory,
23+
session_directory,
24+
)
2125

2226
# ── Schema ────────────────────────────────────────────────────────────────────
2327

@@ -135,7 +139,12 @@ async def handler(args: dict[str, Any] | None = None) -> dict[str, Any]:
135139
if trigger_type not in ("keyword", "time", "file", "domain"):
136140
return {"created": False, "reason": f"invalid trigger_type: {trigger_type}"}
137141

138-
target_directory = (args.get("target_directory") or "").strip() or None
142+
# A trigger fires where its directory is served (core.prospective
143+
# .trigger_in_scope): none given means this session's project, and one
144+
# given passes the rule of every other write (GHSA-7848-qh48-mx2w).
145+
target_directory = (args.get("target_directory") or "").strip()
146+
target_directory = target_directory or session_directory()
147+
require_writable_directory(target_directory, "create_trigger")
139148
source_memory_id = args.get("source_memory_id")
140149

141150
store = _get_store()

‎mcp_server/handlers/ingest_document.py‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
from mcp_server.infrastructure.wiki_store import read_page
3737
from mcp_server.infrastructure.memory_config import get_memory_settings
3838
from mcp_server.infrastructure.memory_store import MemoryStore, get_shared_store
39-
from mcp_server.handlers._write_scope import (
40-
require_writable_directory,
41-
require_writable_domain,
42-
)
39+
from mcp_server.handlers import _write_scope as scope
4340

4441
logger = logging.getLogger(__name__)
4542

@@ -201,10 +198,8 @@ async def handler(args: dict[str, Any] | None = None) -> dict[str, Any]:
201198
source=str(path), version=content_version(raw), source_kind=kind
202199
)
203200
domain = (str(args.get("domain") or "").strip()) or "documents"
204-
# GHSA-7848-qh48-mx2w: the rows keep the domain the check resolved.
205-
domain = require_writable_domain(domain, "ingest_document")
206-
# The rows are stored under the file's folder, which the hooks select by.
207-
require_writable_directory(str(path.resolve().parent), "ingest_document")
201+
domain = scope.require_writable_domain(domain, "ingest_document") # GHSA-7848
202+
scope.require_writable_directory(str(path.resolve().parent), "ingest_document")
208203
return await _persist(path, parsed, prov, domain)
209204

210205

‎mcp_server/handlers/query_methodology.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414

1515
from mcp_server.core.context_generator import generate_context
1616
from mcp_server.core.domain_detector import detect_domain
17-
from mcp_server.core.prospective import check_trigger
17+
from mcp_server.core.prospective import check_trigger, trigger_in_scope
1818
from mcp_server.core.response_budget import ListTarget, TextTarget, bound_payload
1919
from mcp_server.infrastructure.profile_store import load_profiles
2020
from mcp_server.handlers._tool_meta import READ_ONLY
21+
from mcp_server.handlers._write_scope import session_directory
2122
from mcp_server.handlers._telemetry_wrap import instrument
2223
from mcp_server.infrastructure.memory_config import get_memory_settings
2324
from mcp_server.infrastructure.memory_store import get_shared_store
@@ -182,7 +183,10 @@ def _get_fired_triggers(directory: str, first_message: str) -> list[dict[str, An
182183
fired = []
183184
# source: ADR-0427
184185
seen_contents: set[str] = set()
186+
root = directory or session_directory()
185187
for trigger in active_triggers:
188+
if not trigger_in_scope(trigger, root):
189+
continue
186190
if check_trigger(trigger, directory=directory, content=first_message):
187191
store.trigger_prospective_memory(trigger["id"])
188192
content = trigger["content"]

‎mcp_server/handlers/recall_helpers.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
from mcp_server.core.enrichment import build_expanded_query
1212
from mcp_server.core.document_reference import annotate_document_sources
1313
from mcp_server.shared.code_tokenize import expand_fts_query
14-
from mcp_server.core.prospective import check_trigger
14+
from mcp_server.core.prospective import check_trigger, trigger_in_scope
15+
from mcp_server.handlers._write_scope import session_directory
1516
from mcp_server.core.query_intent import QueryIntent
1617
from mcp_server.core.retrieval_signals import (
1718
compute_graph_signals,
@@ -298,10 +299,11 @@ def inject_triggered_memories(
298299
return results
299300
existing_ids = {r["memory_id"] for r in results}
300301
injected: list[dict] = []
302+
root = session_directory()
301303
for t in triggers:
302304
if max_inject is not None and len(injected) >= max_inject:
303305
break
304-
if not check_trigger(t, content=query):
306+
if not trigger_in_scope(t, root) or not check_trigger(t, content=query):
305307
continue
306308
matches = store.search_fts(t.get("content", ""), limit=3)
307309
for mid, _score in matches:
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
"""A prospective trigger carries no text into another project (GHSA-7848-qh48-mx2w).
2+
3+
Review 1 of pull request 981: `remember` turns a phrase such as `TODO:` into a
4+
`keyword_match` trigger, and a trigger used to fire in every project whose first
5+
message or query shared a keyword. The write passed every domain and directory
6+
check, so the advisory's primitive stayed open through this channel. Reproduced
7+
on the real handlers and store with two git repositories, `alpha` and `beta`.
8+
"""
9+
10+
from __future__ import annotations
11+
12+
import pytest
13+
14+
from mcp_server.core.prospective import trigger_in_scope
15+
from mcp_server.errors import ValidationError
16+
from mcp_server.handlers import _write_scope, query_methodology
17+
from mcp_server.handlers.create_trigger import handler as create_trigger
18+
from mcp_server.handlers.recall_helpers import inject_triggered_memories
19+
from mcp_server.handlers.remember import handler as remember_handler
20+
from tests_py.handlers import test_ghsa_7848_cross_project_write as _base
21+
22+
projects = _base.projects # alpha and beta under `dev`; the session runs in beta
23+
24+
MARKER = "rotate the GHSA7848 deploy credentials"
25+
MESSAGE = "please rotate the deploy credentials"
26+
27+
28+
def _fired(directory) -> list[str]:
29+
fired = query_methodology._get_fired_triggers(str(directory), MESSAGE)
30+
return [t["content"] for t in fired]
31+
32+
33+
async def _write_todo(projects) -> None:
34+
await remember_handler(
35+
{
36+
"content": f"TODO: {MARKER}",
37+
"directory": str(projects / "beta"),
38+
"force": True,
39+
}
40+
)
41+
42+
43+
@pytest.mark.asyncio
44+
async def test_a_todo_written_in_beta_does_not_fire_in_alpha(projects):
45+
await _write_todo(projects)
46+
assert _fired(projects / "alpha") == []
47+
48+
49+
@pytest.mark.asyncio
50+
async def test_a_todo_written_in_beta_still_fires_in_beta(projects):
51+
await _write_todo(projects)
52+
assert _fired(projects / "beta") == [MARKER]
53+
54+
55+
@pytest.mark.asyncio
56+
async def test_recall_in_alpha_does_not_inject_a_trigger_of_beta(projects, monkeypatch):
57+
await _write_todo(projects)
58+
store = query_methodology._try_get_memory_store()
59+
in_beta = inject_triggered_memories([], MESSAGE, store)
60+
monkeypatch.setenv(_write_scope.SESSION_ENV, str(projects / "alpha"))
61+
in_alpha = inject_triggered_memories([], MESSAGE, store)
62+
assert [r["content"] for r in in_beta] == [f"TODO: {MARKER}"]
63+
assert in_alpha == []
64+
65+
66+
@pytest.mark.asyncio
67+
async def test_create_trigger_refuses_another_projects_directory(projects):
68+
with pytest.raises(ValidationError, match="CORTEX_CROSS_PROJECT_WRITES=alpha"):
69+
await create_trigger(
70+
{
71+
"content": MARKER,
72+
"trigger_condition": "deploy",
73+
"target_directory": str(projects / "alpha"),
74+
}
75+
)
76+
77+
78+
@pytest.mark.asyncio
79+
async def test_create_trigger_without_a_directory_stays_in_the_session(projects):
80+
made = await create_trigger({"content": MARKER, "trigger_condition": "deploy"})
81+
assert made["target_directory"] == str(projects / "beta")
82+
83+
84+
@pytest.mark.parametrize(
85+
("target", "root", "expected"),
86+
[
87+
("/dev/beta", "/dev/beta", True),
88+
("/dev/beta", "/dev/beta/src", True),
89+
("/dev/beta", "/dev/alpha", False),
90+
("", "/dev/beta", False),
91+
(None, "/dev/beta", False),
92+
("/dev/beta", None, False),
93+
],
94+
)
95+
def test_a_trigger_fires_only_where_its_directory_is_served(target, root, expected):
96+
trigger = {"trigger_type": "keyword_match", "target_directory": target}
97+
assert trigger_in_scope(trigger, root) is expected
98+
99+
100+
def test_a_directory_trigger_is_decided_by_its_own_condition():
101+
trigger = {"trigger_type": "directory_match", "target_directory": "/dev/beta"}
102+
assert trigger_in_scope(trigger, "/dev/alpha") is True

‎tests_py/handlers/test_inject_triggered_memories.py‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,19 @@
1212

1313
from unittest.mock import MagicMock
1414

15+
import pytest
16+
17+
from mcp_server.handlers import _write_scope
1518
from mcp_server.handlers.recall_helpers import inject_triggered_memories
1619

20+
_PROJECT = "/work/project"
21+
22+
23+
@pytest.fixture(autouse=True)
24+
def _session(monkeypatch):
25+
"""A trigger fires only in its own project: the session runs in _PROJECT."""
26+
monkeypatch.setenv(_write_scope.SESSION_ENV, _PROJECT)
27+
1728

1829
def _store(triggers, memories):
1930
"""Mock store: every trigger FTS-matches every memory id in order."""
@@ -25,7 +36,11 @@ def _store(triggers, memories):
2536

2637

2738
def _trigger(condition="deploy"):
28-
return {"trigger_type": "keyword_match", "trigger_condition": condition}
39+
return {
40+
"trigger_type": "keyword_match",
41+
"trigger_condition": condition,
42+
"target_directory": _PROJECT,
43+
}
2944

3045

3146
def _mem(content="standing instruction", source="", tags=None):

0 commit comments

Comments
 (0)