Skip to content

Return FieldDoesNotExist for query JSON paths containing a nul byte #3243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
G26karthik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Return FieldDoesNotExist for query JSON paths containing a nul byte #3243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 31 additions & 0 deletions src/query/query_parser/query_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,13 @@ impl QueryParser {
Ok(terms.into_iter().next().unwrap())
}
FieldType::JsonObject(ref json_options) => {
// The indexer ignores JSON paths containing a nul byte, so none can match.
if json_path.contains('\0') {
return Err(QueryParserError::FieldDoesNotExist(format!(
"{}.{json_path}",
field_entry.name()
)));
}
let mut term = Term::from_field_json_path(
field,
json_path,
Expand Down Expand Up @@ -1021,6 +1028,12 @@ fn generate_literals_for_json_object(
tokenizer_manager: &TokenizerManager,
json_options: &JsonObjectOptions,
) -> Result<Vec<LogicalLiteral>, QueryParserError> {
// The indexer ignores JSON paths containing a nul byte, so none can match.
if json_path.contains('\0') {
return Err(QueryParserError::FieldDoesNotExist(format!(
"{field_name}.{json_path}"
)));
}
let text_options = json_options.get_text_indexing_options().ok_or_else(|| {
// This should have been seen earlier really.
QueryParserError::FieldNotIndexed(field_name.to_string())
Expand Down Expand Up @@ -1464,6 +1477,24 @@ mod test {
);
}

#[test]
fn test_json_path_with_nul_byte_is_rejected() {
// JSON paths containing a nul byte are ignored at indexing time, so they can never match.
for query in [
"json.a\u{0}b:hello",
"json.a\u{0}b:5",
"json.a\u{0}b:\"hello world\"",
"json.a\u{0}b:[1 TO 5]",
"json.a\u{0}b: IN [1 2]",
] {
let error = parse_query_to_logical_ast(query, false).unwrap_err();
assert!(
matches!(error, QueryParserError::FieldDoesNotExist(_)),
"{query:?}: {error:?}"
);
}
}

#[test]
fn test_json_field_possibly_a_number() {
test_parse_query_to_logical_ast_helper(
Expand Down