opencode-landstrip 0.15.1 → 0.15.3

package/index.ts

@@ -55,7 +55,7 @@ interface SandboxPermissionDecision {
 
 type ToastVariant = 'info' | 'success' | 'warning' | 'error';
 
-const LANDSTRIP_VERSION = [0, 15, 8] as const;
+const LANDSTRIP_VERSION = [0, 15, 9] as const;
 const REQUIRED_LANDSTRIP_VERSION = LANDSTRIP_VERSION.join('.');
 const SUPPORTED_PLATFORMS = new Set<NodeJS.Platform>(['linux', 'darwin', 'win32']);
 
@@ -102,11 +102,11 @@ function globToRegExp(globPattern: string): RegExp {
   let regex = '';
 
   for (let i = 0; i < globPattern.length; i++) {
-    const char = globPattern[i];
+    const char = globPattern.charAt(i);
     if (char === '*') {
-      if (globPattern[i + 1] === '*') {
+      if (globPattern.charAt(i + 1) === '*') {
         i++;
-        if (globPattern[i + 1] === '/') {
+        if (globPattern.charAt(i + 1) === '/') {
           i++;
           regex += '(?:.*/)?';
         } else {
@@ -222,19 +222,19 @@ function extractBlockedPath(
   let match = output.match(
     /(?:\/bin\/bash|bash|sh): (?:line \d+: )?([^:\n]+): (?:Operation not permitted|Permission denied)/,
   );
-  if (match) return normalizeBlockedPath(match[1], baseDirectory);
+  if (match?.[1]) return normalizeBlockedPath(match[1], baseDirectory);
 
   // ls/cat/cp: cannot open/access/stat '/path': Permission denied
   match = output.match(
     /^[a-zA-Z0-9_-]+: cannot (?:open|access|stat|create)(?: directory)? '?([^'\n]+?)'?(?: for (?:reading|writing))?: Permission denied$/m,
   );
-  if (match) return normalizeBlockedPath(match[1], baseDirectory);
+  if (match?.[1]) return normalizeBlockedPath(match[1], baseDirectory);
 
   // Generic: cmd: /absolute/path: Permission denied or Operation not permitted
   match = output.match(
     /^[a-zA-Z0-9_-]+: (\/[^\n:]+): (?:Operation not permitted|Permission denied)$/m,
   );
-  if (match) return normalizeBlockedPath(match[1], baseDirectory);
+  if (match?.[1]) return normalizeBlockedPath(match[1], baseDirectory);
 
   // Landstrip structured trap format carrying a denied path
   const landstripTraps = parseLandstripTraps(output);
@@ -390,8 +390,11 @@ function hasMinimumVersion(version: string, minimum: readonly [number, number, n
   if (!parsed) return false;
 
   for (let i = 0; i < minimum.length; i++) {
-    if (parsed[i] > minimum[i]) return true;
-    if (parsed[i] < minimum[i]) return false;
+    const parsedPart = parsed[i];
+    const minimumPart = minimum[i];
+    if (parsedPart === undefined || minimumPart === undefined) return false;
+    if (parsedPart > minimumPart) return true;
+    if (parsedPart < minimumPart) return false;
   }
 
   return true;
@@ -399,7 +402,7 @@ function hasMinimumVersion(version: string, minimum: readonly [number, number, n
 
 function splitHostPort(target: string, defaultPort: number): { host: string; port: number } | null {
   const bracketMatch = target.match(/^\[([^\]]+)\](?::(\d+))?$/);
-  if (bracketMatch) {
+  if (bracketMatch?.[1]) {
     return {
       host: bracketMatch[1],
       port: bracketMatch[2] ? Number(bracketMatch[2]) : defaultPort,
@@ -497,7 +500,13 @@ function startProxy(config: SandboxConfig): Promise<{ port: number; stop: () =>
 
   async function handleHttp(client: Socket, headerText: string, rest: Buffer): Promise<void> {
     const lines = headerText.split(/\r?\n/);
-    const [method, rawTarget, version] = lines[0].split(' ');
+    const requestLine = lines[0];
+    if (!requestLine) {
+      denyProxyRequest(client, '400 Bad Request');
+      return;
+    }
+
+    const [method, rawTarget, version] = requestLine.split(' ');
 
     if (!method || !rawTarget || !version) {
       denyProxyRequest(client, '400 Bad Request');
@@ -567,10 +576,10 @@ function startProxy(config: SandboxConfig): Promise<{ port: number; stop: () =>
       const header = buffered.subarray(0, headerEnd).toString('utf-8');
       const rest = buffered.subarray(headerEnd + 4);
       const firstLine = header.split(/\r?\n/, 1)[0];
-      const [method, target] = firstLine.split(' ');
+      const [method, target] = (firstLine ?? '').split(' ');
 
       const task =
-        method?.toUpperCase() === 'CONNECT'
+        method?.toUpperCase() === 'CONNECT' && target
           ? handleConnect(client, target, rest)
           : handleHttp(client, header, rest);
       task.catch(() => denyProxyRequest(client, '502 Bad Gateway'));
@@ -724,13 +733,13 @@ function extractPatchPaths(patchText: string): string[] {
 
   for (const line of patchText.split(/\r?\n/)) {
     const fileMatch = line.match(/^\*\*\* (?:Add|Update|Delete) File: (.+)$/);
-    if (fileMatch) {
+    if (fileMatch?.[1]) {
       paths.push(fileMatch[1].trim());
       continue;
     }
 
     const moveMatch = line.match(/^\*\*\* Move to: (.+)$/);
-    if (moveMatch) paths.push(moveMatch[1].trim());
+    if (moveMatch?.[1]) paths.push(moveMatch[1].trim());
   }
 
   return paths;
@@ -1025,7 +1034,7 @@ const plugin: Plugin = async ({ client, directory }: PluginInput, options?: Plug
 
     if (isGeneratedWrappedCommand(args.command as string)) {
       const policyMatch = (args.command as string).match(/\s'-p'\s+'([^']+)'/);
-      if (policyMatch && existsSync(policyMatch[1])) {
+      if (policyMatch?.[1] && existsSync(policyMatch[1])) {
         if (typeof args.description === 'string')
           args.description = landstripDescription(args.description);
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-landstrip",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Landlock-based sandboxing for opencode with landstrip",
   "keywords": [
     "landlock",
@@ -43,13 +43,13 @@
     "check": "tsc --noEmit",
     "test": "node --test test/*.test.mjs",
     "all": "npm run fmt && npm run lint && npm run check && npm test",
-    "ci:fmt": "oxfmt --check index.ts tui.ts package.json tsconfig.json sandbox.json .oxfmtrc.json README.md test/*.test.mjs",
+    "ci:fmt": "oxfmt --check index.ts tui.ts shared.ts package.json tsconfig.json sandbox.json .oxfmtrc.json README.md test/*.test.mjs",
     "ci:lint": "npm run lint",
     "ci:check": "npm run check",
     "ci:test": "npm test"
   },
   "dependencies": {
-    "@landstrip/landstrip": "^0.15.8"
+    "@landstrip/landstrip": "^0.15.9"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.7",

package/shared.ts

@@ -238,7 +238,7 @@ export function extractDomainsFromCommand(command: string): string[] {
   let match: RegExpExecArray | null;
 
   while ((match = urlRegex.exec(command)) !== null) {
-    domains.add(match[1]);
+    if (match[1]) domains.add(match[1]);
   }
 
   return [...domains];
@@ -358,9 +358,11 @@ export function decodeLandstripTrap(value: unknown): LandstripTrap | null {
     case 'filesystem': {
       const { operation, path } = value;
       if (!isLandstripOperation(operation) || typeof path !== 'string') return null;
+      const trap: LandstripTrap = { kind: 'filesystem', operation, path, mechanism };
       const state = decodeTrapState(value.state);
-      const queryId = typeof value.query_id === 'number' ? value.query_id : undefined;
-      return { kind: 'filesystem', operation, path, mechanism, state, queryId };
+      if (state) trap.state = state;
+      if (typeof value.query_id === 'number') trap.queryId = value.query_id;
+      return trap;
     }
     case 'network': {
       const { operation, target } = value;

package/tui.ts

@@ -35,16 +35,17 @@ interface PendingPermission {
 
 type PermissionChoice = 'once' | 'session' | 'project' | 'global' | 'reject';
 
-type WriteChoice = 'once' | 'session' | 'project' | 'global' | 'deny';
+type QueryChoice = 'once' | 'session' | 'project' | 'global' | 'deny';
 
-// A landstrip write query held pending over the fd-3 socket. It shares the
-// dialog stack with permission prompts so the two never overlap, hence the
-// common `id`/`kind` shape.
-interface WriteQueryEntry {
-  kind: 'write-query';
+// A landstrip filesystem query (read or write) held pending over the fd-3
+// socket. It shares the dialog stack with permission prompts so the two never
+// overlap, hence the common `id`/`kind` shape.
+interface FsQueryEntry {
+  kind: 'fs-query';
   id: string;
   socket: NetSocket;
   queryId: number;
+  operation: 'read' | 'write';
   path: string;
 }
 
@@ -54,7 +55,7 @@ interface PermissionEntry {
   permission: PendingPermission;
 }
 
-type QueueEntry = PermissionEntry | WriteQueryEntry;
+type QueueEntry = PermissionEntry | FsQueryEntry;
 
 function list(values: string[]): string {
   return values.join(', ') || '(none)';
@@ -120,10 +121,11 @@ const tui: TuiPlugin = async (api, options, meta) => {
   // server regenerates the policy from on-disk config each run — so it affects
   // only live socket decisions, not the static policy.
   const sessionAllowedWritePaths = new Set<string>();
+  const sessionAllowedReadPaths = new Set<string>();
 
-  // Write queries still awaiting a response, so cleanup can release held
+  // Filesystem queries still awaiting a response, so cleanup can release held
   // syscalls instead of letting the child hang.
-  const liveQueries = new Set<WriteQueryEntry>();
+  const liveQueries = new Set<FsQueryEntry>();
 
   function pump(): void {
     if (activeId !== undefined) return;
@@ -131,7 +133,7 @@ const tui: TuiPlugin = async (api, options, meta) => {
     while (next && resolved.has(next.id)) next = queue.shift();
     if (!next) return;
     if (next.kind === 'permission') showPermission(next.permission);
-    else showWriteQuery(next);
+    else showFsQuery(next);
   }
 
   function enqueueEntry(entry: QueueEntry): void {
@@ -267,49 +269,56 @@ const tui: TuiPlugin = async (api, options, meta) => {
     );
   }
 
-  function respondWriteQuery(socket: NetSocket, queryId: number, action: 'allow' | 'deny'): void {
+  function respondFsQuery(socket: NetSocket, queryId: number, action: 'allow' | 'deny'): void {
     if (!socket.destroyed) socket.write(JSON.stringify({ query_id: queryId, action }) + '\n');
   }
 
-  function resolveWriteQuery(entry: WriteQueryEntry, choice: WriteChoice): void {
+  function resolveFsQuery(entry: FsQueryEntry, choice: QueryChoice): void {
     if (resolved.has(entry.id)) return;
     const action = choice === 'deny' ? 'deny' : 'allow';
+    const verb = entry.operation === 'read' ? 'Read' : 'Write';
 
     try {
       if (action === 'allow') {
         if (choice === 'session') {
-          sessionAllowedWritePaths.add(entry.path);
+          const sessionPaths =
+            entry.operation === 'read' ? sessionAllowedReadPaths : sessionAllowedWritePaths;
+          sessionPaths.add(entry.path);
         } else if (choice === 'project' || choice === 'global') {
           const directory = api.state.path.directory || process.cwd();
           const { globalPath, projectPath } = getConfigPaths(directory);
           const update = updateForPermission({
-            permission: 'write',
+            permission: entry.operation,
             metadata: { filepath: entry.path },
           });
           if (update) writeConfigFile(choice === 'project' ? projectPath : globalPath, update);
         }
       }
 
-      respondWriteQuery(entry.socket, entry.queryId, action);
+      respondFsQuery(entry.socket, entry.queryId, action);
       api.ui.toast({
         title: 'Sandbox',
-        message: action === 'deny' ? `Write denied: ${entry.path}` : `Write allowed (${choice})`,
+        message:
+          action === 'deny' ? `${verb} denied: ${entry.path}` : `${verb} allowed (${choice})`,
         variant: action === 'deny' ? 'warning' : 'success',
       });
     } catch {
       // Persisting failed — still release the held syscall by denying it.
-      respondWriteQuery(entry.socket, entry.queryId, 'deny');
+      respondFsQuery(entry.socket, entry.queryId, 'deny');
     } finally {
       liveQueries.delete(entry);
       finishActive(entry.id);
     }
   }
 
-  function showWriteQuery(entry: WriteQueryEntry): void {
+  function showFsQuery(entry: FsQueryEntry): void {
     activeId = entry.id;
+    const verb = entry.operation === 'read' ? 'Read' : 'Write';
+    const noun = entry.operation;
+    const listName = entry.operation === 'read' ? 'allowRead' : 'allowWrite';
 
     void api.attention.notify({
-      title: 'Sandbox write blocked',
+      title: `Sandbox ${noun} blocked`,
       message: entry.path,
       sound: { name: 'permission' },
       notification: true,
@@ -322,48 +331,48 @@ const tui: TuiPlugin = async (api, options, meta) => {
 
     api.ui.dialog.replace(
       () =>
-        api.ui.DialogSelect<WriteChoice>({
-          title: 'Sandbox Write Blocked',
-          placeholder: `Write blocked: ${entry.path}`,
+        api.ui.DialogSelect<QueryChoice>({
+          title: `Sandbox ${verb} Blocked`,
+          placeholder: `${verb} blocked: ${entry.path}`,
           options: [
             {
               title: 'Allow once',
               value: 'once',
-              category: 'This write',
-              description: 'Permit this write and continue',
+              category: `This ${noun}`,
+              description: `Permit this ${noun} and continue`,
             },
             {
               title: 'Allow for session',
               value: 'session',
-              category: 'This write',
-              description: 'Permit writes to this path for the rest of this session',
+              category: `This ${noun}`,
+              description: `Permit ${noun}s to this path for the rest of this session`,
             },
             {
               title: 'Allow for project',
               value: 'project',
               category: 'Persist to sandbox.json',
-              description: 'Add to .opencode/sandbox.json allowWrite and permit',
+              description: `Add to .opencode/sandbox.json ${listName} and permit`,
             },
             {
               title: 'Allow globally',
               value: 'global',
               category: 'Persist to sandbox.json',
-              description: 'Add to ~/.config/opencode/sandbox.json allowWrite and permit',
+              description: `Add to ~/.config/opencode/sandbox.json ${listName} and permit`,
             },
             {
               title: 'Deny',
               value: 'deny',
               category: 'Deny',
-              description: 'Block this write',
+              description: `Block this ${noun}`,
             },
           ],
           onSelect: (option) => {
             selectionMade = true;
-            resolveWriteQuery(entry, option.value);
+            resolveFsQuery(entry, option.value);
           },
         }),
       () => {
-        if (!selectionMade) resolveWriteQuery(entry, 'deny');
+        if (!selectionMade) resolveFsQuery(entry, 'deny');
       },
     );
   }
@@ -408,26 +417,23 @@ const tui: TuiPlugin = async (api, options, meta) => {
           buffer = buffer.slice(newline + 1);
 
           for (const trap of parseLandstripTraps(line)) {
-            if (
-              trap.kind !== 'filesystem' ||
-              trap.state !== 'query' ||
-              trap.operation !== 'write'
-            ) {
-              continue;
-            }
+            if (trap.kind !== 'filesystem' || trap.state !== 'query') continue;
             if (typeof trap.queryId !== 'number' || seen.has(trap.queryId)) continue;
             seen.add(trap.queryId);
 
-            if (sessionAllowedWritePaths.has(trap.path)) {
-              respondWriteQuery(socket, trap.queryId, 'allow');
+            const sessionPaths =
+              trap.operation === 'read' ? sessionAllowedReadPaths : sessionAllowedWritePaths;
+            if (sessionPaths.has(trap.path)) {
+              respondFsQuery(socket, trap.queryId, 'allow');
               continue;
             }
 
-            const entry: WriteQueryEntry = {
-              kind: 'write-query',
-              id: `landstrip-write:${socketId}:${trap.queryId}`,
+            const entry: FsQueryEntry = {
+              kind: 'fs-query',
+              id: `landstrip-${trap.operation}:${socketId}:${trap.queryId}`,
               socket,
               queryId: trap.queryId,
+              operation: trap.operation,
               path: trap.path,
             };
             liveQueries.add(entry);
@@ -572,10 +578,10 @@ const tui: TuiPlugin = async (api, options, meta) => {
     unsubscribeAsked();
     unsubscribeReplied();
 
-    // Deny any still-held writes so the sandboxed children don't hang, then
+    // Deny any still-held queries so the sandboxed children don't hang, then
     // tear down the socket server and drop the discovery file.
     for (const entry of liveQueries) {
-      respondWriteQuery(entry.socket, entry.queryId, 'deny');
+      respondFsQuery(entry.socket, entry.queryId, 'deny');
       liveQueries.delete(entry);
     }
     for (const socket of sockets) socket.destroy();