From b224272f290ea93bc166d443dbcd7ae6d451cdbb Mon Sep 17 00:00:00 2001 From: dawn Date: Thu, 12 Nov 2026 16:47:48 +0300 Subject: [PATCH] bobbin/query: cap and deduplicate qualifier values Signed-off-by: dawn --- bobbin/crates/query/src/error.rs | 2 + bobbin/crates/query/src/lib.rs | 4 +- bobbin/crates/query/src/lower.rs | 63 +++++++++++++++++++++++++++++--- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/bobbin/crates/query/src/error.rs b/bobbin/crates/query/src/error.rs index 34fced317..dc318d204 100644 --- a/bobbin/crates/query/src/error.rs +++ b/bobbin/crates/query/src/error.rs @@ -20,6 +20,8 @@ pub enum QueryErrorKind { }, #[error("`{key}:` takes a single value")] TooManyValues { key: String }, + #[error("`{key}:` takes at most {max} values")] + TooManyQualifierValues { key: String, max: usize }, #[error("`{key}:` cannot be negated")] NotNegatable { key: String }, #[error("only one `sort:` is allowed")] diff --git a/bobbin/crates/query/src/lib.rs b/bobbin/crates/query/src/lib.rs index 56ac4e00d..e2ecd8636 100644 --- a/bobbin/crates/query/src/lib.rs +++ b/bobbin/crates/query/src/lib.rs @@ -7,4 +7,6 @@ mod lower; pub use ast::{Clause, Query, Sort, Span, Term, Text, TicketKind, TicketState}; pub use error::{QueryError, QueryErrorKind, QueryErrors}; -pub use lower::{MAX_CLAUSES, MAX_QUERY_LEN, QUALIFIERS, parse, parse_lenient}; +pub use lower::{ + MAX_CLAUSES, MAX_QUALIFIER_VALUES, MAX_QUERY_LEN, QUALIFIERS, parse, parse_lenient, +}; diff --git a/bobbin/crates/query/src/lower.rs b/bobbin/crates/query/src/lower.rs index c775e6244..e79c849ce 100644 --- a/bobbin/crates/query/src/lower.rs +++ b/bobbin/crates/query/src/lower.rs @@ -5,8 +5,11 @@ use crate::ast::{Clause, Query, Sort, Span, Term, Text, TicketKind, TicketState} use crate::error::{QueryError, QueryErrorKind, QueryErrors}; use crate::lex::{self, RawClause, RawKind, RawValue}; +use std::collections::HashSet; + pub const MAX_QUERY_LEN: usize = 1024; pub const MAX_CLAUSES: usize = 64; +pub const MAX_QUALIFIER_VALUES: usize = 16; const IS_EXPECTED: &str = "open, closed or merged"; const TYPE_EXPECTED: &str = "issue or pull"; @@ -112,6 +115,17 @@ impl Lowering { if !ok { return None; } + if key != "sort" && values.len() > MAX_QUALIFIER_VALUES { + let overflow = Span::new(values[MAX_QUALIFIER_VALUES].span.start, span.end); + self.error( + overflow, + QueryErrorKind::TooManyQualifierValues { + key: key.to_owned(), + max: MAX_QUALIFIER_VALUES, + }, + ); + return None; + } match key { "is" => self .each(key, &values, IS_EXPECTED, TicketState::parse) @@ -144,7 +158,7 @@ impl Lowering { self.each(key, values, DID_EXPECTED, |v| Did::new_owned(v).ok()) } - fn each( + fn each( &mut self, key: &str, values: &[RawValue], @@ -155,7 +169,11 @@ impl Lowering { let mut bad = false; for v in values { match parse(v.text.trim()) { - Some(t) => out.push(t), + Some(t) => { + if !out.contains(&t) { + out.push(t); + } + } None => { bad = true; self.invalid(key, v, expected); @@ -216,10 +234,15 @@ impl Lowering { } fn names(values: Vec) -> Vec { - values - .into_iter() - .map(|v| v.text.trim().to_owned()) - .collect() + let mut seen = HashSet::with_capacity(values.len()); + let mut out = Vec::with_capacity(values.len()); + for v in values { + let trimmed = v.text.trim(); + if seen.insert(trimmed.to_lowercase()) { + out.push(trimmed.to_owned()); + } + } + out } #[cfg(test)] @@ -487,6 +510,34 @@ mod tests { errs.into_iter().map(|e| e.kind).collect::>(), vec![QueryErrorKind::TooManyClauses { max: MAX_CLAUSES }] ); + + assert!(parse(&vec!["w"; 64].join(" ")).is_ok()); + let ok_vals = format!( + "language:{}", + (0..MAX_QUALIFIER_VALUES) + .map(|i| format!("lang{i}")) + .collect::>() + .join(",") + ); + assert!(parse(&ok_vals).is_ok()); + let many_vals = format!( + "language:{}", + vec!["Rust"; MAX_QUALIFIER_VALUES + 1].join(",") + ); + assert_eq!( + errors(&many_vals), + vec![QueryErrorKind::TooManyQualifierValues { + key: "language".into(), + max: MAX_QUALIFIER_VALUES, + }] + ); + assert_eq!( + terms("language:Rust,rust,Go is:open,open"), + vec![ + (false, Term::Language(vec!["Rust".into(), "Go".into()])), + (false, Term::State(vec![TicketState::Open])), + ] + ); } #[test] -- knotmirror 0.0.1