Skip to content

Commit 79b38a6

Browse files
bernatfpclaude
andcommitted
feat: add support for sudo and password-requiring commands
Add SecureInput system for handling password prompts in interactive commands (sudo, ssh -t, ansible -K, etc.). - Create SecureInput namespace with event-based password request system - Add PTY-based execution path in Bash tool for interactive commands - Auto-detect commands needing interaction via pattern matching - Detect password prompts and request secure input from user - Sanitize output to remove password prompts before sending to LLM - Add server routes for secure-input submit/cancel - Add TUI SecureInputPrompt component - Add web app SecureInputPrompt component - Integrate secure_input into sync contexts Security: Password goes directly to PTY, never stored or logged. 60s timeout, max 3 retry attempts. Refs: anomalyco#9808 Co-Authored-By: Claude Opus 4.5 <[email protected]>
1 parent d6caaee commit 79b38a6

12 files changed

Lines changed: 978 additions & 2 deletions

File tree

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
import { createSignal, Show } from "solid-js"
2+
import type { SecureInputRequest } from "@opencode-ai/sdk/v2/client"
3+
import { useData } from "@opencode-ai/ui/context/data"
4+
import { Button } from "@opencode-ai/ui/button"
5+
import { Icon } from "@opencode-ai/ui/icon"
6+
import { useLanguage } from "@/context/language"
7+
8+
interface SecureInputPromptProps {
9+
request: SecureInputRequest
10+
onSubmit?: () => void
11+
onCancel?: () => void
12+
}
13+
14+
export function SecureInputPrompt(props: SecureInputPromptProps) {
15+
const data = useData()
16+
const language = useLanguage()
17+
const [inputValue, setInputValue] = createSignal("")
18+
const [isSubmitting, setIsSubmitting] = createSignal(false)
19+
20+
const handleSubmit = () => {
21+
const value = inputValue()
22+
if (!value) return
23+
if (!data.submitSecureInput) return
24+
25+
setIsSubmitting(true)
26+
data.submitSecureInput({
27+
requestID: props.request.id,
28+
input: value,
29+
})
30+
setInputValue("")
31+
props.onSubmit?.()
32+
}
33+
34+
const handleCancel = () => {
35+
if (!data.cancelSecureInput) return
36+
37+
data.cancelSecureInput({
38+
requestID: props.request.id,
39+
})
40+
setInputValue("")
41+
props.onCancel?.()
42+
}
43+
44+
const handleKeyDown = (e: KeyboardEvent) => {
45+
if (e.key === "Enter") {
46+
e.preventDefault()
47+
handleSubmit()
48+
} else if (e.key === "Escape") {
49+
e.preventDefault()
50+
handleCancel()
51+
}
52+
}
53+
54+
return (
55+
<div class="rounded-md border border-border-base bg-surface-base p-4">
56+
<div class="flex items-center gap-2 mb-3">
57+
<Icon name="lock" size="small" class="text-accent-primary" />
58+
<span class="text-14-medium text-text-strong">
59+
{language.t("secureInput.title", { fallback: "Secure Input Required" })}
60+
</span>
61+
</div>
62+
63+
<div class="mb-3">
64+
<p class="text-14-regular text-text-weak">{props.request.prompt}</p>
65+
<Show when={props.request.command}>
66+
<p class="text-12-regular text-text-weaker mt-1">
67+
Command: <code class="text-text-weak">{props.request.command}</code>
68+
</p>
69+
</Show>
70+
</div>
71+
72+
<div class="flex flex-col gap-3">
73+
<input
74+
type="password"
75+
class="w-full px-3 py-2 rounded-md border border-border-base bg-background-base text-14-regular text-text-strong placeholder:text-text-weak focus:outline-none focus:ring-2 focus:ring-accent-primary/50"
76+
placeholder={language.t("secureInput.placeholder", { fallback: "Enter password..." })}
77+
value={inputValue()}
78+
onInput={(e) => setInputValue(e.currentTarget.value)}
79+
onKeyDown={handleKeyDown}
80+
disabled={isSubmitting()}
81+
autofocus
82+
/>
83+
84+
<div class="flex gap-2 justify-end">
85+
<Button variant="secondary" size="small" onClick={handleCancel} disabled={isSubmitting()}>
86+
{language.t("common.cancel", { fallback: "Cancel" })}
87+
</Button>
88+
<Button variant="primary" size="small" onClick={handleSubmit} disabled={isSubmitting() || !inputValue()}>
89+
{language.t("common.submit", { fallback: "Submit" })}
90+
</Button>
91+
</div>
92+
</div>
93+
</div>
94+
)
95+
}

