NODE-571 added code 59 to legacy server errors when SCRAM-SHA-1 mechanism fails

Author: christkv

lib/admin.js

@@ -243,14 +243,18 @@ define.classMethod('ping', {callback: true, promise:true});
  * @param {Admin~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
  */
-Admin.prototype.authenticate = function(username, password, callback) {
+Admin.prototype.authenticate = function(username, password, options, callback) {
   var self = this;
+  if(typeof options == 'function') callback = options, options = {};
+  options = shallowClone(options);
+  options.authdb = 'admin';
+  
   // Execute using callback
-  if(typeof callback == 'function') return this.s.db.authenticate(username, password, {authdb: 'admin'}, callback);
+  if(typeof callback == 'function') return this.s.db.authenticate(username, password, options, callback);
 
   // Return a Promise
   return new this.s.promiseLibrary(function(resolve, reject) {
-    self.s.db.authenticate(username, password, {authdb: 'admin'}, function(err, r) {
+    self.s.db.authenticate(username, password, options, function(err, r) {
       if(err) return reject(err);
       resolve(r);
     });

lib/db.js

@@ -1409,11 +1409,20 @@ Db.prototype.authenticate = function(username, password, options, callback) {
   }
 
   // If we have a callback fallback
-  if(typeof callback == 'function') return authenticate(self, username, password, options, callback);
+  if(typeof callback == 'function') return authenticate(self, username, password, options, function(err, r) {
+    // Support failed auth method
+    if(err.message.indexOf('saslStart') != -1) err.code = 59;
+    // Reject error
+    if(err) return callback(err);
+    callback(null, r);
+  });
 
   // Return a promise
   return new this.s.promiseLibrary(function(resolve, reject) {
     authenticate(self, username, password, options, function(err, r) {
+      // Support failed auth method
+      if(err.message.indexOf('saslStart') != -1) err.code = 59;
+      // Reject error
       if(err) return reject(err);
       resolve(r);
     });

test/functional/authentication_tests.js

@@ -2,6 +2,46 @@
 
 var f = require('util').format;
 
+/**
+ * Fail due to illegal authentication mechanism
+ *
+ * @ignore
+ */
+exports['should fail due to illegal authentication mechanism'] = {
+  metadata: { requires: { topology: ['auth'], mongodb: "<=2.6.x" } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var Db = configuration.require.Db
+      , MongoClient = configuration.require.MongoClient
+      , Server = configuration.require.Server;
+
+    // restart server
+    configuration.restart(function() {
+      var db1 = new Db('mongo-ruby-test-auth1', new Server(configuration.host, configuration.port, {auto_reconnect: true}), {w:1});
+      db1.open(function(err, db) {
+        test.equal(null, err);
+
+        db.admin().addUser('admin', 'admin', function(err, result) {
+          test.equal(null, err);
+
+          // Login the user
+          db.admin().authenticate("admin", "admin", {
+            authMechanism: 'SCRAM-SHA-1'
+          }, function(err, result) {
+            test.equal(59, err.code);
+
+            // restart server
+            configuration.restart(function() {
+              test.done();
+            });
+          });
+        });
+      });
+    });
+  }
+}
+
 /**
  * Retrieve the current replicaset status if the server is running as part of a replicaset using a Promise.
  *