Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #79 and Bug #58, handle save() asynchronously #233

Merged
merged 2 commits into from
Oct 25, 2017
Merged

Issue #79 and Bug #58, handle save() asynchronously #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c833ce
added code and tests to handle mongoose errors and concurrency gracef…
mvoorberg Oct 19, 2017
0f4db8b
fixed up code tabbing style differences
mvoorberg Oct 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions lib/authenticate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ module.exports = function authenticate(user, password, options, cb) {

if (Date.now() - user.get(options.lastLoginField) < calculatedInterval) {
user.set(options.lastLoginField, Date.now());
user.save();
return cb(null, false, new errors.AttemptTooSoonError(options.errorMessages.AttemptTooSoonError));
user.save(function(saveErr) {
if (saveErr) {
return cb(saveErr);
}
return cb(null, false, new errors.AttemptTooSoonError(options.errorMessages.AttemptTooSoonError));
});
return;
}

if (user.get(options.attemptsField) >= options.maxAttempts) {
Expand All @@ -30,12 +35,18 @@ module.exports = function authenticate(user, password, options, cb) {
}

if (scmp(hashBuffer, new Buffer(user.get(options.hashField), options.encoding))) {
if (options.limitAttempts) {
user.set(options.lastLoginField, Date.now());
user.set(options.attemptsField, 0);
user.save();
}
return cb(null, user);
if (options.limitAttempts) {
user.set(options.lastLoginField, Date.now());
user.set(options.attemptsField, 0);
user.save(function(saveErr, user) {
if (saveErr) {
return cb(saveErr);
}
return cb(null, user);
});
} else {
return cb(null, user);
}
} else {
if (options.limitAttempts) {
user.set(options.lastLoginField, Date.now());
Expand Down
157 changes: 157 additions & 0 deletions test/passport-local-mongoose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ describe('passportLocalMongoose', function() {
});

describe('#authenticate()', function() {

beforeEach(mongotest.prepareDb('mongodb://localhost/passportlocalmongoosetests'));
afterEach(mongotest.disconnect());

this.timeout(5000); // Five seconds - heavy crypto in background

it('should yield false in case user cannot be authenticated', function(done) {
Expand All @@ -264,6 +268,159 @@ describe('passportLocalMongoose', function() {
done();
});
});

it('should supply message when limiting attempts and authenticating too soon', function(done) {
this.timeout(5000); // Five seconds - mongo db access needed

var UserSchema = new Schema({});
UserSchema.plugin(passportLocalMongoose, {
limitAttempts: true,
interval: 20000
});
var User = mongoose.model('LimitAttemptsTooSoonUser', UserSchema);

var user = new User({
username: 'mark',
attempts: 1,
last: Date.now()
});
user.setPassword('password', function(err) {
expect(err).to.not.exist;

user.save(function(err) {
expect(err).to.not.exist;

user.authenticate('password', function(err, user, message) {
expect(err).to.not.exist;
expect(user).to.be.false;
expect(message).to.be.instanceof(errors.AttemptTooSoonError);
done();
});
});
});
});

it('should get an error updating when limiting attempts and authenticating too soon', function(done) {
this.timeout(5000); // Five seconds - mongo db access needed

var UserSchema = new Schema({}, {saveErrorIfNotFound: true});
UserSchema.plugin(passportLocalMongoose, {
limitAttempts: true,
interval: 20000
});
var User = mongoose.model('LimitAttemptsTooSoonUpdateWithError', UserSchema);

var user = new User({
username: 'jimmy',
attempts: 1,
last: Date.now()
});
user.setPassword('password', function(err) {
expect(err).to.not.exist;

user.save(function(err) {
expect(err).to.not.exist;

user._id = id = mongoose.Types.ObjectId();
user.authenticate('password', function(err, user, message) {
expect(err).to.exist;
expect(user).to.not.exist;
expect(message).to.not.exist;
done();
});
});
});
});

it('should get an error updating the user on password match when limiting attempts', function(done) {
this.timeout(5000); // Five seconds - mongo db access needed

var UserSchema = new Schema({}, {saveErrorIfNotFound: true});
UserSchema.plugin(passportLocalMongoose, {
limitAttempts: true
});
var User = mongoose.model('LimitAttemptsUpdateWithError', UserSchema);

var user = new User({
username: 'jane'
});
user.setPassword('password', function(err) {
expect(err).to.not.exist;

user.save(function(err) {
expect(err).to.not.exist;

user._id = id = mongoose.Types.ObjectId();
user.authenticate('password', function(err, user, message) {
expect(err).to.exist;
expect(user).to.not.exist;
expect(message).to.not.exist;
done();
});
});
});
});

it('should update the user on password match while limiting attempts', function(done) {
this.timeout(5000); // Five seconds - mongo db access needed

var UserSchema = new Schema({});
UserSchema.plugin(passportLocalMongoose, {
limitAttempts: true
});
var User = mongoose.model('LimitAttemptsUpdateWithoutError', UserSchema);

var user = new User({
username: 'walter'
});
user.setPassword('password', function(err) {
expect(err).to.not.exist;

user.save(function(err) {
expect(err).to.not.exist;

user.authenticate('password', function(err, result, message) {
expect(err).to.not.exist;
expect(result).to.exist;
expect(result.username).to.equal(user.username);
expect(message).to.not.exist;
done();
});
});
});
});

it('should fail to update the user on password mismatch while limiting attempts', function(done) {
this.timeout(5000); // Five seconds - mongo db access needed

var UserSchema = new Schema({}, {saveErrorIfNotFound: true});
UserSchema.plugin(passportLocalMongoose, {
limitAttempts: true,
interval: 20000
});
var User = mongoose.model('LimitAttemptsMismatchWithAnError', UserSchema);

var user = new User({
username: 'wendy'
});
user.setPassword('password', function(err) {
expect(err).to.not.exist;

user.save(function(err) {
expect(err).to.not.exist;

user.hash = 'deadbeef'; // force an error on scmp with different length hex.
user._id = id = mongoose.Types.ObjectId(); // force the save to fail
user.authenticate('password', function(err, user, message) {
expect(err).to.exist;
expect(user).to.not.exist;
expect(message).to.not.exist;
done();
});
});
});
});

});

describe('static #authenticate()', function() {
Expand Down