SERVER-19783 geoNear, near, and nearSphere correctly handle adjacent and child parameters.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/db/matcher/expression_geo.cpp b/src/mongo/db/matcher/expression_geo.cpp
index a9e02aa807c..3fa8f20b3d7 100644
--- a/src/mongo/db/matcher/expression_geo.cpp
+++ b/src/mongo/db/matcher/expression_geo.cpp
@@ -196,6 +196,10 @@ bool GeoNearExpression::parseLegacyQuery(const BSONObj& obj) {
             uassert(16896, "$maxDistance must be non-negative", maxDistance >= 0.0);
         } else if (equals(e.fieldName(), "$uniqueDocs")) {
             warning() << "ignoring deprecated option $uniqueDocs";
+        } else {
+            // In a query document, $near queries can have no non-geo sibling parameters.
+            uasserted(34410,
+                      str::stream() << "invalid argument in geo near query: " << e.fieldName());
         }
     }
 
@@ -258,6 +262,10 @@ Status GeoNearExpression::parseNewQuery(const BSONObj& obj) {
             uassert(16899, "$maxDistance must be a number", e.isNumber());
             maxDistance = e.Number();
             uassert(16900, "$maxDistance must be non-negative", maxDistance >= 0.0);
+        } else {
+            // Return an error if a bad argument was passed inside the query document.
+            return Status(ErrorCodes::BadValue,
+                          str::stream() << "invalid argument in geo near query: " << e.fieldName());
         }
     }