diff options
| author | Spencer Jackson <spencer.jackson@mongodb.com> | 2017-08-08 15:13:51 -0400 |
|---|---|---|
| committer | Spencer Jackson <spencer.jackson@mongodb.com> | 2017-08-11 15:19:33 -0400 |
| commit | 718e9c68e0526e2db4fbfd0ecac31eae1b3a095a (patch) | |
| tree | eb077f4a2facde33afbd5eb65b33f027d32ad586 /src/mongo/db/auth/user_document_parser.cpp | |
| parent | ba11e4172e8d5f9149a212a0b42da60873338527 (diff) | |
| download | mongo-718e9c68e0526e2db4fbfd0ecac31eae1b3a095a.tar.gz | |
SERVER-30566: Unwind SERVER-28190
Diffstat (limited to 'src/mongo/db/auth/user_document_parser.cpp')
| -rw-r--r-- | src/mongo/db/auth/user_document_parser.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/mongo/db/auth/user_document_parser.cpp b/src/mongo/db/auth/user_document_parser.cpp index 1b778ed4e17..aca408636a3 100644 --- a/src/mongo/db/auth/user_document_parser.cpp +++ b/src/mongo/db/auth/user_document_parser.cpp @@ -228,7 +228,6 @@ Status _checkV2RolesArray(const BSONElement& rolesElement) { Status V2UserDocumentParser::checkValidUserDocument(const BSONObj& doc) const { BSONElement userElement = doc[AuthorizationManager::USER_NAME_FIELD_NAME]; - BSONElement userIDElement = doc[AuthorizationManager::USER_ID_FIELD_NAME]; BSONElement userDBElement = doc[AuthorizationManager::USER_DB_FIELD_NAME]; BSONElement credentialsElement = doc[CREDENTIALS_FIELD_NAME]; BSONElement rolesElement = doc[ROLES_FIELD_NAME]; @@ -239,11 +238,6 @@ Status V2UserDocumentParser::checkValidUserDocument(const BSONObj& doc) const { if (userElement.valueStringData().empty()) return _badValue("User document needs 'user' field to be non-empty", 0); - // If we have an id field, make sure it is an OID - if (!userIDElement.eoo() && (userIDElement.type() != BSONType::jstOID)) { - return _badValue("User document 'userId' field must be an OID", 0); - } - // Validate the "db" element if (userDBElement.type() != String || userDBElement.valueStringData().empty()) { return _badValue("User document needs 'db' field to be a non-empty string", 0); @@ -317,15 +311,6 @@ std::string V2UserDocumentParser::extractUserNameFromUserDocument(const BSONObj& return doc[AuthorizationManager::USER_NAME_FIELD_NAME].str(); } -boost::optional<OID> V2UserDocumentParser::extractUserIDFromUserDocument(const BSONObj& doc) const { - BSONElement e = doc[AuthorizationManager::USER_ID_FIELD_NAME]; - if (e.type() == BSONType::EOO) { - return boost::optional<OID>(); - } - - return e.OID(); -} - Status V2UserDocumentParser::initializeUserCredentialsFromUserDocument( User* user, const BSONObj& privDoc) const { User::CredentialData credentials; |