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(skill-comply): harden home path redaction

haelyrad08331f14eef
diff --git a/skills/skill-comply/scripts/runner.py b/skills/skill-comply/scripts/runner.py
index fc052a579..4a852a57e 100644
--- a/skills/skill-comply/scripts/runner.py
+++ b/skills/skill-comply/scripts/runner.py
@@ -24,6 +24,7 @@ ALLOWED_SETUP_EXECUTABLES = frozenset({
# controlled by the cwd= keyword. Scenarios that include these in
# setup_commands (a common shell-style convention) must be tolerated.
SHELL_BUILTINS = frozenset({"cd", "pushd", "popd"})
+REPORT_VALUE_LIMIT = 5000
@dataclass(frozen=True)
@@ -132,10 +133,40 @@ def _redact_home_path(text: str) -> str:
itself, which lives under a tempdir but scenario setup_commands or
an agent's own tool calls can still reference $HOME directly).
"""
- home = str(Path.home())
- if home and home != "/" and home in text:
- return text.replace(home, "~")
- return text
+ home = str(Path.home()).rstrip("/\\")
+ if not home or home == "/" or re.fullmatch(r"[A-Za-z]:", home):
+ return text
+
+ parts = re.split(r"[\\/]+", home)
+ home_pattern = r"[\\/]".join(re.escape(part) for part in parts)
+ right_boundary = r"(?=$|[\\/]|[\s\"'`,;:)}\]])"
+ flags = re.IGNORECASE if re.match(r"^[A-Za-z]:[\\/]", home) else 0
+ pattern = re.compile(
+ rf"(?<![\w.~+-]){home_pattern}{right_boundary}",
+ flags,
+ )
+ return pattern.sub("~", text)
+
+
+def _redact_home_paths(value: object) -> object:
+ """Return a copy with home paths redacted from every string leaf."""
+ if isinstance(value, str):
+ return _redact_home_path(value)
+ if isinstance(value, dict):
+ return {key: _redact_home_paths(item) for key, item in value.items()}
+ if isinstance(value, list):
+ return [_redact_home_paths(item) for item in value]
+ return value
+
+
+def _serialize_report_value(value: object) -> str:
+ """Redact structured report data before encoding and truncating it."""
+ redacted = _redact_home_paths(value)
+ if isinstance(redacted, (dict, list)):
+ serialized = json.dumps(redacted)
+ else:
+ serialized = str(redacted)
+ return serialized[:REPORT_VALUE_LIMIT]
def _parse_stream_json(stdout: str) -> list[ObservationEvent]:
@@ -163,14 +194,9 @@ def _parse_stream_json(stdout: str) -> list[ObservationEvent]:
if block.get("type") == "tool_use":
tool_use_id = block.get("id", "")
tool_input = block.get("input", {})
- input_str = (
- json.dumps(tool_input)[:5000]
- if isinstance(tool_input, dict)
- else str(tool_input)[:5000]
- )
pending[tool_use_id] = {
"tool": block.get("name", "unknown"),
- "input": _redact_home_path(input_str),
+ "input": _serialize_report_value(tool_input),
"order": event_counter,
}
event_counter += 1
@@ -183,18 +209,13 @@ def _parse_stream_json(stdout: str) -> list[ObservationEvent]:
if tool_use_id in pending:
info = pending.pop(tool_use_id)
output_content = block.get("content", "")
- if isinstance(output_content, list):
- output_str = json.dumps(output_content)[:5000]
- else:
- output_str = str(output_content)[:5000]
-
events.append(ObservationEvent(
timestamp=f"T{info['order']:04d}",
event="tool_complete",
tool=info["tool"],
session=msg.get("session_id", "unknown"),
input=info["input"],
- output=_redact_home_path(output_str),
+ output=_serialize_report_value(output_content),
))
for _tool_use_id, info in pending.items():
diff --git a/skills/skill-comply/tests/test_runner.py b/skills/skill-comply/tests/test_runner.py
index 2fef5a23e..a45270fc1 100644
--- a/skills/skill-comply/tests/test_runner.py
+++ b/skills/skill-comply/tests/test_runner.py
@@ -2,15 +2,13 @@
from __future__ import annotations
+import json
import subprocess
from dataclasses import dataclass
-from unittest.mock import MagicMock, patch
-
-import json
from pathlib import Path
+from unittest.mock import patch
import pytest
-
from scripts.runner import _parse_stream_json, _setup_sandbox, run_scenario
@@ -156,40 +154,115 @@ class TestParseStreamJsonRedactsHomePath:
rather than persisting the raw path.
"""
- def _stream_json_for(self, tool_input: dict, output_text: str) -> str:
+ def _stream_json_for(self, tool_input: dict, output_content: object) -> str:
return (
'{"type":"assistant","message":{"content":[{"type":"tool_use",'
'"id":"tu1","name":"Read","input":' + json.dumps(tool_input) + "}]}}\n"
'{"type":"user","session_id":"s1","message":{"content":[{"type":'
- '"tool_result","tool_use_id":"tu1","content":' + json.dumps(output_text) + "}]}}\n"
+ '"tool_result","tool_use_id":"tu1","content":' + json.dumps(output_content) + "}]}}\n"
)
- def test_input_home_path_redacted(self):
- home = str(Path.home())
+ @staticmethod
+ def _set_home(monkeypatch: pytest.MonkeyPatch, home: str) -> None:
+ monkeypatch.setattr(Path, "home", classmethod(lambda cls: Path(home)))
+
+ def test_posix_input_string_leaves_and_embedded_paths_redacted(
+ self, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ home = "/home/alice"
+ self._set_home(monkeypatch, home)
stdout = self._stream_json_for(
- {"file_path": f"{home}/notes/secrets.env"}, "irrelevant output"
+ {
+ "command": f"cat '{home}/notes/secrets.env' && echo home={home}, done",
+ "nested": {"paths": [f"{home}/one", f"{home}/two"]},
+ },
+ "irrelevant output",
)
events = _parse_stream_json(stdout)
+
assert len(events) == 1
assert home not in events[0].input
- assert "~/notes/secrets.env" in events[0].input
-
- def test_output_home_path_redacted(self):
- home = str(Path.home())
+ parsed_input = json.loads(events[0].input)
+ assert parsed_input["command"] == "cat '~/notes/secrets.env' && echo home=~, done"
+ assert parsed_input["nested"]["paths"] == ["~/one", "~/two"]
+
+ def test_windows_home_with_unicode_and_backslashes_redacted(
+ self, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ home = r"C:\Users\Zoë"
+ self._set_home(monkeypatch, home)
stdout = self._stream_json_for(
- {"file_path": "irrelevant"}, f"wrote to {home}/notes/secrets.env"
+ {
+ "paths": [
+ home + r"\Documents\résumé.txt",
+ "C:/Users/Zoë/資料.txt",
+ ]
+ },
+ "irrelevant output",
)
events = _parse_stream_json(stdout)
+
assert len(events) == 1
- assert home not in events[0].output
- assert "~/notes/secrets.env" in events[0].output
+ parsed_input = json.loads(events[0].input)
+ assert parsed_input["paths"] == [
+ r"~\Documents\résumé.txt",
+ "~/資料.txt",
+ ]
+
+ def test_sibling_and_embedded_prefix_paths_untouched(
+ self, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ home = "/home/alice"
+ self._set_home(monkeypatch, home)
+ outside_paths = [
+ "/home/alice-old/report.txt",
+ "/home/alice2/report.txt",
+ "/tmp/home/alice/report.txt",
+ ]
+ stdout = self._stream_json_for(
+ {"paths": outside_paths},
+ [{"type": "text", "text": path} for path in outside_paths],
+ )
+ events = _parse_stream_json(stdout)
- def test_paths_outside_home_untouched(self):
+ assert json.loads(events[0].input)["paths"] == outside_paths
+ assert [item["text"] for item in json.loads(events[0].output)] == outside_paths
+
+ def test_list_output_redacts_nested_string_leaves(
+ self, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ home = "/Users/reviewer"
+ self._set_home(monkeypatch, home)
+ output_content = [
+ {"type": "text", "text": f"created {home}/résumé.txt"},
+ {"type": "metadata", "paths": [home, f"{home}/資料.json"]},
+ ]
+ stdout = self._stream_json_for({"file_path": "irrelevant"}, output_content)
+ events = _parse_stream_json(stdout)
+
+ assert json.loads(events[0].output) == [
+ {"type": "text", "text": "created ~/résumé.txt"},
+ {"type": "metadata", "paths": ["~", "~/資料.json"]},
+ ]
+
+ def test_redacts_before_json_serialization_and_5000_character_truncation(
+ self, monkeypatch: pytest.MonkeyPatch
+ ) -> None:
+ home = "/home/alice"
+ self._set_home(monkeypatch, home)
+ boundary_value = "x" * 4977 + f" {home}/secret.txt" + "tail" * 20
stdout = self._stream_json_for(
- {"file_path": "/tmp/skill-comply-sandbox/t1/file.txt"}, "ok"
+ {"command": boundary_value},
+ boundary_value,
)
events = _parse_stream_json(stdout)
- assert "/tmp/skill-comply-sandbox/t1/file.txt" in events[0].input
+
+ assert len(events[0].input) == 5000
+ assert "~/secret" in events[0].input
+ assert "/home/" not in events[0].input
+ assert len(events[0].output) == 5000
+ assert "~/secret.txt" in events[0].output
+ assert "/home/" not in events[0].output
class TestRunScenarioErrorIncludesStdoutTail: