diff options
| author | Sara Golemon <sara.golemon@mongodb.com> | 2021-11-10 17:43:14 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-10 20:37:49 +0000 |
| commit | f037d4b8677b6c2f61d8ed9922529384433efedb (patch) | |
| tree | 583b67a88d792336917e4df50fe2468b74378e7f /src/mongo/rpc | |
| parent | b0db08f4676da75f565c482eb2e86d7e0581756f (diff) | |
| download | mongo-f037d4b8677b6c2f61d8ed9922529384433efedb.tar.gz | |
SERVER-61386 Rename acceptOpMsgSecurityToken to supportMultitenancy
Diffstat (limited to 'src/mongo/rpc')
| -rw-r--r-- | src/mongo/rpc/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/rpc/metadata/security_token_metadata_test.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/rpc/op_msg.cpp | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/mongo/rpc/SConscript b/src/mongo/rpc/SConscript index 6901ff84661..ea450788cc0 100644 --- a/src/mongo/rpc/SConscript +++ b/src/mongo/rpc/SConscript @@ -43,6 +43,7 @@ protoEnv.Library( '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/auth/security_token', '$BUILD_DIR/mongo/db/bson/dotted_path_support', + '$BUILD_DIR/mongo/db/multitenancy_params', '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/third_party/wiredtiger/wiredtiger_checksum' if wiredtiger else [], ], @@ -188,6 +189,7 @@ if wiredtiger: ], LIBDEPS=[ '$BUILD_DIR/mongo/client/clientdriver_minimal', + '$BUILD_DIR/mongo/db/multitenancy_params', '$BUILD_DIR/mongo/db/service_context_test_fixture', '$BUILD_DIR/third_party/wiredtiger/wiredtiger_checksum', 'client_metadata', diff --git a/src/mongo/rpc/metadata/security_token_metadata_test.cpp b/src/mongo/rpc/metadata/security_token_metadata_test.cpp index dcdd07b076a..f779f78fdde 100644 --- a/src/mongo/rpc/metadata/security_token_metadata_test.cpp +++ b/src/mongo/rpc/metadata/security_token_metadata_test.cpp @@ -34,6 +34,7 @@ #include "mongo/db/auth/security_token_gen.h" #include "mongo/db/client.h" #include "mongo/db/concurrency/locker_noop_service_context_test_fixture.h" +#include "mongo/db/multitenancy_gen.h" #include "mongo/rpc/op_msg_test.h" #include "mongo/unittest/unittest.h" @@ -51,7 +52,7 @@ TEST_F(SecurityTokenMetadataTest, SecurityTokenNotAccepted) { const auto kPingBody = BSON(kPingFieldName << 1); const auto kTokenBody = BSON(kTenantFieldName << OID::gen()); - auth::gAcceptOpMsgSecurityToken = false; + gSupportMultitenancy = false; auto msgBytes = OpMsgBytes{0, kBodySection, kPingBody, kSecurityTokenSection, kTokenBody}; ASSERT_THROWS_CODE_AND_WHAT(msgBytes.parse(), DBException, @@ -64,7 +65,7 @@ TEST_F(SecurityTokenMetadataTest, BasicSuccess) { const auto kPingBody = BSON(kPingFieldName << 1); const auto kTokenBody = BSON(kTenantFieldName << kOid); - auth::gAcceptOpMsgSecurityToken = true; + gSupportMultitenancy = true; auto msg = OpMsgBytes{0, kBodySection, kPingBody, kSecurityTokenSection, kTokenBody}.parse(); ASSERT_BSONOBJ_EQ(msg.body, kPingBody); ASSERT_EQ(msg.sequences.size(), 0u); diff --git a/src/mongo/rpc/op_msg.cpp b/src/mongo/rpc/op_msg.cpp index a3b57bd1759..eba507d3c1a 100644 --- a/src/mongo/rpc/op_msg.cpp +++ b/src/mongo/rpc/op_msg.cpp @@ -40,6 +40,7 @@ #include "mongo/config.h" #include "mongo/db/auth/security_token_gen.h" #include "mongo/db/bson/dotted_path_support.h" +#include "mongo/db/multitenancy_gen.h" #include "mongo/logv2/log.h" #include "mongo/rpc/object_check.h" #include "mongo/util/bufreader.h" @@ -193,7 +194,7 @@ OpMsg OpMsg::parse(const Message& message) try { case Section::kSecurityToken: { uassert(ErrorCodes::Unauthorized, "Unsupported Security Token provided", - auth::gAcceptOpMsgSecurityToken); + gSupportMultitenancy); msg.securityToken = sectionsBuf.read<Validated<BSONObj>>(); break; } |