opencode-polkit 0.1.3 → 0.1.4

package/README.md

@@ -6,8 +6,12 @@ instead of requiring a terminal for password input.
 
 Like CachyOS Hello, the plugin does not check for a polkit agent up front:
 `sudo` is always redirected to `pkexec` at execution time, and polkitd routes
-the request to whatever agent is currently registered. If no agent is
-available, `pkexec` fails with its own clear error message.
+the request to whatever agent is currently registered. Without an agent,
+`pkexec` fails fast with `Error creating textual authentication agent`
+(no TTY); the plugin reports that as a clear denial. A hang (dialog never
+appears) is bounded by the bash tool's own timeout (default 2 min,
+configurable up to 10 min) and left untranslated — it cannot be told
+apart from a long-running command.
 
 ## Install
 
@@ -33,15 +37,34 @@ For local development, point opencode at the project directory instead:
 
 ## Behavior
 
-| Command         | result                                     |
-|-----------------|--------------------------------------------|
-| `sudo xxx`      | redirects to `pkexec xxx`                  |
-| `doas xxx`      | redirects to `pkexec xxx`                  |
-| `pkexec xxx`    | passes through                             |
-| `sudoedit`      | blocked                                    |
-| `visudo`        | blocked                                    |
-
-When a user denies the polkit authentication dialog, a clear error message is shown.
+| Command               | result                                                |
+|-----------------------|-------------------------------------------------------|
+| `sudo xxx`            | redirects to `pkexec xxx`                             |
+| `doas xxx`            | redirects to `pkexec xxx`                             |
+| `cat x \| sudo tee y` | redirects to `cat x \| pkexec tee y` (mid-command)    |
+| `pkexec xxx`          | passes through                                        |
+| `sudoedit` / `visudo` | blocked                                               |
+
+### Minimal intervention
+
+The command is rewritten **only** by replacing `sudo`/`doas` with
+`pkexec` — its shape is otherwise untouched, so the agent always sees a
+command that behaves like the one it wrote. Privilege keywords are found
+by a lexical scanner (quote/escape/heredoc aware): `sudo` inside string
+literals, comments or heredocs is ignored; `sudo` in any executable
+position (leading, after `&&`/`||`/`|`, in `$(...)` or subshells) is
+rewritten. `sudo a && sudo b` rewrites both.
+
+### Failures
+
+Unambiguous authentication failures are reported as clear errors and the
+command is remembered so a retry is rejected without prompting again
+(cleared when opencode restarts): `Not authorized`, `Error executing
+command as another user`, `Error creating textual authentication agent`
+(no polkit agent + no TTY). A hang (dialog never appears) is bounded by
+the bash tool's own timeout (default 2 min, configurable up to 10 min)
+and is left untranslated — it cannot be told apart from a long-running
+command.
 
 ## i18n
 

package/dist/index.js

