mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-27 14:17:10 -04:00
## Description
Two of the memory storage router's key-derivation paths can pool
distinct identities into one store.
`ProjectResolver._identity_from_cwd` builds a collision-resistant key by
appending a `sha256` digest to the sanitized basename:
```python
safe_basename = cls._sanitize_basename(basename) or "project"
digest = hashlib.sha256(normalised.encode("utf-8")).hexdigest()[:16]
key = f"{safe_basename}-{digest}"
```
But the two non-cwd paths use the bare sanitized basename as the key:
```python
# Tier 1 — explicit x-headroom-project-id
safe = self._sanitize_basename(explicit)
if safe:
return safe, explicit # <-- no digest
# USER mode
user_safe = ProjectResolver._sanitize_basename(ctx.base_user_id) or "default"
db_path = self._config.root_dir / "users" / user_safe / "memory.db" # <-- no digest
```
`_sanitize_basename` maps every disallowed character to a single dash,
so distinct inputs collapse to the same basename:
- `acme/api` and `acme api` (and `acme@api`) all → `acme-api`
- user ids `alice/qa` and `alice qa` → `alice-qa`
Both the project key (`root/projects/<key>/memory.db`) and the USER key
(`root/users/<key>/memory.db`) are derived directly from that basename,
so two distinct project ids — or, in USER mode, two distinct **users** —
resolve to the same `memory.db` and share each other's memories. USER
mode exists specifically to isolate users, so this is a cross-user
data-isolation leak; the explicit-project-id path is the same leak
across projects. Both are client-controlled (`x-headroom-project-id` /
`x-headroom-user-id` headers), so the collision is easy to hit and could
even be provoked deliberately.
## Fix
Append the same digest of the raw id to both keys, exactly as
`_identity_from_cwd` does, keeping the sanitized basename as a
human-readable prefix:
```python
digest = hashlib.sha256(explicit.encode("utf-8")).hexdigest()[:16]
return f"{safe}-{digest}", explicit
```
```python
digest = hashlib.sha256(ctx.base_user_id.encode("utf-8")).hexdigest()[:16]
user_key = f"{user_safe}-{digest}"
db_path = self._config.root_dir / "users" / user_key / "memory.db"
```
Distinct ids now always land on distinct stores; the same id remains
stable across calls.
**Migration note:** this changes the on-disk key format for the
explicit-project and USER stores (`<basename>` → `<basename>-<digest>`).
Memories written under the old bare-basename paths are not migrated; the
router will start a fresh store at the new path. GLOBAL and cwd-derived
PROJECT stores (which already carried the digest) are unaffected.
Flagging this explicitly so you can decide whether a migration shim is
wanted before merge.
Closes #
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- `headroom/memory/storage_router.py`: append a `sha256` digest to the
explicit-project-id key (Tier 1) and the USER-mode key, matching
`_identity_from_cwd`.
- `tests/test_memory_storage_router.py`: update the Tier-1 key assertion
to the prefix+digest form; add collision regression tests for the
explicit-project and USER paths.
- `CHANGELOG.md`: Bug Fixes entry (including the migration note).
## Testing
- [ ] Unit tests pass (`pytest`)
- [x] Linting passes (`ruff check .`)
- [x] Type checking passes (`mypy headroom`)
- [x] New tests added for new functionality
- [ ] Manual testing performed
### Test Output
```text
$ uvx ruff@0.15.17 check headroom/memory/storage_router.py tests/test_memory_storage_router.py
All checks passed!
$ uvx mypy@1.20.2 --ignore-missing-imports headroom/memory/storage_router.py
Success: no issues found in 1 source file
```
## Real Behavior Proof
- Environment: Windows 11, Python 3.12, `uvx ruff@0.15.17` / `uvx
mypy@1.20.2`. A full `pytest` OOM-kills this box (ML stack import), so I
reproduced the key derivation with a dependency-free script mirroring
`_sanitize_basename` + the digest, and left the full pytest to CI.
- Exact command / steps: derived keys for `alice/qa` and `alice qa`
under the OLD bare-basename scheme and the NEW digest scheme.
- Observed result: OLD → both `alice-qa` (identical → shared store); NEW
→ `alice-qa-7e02fc2dfbc447b4` vs `alice-qa-4c9241514a374ba3` (distinct),
stable per input, with the `alice-qa-` prefix retained.
- Not tested: a live proxy with two colliding tenants; full local
`pytest` deferred to CI (OOM).
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Checklist
- [x] My code follows the project's style guidelines
- [x] I have performed a self-review of my code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [x] I have updated the CHANGELOG.md if applicable
## Additional Notes
The "unit tests pass locally" box is unchecked because the full suite
imports the ML stack, which I can't run here. The changed/added tests
use the existing `tests/test_memory_storage_router.py` harness so they
run under the normal CI pytest job; behaviour is additionally verified
by the standalone proof above. I updated
`test_resolver_tier1_explicit_project_id_wins` to assert the new
prefix+digest key. Happy to add a migration shim (read the old path if
the new one is empty) if you'd prefer that over the fresh-store
behavior.
---------
Co-authored-by: JerrettDavis <mxjerrett@gmail.com>
413 lines
14 KiB
Python
413 lines
14 KiB
Python
"""Unit tests for the per-project memory storage router (GH #462)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from headroom.memory.backends.local import LocalBackendConfig
|
|
from headroom.memory.storage_router import (
|
|
BackendRouter,
|
|
BackendRouterConfig,
|
|
MemoryStorageMode,
|
|
ProjectResolver,
|
|
RequestContext,
|
|
extract_system_prompt,
|
|
)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Resolver tier-order tests
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _ctx(
|
|
*,
|
|
headers: dict[str, str] | None = None,
|
|
system_prompt: str = "",
|
|
base_user_id: str = "alice",
|
|
project_root_override: str | None = None,
|
|
) -> RequestContext:
|
|
return RequestContext(
|
|
headers=headers or {},
|
|
system_prompt=system_prompt,
|
|
base_user_id=base_user_id,
|
|
project_root_override=project_root_override,
|
|
)
|
|
|
|
|
|
def test_resolver_tier1_explicit_project_id_wins() -> None:
|
|
r = ProjectResolver()
|
|
# An explicit project id beats everything else.
|
|
out = r.resolve(
|
|
_ctx(
|
|
headers={"x-headroom-project-id": "billing-svc"},
|
|
system_prompt="Primary working directory: /Users/foo/code/other\n",
|
|
project_root_override="/also/ignored",
|
|
)
|
|
)
|
|
assert out is not None
|
|
key, display = out
|
|
# The sanitized id stays as a human-readable prefix; a sha256 digest is
|
|
# appended so distinct ids that sanitize alike cannot collide.
|
|
assert key.startswith("billing-svc-")
|
|
assert len(key.split("-")[-1]) == 16
|
|
assert display == "billing-svc"
|
|
|
|
|
|
def test_resolver_tier1_distinct_ids_that_sanitize_alike_dont_collide() -> None:
|
|
r = ProjectResolver()
|
|
# "acme/api" and "acme api" both sanitize to "acme-api"; without the digest
|
|
# they would share one project store (cross-project memory leak).
|
|
k1, _ = r.resolve(_ctx(headers={"x-headroom-project-id": "acme/api"})) # type: ignore[misc]
|
|
k2, _ = r.resolve(_ctx(headers={"x-headroom-project-id": "acme api"})) # type: ignore[misc]
|
|
assert k1 != k2
|
|
# Same id resolves to a stable key across calls.
|
|
k1b, _ = r.resolve(_ctx(headers={"x-headroom-project-id": "acme/api"})) # type: ignore[misc]
|
|
assert k1 == k1b
|
|
|
|
|
|
def test_resolver_tier2_explicit_cwd_header() -> None:
|
|
r = ProjectResolver()
|
|
out = r.resolve(_ctx(headers={"x-headroom-cwd": "/Users/foo/code/project-b"}))
|
|
assert out is not None
|
|
key, display = out
|
|
assert display == "project-b"
|
|
assert key.startswith("project-b-")
|
|
assert len(key.split("-")[-1]) == 16 # sha256 prefix length
|
|
|
|
|
|
def test_resolver_tier3_cli_override() -> None:
|
|
r = ProjectResolver()
|
|
out = r.resolve(_ctx(project_root_override="/Users/foo/code/project-c"))
|
|
assert out is not None
|
|
_, display = out
|
|
assert display == "project-c"
|
|
|
|
|
|
def test_resolver_tier4_env_block_primary_working_directory() -> None:
|
|
r = ProjectResolver()
|
|
prompt = (
|
|
"You have been invoked in the following environment:\n"
|
|
" - Primary working directory: /Users/foo/code/headroom\n"
|
|
" - Is a git repo: yes\n"
|
|
)
|
|
out = r.resolve(_ctx(system_prompt=prompt))
|
|
assert out is not None
|
|
_, display = out
|
|
assert display == "headroom"
|
|
|
|
|
|
def test_resolver_tier4_env_block_older_working_directory_format() -> None:
|
|
r = ProjectResolver()
|
|
prompt = "Working directory: /Users/foo/code/legacy-project\n"
|
|
out = r.resolve(_ctx(system_prompt=prompt))
|
|
assert out is not None
|
|
_, display = out
|
|
assert display == "legacy-project"
|
|
|
|
|
|
def test_resolver_tier4_env_block_cwd_format() -> None:
|
|
r = ProjectResolver()
|
|
prompt = " cwd: /Users/foo/code/cwd-style\n"
|
|
out = r.resolve(_ctx(system_prompt=prompt))
|
|
assert out is not None
|
|
_, display = out
|
|
assert display == "cwd-style"
|
|
|
|
|
|
def test_resolver_returns_none_when_nothing_resolves() -> None:
|
|
r = ProjectResolver()
|
|
out = r.resolve(_ctx(system_prompt="A generic system prompt with no env block."))
|
|
assert out is None
|
|
|
|
|
|
def test_resolver_same_cwd_yields_stable_key_across_calls() -> None:
|
|
r = ProjectResolver()
|
|
k1, _ = r.resolve(_ctx(headers={"x-headroom-cwd": "/Users/foo/code/x"})) # type: ignore[misc]
|
|
k2, _ = r.resolve(_ctx(headers={"x-headroom-cwd": "/Users/foo/code/x"})) # type: ignore[misc]
|
|
assert k1 == k2
|
|
|
|
|
|
def test_resolver_distinct_cwds_yield_distinct_keys() -> None:
|
|
r = ProjectResolver()
|
|
k1, _ = r.resolve(_ctx(headers={"x-headroom-cwd": "/Users/foo/code/a"})) # type: ignore[misc]
|
|
k2, _ = r.resolve(_ctx(headers={"x-headroom-cwd": "/Users/foo/code/b"})) # type: ignore[misc]
|
|
assert k1 != k2
|
|
|
|
|
|
def test_resolver_sanitises_unsafe_basename_chars() -> None:
|
|
r = ProjectResolver()
|
|
out = r.resolve(_ctx(headers={"x-headroom-project-id": "../etc/passwd; rm -rf /"}))
|
|
assert out is not None
|
|
key, _ = out
|
|
# Path-separators and shell-metas must be neutralised.
|
|
assert "/" not in key
|
|
assert ";" not in key
|
|
assert " " not in key
|
|
|
|
|
|
def test_extract_system_prompt_anthropic_string() -> None:
|
|
assert extract_system_prompt({"system": "hello"}) == "hello"
|
|
|
|
|
|
def test_extract_system_prompt_anthropic_blocks() -> None:
|
|
body = {"system": [{"type": "text", "text": "a"}, {"type": "text", "text": "b"}]}
|
|
assert extract_system_prompt(body) == "a\nb"
|
|
|
|
|
|
def test_extract_system_prompt_openai_messages() -> None:
|
|
body = {
|
|
"messages": [
|
|
{"role": "system", "content": "you are helpful"},
|
|
{"role": "user", "content": "hi"},
|
|
]
|
|
}
|
|
assert extract_system_prompt(body) == "you are helpful"
|
|
|
|
|
|
def test_extract_system_prompt_missing_returns_empty() -> None:
|
|
assert extract_system_prompt({"messages": []}) == ""
|
|
|
|
|
|
def test_extract_system_prompt_user_reminder_with_cwd_reaches_resolver() -> None:
|
|
body = {
|
|
"messages": [
|
|
{
|
|
"role": "user",
|
|
"content": [
|
|
{
|
|
"type": "text",
|
|
"text": (
|
|
"<system-reminder>\n\n"
|
|
"The maximum number of terminals is 5.\n\n"
|
|
"<available_terminal>\n"
|
|
"- terminal_id: 9\n"
|
|
"- cwd: S:\\workspace-zhuangxiu\\decorate-offer-api\n"
|
|
"</available_terminal>\n\n"
|
|
"</system-reminder>"
|
|
),
|
|
}
|
|
],
|
|
}
|
|
]
|
|
}
|
|
|
|
prompt = extract_system_prompt(body)
|
|
assert "cwd:" in prompt
|
|
resolved = ProjectResolver().resolve(_ctx(system_prompt=prompt))
|
|
|
|
assert resolved is not None
|
|
_, display = resolved
|
|
assert "decorate-offer-api" in display
|
|
|
|
|
|
def test_extract_system_prompt_ordinary_user_text_returns_empty() -> None:
|
|
body = {"messages": [{"role": "user", "content": "Hello, can you help me refactor this?"}]}
|
|
|
|
assert extract_system_prompt(body) == ""
|
|
|
|
|
|
def test_extract_system_prompt_system_message_beats_user_cwd_fallback() -> None:
|
|
body = {
|
|
"messages": [
|
|
{"role": "system", "content": "Working directory: /system/project"},
|
|
{"role": "user", "content": "cwd: /user/project\nDo the thing."},
|
|
]
|
|
}
|
|
|
|
prompt = extract_system_prompt(body)
|
|
resolved = ProjectResolver().resolve(_ctx(system_prompt=prompt))
|
|
|
|
assert prompt == "Working directory: /system/project"
|
|
assert resolved is not None
|
|
_, display = resolved
|
|
assert display == "project"
|
|
|
|
|
|
def test_extract_system_prompt_cwd_in_non_user_message_returns_empty() -> None:
|
|
body = {"messages": [{"role": "assistant", "content": "cwd: /spoof/project"}]}
|
|
|
|
assert extract_system_prompt(body) == ""
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# BackendRouter path-layout tests (no real backend I/O — we stub the class).
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class _FakeBackend:
|
|
def __init__(self, cfg: LocalBackendConfig) -> None:
|
|
self.cfg = cfg
|
|
|
|
async def _ensure_initialized(self) -> None:
|
|
return
|
|
|
|
|
|
def _make_router(
|
|
tmp_path: Path,
|
|
mode: MemoryStorageMode,
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> BackendRouter:
|
|
# Patch out the real LocalBackend constructor so the router test
|
|
# doesn't try to load embedders or open SQLite files.
|
|
monkeypatch.setattr(
|
|
"headroom.memory.storage_router.LocalBackend",
|
|
_FakeBackend,
|
|
)
|
|
cfg = BackendRouterConfig(
|
|
mode=mode,
|
|
root_dir=tmp_path / "memories",
|
|
global_db_path=tmp_path / "memory.db",
|
|
max_open_backends=4,
|
|
backend_config_template=LocalBackendConfig(db_path=str(tmp_path / "memory.db")),
|
|
)
|
|
return BackendRouter(cfg)
|
|
|
|
|
|
def test_router_project_mode_two_cwds_two_paths(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
router = _make_router(tmp_path, MemoryStorageMode.PROJECT, monkeypatch)
|
|
|
|
ctx_a = _ctx(headers={"x-headroom-cwd": "/code/a"})
|
|
ctx_b = _ctx(headers={"x-headroom-cwd": "/code/b"})
|
|
|
|
_, scope_a = router.backend_for(ctx_a)
|
|
_, scope_b = router.backend_for(ctx_b)
|
|
|
|
assert scope_a.mode is MemoryStorageMode.PROJECT
|
|
assert scope_b.mode is MemoryStorageMode.PROJECT
|
|
assert scope_a.db_path != scope_b.db_path
|
|
assert scope_a.display_name == "a"
|
|
assert scope_b.display_name == "b"
|
|
|
|
|
|
def test_router_project_mode_unresolved_fails_closed_by_default(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""Default `unresolved_project_fallback='empty'` → fail-closed signal, NOT GLOBAL pool.
|
|
|
|
Updated 2026-05-26 from the prior GLOBAL-fallback assertion. The
|
|
silent GLOBAL pooling was the root cause of the TAM-550
|
|
"implémente X" cross-thread instruction misread (a memory from a
|
|
prior unrelated session ended up in the live user turn and got
|
|
treated as a new command). The new default is fail-closed: the
|
|
router still returns a ResolvedScope (so callers don't need to
|
|
handle None), but signals "no project" via
|
|
``mode=PROJECT & project_key=None``. The memory handler reads
|
|
that sentinel and skips injection entirely.
|
|
"""
|
|
router = _make_router(tmp_path, MemoryStorageMode.PROJECT, monkeypatch)
|
|
|
|
_, scope = router.backend_for(_ctx(system_prompt="no env block"))
|
|
# Fail-closed signal: PROJECT mode preserved, project_key is None.
|
|
assert scope.mode is MemoryStorageMode.PROJECT
|
|
assert scope.project_key is None
|
|
assert scope.display_name == "unresolved (no memory)"
|
|
|
|
|
|
def test_router_project_mode_unresolved_global_fallback_when_opted_in(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""Legacy GLOBAL pooling is reachable via opt-in config."""
|
|
monkeypatch.setattr(
|
|
"headroom.memory.storage_router.LocalBackend",
|
|
_FakeBackend,
|
|
)
|
|
cfg = BackendRouterConfig(
|
|
mode=MemoryStorageMode.PROJECT,
|
|
root_dir=tmp_path / "memories",
|
|
global_db_path=tmp_path / "memory.db",
|
|
max_open_backends=4,
|
|
backend_config_template=LocalBackendConfig(db_path=str(tmp_path / "memory.db")),
|
|
unresolved_project_fallback="global",
|
|
)
|
|
router = BackendRouter(cfg)
|
|
|
|
_, scope = router.backend_for(_ctx(system_prompt="no env block"))
|
|
assert scope.mode is MemoryStorageMode.GLOBAL
|
|
assert scope.db_path == tmp_path / "memory.db"
|
|
assert scope.display_name == "global (unresolved)"
|
|
|
|
|
|
def test_router_invalid_unresolved_fallback_raises(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
"""Unknown values of `unresolved_project_fallback` fail loud, not silently."""
|
|
monkeypatch.setattr(
|
|
"headroom.memory.storage_router.LocalBackend",
|
|
_FakeBackend,
|
|
)
|
|
cfg = BackendRouterConfig(
|
|
mode=MemoryStorageMode.PROJECT,
|
|
root_dir=tmp_path / "memories",
|
|
global_db_path=tmp_path / "memory.db",
|
|
max_open_backends=4,
|
|
backend_config_template=LocalBackendConfig(db_path=str(tmp_path / "memory.db")),
|
|
unresolved_project_fallback="nonsense_value",
|
|
)
|
|
router = BackendRouter(cfg)
|
|
|
|
with pytest.raises(ValueError, match="not a recognised value"):
|
|
router.backend_for(_ctx(system_prompt="no env block"))
|
|
|
|
|
|
def test_router_user_mode_partitions_by_user(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
router = _make_router(tmp_path, MemoryStorageMode.USER, monkeypatch)
|
|
|
|
_, scope_a = router.backend_for(_ctx(base_user_id="alice"))
|
|
_, scope_b = router.backend_for(_ctx(base_user_id="bob"))
|
|
|
|
assert scope_a.mode is MemoryStorageMode.USER
|
|
assert scope_b.mode is MemoryStorageMode.USER
|
|
assert scope_a.db_path != scope_b.db_path
|
|
assert scope_a.display_name == "alice"
|
|
assert scope_b.display_name == "bob"
|
|
|
|
|
|
def test_router_user_mode_distinct_ids_that_sanitize_alike_dont_collide(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
# "alice/qa" and "alice qa" both sanitize to "alice-qa"; without the digest
|
|
# they would share one users/alice-qa/memory.db — a cross-user leak, the one
|
|
# thing USER mode exists to prevent.
|
|
router = _make_router(tmp_path, MemoryStorageMode.USER, monkeypatch)
|
|
|
|
_, scope_a = router.backend_for(_ctx(base_user_id="alice/qa"))
|
|
_, scope_b = router.backend_for(_ctx(base_user_id="alice qa"))
|
|
|
|
assert scope_a.db_path != scope_b.db_path
|
|
|
|
|
|
def test_router_global_mode_reuses_legacy_path(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
router = _make_router(tmp_path, MemoryStorageMode.GLOBAL, monkeypatch)
|
|
|
|
_, scope = router.backend_for(_ctx(headers={"x-headroom-cwd": "/code/anything"}))
|
|
assert scope.mode is MemoryStorageMode.GLOBAL
|
|
# GLOBAL mode hits the legacy DB regardless of cwd signals.
|
|
assert scope.db_path == tmp_path / "memory.db"
|
|
|
|
|
|
def test_router_backend_cache_returns_same_instance(
|
|
tmp_path: Path, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
router = _make_router(tmp_path, MemoryStorageMode.PROJECT, monkeypatch)
|
|
|
|
ctx = _ctx(headers={"x-headroom-cwd": "/code/sticky"})
|
|
b1, _ = router.backend_for(ctx)
|
|
b2, _ = router.backend_for(ctx)
|
|
assert b1 is b2
|
|
|
|
|
|
def test_router_lru_eviction_drops_oldest(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
|
# max_open_backends=4 in _make_router. Opening 5 different projects
|
|
# should evict the first.
|
|
router = _make_router(tmp_path, MemoryStorageMode.PROJECT, monkeypatch)
|
|
for i in range(5):
|
|
router.backend_for(_ctx(headers={"x-headroom-cwd": f"/code/p{i}"}))
|
|
assert len(router.open_backends()) == 4
|