Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-05-07 17:26:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #253 from rmuch/fix-salt-encoding

Browse Source 
Correctly encode and decode password salt
This commit is contained in:
Liran Tal
2015-03-08 14:17:44 +02:00
parent 61d6aba5ac 325a19e276
commit d4ce4ff66c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.server.model.js
View File

@@ -96,7 +96,7 @@ var UserSchema = new Schema({
*/
UserSchema.pre('save', function(next) {
if (this.password && this.password.length > 6) {
this.salt = new Buffer(crypto.randomBytes(16).toString('base64'), 'base64');
this.salt = crypto.randomBytes(16).toString('base64');
this.password = this.hashPassword(this.password);
}
@@ -108,7 +108,7 @@ UserSchema.pre('save', function(next) {
*/
UserSchema.methods.hashPassword = function(password) {
if (this.salt && password) {
return crypto.pbkdf2Sync(password, this.salt, 10000, 64).toString('base64');
return crypto.pbkdf2Sync(password, new Buffer(this.salt, 'base64'), 10000, 64).toString('base64');
} else {
return password;
}