Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"webpack": "webpack --config webpack.config.js"
},
"dependencies": {
"bcryptjs": "^2.4.3",
"bootstrap": "^5.3.8",
"bootstrap-icons": "^1.13.1",
"cookie-session": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion routes/auth/signup.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ router.post('/', async (req, res) => {
req.session.token = generateToken(username);
req.session.expires = expires;

const password = saltAndHashPassword(req.body.password);
const password = await saltAndHashPassword(req.body.password);
const email = req.body.email;
await createUser(username, password, email);
sendVerificationEmail(username);
Expand Down
41 changes: 35 additions & 6 deletions server/authentication.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ import getUserId from '../database/account-info/get-user-id.js';
import updateUser from '../database/account-info/update-user.js';
import verifyEmail from '../database/account-info/verify-email.js';

import bcrypt from 'bcryptjs';
import { createHash } from 'crypto';
import jsonwebtoken from 'jsonwebtoken';
import { ObjectId } from 'mongodb';
const { sign, verify } = jsonwebtoken;

const BCRYPT_ROUNDS = 12;

const baseURL = process.env.BASE_URL ?? (process.env.NODE_ENV === 'production' ? 'https://www.qbreader.org' : 'http://localhost:3000');

const salt = process.env.SALT ? process.env.SALT : 'salt';
Expand All @@ -32,7 +35,23 @@ const activeResetPasswordTokens = {};
* @returns {Promise<Boolean>}
*/
export async function checkPassword (username, password) {
return await getUserField(username, 'password') === saltAndHashPassword(password);
const stored = await getUserField(username, 'password');
if (!stored) {
return false;
}

// bcrypt hashes always start with `$2`; legacy base64 hashes never do.
if (stored.startsWith('$2')) {
return await bcrypt.compare(password, stored);
}

// Legacy triple-SHA256 hash: verify, then transparently upgrade to bcrypt.
if (stored === legacyHashPassword(password)) {
await updatePassword(username, password);
return true;
}

return false;
}

/**
Expand Down Expand Up @@ -63,11 +82,21 @@ export function generateToken (username, verifiedEmail = false) {
}

/**
*
* Hashes a plaintext password using bcrypt (per-hash salt, configurable work factor).
* @param {String} password
* @returns {Promise<String>} A bcrypt hash (60 chars, starts with `$2`).
*/
export async function saltAndHashPassword (password) {
return await bcrypt.hash(password, BCRYPT_ROUNDS);
}

/**
* Legacy triple-SHA256 hash with a single global salt. Retained only to verify
* pre-migration passwords so they can be transparently upgraded to bcrypt.
* @param {String} password
* @returns Base64 encoded hashed password.
* @returns {String} Base64 encoded hashed password.
*/
export function saltAndHashPassword (password) {
function legacyHashPassword (password) {
password = salt + password + salt;
const hash = createHash('sha256').update(password).digest('base64');
const hash2 = createHash('sha256').update(hash).digest('base64');
Expand Down Expand Up @@ -129,8 +158,8 @@ export async function sendVerificationEmail (username) {
return true;
}

export function updatePassword (username, newPassword) {
return updateUser(username, { password: saltAndHashPassword(newPassword) });
export async function updatePassword (username, newPassword) {
return await updateUser(username, { password: await saltAndHashPassword(newPassword) });
}

/**
Expand Down
Loading