nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2024-09-21 07:46:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from figassis/sha512-support

Browse source 
Sha512 support
This commit is contained in:
Andris Reinman 2020-07-14 17:28:21 +03:00 committed by GitHub
parent ba3e3b419c 149cbf30db
commit 491c2d65a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/hashes.js
View file

@ -29,22 +29,19 @@ module.exports.compare = async (password, hash) => {
password = (password || '').toString();
hash = (hash || '').toString();
let algo = [].concat(hash.match(/^\$([^$]+)\$/) || [])[1];
algo = (algo || '').toString().toLowerCase();
let algo = checkHashSupport(hash);
if (!algo.result) {
throw new Error('Invalid algo: ' + JSON.stringify(algo.algo));
}
switch (algo) {
case 'pbkdf2-sha512':
case 'pbkdf2-sha256':
case 'pbkdf2-sha1':
switch (algo.algo) {
case 'pbkdf2':
return await pbkdf2.verify(hash, password);
case '2a':
case '2b':
case '2y':
case 'bcrypt':
return await bcrypt.compare(password, hash);
case '6':
case 'unixcrypt':
return await unixcryptCompareAsync(password, hash);
case '1': {
case 'md5': {
let result;
let salt = hash.split('$')[2] || '';
@ -57,6 +54,33 @@ module.exports.compare = async (password, hash) => {
}
};
function checkHashSupport(hash) {
hash = (hash || '').toString();
let algo = [].concat(hash.match(/^\$([^$]+)\$/) || [])[1];
algo = (algo || '').toString().toLowerCase();
switch (algo) {
case 'pbkdf2-sha512':
case 'pbkdf2-sha256':
case 'pbkdf2-sha1':
return { result: true, algo: 'pbkdf2' };
case '2a':
case '2b':
case '2y':
return { result: true, algo: 'bcrypt' };
case '6':
return { result: true, algo: 'unixcrypt' };
case '1': {
return { result: true, algo: 'md5' };
}
default:
return { result: false, algo };
}
};
module.exports.checkHashSupport = checkHashSupport;
module.exports.shouldRehash = hash => {
hash = (hash || '').toString();
let algo = [].concat(hash.match(/^\$([^$]+)\$/) || [])[1];

10
lib/user-handler.js
View file

@ -1266,9 +1266,13 @@ class UserHandler {
try {
if (data.hashedPassword) {
// try if the hashing library can handle it?
await hashes.compare('whatever', data.password);
// did not throw, so probably OK
hash = data.password;
let algo = hashes.checkHashSupport(data.password);
if (algo.result) {
hash = data.password;
} else {
throw new Error('Invalid algo: ' + JSON.stringify(algo.algo));
}
} else {
hash = await hashes.hash(data.password);
}