tpateeq
ee74d80b45
`graphify merge-chunks` concatenates agent-written `.graphify_chunk_*.json` files with only a JSON-decode guard, so an oversized payload or a crafted node/edge id (e.g. `../../etc/passwd`) flowed straight into the merged graph. Route each chunk through `load_validated_semantic_fragment`, which stats the file size BEFORE reading it (a multi-GB chunk can't blow up memory), parses the JSON, and validates the byte/count caps + the node/edge id charset that blocks path traversal (#825). An invalid chunk is skipped with a warning (filter semantics; never abort). Left OUT of build_from_json/load_graph_json on purpose: those must keep loading valid pre-existing graphs. Also relax two over-strict checks in the shared validator that would otherwise silently drop whole legitimate chunks (a relaxation — never a new rejection): - file_type is no longer gated: build coerces any value via _FILE_TYPE_SYNONYMS (unknown -> "concept", #840), so synonyms like "markdown"/"tool" the loader maps must not fail validation. - the id charset now allows Unicode word chars (build's normalize_id preserves CJK/Cyrillic/accented-Latin ids); the explicit path-separator/".." check still blocks directory escape. Corrects the stale module docstring (the validator serves the devin skill path and merge-chunks, not skill-opencode/codex).
105 lines
4.5 KiB
Python
105 lines
4.5 KiB
Python
"""Tests that `graphify merge-chunks` validates untrusted subagent chunk JSON.
|
|
|
|
merge-chunks concatenates agent-written `.graphify_chunk_*.json` files. Those are
|
|
untrusted output, so each is run through `validate_semantic_fragment` (caps + the
|
|
node/edge ID charset that blocks path-escape). An invalid chunk is skipped with a
|
|
warning; valid chunks still merge.
|
|
"""
|
|
import json
|
|
|
|
import graphify.__main__ as mainmod
|
|
|
|
|
|
def _write(path, obj):
|
|
path.write_text(json.dumps(obj), encoding="utf-8")
|
|
|
|
|
|
def _run_merge(monkeypatch, argv):
|
|
monkeypatch.setattr(mainmod, "_check_skill_version", lambda _: None)
|
|
monkeypatch.setattr(mainmod.sys, "argv", argv)
|
|
mainmod.main()
|
|
|
|
|
|
def test_merge_chunks_skips_chunk_with_path_escape_id(tmp_path, monkeypatch, capsys):
|
|
good = tmp_path / ".graphify_chunk_0.json"
|
|
_write(good, {"nodes": [{"id": "pkg.mod.good", "label": "G"}], "edges": [], "hyperedges": []})
|
|
bad = tmp_path / ".graphify_chunk_1.json"
|
|
# A node id with a path separator would escape the chunk directory (#825).
|
|
_write(bad, {"nodes": [{"id": "../../etc/passwd", "label": "B"}], "edges": [], "hyperedges": []})
|
|
out = tmp_path / "merged.json"
|
|
|
|
_run_merge(monkeypatch, ["graphify", "merge-chunks", str(good), str(bad), "--out", str(out)])
|
|
|
|
merged = json.loads(out.read_text())
|
|
assert {n["id"] for n in merged["nodes"]} == {"pkg.mod.good"}
|
|
assert "skipping invalid chunk" in capsys.readouterr().err
|
|
|
|
|
|
def test_merge_chunks_skips_malformed_shape(tmp_path, monkeypatch, capsys):
|
|
bad = tmp_path / ".graphify_chunk_0.json"
|
|
_write(bad, {"nodes": "not-a-list", "edges": []})
|
|
out = tmp_path / "merged.json"
|
|
|
|
_run_merge(monkeypatch, ["graphify", "merge-chunks", str(bad), "--out", str(out)])
|
|
|
|
merged = json.loads(out.read_text())
|
|
assert merged["nodes"] == []
|
|
assert "skipping invalid chunk" in capsys.readouterr().err
|
|
|
|
|
|
def test_merge_chunks_accepts_synonym_file_type(tmp_path, monkeypatch):
|
|
# file_type synonyms (markdown/tool/framework/...) are coerced by build, not
|
|
# a validation failure — the chunk must merge, not be silently dropped (#840).
|
|
c = tmp_path / ".graphify_chunk_0.json"
|
|
_write(c, {"nodes": [{"id": "pkg.readme", "label": "Readme", "file_type": "markdown"},
|
|
{"id": "pkg.tool", "label": "Tool", "file_type": "tool"}],
|
|
"edges": [], "hyperedges": []})
|
|
out = tmp_path / "merged.json"
|
|
_run_merge(monkeypatch, ["graphify", "merge-chunks", str(c), "--out", str(out)])
|
|
merged = json.loads(out.read_text())
|
|
assert {n["id"] for n in merged["nodes"]} == {"pkg.readme", "pkg.tool"}
|
|
|
|
|
|
def test_merge_chunks_accepts_unicode_id(tmp_path, monkeypatch):
|
|
# build's normalize_id preserves Unicode identifiers; validation must not
|
|
# reject a chunk that uses them.
|
|
c = tmp_path / ".graphify_chunk_0.json"
|
|
_write(c, {"nodes": [{"id": "mod_处理数据", "label": "handler", "file_type": "code"}],
|
|
"edges": [], "hyperedges": []})
|
|
out = tmp_path / "merged.json"
|
|
_run_merge(monkeypatch, ["graphify", "merge-chunks", str(c), "--out", str(out)])
|
|
merged = json.loads(out.read_text())
|
|
assert {n["id"] for n in merged["nodes"]} == {"mod_处理数据"}
|
|
|
|
|
|
def test_validate_semantic_fragment_accepts_synonyms_and_unicode():
|
|
from graphify.semantic_cleanup import validate_semantic_fragment
|
|
frag = {"nodes": [{"id": "mod_处理", "file_type": "markdown"},
|
|
{"id": "a.b::C.d", "file_type": "tool"}],
|
|
"edges": [], "hyperedges": []}
|
|
assert validate_semantic_fragment(frag) == []
|
|
|
|
|
|
def test_validate_semantic_fragment_still_blocks_path_escape():
|
|
from graphify.semantic_cleanup import validate_semantic_fragment
|
|
errs = validate_semantic_fragment({"nodes": [{"id": "../../etc/passwd"}],
|
|
"edges": [], "hyperedges": []})
|
|
assert errs
|
|
|
|
|
|
def test_merge_chunks_merges_valid_chunks(tmp_path, monkeypatch):
|
|
c0 = tmp_path / ".graphify_chunk_0.json"
|
|
_write(c0, {"nodes": [{"id": "a", "label": "A"}], "edges": [], "hyperedges": [],
|
|
"input_tokens": 10, "output_tokens": 5})
|
|
c1 = tmp_path / ".graphify_chunk_1.json"
|
|
_write(c1, {"nodes": [{"id": "b", "label": "B"}], "edges": [], "hyperedges": [],
|
|
"input_tokens": 7, "output_tokens": 3})
|
|
out = tmp_path / "merged.json"
|
|
|
|
_run_merge(monkeypatch, ["graphify", "merge-chunks", str(c0), str(c1), "--out", str(out)])
|
|
|
|
merged = json.loads(out.read_text())
|
|
assert {n["id"] for n in merged["nodes"]} == {"a", "b"}
|
|
assert merged["input_tokens"] == 17
|
|
assert merged["output_tokens"] == 8
|