fix(kvb-org-operator): refuse operator commands no shell can run
operator.py add accepted prose, slash commands, aliases and <slot> commands as runnable rows, so the operator got bash blocks that do nothing or fail. A command must now start, after VAR=value words, with a program on PATH, a path to one or a shell builtin, and hold no <slot>; anything else is refused unless the row is a decision. Older rows of that kind stay in the table but get no bash block and are skipped by run. Ordered by the operator on 2026-11-11. 🎯 Fix: 93 % 💥 Break: 4 % 💸 Cost: 100 % ⏱️ Time: 100 % 🛡️ Security: 100 % 🏆 Score: 89 🚦 Gate: ✅ 90/5, cost and time <= 100, security 100 % Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e52db1dca0
commit
47ec0213e1
2 files changed
+50
-2
No files matched your search
@@ -27,7 +27,11 @@ Args:
|
||||
decision a decision with no command to run: listed in the table
|
||||
only, never in a block or `run`; only `done` closes it.
|
||||
Paths are absolute; no argument holds a shell metacharacter; the
|
||||
command is one line without control characters.
|
||||
command is one line without control characters. Unless the check is
|
||||
decision, the command starts, after VAR=value words, with a program
|
||||
on PATH, a path to one or a shell builtin and holds no <placeholder>;
|
||||
an alias, a slash command or prose is refused, and an older row
|
||||
holding one stays in the table only.
|
||||
list [--json]: run the check of every queued or blocked operator row and
|
||||
set the passing ones done.
|
||||
run: walk the open rows that hold a directory and a command, in list
|
||||
@@ -129,6 +133,9 @@ OPEN = ("queued", "blocked")
|
||||
META = re.compile(r"[\s|&;()<>$`\\\"'*?\[\]{}~!#]")
|
||||
NAME = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._+-]*$")
|
||||
COMMIT = re.compile(r"\bcommit\b")
|
||||
ASSIGNMENT = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*=")
|
||||
SLOT = re.compile(r"<[A-Za-z][^<>]*>")
|
||||
BUILTINS = frozenset({".", ":", "cd", "exec", "exit", "export", "set", "source", "umask"})
|
||||
HEADER = "| # | Directory | Command | Why | Check |"
|
||||
GIT = ["git", "-c", "core.fsmonitor=false", "-c", "core.hooksPath=/dev/null", "-c", "log.showSignature=false", "--no-pager", "--no-optional-locks"]
|
||||
DIFF = [*GIT, "diff", "--no-ext-diff", "--no-textconv", "--ignore-submodules=all"]
|
||||
@@ -188,6 +195,19 @@ def problem(check: str) -> str | None:
|
||||
return path_problem(arg, kind)
|
||||
|
||||
|
||||
def unrunnable(command: str, directory: str) -> str | None:
|
||||
if SLOT.search(command):
|
||||
return "holds a <...> slot to fill in"
|
||||
try:
|
||||
words = [word for word in shlex.split(command) if not ASSIGNMENT.match(word)]
|
||||
except ValueError:
|
||||
return "does not parse as a shell command"
|
||||
program = os.path.expanduser(next((word.lstrip("(") for word in words if word.lstrip("(")), ""))
|
||||
if program in BUILTINS or shutil.which(os.path.join(directory, program) if "/" in program else program):
|
||||
return None
|
||||
return f"names no program on PATH ({program!r})"
|
||||
|
||||
|
||||
def git_env() -> dict[str, str]:
|
||||
return {**os.environ, "GIT_NO_LAZY_FETCH": "1"}
|
||||
|
||||
@@ -249,6 +269,9 @@ def cmd_add(rasci: ModuleType, args: argparse.Namespace) -> int:
|
||||
fail("--command and --reason must not be empty")
|
||||
if not command.isprintable():
|
||||
fail(f"--command {visible(command, '')!r} holds a control character; record one line")
|
||||
refused = None if args.check == "decision" else unrunnable(command, args.dir)
|
||||
if refused:
|
||||
fail(f"--command {command!r} {refused}; write the real command, or record the step with --check decision")
|
||||
council = module("council", rasci.COUNCIL)
|
||||
sid, _ = council.caller(args.session)
|
||||
party = council.live_sessions().get(sid) or sid
|
||||
@@ -332,7 +355,10 @@ def cmd_list(rasci: ModuleType, args: argparse.Namespace) -> int:
|
||||
|
||||
|
||||
def runnable(row: dict) -> bool:
|
||||
return bool(row["directory"] and row["command"]) and row["command"].isprintable() and row["check"] != "decision"
|
||||
return (
|
||||
bool(row["directory"] and row["command"]) and row["command"].isprintable() and row["check"] != "decision"
|
||||
and not unrunnable(row["command"], row["directory"])
|
||||
)
|
||||
|
||||
|
||||
def visible(text: str, keep: str) -> str:
|
||||
|
||||
Reference in new issue
Block a user