justinandClaude Opus 5
f1bb2343b0
Two changes that both come from the same mistake: assuming an answer
instead of reading one.
1. Read the task after inserting a checkpoint.
POST /v1/vpgs/{id}/checkpoints returns a TASK ID, not a result. A 200
only means queued. The outcome lives in GET /v1/tasks/{id} under
Status.State: 1 InProgress, 4 Failed, 5 Stopped, 6 Completed, with
4/5/6 terminal.
tag_vpgs now waits for that task and refuses unless it Completed, and
reports task_id and task_state. Measured: two inserts fired back to
back at one VPG give Completed for the first and Failed for the
second. That is exactly the case an earlier comment in this file
called "silently dropped" -- it was never silent, we just never read
the task. Comment corrected.
Previously a failed insert surfaced only as wait_for_tag timing out
45s later with a misleading hint about Azure/AWS. Now it says the
task failed and the operation did not happen.
2. Unknown tools ask the human instead of passing through.
The catalog is opt-in, so an unlisted tool ran unguarded. But the set
of mutating tools is unbounded and grows with every MCP installed,
while the set of read-only ones is small, so a mutating-only list is
permanently behind and being behind fails open.
Adds read_only_tools and zerto_check_tool(server, tool, vm) returning
read_only / mutating / unknown. unknown does not mean safe: it means
nobody classified it, so the tool hands the agent a question to put
to the human, and the human decides whether to checkpoint. On yes the
agent guards; on no it runs and says plainly that Zerto cannot rewind
it; if they want it remembered, zerto_add_mutating_tool.
This stays advisory. An MCP server cannot see or block another
server's tool calls, so real enforcement belongs in a host PreToolUse
hook. The skill carries the flow.
Known issue, not addressed here: two concurrent tool calls race on
Keycloak token acquisition in the shared client and one gets HTTP 401.
pytest 41 passed (12 new).
Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
Claude-Session: https://claude.ai/code/session_016yVfC5nvZowoLFnEGWhLGn
72 lines
2.6 KiB
Python
72 lines
2.6 KiB
Python
import json
|
|
from pathlib import Path
|
|
|
|
from zerto_rewind_mcp.catalog import CatalogEntry, MutatingCatalog, entry_from_dict
|
|
|
|
|
|
def test_add_and_get(tmp_path: Path):
|
|
path = tmp_path / "config.json"
|
|
path.write_text(
|
|
json.dumps({"zerto_url": "https://zvm", "mutating_tools": []}),
|
|
encoding="utf-8",
|
|
)
|
|
cat = MutatingCatalog(path=path)
|
|
cat.add(CatalogEntry(server="ssh", tool="exec", vm_arg="host", notes="guest shell"))
|
|
found = cat.get("SSH", "Exec")
|
|
assert found is not None
|
|
assert found.vm_arg == "host"
|
|
saved = json.loads(path.read_text(encoding="utf-8"))
|
|
assert saved["zerto_url"] == "https://zvm"
|
|
assert saved["mutating_tools"][0]["tool"] == "exec"
|
|
|
|
|
|
def test_unlisted_is_missing():
|
|
cat = MutatingCatalog()
|
|
assert cat.get("foo", "bar") is None
|
|
|
|
|
|
def test_entry_requires_fields():
|
|
try:
|
|
entry_from_dict({"server": "ssh"})
|
|
raise AssertionError("expected ValueError")
|
|
except ValueError:
|
|
pass
|
|
|
|
|
|
def test_example_config_covers_windows_and_linux():
|
|
"""The starter catalog must not be Linux-only.
|
|
|
|
The catalog is opt-in: an unlisted tool passes through unguarded. A
|
|
Windows-only shop taking the shipped defaults would therefore mutate
|
|
protected guests with no checkpoint at all.
|
|
"""
|
|
example = Path(__file__).resolve().parent.parent / "config.example.json"
|
|
data = json.loads(example.read_text(encoding="utf-8"))
|
|
cat = MutatingCatalog.from_config(data)
|
|
assert cat.get("ssh", "exec") is not None
|
|
assert cat.get("winrm", "run_command") is not None
|
|
assert cat.get("winrm", "run_ps") is not None
|
|
assert cat.get("powershell", "invoke_command") is not None
|
|
# every entry must name the arg holding the VM, or the guard cannot resolve one
|
|
for entry in cat.list():
|
|
assert entry.vm_arg, f"{entry.server}/{entry.tool} has no vm_arg"
|
|
|
|
|
|
def test_classify_three_way():
|
|
data = {
|
|
"mutating_tools": [{"server": "winrm", "tool": "run_ps", "vm_arg": "host"}],
|
|
"read_only_tools": [{"server": "ssh", "tool": "read_file"}],
|
|
}
|
|
cat = MutatingCatalog.from_config(data)
|
|
assert cat.classify("winrm", "run_ps") == "mutating"
|
|
assert cat.classify("SSH", "Read_File") == "read_only"
|
|
# unknown is not safe; it means nobody classified it
|
|
assert cat.classify("anything", "else") == "unknown"
|
|
|
|
|
|
def test_read_only_entries_need_no_vm_arg():
|
|
data = {"read_only_tools": [{"server": "ssh", "tool": "stat"}]}
|
|
cat = MutatingCatalog.from_config(data)
|
|
assert cat.classify("ssh", "stat") == "read_only"
|
|
assert [e.tool for e in cat.read_only()] == ["stat"]
|