mirror of
https://github.com/openai/codex.git
synced 2026-11-13 14:46:14 +00:00
Alec Barber
fcf636a41d
## Why Client-facing command execution items can include recognizable secrets in the rendered command or parsed command actions. ## What changed - Redact secrets in `commandExecution.command` and `commandActions` for live items, completed items, and replayed thread history. - Keep command approval requests backed by the original executable command and parsed actions while using the redacted representation for display items. - Document that execution item commands are redacted display values rather than executable commands. ## Testing - Cover redaction for command conversion, parsed search actions, legacy replay, approval flows, completion notifications, and rejected commands. GitOrigin-RevId: 2ad056f21882bf5166182ad1a4ff0bf6471d9c0e
86 lines
2.7 KiB
Rust
86 lines
2.7 KiB
Rust
use super::*;
|
|
use pretty_assertions::assert_eq;
|
|
use serde_json::json;
|
|
|
|
#[test]
|
|
fn read_command_actions_preserve_native_and_foreign_paths() {
|
|
let api_key = "sk-abcdefghijklmnopqrstuvwxyz123456";
|
|
for (cwd_uri, relative_path, expected_path) in [
|
|
(
|
|
"file:///home/alice/repo",
|
|
"src/main.rs",
|
|
"/home/alice/repo/src/main.rs",
|
|
),
|
|
(
|
|
"file:///C:/Users/Alice%20Smith/repo",
|
|
r"src\main.rs",
|
|
r"C:\Users\Alice Smith\repo\src\main.rs",
|
|
),
|
|
(
|
|
"file:///C:/Users/Alice%20Smith/repo",
|
|
r"C:src\main.rs",
|
|
r"C:\Users\Alice Smith\repo\src\main.rs",
|
|
),
|
|
(
|
|
"file://server/share/repo",
|
|
r"src\main.rs",
|
|
r"\\server\share\repo\src\main.rs",
|
|
),
|
|
] {
|
|
let cwd = PathUri::parse(cwd_uri).expect("valid cross-platform cwd");
|
|
let command = format!("cat {relative_path}");
|
|
let parsed_cmd = vec![
|
|
ParsedCommand::Read {
|
|
cmd: command.clone(),
|
|
name: "main.rs".to_string(),
|
|
path: PathBuf::from(relative_path),
|
|
},
|
|
ParsedCommand::ListFiles {
|
|
cmd: "ls".to_string(),
|
|
path: Some("subdir".to_string()),
|
|
},
|
|
ParsedCommand::Search {
|
|
cmd: format!("rg {api_key}"),
|
|
query: Some(api_key.to_string()),
|
|
path: Some("src".to_string()),
|
|
},
|
|
ParsedCommand::Search {
|
|
cmd: "rg needle".to_string(),
|
|
query: Some("needle".to_string()),
|
|
path: Some("src".to_string()),
|
|
},
|
|
];
|
|
|
|
assert_eq!(
|
|
serde_json::to_value(command_actions_for_path_uri(&parsed_cmd, &cwd))
|
|
.expect("command actions should serialize"),
|
|
json!([
|
|
{
|
|
"type": "read",
|
|
"command": command,
|
|
"name": "main.rs",
|
|
"path": expected_path,
|
|
},
|
|
{
|
|
"type": "listFiles",
|
|
"command": "ls",
|
|
"path": "subdir",
|
|
},
|
|
{
|
|
"type": "search",
|
|
"command": "rg [REDACTED_SECRET]",
|
|
"query": "[REDACTED_SECRET]",
|
|
"path": "src",
|
|
},
|
|
{
|
|
"type": "search",
|
|
"command": "rg needle",
|
|
"query": "needle",
|
|
"path": "src",
|
|
},
|
|
]),
|
|
"resolving command actions against {cwd_uri}",
|
|
);
|
|
}
|
|
}
|