AI search engine and MCP server for bots and agents. One Rust binary indexes code, docs, logs, JSONL/CSV and PDFs for BM25 full-text, vector and hybrid search, code search without grep, agent memory and RAG. Elasticsearch-compatible API; Corpus Hub serves hundreds of reference memory corpora.
Rust agent-memoryai-agentsbm25claude-codeclicode-searchcursordatabaseelasticsearchfull-text-searchhybrid-searchjsonllocal-firstmcpmcp-servermodel-context-protocolragrustsearch-enginevector-search
fix(aggs): stop a multi-byte date_histogram time_zone from aborting the process
Vincenzo Lombardo47b89feba748
diff --git a/engine/crates/xerj-engine/src/aggs.rs b/engine/crates/xerj-engine/src/aggs.rsindex 4ff756655..5e43cbc13 100644--- a/engine/crates/xerj-engine/src/aggs.rs+++ b/engine/crates/xerj-engine/src/aggs.rs@@ -5675,7 +5675,17 @@ pub(crate) fn parse_time_zone_offset(tz: &str) -> Option<chrono::FixedOffset> {rest[..idx].parse::<i32>().ok()?,rest[idx + 1..].parse::<i32>().ok()?,)- } else if rest.len() == 4 {+ } else if rest.len() == 4 && rest.bytes().all(|b| b.is_ascii_digit()) {+ // The digit check makes the byte offset 2 a true char boundary+ // by construction, rather than assuming `rest` is ASCII and+ // slicing blind — `rest.len()` counts bytes, so a two-character+ // zone like "+中a" is also 4 bytes long, and slicing at byte 2+ // would land inside the multi-byte '中' and panic (the release+ // profile's `panic = "abort"` turns that into a process crash,+ // reachable from an unauthenticated `_search` body). Every input+ // that used to reach `parse::<i32>()` and succeed is still+ // all-ASCII-digits, so this rejects nothing that previously+ // parsed into a valid offset.(rest[..2].parse::<i32>().ok()?,rest[2..].parse::<i32>().ok()?,@@ -5691,6 +5701,51 @@ pub(crate) fn parse_time_zone_offset(tz: &str) -> Option<chrono::FixedOffset> {None}+#[cfg(test)]+mod parse_time_zone_offset_char_boundary_tests {+ //! Regression coverage for #272: `rest.len() == 4` counts BYTES, not+ //! characters, so a two-character zone like "+中a" is also 4 bytes and+ //! `rest[..2]` used to slice inside the multi-byte '中' — a byte-index+ //! panic that the release profile's `panic = "abort"` turns into a+ //! process crash, reachable from an unauthenticated `_search` body via+ //! `date_histogram.time_zone`.+ use super::*;++ #[test]+ fn multi_byte_offset_does_not_panic_and_is_rejected() {+ assert_eq!(parse_time_zone_offset("+中a"), None);+ assert_eq!(parse_time_zone_offset("-中a"), None);+ }++ #[test]+ fn run_aggs_with_a_multi_byte_time_zone_does_not_abort() {+ // The exact reproduction from #272, through the public entry point+ // an unauthenticated `_search` body reaches.+ let aggs_def = json!({+ "h": {+ "date_histogram": {+ "field": "ts",+ "fixed_interval": "1d",+ "time_zone": "+中a",+ }+ }+ });+ let docs = [json!({"ts": "2025-01-24T07:31:52.102Z"})];+ // Must return, not panic — the assertion is that this line is+ // reached at all.+ let _ = run_aggs(&aggs_def, &docs);+ }++ #[test]+ fn valid_four_digit_offsets_still_parse_the_same_as_before() {+ // The digit guard must not reject anything that used to succeed.+ let plus = parse_time_zone_offset("+0530").expect("valid offset must still parse");+ assert_eq!(plus.local_minus_utc(), 5 * 3600 + 30 * 60);+ let minus = parse_time_zone_offset("-0800").expect("valid offset must still parse");+ assert_eq!(minus.local_minus_utc(), -8 * 3600);+ }+}+/// Given an IANA zone name and an instant, return the offset at that instant,/// accounting for DST. Falls back to fixed-offset parsing when `tz` is already/// numeric.