diff options
| author | Spencer T Brody <spencer@10gen.com> | 2013-10-09 20:05:09 -0400 |
|---|---|---|
| committer | Spencer T Brody <spencer@10gen.com> | 2013-10-10 11:52:06 -0400 |
| commit | 8093bb525d453cf880a3525c78f87178b493128c (patch) | |
| tree | f4bb315269f0592a19a7cfb25ffb16975e045947 /src/mongo/db/auth/user_document_parser_test.cpp | |
| parent | 3f3bf961cb9676235f5d24989bbf8b30fb125563 (diff) | |
| download | mongo-8093bb525d453cf880a3525c78f87178b493128c.tar.gz | |
SERVER-9515 SERVER-6246 SERVER-9517 Instead of "name", in user objects use "user" and in role objects use "role"
Diffstat (limited to 'src/mongo/db/auth/user_document_parser_test.cpp')
| -rw-r--r-- | src/mongo/db/auth/user_document_parser_test.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/mongo/db/auth/user_document_parser_test.cpp b/src/mongo/db/auth/user_document_parser_test.cpp index 9edac47e971..f03756bb47f 100644 --- a/src/mongo/db/auth/user_document_parser_test.cpp +++ b/src/mongo/db/auth/user_document_parser_test.cpp @@ -187,45 +187,45 @@ namespace { // Need source field ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "credentials" << BSON("MONGODB-CR" << "a") << "roles" << emptyArray))); // Need credentials field ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "roles" << emptyArray))); // Need roles field ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a")))); // Don't need credentials field if userSource is $external ASSERT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "$external" << "roles" << emptyArray))); // Empty roles arrays are OK ASSERT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << "roles" << emptyArray))); // Roles must be objects ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << "roles" << BSON_ARRAY("read")))); // Role needs name ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << "roles" << BSON_ARRAY(BSON("db" << "dbA" << @@ -234,63 +234,63 @@ namespace { // Role needs source ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "canDelegate" << true << "hasRole" << true))))); // Role needs canDelegate ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "hasRole" << true))))); // Role needs hasRole ASSERT_NOT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "canDelegate" << true))))); // Basic valid user document ASSERT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "canDelegate" << true << "hasRole" << true))))); // Multiple roles OK ASSERT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "canDelegate" << true << "hasRole" << true) << - BSON("name" << "roleB" << + BSON("role" << "roleB" << "db" << "dbB" << "canDelegate" << true << "hasRole" << true))))); // Optional extraData field OK ASSERT_OK(v2parser.checkValidUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a") << "extraData" << BSON("foo" << "bar") << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "canDelegate" << true << "hasRole" << true))))); @@ -300,34 +300,34 @@ namespace { // Old "pwd" field not valid ASSERT_NOT_OK(v2parser.initializeUserCredentialsFromUserDocument( user.get(), - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "pwd" << ""))); // Credentials must be provided (so long as userSource is not $external) ASSERT_NOT_OK(v2parser.initializeUserCredentialsFromUserDocument( user.get(), - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test"))); // Credentials must be object ASSERT_NOT_OK(v2parser.initializeUserCredentialsFromUserDocument( user.get(), - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << "a"))); // Must specify credentials for MONGODB-CR ASSERT_NOT_OK(v2parser.initializeUserCredentialsFromUserDocument( user.get(), - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("foo" << "bar")))); // Make sure extracting valid credentials works ASSERT_OK(v2parser.initializeUserCredentialsFromUserDocument( user.get(), - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "test" << "credentials" << BSON("MONGODB-CR" << "a")))); ASSERT(user->getCredentials().password == "a"); @@ -336,7 +336,7 @@ namespace { // Leaving out 'credentials' field is OK so long as userSource is $external ASSERT_OK(v2parser.initializeUserCredentialsFromUserDocument( user.get(), - BSON("name" << "spencer" << + BSON("user" << "spencer" << "db" << "$external"))); ASSERT(user->getCredentials().password.empty()); ASSERT(user->getCredentials().isExternal); @@ -346,42 +346,42 @@ namespace { TEST_F(V2UserDocumentParsing, V2RoleExtraction) { // "roles" field must be provided ASSERT_NOT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer"), + BSON("user" << "spencer"), user.get())); // V1-style roles arrays no longer work ASSERT_NOT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "roles" << BSON_ARRAY("read")), user.get())); - // Roles must have "name", "db", "canDelegate", and "hasRole" fields + // Roles must have "user", "db", "canDelegate", and "hasRole" fields ASSERT_NOT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << + BSON("user" << "spencer" << "roles" << BSON_ARRAY(BSONObj())), user.get())); ASSERT_NOT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << - "roles" << BSON_ARRAY(BSON("name" << "roleA"))), + BSON("user" << "spencer" << + "roles" << BSON_ARRAY(BSON("role" << "roleA"))), user.get())); ASSERT_NOT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << "db" << "dbA"))), + BSON("user" << "spencer" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA"))), user.get())); ASSERT_NOT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + BSON("user" << "spencer" << + "roles" << BSON_ARRAY(BSON("user" << "roleA" << "db" << "dbA" << "canDelegate" << true))), user.get())); // Role doesn't get added if hasRole is false ASSERT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + BSON("user" << "spencer" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "canDelegate" << true << "hasRole" << false))), @@ -396,8 +396,8 @@ namespace { // Valid role names are extracted successfully ASSERT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + BSON("user" << "spencer" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "canDelegate" << true << "hasRole" << true))), @@ -411,12 +411,12 @@ namespace { // Multiple roles OK ASSERT_OK(v2parser.initializeUserRolesFromUserDocument( - BSON("name" << "spencer" << - "roles" << BSON_ARRAY(BSON("name" << "roleA" << + BSON("user" << "spencer" << + "roles" << BSON_ARRAY(BSON("role" << "roleA" << "db" << "dbA" << "canDelegate" << true << "hasRole" << true) << - BSON("name" << "roleB" << + BSON("role" << "roleB" << "db" << "dbB" << "canDelegate" << false << "hasRole" << true))), |