diff options
author | Tess Avitabile <tess.avitabile@mongodb.com> | 2017-03-21 11:14:18 -0400 |
---|---|---|
committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2017-03-21 11:14:18 -0400 |
commit | cbbdb02faead044e07b5a7d957298cdc07cc9258 (patch) | |
tree | c2c89b05faaadbe77254837ba434a2c81e4670cf /src/mongo/db/clientcursor.h | |
parent | b283aecc3a6e65e805c5ffe57b0ad4368faacbfd (diff) | |
download | mongo-cbbdb02faead044e07b5a7d957298cdc07cc9258.tar.gz |
Revert "SERVER-9609 Ensure users can only call getMore on cursors they created"
This reverts commit 9e7974e4b6e2b3fe5e7741dce6549624113af196.
Diffstat (limited to 'src/mongo/db/clientcursor.h')
-rw-r--r-- | src/mongo/db/clientcursor.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/mongo/db/clientcursor.h b/src/mongo/db/clientcursor.h index 384cede1fd6..91e7a0d325c 100644 --- a/src/mongo/db/clientcursor.h +++ b/src/mongo/db/clientcursor.h @@ -29,7 +29,6 @@ #pragma once #include "mongo/client/dbclientinterface.h" -#include "mongo/db/auth/user_name.h" #include "mongo/db/cursor_id.h" #include "mongo/db/jsobj.h" #include "mongo/db/query/plan_executor.h" @@ -53,7 +52,6 @@ class RecoveryUnit; struct ClientCursorParams { ClientCursorParams(std::unique_ptr<PlanExecutor> planExecutor, NamespaceString nss, - UserNameIterator authenticatedUsersIter, bool isReadCommitted, BSONObj originatingCommandObj) : exec(std::move(planExecutor)), @@ -62,15 +60,10 @@ struct ClientCursorParams { queryOptions(exec->getCanonicalQuery() ? exec->getCanonicalQuery()->getQueryRequest().getOptions() : 0), - originatingCommandObj(originatingCommandObj.getOwned()) { - while (authenticatedUsersIter.more()) { - authenticatedUsers.emplace_back(authenticatedUsersIter.next()); - } - } + originatingCommandObj(originatingCommandObj.getOwned()) {} std::unique_ptr<PlanExecutor> exec; const NamespaceString nss; - std::vector<UserName> authenticatedUsers; bool isReadCommitted = false; int queryOptions = 0; BSONObj originatingCommandObj; @@ -104,10 +97,6 @@ public: return _nss; } - UserNameIterator getAuthenticatedUsers() const { - return makeUserNameIterator(_authenticatedUsers.begin(), _authenticatedUsers.end()); - } - bool isReadCommitted() const { return _isReadCommitted; } @@ -264,9 +253,6 @@ private: // The namespace we're operating on. const NamespaceString _nss; - // The set of authenticated users when this cursor was created. - std::vector<UserName> _authenticatedUsers; - const bool _isReadCommitted = false; // A pointer to the CursorManager which owns this cursor. This must be filled out when the |