ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2026-02-04 01:42:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix v13 otplib upgrades

Browse Source
This commit is contained in:
Jamie Curnow
2026-02-04 07:47:16 +10:00
parent bb4b5fb3aa
commit f90066822f
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
backend/internal/2fa.js
View File

@@ -1,6 +1,6 @@
import crypto from "node:crypto"; import crypto from "node:crypto";
import bcrypt from "bcrypt"; import bcrypt from "bcrypt";
import { authenticator } from "otplib"; import { generateSecret, generateURI, verify } from "otplib";
import errs from "../lib/error.js"; import errs from "../lib/error.js";
import authModel from "../models/auth.js"; import authModel from "../models/auth.js";
import internalUser from "./user.js"; import internalUser from "./user.js";
@@ -27,7 +27,6 @@ const generateBackupCodes = async () => {
}; };
const internal2fa = { const internal2fa = {
/** /**
* Check if user has 2FA enabled * Check if user has 2FA enabled
* @param {number} userId * @param {number} userId
@@ -72,8 +71,12 @@ const internal2fa = {
startSetup: async (access, userId) => { startSetup: async (access, userId) => {
await access.can("users:password", userId); await access.can("users:password", userId);
const user = await internalUser.get(access, { id: userId }); const user = await internalUser.get(access, { id: userId });
const secret = authenticator.generateSecret(); const secret = generateSecret();
const otpauth_url = authenticator.keyuri(user.email, APP_NAME, secret); const otpauth_url = generateURI({
issuer: APP_NAME,
label: user.email,
secret: secret,
});
const auth = await internal2fa.getUserPasswordAuth(userId); const auth = await internal2fa.getUserPasswordAuth(userId);
// ensure user isn't already setup for 2fa // ensure user isn't already setup for 2fa
@@ -85,7 +88,8 @@ const internal2fa = {
const meta = auth.meta || {}; const meta = auth.meta || {};
meta.totp_pending_secret = secret; meta.totp_pending_secret = secret;
await authModel.query() await authModel
.query()
.where("id", auth.id) .where("id", auth.id)
.andWhere("user_id", userId) .andWhere("user_id", userId)
.andWhere("type", "password") .andWhere("type", "password")
@@ -112,8 +116,8 @@ const internal2fa = {
throw new errs.ValidationError("No pending 2FA setup found"); throw new errs.ValidationError("No pending 2FA setup found");
} }
const valid = authenticator.verify({ token: code, secret }); const result = await verify({ token: code, secret });
if (!valid) { if (!result.valid) {
throw new errs.ValidationError("Invalid verification code"); throw new errs.ValidationError("Invalid verification code");
} }
@@ -156,12 +160,12 @@ const internal2fa = {
throw new errs.ValidationError("2FA is not enabled"); throw new errs.ValidationError("2FA is not enabled");
} }
const valid = authenticator.verify({ const result = await verify({
token: code, token: code,
secret: auth.meta.totp_secret, secret: auth.meta.totp_secret,
}); });
if (!valid) { if (!result.valid) {
throw new errs.AuthError("Invalid verification code"); throw new errs.AuthError("Invalid verification code");
} }
@@ -195,12 +199,12 @@ const internal2fa = {
} }
// Try TOTP code first // Try TOTP code first
const valid = authenticator.verify({ const result = await verify({
token, token,
secret, secret,
}); });
if (valid) { if (result.valid) {
return true; return true;
} }
@@ -248,12 +252,12 @@ const internal2fa = {
throw new errs.ValidationError("No 2FA secret found"); throw new errs.ValidationError("No 2FA secret found");
} }
const valid = authenticator.verify({ const result = await verify({
token, token,
secret, secret,
}); });
if (!valid) { if (!result.valid) {
throw new errs.ValidationError("Invalid verification code"); throw new errs.ValidationError("Invalid verification code");
} }
@@ -271,11 +275,7 @@ const internal2fa = {
}, },
getUserPasswordAuth: async (userId) => { getUserPasswordAuth: async (userId) => {
const auth = await authModel const auth = await authModel.query().where("user_id", userId).andWhere("type", "password").first();
.query()
.where("user_id", userId)
.andWhere("type", "password")
.first();
if (!auth) { if (!auth) {
throw new errs.ItemNotFoundError("Auth not found"); throw new errs.ItemNotFoundError("Auth not found");