Skip to content

armgit / ECC

Public Imported from GitHub
0

The agent harness performance optimization system. Skills, instincts, memory, security, and research-first development for Claude Code, Codex, Opencode, Cursor and beyond.

fix(clv2): harden registry writes and project deletion (#2294, #2297) (#2323)

Affaan Mustafa2bc924faf2f8
diff --git a/skills/continuous-learning-v2/scripts/instinct-cli.py b/skills/continuous-learning-v2/scripts/instinct-cli.py
index 8cbbc9437..13bc467bc 100755
--- a/skills/continuous-learning-v2/scripts/instinct-cli.py
+++ b/skills/continuous-learning-v2/scripts/instinct-cli.py
@@ -27,6 +27,7 @@ import ipaddress
import socket
import urllib.parse
import urllib.request
+from contextlib import contextmanager
from pathlib import Path
from datetime import datetime, timedelta, timezone
from collections import defaultdict
@@ -394,22 +395,36 @@ def detect_project() -> dict:
}
-def _update_registry(pid: str, pname: str, proot: str, premote: str) -> None:
- """Update the projects.json registry.
+@contextmanager
+def _registry_lock():
+ """Serialize registry read-modify-write across concurrent sessions.
- Uses file locking (where available) to prevent concurrent sessions from
- overwriting each other's updates.
+ Acquires the same advisory lock for every registry writer (``_update_registry``
+ and ``_write_registry``) so ``projects delete/gc/merge`` cannot interleave with
+ a concurrent observe-time update and corrupt ``projects.json``. No-op on
+ platforms without ``fcntl`` (Windows).
"""
REGISTRY_FILE.parent.mkdir(parents=True, exist_ok=True)
lock_path = REGISTRY_FILE.parent / f".{REGISTRY_FILE.name}.lock"
lock_fd = None
-
try:
- # Acquire advisory lock to serialize read-modify-write
if _HAS_FCNTL:
lock_fd = open(lock_path, "w")
fcntl.flock(lock_fd, fcntl.LOCK_EX)
+ yield
+ finally:
+ if lock_fd is not None:
+ fcntl.flock(lock_fd, fcntl.LOCK_UN)
+ lock_fd.close()
+
+def _update_registry(pid: str, pname: str, proot: str, premote: str) -> None:
+ """Update the projects.json registry.
+
+ Uses file locking (where available) to prevent concurrent sessions from
+ overwriting each other's updates.
+ """
+ with _registry_lock():
try:
with open(REGISTRY_FILE, encoding="utf-8") as f:
registry = json.load(f)
@@ -429,10 +444,6 @@ def _update_registry(pid: str, pname: str, proot: str, premote: str) -> None:
f.flush()
os.fsync(f.fileno())
os.replace(tmp_file, REGISTRY_FILE)
- finally:
- if lock_fd is not None:
- fcntl.flock(lock_fd, fcntl.LOCK_UN)
- lock_fd.close()
def load_registry() -> dict:
@@ -445,15 +456,19 @@ def load_registry() -> dict:
def _write_registry(registry: dict) -> None:
- """Write the project registry atomically."""
- REGISTRY_FILE.parent.mkdir(parents=True, exist_ok=True)
- tmp_file = REGISTRY_FILE.parent / f".{REGISTRY_FILE.name}.tmp.{os.getpid()}"
- with open(tmp_file, "w", encoding="utf-8") as f:
- json.dump(registry, f, indent=2)
- f.write("\n")
- f.flush()
- os.fsync(f.fileno())
- os.replace(tmp_file, REGISTRY_FILE)
+ """Write the project registry atomically.
+
+ Holds the same advisory lock as ``_update_registry`` so concurrent
+ ``projects delete/gc/merge`` and observe-time updates cannot corrupt the file.
+ """
+ with _registry_lock():
+ tmp_file = REGISTRY_FILE.parent / f".{REGISTRY_FILE.name}.tmp.{os.getpid()}"
+ with open(tmp_file, "w", encoding="utf-8") as f:
+ json.dump(registry, f, indent=2)
+ f.write("\n")
+ f.flush()
+ os.fsync(f.fileno())
+ os.replace(tmp_file, REGISTRY_FILE)
def _validate_project_id(project_id: str) -> bool:
@@ -573,7 +588,14 @@ def _project_counts(project_id: str) -> dict:
def _remove_project_storage(project_id: str) -> None:
- project_dir = PROJECTS_DIR / project_id
+ # Defense-in-depth: resolve and confirm the target is contained within
+ # PROJECTS_DIR before recursively deleting, even though callers validate the
+ # project id. A relaxed validator or a future caller must never be able to
+ # turn this into an arbitrary-directory delete.
+ projects_root = PROJECTS_DIR.resolve()
+ project_dir = (PROJECTS_DIR / project_id).resolve()
+ if project_dir == projects_root or projects_root not in project_dir.parents:
+ raise ValueError(f"refusing to remove {project_dir}: escapes {projects_root}")
if project_dir.exists():
shutil.rmtree(project_dir)
diff --git a/skills/continuous-learning-v2/scripts/test_parse_instinct.py b/skills/continuous-learning-v2/scripts/test_parse_instinct.py
index ea5e910d6..225dcb053 100644
--- a/skills/continuous-learning-v2/scripts/test_parse_instinct.py
+++ b/skills/continuous-learning-v2/scripts/test_parse_instinct.py
@@ -46,6 +46,8 @@ load_registry = _mod.load_registry
_validate_instinct_id = _mod._validate_instinct_id
_validate_import_url = _mod._validate_import_url
_update_registry = _mod._update_registry
+_write_registry = _mod._write_registry
+_remove_project_storage = _mod._remove_project_storage
_confidence_bar = _mod._confidence_bar
@@ -1043,3 +1045,41 @@ def test_update_registry_atomic_replaces_file(patch_globals):
assert "abc123" in data
leftovers = list(tree["registry_file"].parent.glob(".projects.json.tmp.*"))
assert leftovers == []
+
+
+def test_write_registry_atomic_no_tmp_leftovers(patch_globals):
+ # Issue #2294: _write_registry now holds the registry lock like
+ # _update_registry. It must still write atomically with no stray tmp files.
+ tree = patch_globals
+ _write_registry({"keep": {"name": "demo", "root": "/repo", "remote": ""}})
+ data = json.loads(tree["registry_file"].read_text())
+ assert data == {"keep": {"name": "demo", "root": "/repo", "remote": ""}}
+ leftovers = list(tree["registry_file"].parent.glob(".projects.json.tmp.*"))
+ assert leftovers == []
+
+
+def test_remove_project_storage_deletes_contained_dir(patch_globals):
+ tree = patch_globals
+ target = tree["projects_dir"] / "proj-1"
+ (target / "instincts").mkdir(parents=True)
+ (target / "instincts" / "x.md").write_text("hi", encoding="utf-8")
+ _remove_project_storage("proj-1")
+ assert not target.exists()
+
+
+def test_remove_project_storage_missing_dir_is_noop(patch_globals):
+ # No raise when the contained dir simply does not exist.
+ _remove_project_storage("never-created")
+
+
+def test_remove_project_storage_blocks_traversal(patch_globals):
+ # Issue #2297: defense-in-depth — a traversal id must be refused even when a
+ # caller skips _validate_project_id, so this can never delete outside
+ # PROJECTS_DIR.
+ with pytest.raises(ValueError):
+ _remove_project_storage("../../etc")
+
+
+def test_remove_project_storage_blocks_root_itself(patch_globals):
+ with pytest.raises(ValueError):
+ _remove_project_storage(".")