mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-29 21:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

assistant: Prevent possible execution of generated terminal commands (#17647)
Some checks are pending
CI / Check formatting and spelling (push) Waiting to run
Details
CI / (macOS) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Run Clippy and tests (push) Waiting to run
Details
CI / (Windows) Run Clippy and tests (push) Waiting to run
Details
CI / Create a macOS bundle (push) Blocked by required conditions
Details
CI / Create a Linux bundle (push) Blocked by required conditions
Details
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Details
Deploy Docs / Deploy Docs (push) Waiting to run
Details
Docs / Check formatting (push) Waiting to run
Details

Browse source 
Closes #17424

Release Notes:

- Fixed an issue where commands generated by the terminal command could
sometimes be executed without confirmation
This commit is contained in:
Bennet Bo Fenner 2024-09-10 11:03:44 -04:00 committed by GitHub
parent bf64c0899f
commit 93b3520c11
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/assistant/src/terminal_inline_assistant.rs
View file

@ -988,7 +988,7 @@ impl TerminalTransaction {
pub fn push(&mut self, hunk: String, cx: &mut AppContext) { pub fn push(&mut self, hunk: String, cx: &mut AppContext) {
// Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
let input = hunk.replace(CARRIAGE_RETURN, " "); let input = Self::sanitize_input(hunk);
self.terminal self.terminal
.update(cx, |terminal, _| terminal.input(input)); .update(cx, |terminal, _| terminal.input(input));
} }
@ -1003,6 +1003,10 @@ impl TerminalTransaction {
terminal.input(CARRIAGE_RETURN.to_string()) terminal.input(CARRIAGE_RETURN.to_string())
}); });
} }
fn sanitize_input(input: String) -> String {
input.replace(['\r', '\n'], "")
}
} }
pub struct Codegen { pub struct Codegen {