‎packages/app/src/context/global-sync.tsx‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
type VcsInfo,
1818
type PermissionRequest,
1919
type QuestionRequest,
20+
type SecureInputRequest,
2021
createOpencodeClient,
2122
} from "@opencode-ai/sdk/v2/client"
2223
import { createStore, produce, reconcile, type SetStoreFunction, type Store } from "solid-js/store"
@@ -69,6 +70,9 @@ type State = {
6970
question: {
7071
[sessionID: string]: QuestionRequest[]
7172
}
73+
secure_input: {
74+
[sessionID: string]: SecureInputRequest[]
75+
}
7276
mcp: {
7377
[name: string]: McpStatus
7478
}
@@ -165,6 +169,7 @@ function createGlobalSync() {
165169
todo: {},
166170
permission: {},
167171
question: {},
172+
secure_input: {},
168173
mcp: {},
169174
lsp: [],
170175
vcs: cache[0].value,
@@ -377,6 +382,38 @@ function createGlobalSync() {
377382
}
378383
})
379384
}),
385+
sdk.secureInput.list().then((x) => {
386+
const grouped: Record<string, SecureInputRequest[]> = {}
387+
for (const request of x.data ?? []) {
388+
if (!request?.id || !request.sessionID) continue
389+
const existing = grouped[request.sessionID]
390+
if (existing) {
391+
existing.push(request)
392+
continue
393+
}
394+
grouped[request.sessionID] = [request]
395+
}
396+
397+
batch(() => {
398+
for (const sessionID of Object.keys(store.secure_input)) {
399+
if (grouped[sessionID]) continue
400+
setStore("secure_input", sessionID, [])
401+
}
402+
for (const [sessionID, requests] of Object.entries(grouped)) {
403+
setStore(
404+
"secure_input",
405+
sessionID,
406+
reconcile(
407+
requests
408+
.filter((r) => !!r?.id)
409+
.slice()
410+
.sort((a, b) => a.id.localeCompare(b.id)),
411+
{ key: "id" },
412+
),
413+
)
414+
}
415+
})
416+
}),
380417
]).then(() => {
381418
setStore("status", "complete")
382419
})
@@ -638,6 +675,45 @@ function createGlobalSync() {
638675
)
639676
break
640677
}
678+
case "secure-input.requested": {
679+
const sessionID = event.properties.sessionID
680+
const requests = store.secure_input[sessionID]
681+
if (!requests) {
682+
setStore("secure_input", sessionID, [event.properties])
683+
break
684+
}
685+
686+
const result = Binary.search(requests, event.properties.id, (r) => r.id)
687+
if (result.found) {
688+
setStore("secure_input", sessionID, result.index, reconcile(event.properties))
689+
break
690+
}
691+
692+
setStore(
693+
"secure_input",
694+
sessionID,
695+
produce((draft) => {
696+
draft.splice(result.index, 0, event.properties)
697+
}),
698+
)
699+
break
700+
}
701+
case "secure-input.submitted":
702+
case "secure-input.cancelled":
703+
case "secure-input.timed-out": {
704+
const requests = store.secure_input[event.properties.sessionID]
705+
if (!requests) break
706+
const result = Binary.search(requests, event.properties.requestID, (r) => r.id)
707+
if (!result.found) break
708+
setStore(
709+
"secure_input",
710+
event.properties.sessionID,
711+
produce((draft) => {
712+
draft.splice(result.index, 1)
713+
}),
714+
)
715+
break
716+
}
641717
case "lsp.updated": {
642718
const sdk = createOpencodeClient({
643719
baseUrl: globalSDK.url,

‎packages/app/src/pages/directory-layout.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ export default function Layout(props: ParentProps) {
3333

3434
const rejectQuestion = (input: { requestID: string }) => sdk.client.question.reject(input)
3535

36+
const submitSecureInput = (input: { requestID: string; input: string }) =>
37+
sdk.client.secureInput.submit(input)
38+
39+
const cancelSecureInput = (input: { requestID: string }) => sdk.client.secureInput.cancel(input)
40+
3641
const navigateToSession = (sessionID: string) => {
3742
navigate(`/${params.dir}/session/${sessionID}`)
3843
}
@@ -44,6 +49,8 @@ export default function Layout(props: ParentProps) {
4449
onPermissionRespond={respond}
4550
onQuestionReply={replyToQuestion}
4651
onQuestionReject={rejectQuestion}
52+
onSecureInputSubmit={submitSecureInput}
53+
onSecureInputCancel={cancelSecureInput}
4754
onNavigateToSession={navigateToSession}
4855
>
4956
<LocalProvider>{props.children}</LocalProvider>

‎packages/opencode/src/cli/cmd/tui/context/sync.tsx‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import type {
99
Command,
1010
PermissionRequest,
1111
QuestionRequest,
12+
SecureInputRequest,
1213
LspStatus,
1314
McpStatus,
1415
McpResource,
@@ -46,6 +47,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
4647
question: {
4748
[sessionID: string]: QuestionRequest[]
4849
}
50+
secure_input: {
51+
[sessionID: string]: SecureInputRequest[]
52+
}
4953
config: Config
5054
session: Session[]
5155
session_status: {
@@ -85,6 +89,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
8589
agent: [],
8690
permission: {},
8791
question: {},
92+
secure_input: {},
8893
command: [],
8994
provider: [],
9095
provider_default: {},
@@ -185,6 +190,45 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
185190
break
186191
}
187192

193+
case "secure-input.submitted":
194+
case "secure-input.cancelled":
195+
case "secure-input.timed-out": {
196+
const requests = store.secure_input[event.properties.sessionID]
197+
if (!requests) break
198+
const match = Binary.search(requests, event.properties.requestID, (r) => r.id)
199+
if (!match.found) break
200+
setStore(
201+
"secure_input",
202+
event.properties.sessionID,
203+
produce((draft) => {
204+
draft.splice(match.index, 1)
205+
}),
206+
)
207+
break
208+
}
209+
210+
case "secure-input.requested": {
211+
const request = event.properties
212+
const requests = store.secure_input[request.sessionID]
213+
if (!requests) {
214+
setStore("secure_input", request.sessionID, [request])
215+
break
216+
}
217+
const match = Binary.search(requests, request.id, (r) => r.id)
218+
if (match.found) {
219+
setStore("secure_input", request.sessionID, match.index, reconcile(request))
220+
break
221+
}
222+
setStore(
223+
"secure_input",
224+
request.sessionID,
225+
produce((draft) => {
226+
draft.splice(match.index, 0, request)
227+
}),
228+
)
229+
break
230+
}
231+
188232
case "todo.updated":
189233
setStore("todo", event.properties.sessionID, event.properties.todos)
190234
break

‎packages/opencode/src/cli/cmd/tui/routes/session/index.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ import { Filesystem } from "@/util/filesystem"
7272
import { Global } from "@/global"
7373
import { PermissionPrompt } from "./permission"
7474
import { QuestionPrompt } from "./question"
75+
import { SecureInputPrompt } from "./secure-input"
7576
import { DialogExportOptions } from "../../ui/dialog-export-options"
7677
import { formatTranscript } from "../../util/transcript"
7778

@@ -127,6 +128,10 @@ export function Session() {
127128
if (session()?.parentID) return []
128129
return children().flatMap((x) => sync.data.question[x.id] ?? [])
129130
})
131+
const secureInputs = createMemo(() => {
132+
if (session()?.parentID) return []
133+
return children().flatMap((x) => sync.data.secure_input[x.id] ?? [])
134+
})
130135

131136
const pending = createMemo(() => {
132137
return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id
@@ -1084,8 +1089,11 @@ export function Session() {
10841089
<Show when={permissions().length === 0 && questions().length > 0}>
10851090
<QuestionPrompt request={questions()[0]} />
10861091
</Show>
1092+
<Show when={permissions().length === 0 && questions().length === 0 && secureInputs().length > 0}>
1093+
<SecureInputPrompt request={secureInputs()[0]} />
1094+
</Show>
10871095
<Prompt
1088-
visible={!session()?.parentID && permissions().length === 0 && questions().length === 0}
1096+
visible={!session()?.parentID && permissions().length === 0 && questions().length === 0 && secureInputs().length === 0}
10891097
ref={(r) => {
10901098
prompt = r
10911099
promptRef.set(r)
@@ -1094,7 +1102,7 @@ export function Session() {
10941102
r.set(route.initialPrompt)
10951103
}
10961104
}}
1097-
disabled={permissions().length > 0 || questions().length > 0}
1105+
disabled={permissions().length > 0 || questions().length > 0 || secureInputs().length > 0}
10981106
onSubmit={() => {
10991107
toBottom()
11001108
}}

0 commit comments

Comments
 (0)