diff options
Diffstat (limited to 'src/mongo/db/auth/authorization_manager_test.cpp')
| -rw-r--r-- | src/mongo/db/auth/authorization_manager_test.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mongo/db/auth/authorization_manager_test.cpp b/src/mongo/db/auth/authorization_manager_test.cpp index 144f43d2735..83edae4ddef 100644 --- a/src/mongo/db/auth/authorization_manager_test.cpp +++ b/src/mongo/db/auth/authorization_manager_test.cpp @@ -182,9 +182,9 @@ public: }; TEST_F(AuthorizationManagerTest, testAcquireV2User) { - OperationContextNoop txn; + OperationContextNoop opCtx; - ASSERT_OK(externalState->insertPrivilegeDocument(&txn, + ASSERT_OK(externalState->insertPrivilegeDocument(&opCtx, BSON("_id" << "admin.v2read" << "user" @@ -200,7 +200,7 @@ TEST_F(AuthorizationManagerTest, testAcquireV2User) { << "db" << "test"))), BSONObj())); - ASSERT_OK(externalState->insertPrivilegeDocument(&txn, + ASSERT_OK(externalState->insertPrivilegeDocument(&opCtx, BSON("_id" << "admin.v2cluster" << "user" @@ -218,7 +218,7 @@ TEST_F(AuthorizationManagerTest, testAcquireV2User) { BSONObj())); User* v2read; - ASSERT_OK(authzManager->acquireUser(&txn, UserName("v2read", "test"), &v2read)); + ASSERT_OK(authzManager->acquireUser(&opCtx, UserName("v2read", "test"), &v2read)); ASSERT_EQUALS(UserName("v2read", "test"), v2read->getName()); ASSERT(v2read->isValid()); ASSERT_EQUALS(1U, v2read->getRefCount()); @@ -232,7 +232,7 @@ TEST_F(AuthorizationManagerTest, testAcquireV2User) { authzManager->releaseUser(v2read); User* v2cluster; - ASSERT_OK(authzManager->acquireUser(&txn, UserName("v2cluster", "admin"), &v2cluster)); + ASSERT_OK(authzManager->acquireUser(&opCtx, UserName("v2cluster", "admin"), &v2cluster)); ASSERT_EQUALS(UserName("v2cluster", "admin"), v2cluster->getName()); ASSERT(v2cluster->isValid()); ASSERT_EQUALS(1U, v2cluster->getRefCount()); @@ -254,11 +254,11 @@ TEST_F(AuthorizationManagerTest, testLocalX509Authorization) { session, SSLPeerInfo("CN=mongodb.com", {RoleName("read", "test"), RoleName("readWrite", "test")})); ServiceContext::UniqueClient client = serviceContext.makeClient("testClient", session); - ServiceContext::UniqueOperationContext txn = client->makeOperationContext(); + ServiceContext::UniqueOperationContext opCtx = client->makeOperationContext(); User* x509User; ASSERT_OK( - authzManager->acquireUser(txn.get(), UserName("CN=mongodb.com", "$external"), &x509User)); + authzManager->acquireUser(opCtx.get(), UserName("CN=mongodb.com", "$external"), &x509User)); ASSERT(x509User->isValid()); stdx::unordered_set<RoleName> expectedRoles{RoleName("read", "test"), @@ -288,11 +288,11 @@ TEST_F(AuthorizationManagerTest, testLocalX509AuthorizationInvalidUser) { session, SSLPeerInfo("CN=mongodb.com", {RoleName("read", "test"), RoleName("write", "test")})); ServiceContext::UniqueClient client = serviceContext.makeClient("testClient", session); - ServiceContext::UniqueOperationContext txn = client->makeOperationContext(); + ServiceContext::UniqueOperationContext opCtx = client->makeOperationContext(); User* x509User; ASSERT_NOT_OK( - authzManager->acquireUser(txn.get(), UserName("CN=10gen.com", "$external"), &x509User)); + authzManager->acquireUser(opCtx.get(), UserName("CN=10gen.com", "$external"), &x509User)); } TEST_F(AuthorizationManagerTest, testLocalX509AuthenticationNoAuthorization) { @@ -301,11 +301,11 @@ TEST_F(AuthorizationManagerTest, testLocalX509AuthenticationNoAuthorization) { transport::SessionHandle session = transportLayer.createSession(); setX509PeerInfo(session, {}); ServiceContext::UniqueClient client = serviceContext.makeClient("testClient", session); - ServiceContext::UniqueOperationContext txn = client->makeOperationContext(); + ServiceContext::UniqueOperationContext opCtx = client->makeOperationContext(); User* x509User; ASSERT_NOT_OK( - authzManager->acquireUser(txn.get(), UserName("CN=mongodb.com", "$external"), &x509User)); + authzManager->acquireUser(opCtx.get(), UserName("CN=mongodb.com", "$external"), &x509User)); } /** @@ -325,15 +325,15 @@ public: * the mock's user document catalog, without performing any role resolution. This way the tests * can control exactly what privileges are returned for the user. */ - Status getUserDescription(OperationContext* txn, + Status getUserDescription(OperationContext* opCtx, const UserName& userName, BSONObj* result) override { - return _getUserDocument(txn, userName, result); + return _getUserDocument(opCtx, userName, result); } private: - Status _getUserDocument(OperationContext* txn, const UserName& userName, BSONObj* userDoc) { - Status status = findOne(txn, + Status _getUserDocument(OperationContext* opCtx, const UserName& userName, BSONObj* userDoc) { + Status status = findOne(opCtx, AuthorizationManager::usersCollectionNamespace, BSON(AuthorizationManager::USER_NAME_FIELD_NAME << userName.getUser() @@ -372,10 +372,10 @@ public: // Tests SERVER-21535, unrecognized actions should be ignored rather than causing errors. TEST_F(AuthorizationManagerTest, testAcquireV2UserWithUnrecognizedActions) { - OperationContextNoop txn; + OperationContextNoop opCtx; ASSERT_OK( - externalState->insertPrivilegeDocument(&txn, + externalState->insertPrivilegeDocument(&opCtx, BSON("_id" << "admin.myUser" << "user" @@ -403,7 +403,7 @@ TEST_F(AuthorizationManagerTest, testAcquireV2UserWithUnrecognizedActions) { BSONObj())); User* myUser; - ASSERT_OK(authzManager->acquireUser(&txn, UserName("myUser", "test"), &myUser)); + ASSERT_OK(authzManager->acquireUser(&opCtx, UserName("myUser", "test"), &myUser)); ASSERT_EQUALS(UserName("myUser", "test"), myUser->getName()); ASSERT(myUser->isValid()); ASSERT_EQUALS(1U, myUser->getRefCount()); @@ -444,17 +444,17 @@ public: }; virtual void setUp() override { - txn.setRecoveryUnit(recoveryUnit, OperationContext::kNotInUnitOfWork); + opCtx.setRecoveryUnit(recoveryUnit, OperationContext::kNotInUnitOfWork); AuthorizationManagerTest::setUp(); } - OperationContextNoop txn; + OperationContextNoop opCtx; size_t registeredChanges = 0; MockRecoveryUnit* recoveryUnit = new MockRecoveryUnit(®isteredChanges); }; TEST_F(AuthorizationManagerLogOpTest, testDropDatabaseAddsRecoveryUnits) { - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("dropDatabase" @@ -464,7 +464,7 @@ TEST_F(AuthorizationManagerLogOpTest, testDropDatabaseAddsRecoveryUnits) { } TEST_F(AuthorizationManagerLogOpTest, testDropAuthCollectionAddsRecoveryUnits) { - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("drop" @@ -472,7 +472,7 @@ TEST_F(AuthorizationManagerLogOpTest, testDropAuthCollectionAddsRecoveryUnits) { nullptr); ASSERT_EQ(size_t(1), registeredChanges); - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("drop" @@ -480,7 +480,7 @@ TEST_F(AuthorizationManagerLogOpTest, testDropAuthCollectionAddsRecoveryUnits) { nullptr); ASSERT_EQ(size_t(2), registeredChanges); - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("drop" @@ -488,7 +488,7 @@ TEST_F(AuthorizationManagerLogOpTest, testDropAuthCollectionAddsRecoveryUnits) { nullptr); ASSERT_EQ(size_t(3), registeredChanges); - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("drop" @@ -498,21 +498,21 @@ TEST_F(AuthorizationManagerLogOpTest, testDropAuthCollectionAddsRecoveryUnits) { } TEST_F(AuthorizationManagerLogOpTest, testCreateAnyCollectionAddsNoRecoveryUnits) { - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("create" << "system.users"), nullptr); - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("create" << "system.profile"), nullptr); - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "c", "admin.$cmd", BSON("create" @@ -523,7 +523,7 @@ TEST_F(AuthorizationManagerLogOpTest, testCreateAnyCollectionAddsNoRecoveryUnits } TEST_F(AuthorizationManagerLogOpTest, testRawInsertToRolesCollectionAddsRecoveryUnits) { - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "i", "admin.system.profile", BSON("_id" @@ -531,7 +531,7 @@ TEST_F(AuthorizationManagerLogOpTest, testRawInsertToRolesCollectionAddsRecovery nullptr); ASSERT_EQ(size_t(0), registeredChanges); - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "i", "admin.system.users", BSON("_id" @@ -539,7 +539,7 @@ TEST_F(AuthorizationManagerLogOpTest, testRawInsertToRolesCollectionAddsRecovery nullptr); ASSERT_EQ(size_t(0), registeredChanges); - authzManager->logOp(&txn, + authzManager->logOp(&opCtx, "i", "admin.system.roles", BSON("_id" |