From 8bef798eec555b126b65be39881096084fb51356 Mon Sep 17 00:00:00 2001 From: Paul Sori Date: Sun, 7 Oct 2018 02:01:31 -0400 Subject: [PATCH] buffer deprecation --- modules/config/config-inquirer.js | 3 ++- modules/login.js | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/config/config-inquirer.js b/modules/config/config-inquirer.js index 768d906..074f5e6 100644 --- a/modules/config/config-inquirer.js +++ b/modules/config/config-inquirer.js @@ -2,6 +2,7 @@ const inquirer = require('inquirer'); const colors = require('colors'); const fs = require('fs'); const path = require('path'); +const Buffer = require('buffer').Buffer; // TODO: Get this from login module const hashConfig = { @@ -355,7 +356,7 @@ exports.addUser = function(current, callback) { console.log(`Failed to hash password`); return; } - cb(salt, new Buffer(hash).toString('hex')); + cb(salt, Buffer.from(hash).toString('hex')); }); }); } diff --git a/modules/login.js b/modules/login.js index 3736b57..fa33270 100644 --- a/modules/login.js +++ b/modules/login.js @@ -1,6 +1,7 @@ const jwt = require('jsonwebtoken'); const crypto = require('crypto'); const winston = require('winston'); +const Buffer = require('buffer').Buffer; exports.setup = function (mstream, program) { // Crypto Config @@ -43,7 +44,7 @@ exports.setup = function (mstream, program) { // If the user already has a salt, it means the password is hashed and can be used as is if (program.users[username].salt) { - program.users[username].salt = new Buffer(program.users[username].salt); + program.users[username].salt = Buffer.from(program.users[username].salt); continue; } @@ -62,7 +63,7 @@ exports.setup = function (mstream, program) { winston.error(`Failed to hash password for user ${username}: ${err}`); return; } - program.users[username]['password'] = new Buffer(hash).toString('hex'); + program.users[username]['password'] = Buffer.from(hash).toString('hex'); program.users[username]['salt'] = salt; }); }); @@ -99,7 +100,7 @@ exports.setup = function (mstream, program) { return res.redirect('/login-failed'); } - if (new Buffer(verifyHash).toString('hex') !== program.users[username]['password']) { + if (Buffer.from(verifyHash).toString('hex') !== program.users[username]['password']) { return res.redirect('/login-failed'); }