Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Disallow empty filter values + add bounds checks.
Kishore Nallanba9a5e65d134
diff --git a/src/collection.cpp b/src/collection.cppindex 3ab0fe25..cb2ee20a 100644--- a/src/collection.cpp+++ b/src/collection.cpp@@ -2231,7 +2231,7 @@ Option<bool> Collection::parse_filter_query(const std::string& simple_filter_que// string filter should be evaluated in strict "equals" modestr_comparator = EQUALS;- while(raw_value[++filter_value_index] == ' ');+ while(++filter_value_index < raw_value.size() && raw_value[filter_value_index] == ' ');} else if(raw_value.size() >= 2 && raw_value[0] == '!' && raw_value[1] == '=') {if(!_field.facet) {// EXCLUDE filtering on string is possible only on facet fields@@ -2240,7 +2240,13 @@ Option<bool> Collection::parse_filter_query(const std::string& simple_filter_que}str_comparator = NOT_EQUALS;- while(raw_value[++filter_value_index] == ' ');+ filter_value_index++;+ while(++filter_value_index < raw_value.size() && raw_value[filter_value_index] == ' ');+ }++ if(filter_value_index == raw_value.size()) {+ return Option<bool>(400, "Error with filter field `" + _field.name ++ "`: Filter value cannot be empty.");}if(raw_value[filter_value_index] == '[' && raw_value[raw_value.size() - 1] == ']') {diff --git a/test/collection_filtering_test.cpp b/test/collection_filtering_test.cppindex 30cc9a20..d81ae59a 100644--- a/test/collection_filtering_test.cpp+++ b/test/collection_filtering_test.cpp@@ -129,6 +129,11 @@ TEST_F(CollectionFilteringTest, FilterOnTextFields) {results = coll_array_fields->search("Jeremy", query_fields, "tags:>BRONZE", facets, sort_fields, {0}, 10, 1, FREQUENCY, {false}).get();ASSERT_EQ(2, results["hits"].size());+ // bad filter value (empty)+ auto res_op = coll_array_fields->search("Jeremy", query_fields, "tags:=", facets, sort_fields, {0}, 10, 1, FREQUENCY, {false});+ ASSERT_FALSE(res_op.ok());+ ASSERT_EQ("Error with filter field `tags`: Filter value cannot be empty.", res_op.error());+collectionManager.drop_collection("coll_array_fields");}@@ -319,7 +324,7 @@ TEST_F(CollectionFilteringTest, HandleBadlyFormedFilterQuery) {std::vector<field> fields = {field("name", field_types::STRING, false), field("age", field_types::INT32, false),field("years", field_types::INT32_ARRAY, false),field("timestamps", field_types::INT64_ARRAY, false),- field("tags", field_types::STRING_ARRAY, false)};+ field("tags", field_types::STRING_ARRAY, true)};std::vector<sort_by> sort_fields = { sort_by("age", "DESC") };@@ -363,6 +368,20 @@ TEST_F(CollectionFilteringTest, HandleBadlyFormedFilterQuery) {results = coll_array_fields->search("Jeremy", query_fields, "age: '21'", facets, sort_fields, {0}, 10, 1, FREQUENCY, {false}).get();ASSERT_EQ(0, results["hits"].size());+ // empty value for a numerical filter field+ auto res_op = coll_array_fields->search("Jeremy", query_fields, "age:", facets, sort_fields, {0}, 10, 1, FREQUENCY, {false});+ ASSERT_FALSE(res_op.ok());+ ASSERT_EQ("Error with filter field `age`: Numerical field has an invalid comparator.", res_op.error());++ // empty value for string filter field+ res_op = coll_array_fields->search("Jeremy", query_fields, "tags:", facets, sort_fields, {0}, 10, 1, FREQUENCY, {false});+ ASSERT_FALSE(res_op.ok());+ ASSERT_EQ("Error with filter field `tags`: Filter value cannot be empty.", res_op.error());++ res_op = coll_array_fields->search("Jeremy", query_fields, "tags:= ", facets, sort_fields, {0}, 10, 1, FREQUENCY, {false});+ ASSERT_FALSE(res_op.ok());+ ASSERT_EQ("Error with filter field `tags`: Filter value cannot be empty.", res_op.error());+collectionManager.drop_collection("coll_array_fields");}@@ -1323,7 +1342,7 @@ TEST_F(CollectionFilteringTest, NegationOperatorBasics) {ASSERT_TRUE(coll1->add(doc.dump()).ok());}- auto results = coll1->search("*", {"artist"}, "artist:!= Michael Jackson", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10).get();+ auto results = coll1->search("*", {"artist"}, "artist:!=Michael Jackson", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10).get();ASSERT_EQ(3, results["found"].get<size_t>());@@ -1342,6 +1361,15 @@ TEST_F(CollectionFilteringTest, NegationOperatorBasics) {ASSERT_EQ(1, results["found"].get<size_t>());ASSERT_STREQ("3", results["hits"][0]["document"]["id"].get<std::string>().c_str());+ // empty value (bad filtering)+ auto res_op = coll1->search("*", {"artist"}, "artist:!=", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10);+ ASSERT_FALSE(res_op.ok());+ ASSERT_EQ("Error with filter field `artist`: Filter value cannot be empty.", res_op.error());++ res_op = coll1->search("*", {"artist"}, "artist:!= ", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10);+ ASSERT_FALSE(res_op.ok());+ ASSERT_EQ("Error with filter field `artist`: Filter value cannot be empty.", res_op.error());+collectionManager.drop_collection("coll1");}