Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix: avoid parsing search malformed requests #4175

Merged
merged 3 commits into from
Nov 22, 2023
Merged

fix: avoid parsing search malformed requests #4175

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86a7477
fix: avoid parsing search malformed requests
etolbakov Nov 21, 2023
df1fae6
chore: rust fmt
etolbakov Nov 21, 2023
d1b4188
chore: CR feedback
etolbakov Nov 21, 2023
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
28 changes: 25 additions & 3 deletions quickwit/quickwit-serve/src/elastic_search_api/model/search_body.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ struct FieldSortParams {
}

#[derive(Debug, Default, Clone, Deserialize, PartialEq)]
#[serde(deny_unknown_fields)]
pub struct SearchBody {
#[serde(default)]
pub from: Option<u64>,
Expand Down Expand Up @@ -164,7 +165,7 @@ mod tests {
]
}
"#;
let search_body: super::SearchBody = serde_json::from_str(json).unwrap();
let search_body: SearchBody = serde_json::from_str(json).unwrap();
let sort_fields = search_body.sort.unwrap();
assert_eq!(sort_fields.len(), 5);
assert_eq!(sort_fields[0].field, "timestamp");
Expand All @@ -189,7 +190,7 @@ mod tests {
}
}
"#;
let search_body: super::SearchBody = serde_json::from_str(json).unwrap();
let search_body: SearchBody = serde_json::from_str(json).unwrap();
let field_sorts = search_body.sort.unwrap();
assert_eq!(field_sorts.len(), 2);
assert_eq!(field_sorts[0].field, "timestamp");
Expand All @@ -210,7 +211,7 @@ mod tests {
]
}
"#;
let search_body: super::SearchBody = serde_json::from_str(json).unwrap();
let search_body: SearchBody = serde_json::from_str(json).unwrap();
let field_sorts = search_body.sort.unwrap();
assert_eq!(field_sorts.len(), 4);
assert_eq!(field_sorts[0].field, "timestamp");
Expand All @@ -222,4 +223,25 @@ mod tests {
assert_eq!(field_sorts[3].field, "_doc");
assert_eq!(field_sorts[3].order, SortOrder::Asc);
}

#[test]
fn test_unknown_field_behaviour() {
let json = r#"
{
"term": {
"actor.id": {
"value": "95077794"
}
}
}
"#;

let search_body = serde_json::from_str::<SearchBody>(json);
assert!(search_body.is_err());
assert_eq!(
search_body.err().unwrap().to_string(),
"unknown field `term`, expected one of `from`, `size`, `query`, `sort`, `aggs`, \
`track_total_hits`, `stored_fields`, `search_after` at line 3 column 22"
);
}
}