redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Fix redis 2.4 auth support

Browse Source
This commit is contained in:
Ruben Bridgewater
2016-03-16 23:15:21 +01:00
parent 08a4537263
commit eb9500bb9f
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/individualCommands.js
View File

@@ -4,6 +4,7 @@ var utils = require('./utils');
var debug = require('./debug'); var debug = require('./debug');
var Multi = require('./multi'); var Multi = require('./multi');
var no_password_is_set = /no password is set/; var no_password_is_set = /no password is set/;
var loading = /LOADING/;
var RedisClient = require('../').RedisClient; var RedisClient = require('../').RedisClient;
/******************************** /********************************
@@ -91,12 +92,20 @@ RedisClient.prototype.auth = RedisClient.prototype.AUTH = function auth (pass, c
this.auth_pass = pass; this.auth_pass = pass;
this.ready = this.offline_queue.length === 0; // keep the execution order intakt this.ready = this.offline_queue.length === 0; // keep the execution order intakt
var tmp = this.send_command('auth', [pass], function (err, res) { var tmp = this.send_command('auth', [pass], function (err, res) {
if (err && no_password_is_set.test(err.message)) { if (err) {
self.warn('Warning: Redis server does not require a password, but a password was supplied.'); if (no_password_is_set.test(err.message)) {
err = null; self.warn('Warning: Redis server does not require a password, but a password was supplied.');
res = 'OK'; err = null;
res = 'OK';
} else if (loading.test(err.message)) {
// If redis is still loading the db, it will not authenticate and everything else will fail
debug('Redis still loading, trying to authenticate later');
setTimeout(function () {
self.auth(pass, callback);
}, 200);
return;
}
} }
utils.callback_or_emit(self, callback, err, res); utils.callback_or_emit(self, callback, err, res);
}); });
this.ready = ready; this.ready = ready;

20
test/auth.spec.js
View File

@@ -45,6 +45,26 @@ describe("client authentication", function () {
}); });
}); });
it('support redis 2.4 with retrying auth commands if still loading', function (done) {
if (helper.redisProcess().spawnFailed()) this.skip();
client = redis.createClient.apply(null, args);
var time = Date.now();
client.auth(auth, function (err, res) {
assert.strictEqual('retry worked', res);
assert(Date.now() - time >= 200, 'Time should be above 200 ms (the reconnect time)');
assert(Date.now() - time < 300, 'Time should be below 300 ms (the reconnect should only take a bit above 200 ms)');
done();
});
var tmp = client.command_queue.get(0).callback;
client.command_queue.get(0).callback = function (err, res) {
client.auth = function (pass, callback) {
callback(null, 'retry worked');
};
tmp(new Error('ERR redis is still LOADING'));
};
});
it("emits error when auth is bad without callback", function (done) { it("emits error when auth is bad without callback", function (done) {
if (helper.redisProcess().spawnFailed()) this.skip(); if (helper.redisProcess().spawnFailed()) this.skip();