diff options
author | Tommaso Tocci <tommaso.tocci@mongodb.com> | 2020-10-01 13:46:39 +0200 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-10-01 12:55:27 +0000 |
commit | f880b32be6c6081ca0eb6599fd14b8fad5a5813c (patch) | |
tree | 827fd25908add62d0b11340cb3632da6b57ea918 /src/mongo/db/kill_sessions.cpp | |
parent | bfd22982681e0af44f52b586b432091174d17945 (diff) | |
download | mongo-f880b32be6c6081ca0eb6599fd14b8fad5a5813c.tar.gz |
Revert "SERVER-50375 Thoroughly test that mongos forwards API parameters"
This reverts commit e66093f0a8ee3cd95dea9480028a6da814bb1854.
Diffstat (limited to 'src/mongo/db/kill_sessions.cpp')
-rw-r--r-- | src/mongo/db/kill_sessions.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/mongo/db/kill_sessions.cpp b/src/mongo/db/kill_sessions.cpp index b167e14c156..41033d23bbb 100644 --- a/src/mongo/db/kill_sessions.cpp +++ b/src/mongo/db/kill_sessions.cpp @@ -31,7 +31,6 @@ #include "mongo/db/kill_sessions.h" -#include "mongo/db/api_parameters.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" #include "mongo/db/operation_context.h" @@ -97,25 +96,27 @@ std::tuple<std::vector<UserName>, std::vector<RoleName>> getKillAllSessionsByPat return out; } -KillAllSessionsByPatternItem makeKillAllSessionsByPattern(OperationContext* opCtx) { +KillAllSessionsByPattern makeKillAllSessionsByPattern(OperationContext* opCtx) { KillAllSessionsByPattern kasbp; kasbp.setUsers(getKillAllSessionsImpersonateUsers(opCtx)); kasbp.setRoles(getKillAllSessionsImpersonateRoles(opCtx)); - return {kasbp, APIParameters::get(opCtx)}; + + return kasbp; } -KillAllSessionsByPatternItem makeKillAllSessionsByPattern(OperationContext* opCtx, - const KillAllSessionsUser& kasu) { - KillAllSessionsByPatternItem item = makeKillAllSessionsByPattern(opCtx); +KillAllSessionsByPattern makeKillAllSessionsByPattern(OperationContext* opCtx, + const KillAllSessionsUser& kasu) { + KillAllSessionsByPattern kasbp = makeKillAllSessionsByPattern(opCtx); auto authMgr = AuthorizationManager::get(opCtx->getServiceContext()); UserName un(kasu.getUser(), kasu.getDb()); auto user = uassertStatusOK(authMgr->acquireUser(opCtx, un)); - item.pattern.setUid(user->getDigest()); - return item; + kasbp.setUid(user->getDigest()); + + return kasbp; } KillAllSessionsByPatternSet makeSessionFilterForAuthenticatedUsers(OperationContext* opCtx) { @@ -126,18 +127,18 @@ KillAllSessionsByPatternSet makeSessionFilterForAuthenticatedUsers(OperationCont if (auto user = authSession->lookupUser(*it)) { KillAllSessionsByPattern pattern; pattern.setUid(user->getDigest()); - KillAllSessionsByPatternItem item{std::move(pattern), APIParameters::get(opCtx)}; - patterns.emplace(std::move(item)); + patterns.emplace(std::move(pattern)); } } return patterns; } -KillAllSessionsByPatternItem makeKillAllSessionsByPattern(OperationContext* opCtx, - const LogicalSessionId& lsid) { - auto item = makeKillAllSessionsByPattern(opCtx); - item.pattern.setLsid(lsid); - return item; +KillAllSessionsByPattern makeKillAllSessionsByPattern(OperationContext* opCtx, + const LogicalSessionId& lsid) { + KillAllSessionsByPattern kasbp = makeKillAllSessionsByPattern(opCtx); + kasbp.setLsid(lsid); + + return kasbp; } } // namespace mongo |