@@ -1,4 +1,95 @@
-const MATCH = /(?<![-\/.\w])(sudo|pkexec|doas|sudoedit|visudo)(?![-\/.\w])/i;
+/**
+ * Lexical scan for privilege-escalation keywords OUTSIDE quotes.
+ *
+ * Shell commands may contain `sudo` anywhere a command starts (pipes,
+ * `&&`/`||`, subshells, command substitution), and string literals /
+ * comments may contain the same words spuriously. A plain regex cannot
+ * tell those apart; this scanner tracks quote state (' " and backslash
+ * escapes) and only reports keywords in executable position.
+ *
+ * - `node -e "…sudo…"`        → no hit (inside quotes)
+ * - `cat x | sudo tee y`       → hit at index 8 (command boundary)
+ * - `cd /tmp && sudo ./x`      → hit (after `&&`)
+ */
+function scanPrivileged(command) {
+    const hits = [];
+    let inSingle = false;
+    let inDouble = false;
+    let escaped = false;
+    // Heredoc delimiters waiting to close (stack; multiple << are legal).
+    const heredocs = [];
+    for (let i = 0; i < command.length; i++) {
+        const ch = command[i];
+        // Inside a heredoc body: only a line consisting of the delimiter ends
+        // it. Content there is a string literal, never a command.
+        if (heredocs.length > 0) {
+            const lineEnd = command.indexOf("\n", i);
+            const line = lineEnd === -1 ? command.slice(i) : command.slice(i, lineEnd);
+            if (heredocs.some((d) => line === d)) {
+                heredocs.pop();
+            }
+            i = lineEnd === -1 ? command.length : lineEnd;
+            continue;
+        }
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (ch === "\\" && !inSingle) {
+            escaped = true;
+            continue;
+        }
+        if (ch === "'" && !inDouble) {
+            inSingle = !inSingle;
+            continue;
+        }
+        if (ch === '"' && !inSingle) {
+            inDouble = !inDouble;
+            continue;
+        }
+        if (inSingle || inDouble)
+            continue;
+        // Heredoc start: `<<[-]DELIM` (delim may be quoted or unquoted).
+        if (ch === "<" && command[i + 1] === "<") {
+            let j = i + 2;
+            if (command[j] === "-")
+                j++;
+            while (j < command.length && /\s/.test(command[j]))
+                j++;
+            if (j < command.length && (command[j] === "'" || command[j] === '"')) {
+                const q = command[j];
+                const end = command.indexOf(q, j + 1);
+                if (end !== -1) {
+                    heredocs.push(command.slice(j + 1, end));
+                    i = end;
+                    continue;
+                }
+            }
+            else {
+                const m = /^[^\s|;&<>()]+/.exec(command.slice(j));
+                if (m) {
+                    heredocs.push(m[0]);
+                    i = j + m[0].length - 1;
+                    continue;
+                }
+            }
+        }
+        const prev = i > 0 ? command[i - 1] : "";
+        if (/[-\/.\w]/.test(prev))
+            continue;
+        for (const kw of ["sudoedit", "visudo", "sudo", "doas", "pkexec"]) {
+            if (command.startsWith(kw, i)) {
+                const next = command[i + kw.length] ?? "";
+                if (!/[-\/.\w]/.test(next)) {
+                    hits.push({ index: i, kw });
+                    i += kw.length - 1;
+                    break;
+                }
+            }
+        }
+    }
+    return hits;
+}
 const translations = {
     en: {
         blocked: "Privilege escalation command blocked by plugin",
@@ -62,29 +153,54 @@ export const PolkitPlugin = async (_input) => {
             if (hookInput.tool !== "bash")
                 return;
             const command = hookOutput?.args?.command ?? "";
-            if (!MATCH.test(command))
+            const hits = scanPrivileged(command);
+            if (hits.length === 0)
                 return;
             if (deniedCommands.has(command)) {
                 throw new Error(MSG.polkitDenied);
             }
-            if (/^pkexec(?![-\/.\w])/.test(command.trim())) {
-                return;
-            }
-            if (/(?<![-\/.\w])(sudoedit|visudo)(?![-\/.\w])/.test(command)) {
+            if (hits.some((h) => h.kw === "sudoedit" || h.kw === "visudo")) {
                 throw new Error(MSG.blocked);
             }
-            hookOutput.args.command = command.replace(/(?<![-\/.\w])(sudo|doas)(?![-\/.\w])/, "pkexec");
+            // Already pkexec (leading or mid-command): pass through untouched.
+            if (hits.every((h) => h.kw === "pkexec"))
+                return;
+            // Rewrite every in-command sudo/doas to pkexec (back to front so
+            // indices stay valid): `cat x | sudo tee y` -> `cat x | pkexec tee y`.
+            // No other rewriting: the command keeps its exact shape so the agent
+            // sees only the minimal change (sudo -> pkexec).
+            let rewritten = command;
+            for (const h of [...hits].reverse()) {
+                if (h.kw === "sudo" || h.kw === "doas") {
+                    rewritten =
+                        rewritten.slice(0, h.index) + "pkexec" + rewritten.slice(h.index + h.kw.length);
+                }
+            }
+            hookOutput.args.command = rewritten;
         },
         "tool.execute.after": async (hookInput, hookOutput) => {
             if (hookInput.tool !== "bash")
                 return;
             const command = hookInput.args?.command ?? "";
-            if (!MATCH.test(command))
+            const hits = scanPrivileged(command);
+            if (hits.length === 0)
                 return;
-            const originalCommand = command.replace(/(?<![-\/.\w])pkexec(?![-\/.\w])/, "sudo");
+            // Reconstruct the user's original command for the deny list: map
+            // pkexec back to sudo.
+            let original = command;
+            for (const h of [...scanPrivileged(original)].reverse()) {
+                if (h.kw === "pkexec") {
+                    original = original.slice(0, h.index) + "sudo" + original.slice(h.index + 6);
+                }
+            }
+            // Only unambiguous authentication failures are reported and deny
+            // listed. A hang (dialog never appears) is bounded by the bash tool's
+            // own timeout (default 2 min) and is NOT translated here: it cannot
+            // be told apart from a long-running command.
             if (/\bNot authorized\b/.test(hookOutput.output) ||
-                /\bError executing command as another user\b/.test(hookOutput.output)) {
-                deniedCommands.add(originalCommand);
+                /\bError executing command as another user\b/.test(hookOutput.output) ||
+                /\bError creating textual authentication agent\b/.test(hookOutput.output)) {
+                deniedCommands.add(original);
                 throw new Error(MSG.polkitDenied);
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-polkit",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Redirect sudo/doas to pkexec in OpenCode — uses system polkit agent for native auth dialogs",
   "type": "module",
   "main": "./dist/index.js",