Skip to content
Open
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
24 changes: 18 additions & 6 deletions src/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2615,16 +2615,20 @@ fn parse_duration_to_seconds(input: &str) -> Result<u64> {
return Ok(seconds);
}

let (num_str, unit) = trimmed.split_at(trimmed.len().saturating_sub(1));
let suffix = trimmed.chars().last().filter(|ch| ch.is_ascii_alphabetic());
let (num_str, unit) = match suffix {
Some(unit) => (&trimmed[..trimmed.len() - unit.len_utf8()], unit),
None => (trimmed, 's'),
};
let value: u64 = num_str
.trim()
.parse()
.with_context(|| format!("invalid duration '{input}'"))?;
let multiplier = match unit.to_ascii_lowercase().as_str() {
"s" => 1,
"m" => 60,
"h" => 60 * 60,
"d" => 60 * 60 * 24,
let multiplier = match unit.to_ascii_lowercase() {
's' => 1,
'm' => 60,
'h' => 60 * 60,
'd' => 60 * 60 * 24,
_ => bail!("invalid duration '{input}'. expected suffix s/m/h/d"),
};
Ok(value.saturating_mul(multiplier))
Expand Down Expand Up @@ -4291,6 +4295,14 @@ fn spinner_bar(message: &str) -> ProgressBar {
mod tests {
use super::*;

#[test]
fn parse_duration_to_seconds_rejects_non_ascii_suffix_without_panicking() {
for input in ["1–", "1é", "1🙂"] {
let err = parse_duration_to_seconds(input).expect_err("invalid unicode suffix");
assert!(err.to_string().contains("invalid duration"));
}
}

#[test]
fn push_checkpoint_line_offset_advances_only_after_commit() {
let mut state =
Expand Down
24 changes: 18 additions & 6 deletions src/traces.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5015,16 +5015,20 @@ fn parse_duration_to_seconds(input: &str) -> Result<u64> {
return Ok(seconds);
}

let (num_str, unit) = trimmed.split_at(trimmed.len().saturating_sub(1));
let suffix = trimmed.chars().last().filter(|ch| ch.is_ascii_alphabetic());
let (num_str, unit) = match suffix {
Some(unit) => (&trimmed[..trimmed.len() - unit.len_utf8()], unit),
None => (trimmed, 's'),
};
let value: u64 = num_str
.trim()
.parse()
.with_context(|| format!("invalid duration '{input}'"))?;
let multiplier = match unit.to_ascii_lowercase().as_str() {
"s" => 1,
"m" => 60,
"h" => 60 * 60,
"d" => 60 * 60 * 24,
let multiplier = match unit.to_ascii_lowercase() {
's' => 1,
'm' => 60,
'h' => 60 * 60,
'd' => 60 * 60 * 24,
_ => bail!("invalid duration '{input}'. expected suffix s/m/h/d"),
};
Ok(value.saturating_mul(multiplier))
Expand Down Expand Up @@ -6163,6 +6167,14 @@ mod tests {
assert_eq!(parse_duration_to_seconds("1d").expect("days"), 86_400);
}

#[test]
fn parse_duration_to_seconds_rejects_non_ascii_suffix_without_panicking() {
for input in ["1–", "1é", "1🙂"] {
let err = parse_duration_to_seconds(input).expect_err("invalid unicode suffix");
assert!(err.to_string().contains("invalid duration"));
}
}

#[test]
fn build_base_filter_clause_uses_window_or_since() {
let from_window = build_base_filter_clause(None, "1h", Some("metadata.model IS NOT NULL"))
Expand Down
Loading