diff options
Diffstat (limited to 'src/mongo/db/commands')
| -rw-r--r-- | src/mongo/db/commands/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/db/commands/end_sessions.idl | 28 | ||||
| -rw-r--r-- | src/mongo/db/commands/end_sessions_command.cpp | 89 | ||||
| -rw-r--r-- | src/mongo/db/commands/start_session_command.cpp | 6 |
4 files changed, 120 insertions, 5 deletions
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript index 99cb82a1298..31f8600cd16 100644 --- a/src/mongo/db/commands/SConscript +++ b/src/mongo/db/commands/SConscript @@ -57,6 +57,7 @@ env.Library( "conn_pool_sync.cpp", "connection_status.cpp", "copydb_common.cpp", + "end_sessions_command.cpp", "fail_point_cmd.cpp", "feature_compatibility_version_command_parser.cpp", "find_and_modify_common.cpp", @@ -93,6 +94,7 @@ env.Library( '$BUILD_DIR/mongo/db/lasterror', '$BUILD_DIR/mongo/db/log_process_details', '$BUILD_DIR/mongo/db/logical_session_cache', + '$BUILD_DIR/mongo/db/logical_session_cache_impl', '$BUILD_DIR/mongo/db/logical_session_id', '$BUILD_DIR/mongo/db/logical_session_id_helpers', '$BUILD_DIR/mongo/db/matcher/expressions', diff --git a/src/mongo/db/commands/end_sessions.idl b/src/mongo/db/commands/end_sessions.idl new file mode 100644 index 00000000000..877eddd72f4 --- /dev/null +++ b/src/mongo/db/commands/end_sessions.idl @@ -0,0 +1,28 @@ +# Copyright (C) 2017 MongoDB Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License, version 3, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +global: + cpp_namespace: "mongo" + +imports: + - "mongo/db/logical_session_id.idl" + +structs: + + EndSessionsCmdFromClient: + description: "A struct representing an endSessions command from a client" + strict: false + fields: + endSessions: array<LogicalSessionFromClient> diff --git a/src/mongo/db/commands/end_sessions_command.cpp b/src/mongo/db/commands/end_sessions_command.cpp new file mode 100644 index 00000000000..6a07059f472 --- /dev/null +++ b/src/mongo/db/commands/end_sessions_command.cpp @@ -0,0 +1,89 @@ +/** + * Copyright (C) 2017 MongoDB Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * As a special exception, the copyright holders give permission to link the + * code of portions of this program with the OpenSSL library under certain + * conditions as described in each individual source file and distribute + * linked combinations including the program with the OpenSSL library. You + * must comply with the GNU Affero General Public License in all respects for + * all of the code used other than as permitted herein. If you modify file(s) + * with this exception, you may extend this exception to your version of the + * file(s), but you are not obligated to do so. If you do not wish to do so, + * delete this exception statement from your version. If you delete this + * exception statement from all source files in the program, then also delete + * it in the license file. + */ + +#include "mongo/platform/basic.h" + +#include "mongo/base/init.h" +#include "mongo/db/auth/authorization_session.h" +#include "mongo/db/client.h" +#include "mongo/db/commands.h" +#include "mongo/db/logical_session_cache.h" +#include "mongo/db/logical_session_id_helpers.h" +#include "mongo/db/operation_context.h" + +namespace mongo { + +class EndSessionsCommand final : public BasicCommand { + MONGO_DISALLOW_COPYING(EndSessionsCommand); + +public: + EndSessionsCommand() : BasicCommand("endSessions") {} + + bool slaveOk() const override { + return true; + } + bool adminOnly() const override { + return false; + } + bool supportsWriteConcern(const BSONObj& cmd) const override { + return false; + } + void help(std::stringstream& help) const override { + help << "end a set of logical sessions"; + } + Status checkAuthForOperation(OperationContext* opCtx, + const std::string& dbname, + const BSONObj& cmdObj) override { + + // It is always ok to run this command, as long as you are authenticated + // as some user, if auth is enabled. + AuthorizationSession* authSession = AuthorizationSession::get(opCtx->getClient()); + try { + auto user = authSession->getSingleUser(); + invariant(user); + return Status::OK(); + } catch (...) { + return exceptionToStatus(); + } + } + + virtual bool run(OperationContext* opCtx, + const std::string& db, + const BSONObj& cmdObj, + BSONObjBuilder& result) override { + + auto lsCache = LogicalSessionCache::get(opCtx); + + auto cmd = EndSessionsCmdFromClient::parse("EndSessionsCmdFromClient"_sd, cmdObj); + + lsCache->endSessions(makeLogicalSessionIds(cmd.getEndSessions(), opCtx)); + return true; + } +} endSessionsCommand; + +} // namespace mongo diff --git a/src/mongo/db/commands/start_session_command.cpp b/src/mongo/db/commands/start_session_command.cpp index a8ae4219a34..63fe696057d 100644 --- a/src/mongo/db/commands/start_session_command.cpp +++ b/src/mongo/db/commands/start_session_command.cpp @@ -90,11 +90,7 @@ public: return appendCommandStatus(result, status); } - Status startSessionStatus = lsCache->startSession(opCtx, record.get()); - - if (!startSessionStatus.isOK()) { - return appendCommandStatus(result, startSessionStatus); - } + lsCache->startSession(opCtx, record.get()); makeLogicalSessionToClient(record->getId()).serialize(&result); |