Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,18 @@ export function Prompt(props: PromptProps) {
e.preventDefault()
return
}
if (keybind.match("input_copy", e)) {
const selection = input.visualCursor.selection
if (selection) {
const start = Math.min(selection.start, selection.end)
const end = Math.max(selection.start, selection.end)
const text = input.plainText.slice(start, end)
if (text) {
await Clipboard.write(text)
return
}
}
}
// Handle clipboard paste (Ctrl+V) - check for images first on Windows
// This is needed because Windows terminal doesn't properly send image data
// through bracketed paste, so we need to intercept the keypress and
Expand Down
13 changes: 7 additions & 6 deletions packages/opencode/src/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ export namespace Config {
session_rename: z.string().optional().default("ctrl+r").describe("Rename session"),
session_delete: z.string().optional().default("ctrl+d").describe("Delete session"),
stash_delete: z.string().optional().default("ctrl+d").describe("Delete stash entry"),
model_provider_list: z.string().optional().default("ctrl+a").describe("Open provider list from model dialog"),
model_provider_list: z.string().optional().default("ctrl+alt+m").describe("Open provider list from model dialog"),
model_favorite_toggle: z.string().optional().default("ctrl+f").describe("Toggle model favorite status"),
session_share: z.string().optional().default("none").describe("Share current session"),
session_unshare: z.string().optional().default("none").describe("Unshare current session"),
Expand Down Expand Up @@ -690,7 +690,8 @@ export namespace Config {
agent_cycle_reverse: z.string().optional().default("shift+tab").describe("Previous agent"),
variant_cycle: z.string().optional().default("ctrl+t").describe("Cycle model variants"),
input_clear: z.string().optional().default("ctrl+c").describe("Clear input field"),
input_paste: z.string().optional().default("ctrl+v").describe("Paste from clipboard"),
input_copy: z.string().optional().default("ctrl+c,super+c").describe("Copy from input"),
input_paste: z.string().optional().default("ctrl+v,super+v").describe("Paste from clipboard"),
input_submit: z.string().optional().default("return").describe("Submit input"),
input_newline: z
.string()
Expand All @@ -699,8 +700,8 @@ export namespace Config {
.describe("Insert newline in input"),
input_move_left: z.string().optional().default("left,ctrl+b").describe("Move cursor left in input"),
input_move_right: z.string().optional().default("right,ctrl+f").describe("Move cursor right in input"),
input_move_up: z.string().optional().default("up").describe("Move cursor up in input"),
input_move_down: z.string().optional().default("down").describe("Move cursor down in input"),
input_move_up: z.string().optional().default("up,ctrl+p").describe("Move cursor up in input"),
input_move_down: z.string().optional().default("down,ctrl+n").describe("Move cursor down in input"),
input_select_left: z.string().optional().default("shift+left").describe("Select left in input"),
input_select_right: z.string().optional().default("shift+right").describe("Select right in input"),
input_select_up: z.string().optional().default("shift+up").describe("Select up in input"),
Expand Down Expand Up @@ -770,8 +771,8 @@ export namespace Config {
.optional()
.default("ctrl+w,ctrl+backspace,alt+backspace")
.describe("Delete word backward in input"),
history_previous: z.string().optional().default("up").describe("Previous history item"),
history_next: z.string().optional().default("down").describe("Next history item"),
history_previous: z.string().optional().default("up,ctrl+p").describe("Previous history item"),
history_next: z.string().optional().default("down,ctrl+n").describe("Next history item"),
session_child_cycle: z.string().optional().default("<leader>right").describe("Next child session"),
session_child_cycle_reverse: z.string().optional().default("<leader>left").describe("Previous child session"),
session_parent: z.string().optional().default("<leader>up").describe("Go to parent session"),
Expand Down
20 changes: 16 additions & 4 deletions packages/opencode/src/file/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,7 @@ export namespace File {
const project = Instance.project
const full = path.join(Instance.directory, file)

// TODO: Filesystem.contains is lexical only - symlinks inside the project can escape.
// TODO: On Windows, cross-drive paths bypass this check. Consider realpath canonicalization.
// Check if path is lexically contained first (fast check)
if (!Instance.containsPath(full)) {
throw new Error(`Access denied: path escapes project directory`)
}
Expand All @@ -289,6 +288,11 @@ export namespace File {
return { type: "text", content: "" }
}

const real = await fs.promises.realpath(full)
if (!Instance.containsPath(real)) {
throw new Error(`Access denied: path escapes project directory`)
}

const encode = await shouldEncode(bunFile)

if (encode) {
Expand Down Expand Up @@ -337,12 +341,20 @@ export namespace File {
}
const resolved = dir ? path.join(Instance.directory, dir) : Instance.directory

// TODO: Filesystem.contains is lexical only - symlinks inside the project can escape.
// TODO: On Windows, cross-drive paths bypass this check. Consider realpath canonicalization.
// Check if path is lexically contained first (fast check)
if (!Instance.containsPath(resolved)) {
throw new Error(`Access denied: path escapes project directory`)
}

try {
const real = await fs.promises.realpath(resolved)
if (!Instance.containsPath(real)) {
throw new Error(`Access denied: path escapes project directory`)
}
} catch (err: any) {
if (err.message && err.message.startsWith("Access denied")) throw err
}

const nodes: Node[] = []
for (const entry of await fs.promises
.readdir(resolved, {
Expand Down
12 changes: 9 additions & 3 deletions packages/opencode/src/permission/next.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,15 @@ export namespace PermissionNext {
export function evaluate(permission: string, pattern: string, ...rulesets: Ruleset[]): Rule {
const merged = merge(...rulesets)
log.info("evaluate", { permission, pattern, ruleset: merged })
const match = merged.findLast(
(rule) => Wildcard.match(permission, rule.permission) && Wildcard.match(pattern, rule.pattern),
)
const match = merged.findLast((rule) => {
if (!Wildcard.match(permission, rule.permission)) return false
if (Wildcard.match(pattern, rule.pattern)) return true
if (permission === "bash") {
const cmd = pattern.split(/\s+/)[0]
if (cmd && Wildcard.match(cmd, rule.pattern)) return true
}
return false
})
return match ?? { action: "ask", permission, pattern: "*" }
}

Expand Down
75 changes: 75 additions & 0 deletions packages/opencode/test/permission/next.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,81 @@ test("disabled - specific allow overrides wildcard deny", () => {
expect(result.has("read")).toBe(true)
})

// bash command name matching tests (Issue #7063)

test("evaluate - bash denies command with args when command name matches deny rule", () => {
const result = PermissionNext.evaluate("bash", "yarn test", [{ permission: "bash", pattern: "yarn", action: "deny" }])
expect(result.action).toBe("deny")
})

test("evaluate - bash denies npm install when npm is denied", () => {
const result = PermissionNext.evaluate("bash", "npm install", [
{ permission: "bash", pattern: "npm", action: "deny" },
])
expect(result.action).toBe("deny")
})

test("evaluate - bash denies pnpm run build when pnpm is denied", () => {
const result = PermissionNext.evaluate("bash", "pnpm run build", [
{ permission: "bash", pattern: "pnpm", action: "deny" },
])
expect(result.action).toBe("deny")
})

test("evaluate - bash denies npx create-react-app when npx is denied", () => {
const result = PermissionNext.evaluate("bash", "npx create-react-app myapp", [
{ permission: "bash", pattern: "npx", action: "deny" },
])
expect(result.action).toBe("deny")
})

test("evaluate - bash command name match does not affect non-bash permissions", () => {
const result = PermissionNext.evaluate("edit", "yarn test", [
{ permission: "edit", pattern: "yarn", action: "deny" },
])
expect(result.action).toBe("ask")
})

test("evaluate - bash allows command when no deny rule exists", () => {
const result = PermissionNext.evaluate("bash", "yarn test", [
{ permission: "bash", pattern: "*", action: "allow" },
])
expect(result.action).toBe("allow")
})

test("evaluate - bash exact pattern still works", () => {
const result = PermissionNext.evaluate("bash", "yarn", [{ permission: "bash", pattern: "yarn", action: "deny" }])
expect(result.action).toBe("deny")
})

test("evaluate - bash wildcard pattern takes precedence over command name match", () => {
const result = PermissionNext.evaluate("bash", "yarn test", [
{ permission: "bash", pattern: "yarn", action: "deny" },
{ permission: "bash", pattern: "*", action: "allow" },
])
expect(result.action).toBe("allow")
})

test("evaluate - bash command name deny after wildcard allow", () => {
const result = PermissionNext.evaluate("bash", "yarn test", [
{ permission: "bash", pattern: "*", action: "allow" },
{ permission: "bash", pattern: "yarn", action: "deny" },
])
expect(result.action).toBe("deny")
})

test("evaluate - bash with multiple denied commands", () => {
const rules: PermissionNext.Ruleset = [
{ permission: "bash", pattern: "yarn", action: "deny" },
{ permission: "bash", pattern: "npm", action: "deny" },
{ permission: "bash", pattern: "pnpm", action: "deny" },
]
expect(PermissionNext.evaluate("bash", "yarn install", rules).action).toBe("deny")
expect(PermissionNext.evaluate("bash", "npm run test", rules).action).toBe("deny")
expect(PermissionNext.evaluate("bash", "pnpm add lodash", rules).action).toBe("deny")
expect(PermissionNext.evaluate("bash", "ls -la", rules).action).toBe("ask")
})

// ask tests

test("ask - resolves immediately when action is allow", async () => {
Expand Down
45 changes: 45 additions & 0 deletions packages/opencode/test/security/symlink.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { describe, expect, test } from "bun:test"
import path from "path"
import fs from "fs/promises"
import os from "os"
import { tmpdir } from "../fixture/fixture"
import { Instance } from "../../src/project/instance"
import { File } from "../../src/file"

describe("security", () => {
test("prevents reading files outside project via symlink", async () => {
// Create a "secret" file outside the project
const secretDir = path.join(os.tmpdir(), "secret-" + Math.random().toString(36).slice(2))
await fs.mkdir(secretDir, { recursive: true })
const secretFile = path.join(secretDir, "passwd")
await Bun.write(secretFile, "secret-data")

try {
await using tmp = await tmpdir({
init: async (dir) => {
// Create a symlink to the secret file
await fs.symlink(secretFile, path.join(dir, "link-to-secret"))
},
})

await Instance.provide({
directory: tmp.path,
fn: async () => {
// Try to read the symlink
// This should FAIL (throw error) if security check works
// We expect "Access denied: path escapes project directory"
try {
await File.read("link-to-secret")
// If we get here, it failed to throw
throw new Error("Security check failed: File.read succeeded but should have failed")
} catch (err: any) {
expect(err.message).toContain("Access denied")
}
},
})
} finally {
// Clean up secret dir
await fs.rm(secretDir, { recursive: true, force: true })
}
})
})