Skip to content
Closed
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
14 changes: 12 additions & 2 deletions crates/bashkit/src/builtins/awk/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
use std::collections::HashMap;

use super::{AwkAction, AwkExpr, AwkFunctionDef, AwkOutputTarget, AwkPattern, AwkProgram, AwkRule};
use crate::builtins::limits::AWK_MAX_PARSER_DEPTH as MAX_AWK_PARSER_DEPTH;
use crate::builtins::limits::{
AWK_MAX_MULTI_SUBSCRIPTS as MAX_AWK_MULTI_SUBSCRIPTS,
AWK_MAX_PARSER_DEPTH as MAX_AWK_PARSER_DEPTH,
};
use crate::builtins::search_common::build_regex;
use crate::error::{Error, Result};

Expand Down Expand Up @@ -1484,8 +1487,15 @@ impl<'a> AwkParser<'a> {
self.pos += 1; // consume '['
let mut subscripts = vec![self.parse_expression()?];
self.skip_whitespace();
// Handle multi-subscript: arr[e1, e2, ...] joined by SUBSEP
// THREAT[TM-DOS-027]: SUBSEP_CONCAT still evaluates recursively, so cap
// attacker-controlled comma lists before folding them into a left-deep AST.
while self.pos < self.input.len() && self.current_char().unwrap() == ',' {
if subscripts.len() >= MAX_AWK_MULTI_SUBSCRIPTS {
return Err(Error::Execution(format!(
"awk: too many array subscripts (max {})",
MAX_AWK_MULTI_SUBSCRIPTS
)));
}
self.pos += 1; // consume ','
self.skip_whitespace();
subscripts.push(self.parse_expression()?);
Expand Down
11 changes: 11 additions & 0 deletions crates/bashkit/src/builtins/awk/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,17 @@ async fn test_awk_multi_subscript() {
assert_eq!(result.stdout.trim(), "1");
}

#[tokio::test]
async fn test_awk_rejects_too_many_multi_subscripts() {
// Regression: unbounded multi-subscript lists built a recursive SUBSEP_CONCAT AST.
let subscripts = std::iter::repeat_n("1", 101).collect::<Vec<_>>().join(",");
let program = format!("BEGIN {{ a[{subscripts}] = 1 }}");

let err = run_awk(&[&program], Some("")).await.unwrap_err();

assert!(err.to_string().contains("too many array subscripts"));
}

#[tokio::test]
async fn test_awk_subsep_defined() {
// Issue #396.3: SUBSEP should be defined as \034
Expand Down
2 changes: 2 additions & 0 deletions crates/bashkit/src/builtins/limits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ pub(crate) const ARCHIVE_MAX_DECOMPRESSION_RATIO: usize = 100;

/// awk: max parser recursion depth.
pub(crate) const AWK_MAX_PARSER_DEPTH: usize = 100;
/// awk: max comma-separated subscripts in one array key.
pub(crate) const AWK_MAX_MULTI_SUBSCRIPTS: usize = 100;
/// awk: max user-function call depth at runtime.
pub(crate) const AWK_MAX_CALL_DEPTH: usize = 64;
/// awk: total output byte cap per invocation.
Expand Down
Loading