moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wrap bcrypt in a try-catch

This commit is contained in:
calzoneman 2013-03-27 15:02:43 -05:00
parent 124ec0080f
commit 448d774b0d
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
auth.js
View File

@ -77,28 +77,34 @@ exports.login = function(name, pw) {
var results = db.querySync(query); var results = db.querySync(query);
var rows = results.fetchAllSync(); var rows = results.fetchAllSync();
if(rows.length > 0) { if(rows.length > 0) {
if(bcrypt.compareSync(pw, rows[0].pw)) { try {
db.closeSync(); if(bcrypt.compareSync(pw, rows[0].pw)) {
return rows[0];
}
else {
// Check if the sha256 is in the database
// If so, migrate to bcrypt
var sha256 = hashlib.sha256(pw);
if(sha256 == rows[0].pw) {
var newhash = bcrypt.hashSync(pw, 10);
var query = "UPDATE registrations SET pw='{1}' WHERE uname='{2}'"
.replace(/\{1\}/, newhash)
.replace(/\{2\}/, name);
var results = db.querySync(query);
db.closeSync(); db.closeSync();
if(!results) {
Logger.errlog.log("Failed to migrate password! user=" + name);
return false;
}
return rows[0]; return rows[0];
} }
return false; else {
// Check if the sha256 is in the database
// If so, migrate to bcrypt
var sha256 = hashlib.sha256(pw);
if(sha256 == rows[0].pw) {
var newhash = bcrypt.hashSync(pw, 10);
var query = "UPDATE registrations SET pw='{1}' WHERE uname='{2}'"
.replace(/\{1\}/, newhash)
.replace(/\{2\}/, name);
var results = db.querySync(query);
db.closeSync();
if(!results) {
Logger.errlog.log("Failed to migrate password! user=" + name);
return false;
}
return rows[0];
}
return false;
}
}
catch(e) {
Logger.errlog.log("Auth.login fail");
Logger.errlog.log(e);
} }
} }
return false; return false;