diff options
author | David Storch <david.storch@10gen.com> | 2015-12-14 18:22:01 -0500 |
---|---|---|
committer | David Storch <david.storch@10gen.com> | 2015-12-22 10:13:40 -0500 |
commit | 26bcf4ddd7e86885448e981f86aaf51fba0e2539 (patch) | |
tree | 5d9cd1de1193f8c52f8d1eae3dd3e35a3bffd3f0 /src/mongo/db/query/canonical_query_test.cpp | |
parent | 3663e004dfc2f73b82b3d88b5fa1ac6b7dcd1d33 (diff) | |
download | mongo-26bcf4ddd7e86885448e981f86aaf51fba0e2539.tar.gz |
SERVER-21407 explicitly disallow $text/$where extensions during MatchExpression parsing
Diffstat (limited to 'src/mongo/db/query/canonical_query_test.cpp')
-rw-r--r-- | src/mongo/db/query/canonical_query_test.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/mongo/db/query/canonical_query_test.cpp b/src/mongo/db/query/canonical_query_test.cpp index ec650b1f1cc..0e9a0a60d04 100644 --- a/src/mongo/db/query/canonical_query_test.cpp +++ b/src/mongo/db/query/canonical_query_test.cpp @@ -29,6 +29,7 @@ #include "mongo/db/query/canonical_query.h" #include "mongo/db/json.h" +#include "mongo/db/matcher/extensions_callback_disallow_extensions.h" #include "mongo/db/matcher/extensions_callback_noop.h" #include "mongo/db/namespace_string.h" #include "mongo/unittest/unittest.h" @@ -406,7 +407,8 @@ TEST(CanonicalQueryTest, IsValidSortKeyMetaProjection) { const bool isExplain = false; auto lpq = assertGet(LiteParsedQuery::makeFromFindCommand( nss, fromjson("{find: 'testcoll', projection: {foo: {$meta: 'sortKey'}}}"), isExplain)); - auto cq = CanonicalQuery::canonicalize(lpq.release()); + auto cq = + CanonicalQuery::canonicalize(lpq.release(), ExtensionsCallbackDisallowExtensions()); ASSERT_NOT_OK(cq.getStatus()); } @@ -417,7 +419,8 @@ TEST(CanonicalQueryTest, IsValidSortKeyMetaProjection) { nss, fromjson("{find: 'testcoll', projection: {foo: {$meta: 'sortKey'}}, sort: {bar: 1}}"), isExplain)); - auto cq = CanonicalQuery::canonicalize(lpq.release()); + auto cq = + CanonicalQuery::canonicalize(lpq.release(), ExtensionsCallbackDisallowExtensions()); ASSERT_OK(cq.getStatus()); } } @@ -483,7 +486,8 @@ TEST(CanonicalQueryTest, SortTreeNumChildrenComparison) { */ unique_ptr<CanonicalQuery> canonicalize(const char* queryStr) { BSONObj queryObj = fromjson(queryStr); - auto statusWithCQ = CanonicalQuery::canonicalize(nss, queryObj); + auto statusWithCQ = + CanonicalQuery::canonicalize(nss, queryObj, ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); return std::move(statusWithCQ.getValue()); } @@ -494,7 +498,8 @@ std::unique_ptr<CanonicalQuery> canonicalize(const char* queryStr, BSONObj queryObj = fromjson(queryStr); BSONObj sortObj = fromjson(sortStr); BSONObj projObj = fromjson(projStr); - auto statusWithCQ = CanonicalQuery::canonicalize(nss, queryObj, sortObj, projObj); + auto statusWithCQ = CanonicalQuery::canonicalize( + nss, queryObj, sortObj, projObj, ExtensionsCallbackDisallowExtensions()); ASSERT_OK(statusWithCQ.getStatus()); return std::move(statusWithCQ.getValue()); } @@ -537,10 +542,12 @@ TEST(CanonicalQueryTest, CanonicalizeFromBaseQuery) { const std::string cmdStr = "{find:'bogusns', filter:{$or:[{a:1,b:1},{a:1,c:1}]}, projection:{a:1}, sort:{b:1}}"; auto lpq = assertGet(LiteParsedQuery::makeFromFindCommand(nss, fromjson(cmdStr), isExplain)); - auto baseCq = assertGet(CanonicalQuery::canonicalize(lpq.release())); + auto baseCq = assertGet( + CanonicalQuery::canonicalize(lpq.release(), ExtensionsCallbackDisallowExtensions())); MatchExpression* firstClauseExpr = baseCq->root()->getChild(0); - auto childCq = assertGet(CanonicalQuery::canonicalize(*baseCq, firstClauseExpr)); + auto childCq = assertGet(CanonicalQuery::canonicalize( + *baseCq, firstClauseExpr, ExtensionsCallbackDisallowExtensions())); // Descriptive test. The childCq's filter should be the relevant $or clause, rather than the // entire query predicate. |