diff options
author | Andreas Nilsson <andreas.nilsson@mongodb.com> | 2016-08-01 12:09:42 -0400 |
---|---|---|
committer | Andreas Nilsson <andreas.nilsson@mongodb.com> | 2016-08-01 15:58:22 -0400 |
commit | c4ddaca40ddb1bf339fc31fa6c47d2c411958edf (patch) | |
tree | 35e8348e4f5112429366ad89cdd11f13686090af /src/mongo/db/auth/internal_user_auth.cpp | |
parent | f88ac8b8d347df73adab8374428eb5926b6885e5 (diff) | |
download | mongo-c4ddaca40ddb1bf339fc31fa6c47d2c411958edf.tar.gz |
SERVER-25340 Remove MONGODB-CR cluster authentication fallback
Diffstat (limited to 'src/mongo/db/auth/internal_user_auth.cpp')
-rw-r--r-- | src/mongo/db/auth/internal_user_auth.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/mongo/db/auth/internal_user_auth.cpp b/src/mongo/db/auth/internal_user_auth.cpp index 77d01a31b58..f9721b7e046 100644 --- a/src/mongo/db/auth/internal_user_auth.cpp +++ b/src/mongo/db/auth/internal_user_auth.cpp @@ -59,24 +59,10 @@ void setInternalUserAuthParams(const BSONObj& authParamsIn) { } stdx::lock_guard<stdx::mutex> lk(authParamMutex); - if (authParamsIn["mechanism"].String() != "SCRAM-SHA-1") { - authParams = authParamsIn.copy(); - return; - } - - // Create authParams for legacy MONGODB-CR authentication for 2.6/3.0 mixed - // mode if applicable. - mmb::Document fallback(authParamsIn); - fallback.root().findFirstChildNamed("mechanism").setValueString("MONGODB-CR"); - - mmb::Document doc(authParamsIn); - mmb::Element fallbackEl = doc.makeElementObject("fallbackParams"); - fallbackEl.setValueObject(fallback.getObject()); - doc.root().pushBack(fallbackEl); - authParams = doc.getObject().copy(); + authParams = authParamsIn.copy(); } -BSONObj getInternalUserAuthParamsWithFallback() { +BSONObj getInternalUserAuthParams() { if (!authParamsSet) { return BSONObj(); } |