Redirects to `/dev/null` (e.g. `2>/dev/null`, `&>/dev/null`) are known-safe I/O routing, not commands. Previously, `extract_commands` emitted normalized redirect strings like `"2> /dev/null"` as separate entries in the command list checked against auto-allow regexes. Since `check_commands` requires **all** extracted entries to match an allow pattern, the unmatched redirect caused false-negatives — e.g. `git log --oneline -20 2>/dev/null || echo ...` would not be auto-allowed despite matching `^git` and `^echo` patterns. Rather than removing all redirects from extraction (which would hide dangerous redirects like `> /etc/passwd` from deny/confirm pattern checking), this fix surgically skips only `/dev/null` targets during redirect normalization. Redirects to real files are still emitted and still require a matching pattern for auto-allow, preserving the defense-in-depth property. Closes AI-41 Release Notes: - Fixed terminal auto-allow patterns incorrectly prompting for confirmation on commands containing `/dev/null` redirects (e.g. `2>/dev/null`).
Showing the changes to crates/shell_command_parser/src/shell_command_parser.rs (1 of 2 files). Show all
Unified · Split
| @@ -232,6 +232,10 @@ fn normalize_word_piece_into( · 231 unmodified lines | |||
| 232 | Some(()) | 232 | Some(()) |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | fn is_known_safe_redirect_target(normalized_target: &str) -> bool { | ||
| 236 | normalized_target == "/dev/null" | ||
| 237 | } | ||
| 238 | |||
| 235 | fn normalize_io_redirect(redirect: &ast::IoRedirect) -> Option<RedirectNormalization> { | 239 | fn normalize_io_redirect(redirect: &ast::IoRedirect) -> Option<RedirectNormalization> { |
| 236 | match redirect { | 240 | match redirect { |
| 237 | ast::IoRedirect::File(fd, kind, target) => { | 241 | ast::IoRedirect::File(fd, kind, target) => { |
| @@ -257,6 +261,9 @@ fn normalize_io_redirect(redirect: &ast::IoRedirect) -> Option<RedirectNormaliza · 19 unmodified lines | |||
| 257 | None => String::new(), | 261 | None => String::new(), |
| 258 | }; | 262 | }; |
| 259 | let normalized = normalize_word(target_word)?; | 263 | let normalized = normalize_word(target_word)?; |
| 264 | if is_known_safe_redirect_target(&normalized) { | ||
| 265 | return Some(RedirectNormalization::Skip); | ||
| 266 | } | ||
| 260 | Some(RedirectNormalization::Normalized(format!( | 267 | Some(RedirectNormalization::Normalized(format!( |
| 261 | "{}{} {}", | 268 | "{}{} {}", |
| 262 | fd_prefix, operator, normalized | 269 | fd_prefix, operator, normalized |
| @@ -265,6 +272,9 @@ fn normalize_io_redirect(redirect: &ast::IoRedirect) -> Option<RedirectNormaliza · 2 unmodified lines | |||
| 265 | ast::IoRedirect::OutputAndError(word, append) => { | 272 | ast::IoRedirect::OutputAndError(word, append) => { |
| 266 | let operator = if *append { "&>>" } else { "&>" }; | 273 | let operator = if *append { "&>>" } else { "&>" }; |
| 267 | let normalized = normalize_word(word)?; | 274 | let normalized = normalize_word(word)?; |
| 275 | if is_known_safe_redirect_target(&normalized) { | ||
| 276 | return Some(RedirectNormalization::Skip); | ||
| 277 | } | ||
| 268 | Some(RedirectNormalization::Normalized(format!( | 278 | Some(RedirectNormalization::Normalized(format!( |
| 269 | "{} {}", | 279 | "{} {}", |
| 270 | operator, normalized | 280 | operator, normalized |
| @@ -896,7 +906,7 @@ mod tests { · 625 unmodified lines | |||
| 896 | #[test] | 906 | #[test] |
| 897 | fn test_pipe_with_stderr_redirect_on_first_command() { | 907 | fn test_pipe_with_stderr_redirect_on_first_command() { |
| 898 | let commands = extract_commands("ls 2>/dev/null | grep foo").expect("parse failed"); | 908 | let commands = extract_commands("ls 2>/dev/null | grep foo").expect("parse failed"); |
| 899 | assert_eq!(commands, vec!["ls", "2> /dev/null", "grep foo"]); | 909 | assert_eq!(commands, vec!["ls", "grep foo"]); |
| 900 | } | 910 | } |
| 901 | 911 | ||
| 902 | #[test] | 912 | #[test] |
| @@ -990,4 +1000,65 @@ mod tests { · 87 unmodified lines | |||
| 990 | assert!(commands.contains(&"cat".to_string())); | 1000 | assert!(commands.contains(&"cat".to_string())); |
| 991 | assert!(commands.contains(&"tee /tmp/log".to_string())); | 1001 | assert!(commands.contains(&"tee /tmp/log".to_string())); |
| 992 | } | 1002 | } |
| 1003 | |||
| 1004 | #[test] | ||
| 1005 | fn test_redirect_to_dev_null_skipped() { | ||
| 1006 | let commands = extract_commands("cmd > /dev/null").expect("parse failed"); | ||
| 1007 | assert_eq!(commands, vec!["cmd"]); | ||
| 1008 | } | ||
| 1009 | |||
| 1010 | #[test] | ||
| 1011 | fn test_stderr_redirect_to_dev_null_skipped() { | ||
| 1012 | let commands = extract_commands("cmd 2>/dev/null").expect("parse failed"); | ||
| 1013 | assert_eq!(commands, vec!["cmd"]); | ||
| 1014 | } | ||
| 1015 | |||
| 1016 | #[test] | ||
| 1017 | fn test_stderr_redirect_to_dev_null_with_space_skipped() { | ||
| 1018 | let commands = extract_commands("cmd 2> /dev/null").expect("parse failed"); | ||
| 1019 | assert_eq!(commands, vec!["cmd"]); | ||
| 1020 | } | ||
| 1021 | |||
| 1022 | #[test] | ||
| 1023 | fn test_append_redirect_to_dev_null_skipped() { | ||
| 1024 | let commands = extract_commands("cmd >> /dev/null").expect("parse failed"); | ||
| 1025 | assert_eq!(commands, vec!["cmd"]); | ||
| 1026 | } | ||
| 1027 | |||
| 1028 | #[test] | ||
| 1029 | fn test_output_and_error_redirect_to_dev_null_skipped() { | ||
| 1030 | let commands = extract_commands("cmd &>/dev/null").expect("parse failed"); | ||
| 1031 | assert_eq!(commands, vec!["cmd"]); | ||
| 1032 | } | ||
| 1033 | |||
| 1034 | #[test] | ||
| 1035 | fn test_append_output_and_error_redirect_to_dev_null_skipped() { | ||
| 1036 | let commands = extract_commands("cmd &>>/dev/null").expect("parse failed"); | ||
| 1037 | assert_eq!(commands, vec!["cmd"]); | ||
| 1038 | } | ||
| 1039 | |||
| 1040 | #[test] | ||
| 1041 | fn test_quoted_dev_null_redirect_skipped() { | ||
| 1042 | let commands = extract_commands("cmd 2>'/dev/null'").expect("parse failed"); | ||
| 1043 | assert_eq!(commands, vec!["cmd"]); | ||
| 1044 | } | ||
| 1045 | |||
| 1046 | #[test] | ||
| 1047 | fn test_redirect_to_real_file_still_included() { | ||
| 1048 | let commands = extract_commands("echo hello > /etc/passwd").expect("parse failed"); | ||
| 1049 | assert_eq!(commands, vec!["echo hello", "> /etc/passwd"]); | ||
| 1050 | } | ||
| 1051 | |||
| 1052 | #[test] | ||
| 1053 | fn test_dev_null_redirect_in_chained_command() { | ||
| 1054 | let commands = | ||
| 1055 | extract_commands("git log 2>/dev/null || echo fallback").expect("parse failed"); | ||
| 1056 | assert_eq!(commands, vec!["git log", "echo fallback"]); | ||
| 1057 | } | ||
| 1058 | |||
| 1059 | #[test] | ||
| 1060 | fn test_mixed_safe_and_unsafe_redirects() { | ||
| 1061 | let commands = extract_commands("cmd > /tmp/out 2>/dev/null").expect("parse failed"); | ||
| 1062 | assert_eq!(commands, vec!["cmd", "> /tmp/out"]); | ||
| 1063 | } | ||
| 993 | } | 1064 | } |