|
8 | 8 |
|
9 | 9 | from __future__ import annotations |
10 | 10 |
|
| 11 | +import subprocess |
| 12 | + |
11 | 13 | import pytest |
12 | 14 |
|
13 | 15 | from mcp_server.errors import ValidationError |
14 | | -from mcp_server.handlers import _write_scope |
| 16 | +from mcp_server.handlers import _write_scope, query_methodology |
| 17 | +from mcp_server.handlers.remember import handler as remember_handler |
15 | 18 | from mcp_server.shared import domain_mapping |
16 | 19 | from tests_py.handlers.test_ghsa_7848_cross_project_write import ( |
17 | 20 | projects as _projects, |
@@ -105,12 +108,90 @@ def test_the_aliased_project_cannot_change_the_familys_rows(collision): |
105 | 108 | _write_scope.require_writable_canonical(" Family ", "remember") |
106 | 109 |
|
107 | 110 |
|
108 | | -def test_the_alias_given_as_a_name_still_resolves_to_the_sessions_project(collision): |
109 | | - assert _write_scope.require_writable_domain("family", "ingest_prd") == "beta" |
| 111 | +def test_a_name_that_is_another_familys_domain_is_refused_never_redirected(collision): |
| 112 | + with pytest.raises(ValidationError, match=r"^ingest_prd: domain 'family' belongs"): |
| 113 | + _write_scope.require_writable_domain(" Family ", "ingest_prd") |
110 | 114 |
|
111 | 115 |
|
112 | 116 | def test_a_resolved_domain_of_no_known_project_stays_writable(collision): |
113 | 117 | _write_scope.require_writable_canonical("team-notes", "remember") |
114 | 118 | _write_scope.require_writable_canonical("", "remember") |
115 | 119 | _write_scope.require_writable_canonical(None, "remember") |
116 | 120 | _write_scope.require_writable_canonical("beta", "remember") |
| 121 | + |
| 122 | + |
| 123 | +# Review 2 of PR #969, B2: the same collision built with real git repositories and |
| 124 | +# the real registry (`_group_repos`), on the real handlers and store. |
| 125 | +@pytest.fixture |
| 126 | +def family(tmp_path, monkeypatch): |
| 127 | + """`foo-lib-a` and `foo-lib-b` form the family `foo-lib`; the repository `zed` |
| 128 | + lives in a directory named `foo-lib`, so the registry maps `foo-lib` to `zed`.""" |
| 129 | + dev = tmp_path.resolve() / "dev" |
| 130 | + for name in ("foo-lib-a", "foo-lib-b", "foo-lib"): |
| 131 | + (dev / name / "src").mkdir(parents=True) |
| 132 | + subprocess.run(["git", "init", "-q", str(dev / name)], check=True) |
| 133 | + subprocess.run( |
| 134 | + [ |
| 135 | + "git", |
| 136 | + "-C", |
| 137 | + str(dev / "foo-lib"), |
| 138 | + "remote", |
| 139 | + "add", |
| 140 | + "origin", |
| 141 | + "https://example.invalid/owner/zed.git", |
| 142 | + ], |
| 143 | + check=True, |
| 144 | + ) |
| 145 | + monkeypatch.setenv("HOME", str(tmp_path / "home")) |
| 146 | + monkeypatch.setenv("CORTEX_DEV_ROOT", str(dev)) |
| 147 | + monkeypatch.delenv(_write_scope.ALLOW_ENV, raising=False) |
| 148 | + monkeypatch.setattr(domain_mapping, "_candidate_dev_roots", lambda: [dev]) |
| 149 | + domain_mapping._build_registry.cache_clear() |
| 150 | + yield dev |
| 151 | + domain_mapping._build_registry.cache_clear() |
| 152 | + |
| 153 | + |
| 154 | +def _hot(domain): |
| 155 | + return [m["content"] for m in query_methodology._get_hot_memories(domain, "")] |
| 156 | + |
| 157 | + |
| 158 | +def test_the_registry_holds_the_collision(family): |
| 159 | + assert domain_mapping.resolve_cwd(str(family / "foo-lib-a")) == "foo-lib" |
| 160 | + assert domain_mapping.resolve_cwd(str(family / "foo-lib")) == "zed" |
| 161 | + assert domain_mapping.resolve_explicit_domain("foo-lib") == "zed" |
| 162 | + assert {"foo-lib", "zed"} <= domain_mapping.project_domains() |
| 163 | + |
| 164 | + |
| 165 | +@pytest.mark.asyncio |
| 166 | +async def test_a_session_in_the_aliased_project_cannot_write_into_the_family( |
| 167 | + family, monkeypatch |
| 168 | +): |
| 169 | + monkeypatch.setenv(_write_scope.SESSION_ENV, str(family / "foo-lib")) |
| 170 | + marker = "GHSA-7848 collision marker" |
| 171 | + with pytest.raises(ValidationError, match=r"^remember: domain 'foo-lib' belongs"): |
| 172 | + await remember_handler( |
| 173 | + { |
| 174 | + "content": marker, |
| 175 | + "directory": str(family / "foo-lib-a" / "src"), |
| 176 | + "force": True, |
| 177 | + } |
| 178 | + ) |
| 179 | + with pytest.raises(ValidationError, match=r"^ingest_prd: domain 'foo-lib' belongs"): |
| 180 | + _write_scope.require_writable_domain("foo-lib", "ingest_prd") |
| 181 | + assert _write_scope.memory_writable({"domain": "foo-lib"}) is False |
| 182 | + assert marker not in _hot("foo-lib") |
| 183 | + |
| 184 | + |
| 185 | +@pytest.mark.asyncio |
| 186 | +async def test_the_family_writes_in_its_own_domain(family, monkeypatch): |
| 187 | + monkeypatch.setenv(_write_scope.SESSION_ENV, str(family / "foo-lib-a")) |
| 188 | + stored = await remember_handler( |
| 189 | + { |
| 190 | + "content": "family note", |
| 191 | + "directory": str(family / "foo-lib-a"), |
| 192 | + "force": True, |
| 193 | + } |
| 194 | + ) |
| 195 | + assert stored["stored"] is True |
| 196 | + assert "family note" in _hot("foo-lib") |
| 197 | + assert _write_scope.require_writable_domain("foo-lib", "ingest_prd") == "foo-lib" |
0 commit comments