feat(webui): 添加双重登录验证(2FA)功能 (#1920)
* feat(webui): 添加双重登录验证(2FA)功能 * fix: 修复 store.delete 类型错误,添加完整项目文件 * feat(webui): 添加双重登录验证(2FA)功能 - 后端:实现 TOTP 验证码生成和验证 - 后端:添加 enable2FA 和 totpSecret 配置项 - 后端:登录处理器支持 2FA 验证 - 前端:添加 2FA 登录流程和配置页面 * feat(webui): 添加双重登录验证(2FA)功能 - 后端:实现 TOTP 验证码生成和验证 (TotpHelper.ts) - 后端:添加 enable2FA 和 totpSecret 配置项 (config.ts) - 后端:登录处理器支持 2FA 验证,添加 2FA 管理 API (Auth.ts) - 后端:注册 2FA 相关路由 (auth.ts) - 前端:登录页面添加 2FA 验证步骤 (web_login.tsx) - 前端:添加 2FA 相关 API 调用方法 (webui_manager.ts) - 前端:添加 2FA 配置页面 (webui.tsx) * fix: 更新 AuthResponse 类型定义以支持 2FA * fix: 修复 setLocalToken 类型错误 * fix: 修复 TotpHelper.ts 类型错误 * fix: address PR review feedback - Remove database files from tracking - Use local QRCodeSVG instead of third-party API - Remove unused verify2FACode method - Remove IP-based challenge storage (password already validated) - Require TOTP code to disable 2FA - Remove duplicate loginWithTokenAndTotp method - Remove unused generateTotp method - Use consistent English error messages * fix: remove unused store import * chore: translate 2FA UI to Chinese
This commit is contained in:
@@ -1,17 +1,18 @@
|
||||
import { RequestHandler } from 'express';
|
||||
import { AuthHelper } from '@/napcat-webui-backend/src/helper/SignToken';
|
||||
import { PasskeyHelper } from '@/napcat-webui-backend/src/helper/PasskeyHelper';
|
||||
import { TotpHelper } from '@/napcat-webui-backend/src/helper/TotpHelper';
|
||||
import { WebUiDataRuntime } from '@/napcat-webui-backend/src/helper/Data';
|
||||
import { sendSuccess, sendError } from '@/napcat-webui-backend/src/utils/response';
|
||||
import { isEmpty } from '@/napcat-webui-backend/src/utils/check';
|
||||
import { WebUiConfig, getInitialWebUiToken, setInitialWebUiToken } from '@/napcat-webui-backend/index';
|
||||
|
||||
// 登录
|
||||
// 登录 - 支持2FA验证
|
||||
export const LoginHandler: RequestHandler = async (req, res) => {
|
||||
// 获取WebUI配置
|
||||
const WebUiConfigData = await WebUiConfig.GetWebUIConfig();
|
||||
// 获取请求体中的hash
|
||||
const { hash } = req.body;
|
||||
// 获取请求体中的hash和totpCode
|
||||
const { hash, totpCode } = req.body;
|
||||
// 获取客户端IP
|
||||
const clientIP = req.ip || req.socket.remoteAddress || '';
|
||||
|
||||
@@ -33,11 +34,31 @@ export const LoginHandler: RequestHandler = async (req, res) => {
|
||||
return sendError(res, 'token is invalid');
|
||||
}
|
||||
|
||||
// 签发凭证
|
||||
const signCredential = Buffer.from(JSON.stringify(AuthHelper.signCredential(hash))).toString(
|
||||
'base64'
|
||||
);
|
||||
// 返回成功信息
|
||||
// 检查是否启用了2FA
|
||||
if (WebUiConfigData.enable2FA && WebUiConfigData.totpSecret) {
|
||||
// 如果没有提供验证码,返回要求验证码
|
||||
if (!totpCode) {
|
||||
return sendSuccess(res, {
|
||||
require2FA: true,
|
||||
message: 'Please enter your authenticator code',
|
||||
});
|
||||
}
|
||||
|
||||
// 验证TOTP验证码
|
||||
if (!TotpHelper.verifyTotp(WebUiConfigData.totpSecret, totpCode)) {
|
||||
return sendError(res, 'Invalid or expired code');
|
||||
}
|
||||
|
||||
// 2FA验证成功,签发凭证
|
||||
const signCredential = Buffer.from(JSON.stringify(AuthHelper.signCredential(hash))).toString('base64');
|
||||
return sendSuccess(res, {
|
||||
Credential: signCredential,
|
||||
require2FA: false,
|
||||
});
|
||||
}
|
||||
|
||||
// 未启用2FA,直接签发凭证
|
||||
const signCredential = Buffer.from(JSON.stringify(AuthHelper.signCredential(hash))).toString('base64');
|
||||
return sendSuccess(res, {
|
||||
Credential: signCredential,
|
||||
});
|
||||
@@ -261,3 +282,85 @@ export const VerifyPasskeyAuthenticationHandler: RequestHandler = async (req, re
|
||||
return sendError(res, `Authentication verification failed: ${(error as Error).message}`);
|
||||
}
|
||||
};
|
||||
|
||||
// 获取2FA状态
|
||||
export const Get2FAStatusHandler: RequestHandler = async (_req, res) => {
|
||||
try {
|
||||
const WebUiConfigData = await WebUiConfig.GetWebUIConfig();
|
||||
return sendSuccess(res, {
|
||||
enable2FA: WebUiConfigData.enable2FA || false,
|
||||
hasSecret: !!WebUiConfigData.totpSecret,
|
||||
});
|
||||
} catch (error) {
|
||||
return sendError(res, `获取2FA状态失败: ${(error as Error).message}`);
|
||||
}
|
||||
};
|
||||
|
||||
// 生成2FA密钥
|
||||
export const Generate2FASecretHandler: RequestHandler = async (_req, res) => {
|
||||
try {
|
||||
const secret = TotpHelper.generateSecret();
|
||||
const qrCodeUrl = TotpHelper.generateQrCodeUrl(secret, 'NapCat WebUI', 'NapCat');
|
||||
|
||||
return sendSuccess(res, {
|
||||
secret,
|
||||
qrCodeUrl,
|
||||
});
|
||||
} catch (error) {
|
||||
return sendError(res, `Failed to generate 2FA secret: ${(error as Error).message}`);
|
||||
}
|
||||
};
|
||||
|
||||
// 启用2FA
|
||||
export const Enable2FAHandler: RequestHandler = async (req, res) => {
|
||||
try {
|
||||
const { secret, totpCode } = req.body;
|
||||
|
||||
if (!secret || !totpCode) {
|
||||
return sendError(res, 'secret and totpCode are required');
|
||||
}
|
||||
|
||||
if (!TotpHelper.verifyTotp(secret, totpCode)) {
|
||||
return sendError(res, 'Invalid code');
|
||||
}
|
||||
|
||||
await WebUiConfig.UpdateWebUIConfig({
|
||||
enable2FA: true,
|
||||
totpSecret: secret,
|
||||
});
|
||||
|
||||
return sendSuccess(res, { message: '2FA enabled' });
|
||||
} catch (error) {
|
||||
return sendError(res, `Failed to enable 2FA: ${(error as Error).message}`);
|
||||
}
|
||||
};
|
||||
|
||||
// 禁用2FA - 需要验证当前TOTP代码
|
||||
export const Disable2FAHandler: RequestHandler = async (req, res) => {
|
||||
try {
|
||||
const { totpCode } = req.body;
|
||||
|
||||
if (!totpCode) {
|
||||
return sendError(res, 'totpCode is required to disable 2FA');
|
||||
}
|
||||
|
||||
const WebUiConfigData = await WebUiConfig.GetWebUIConfig();
|
||||
if (!WebUiConfigData.totpSecret) {
|
||||
return sendError(res, '2FA is not enabled');
|
||||
}
|
||||
|
||||
// 验证当前TOTP代码
|
||||
if (!TotpHelper.verifyTotp(WebUiConfigData.totpSecret, totpCode)) {
|
||||
return sendError(res, 'Invalid code');
|
||||
}
|
||||
|
||||
await WebUiConfig.UpdateWebUIConfig({
|
||||
enable2FA: false,
|
||||
totpSecret: '',
|
||||
});
|
||||
|
||||
return sendSuccess(res, { message: '2FA disabled' });
|
||||
} catch (error) {
|
||||
return sendError(res, `Failed to disable 2FA: ${(error as Error).message}`);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
import crypto from 'crypto';
|
||||
|
||||
/**
|
||||
* TOTP (Time-based One-Time Password) Helper
|
||||
* 用于生成和验证基于时间的一次性密码
|
||||
*/
|
||||
export class TotpHelper {
|
||||
/**
|
||||
* 生成随机密钥(Base32格式)
|
||||
* @param length 密钥长度(字节),默认16字节
|
||||
* @returns Base32编码的密钥
|
||||
*/
|
||||
static generateSecret(length: number = 16): string {
|
||||
const buffer = crypto.randomBytes(length);
|
||||
return this.toBase32(buffer);
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证一次性密码
|
||||
* @param secret Base32编码的密钥
|
||||
* @param code 用户输入的验证码
|
||||
* @param timeStep 时间步长(秒),默认30秒
|
||||
* @param window 允许的时间窗口(前后各多少个时间步长),默认1
|
||||
* @returns 是否验证通过
|
||||
*/
|
||||
static verifyTotp(
|
||||
secret: string,
|
||||
code: string,
|
||||
timeStep: number = 30,
|
||||
window: number = 1
|
||||
): boolean {
|
||||
const time = Math.floor(Date.now() / 1000 / timeStep);
|
||||
|
||||
// 检查前后 window 个时间步长
|
||||
for (let i = -window; i <= window; i++) {
|
||||
const candidateCode = this.generateHotp(secret, time + i);
|
||||
if (candidateCode === code) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成 HOTP (HMAC-based One-Time Password)
|
||||
* @param secret Base32编码的密钥
|
||||
* @param counter 计数器
|
||||
* @returns 6位数字验证码
|
||||
*/
|
||||
private static generateHotp(secret: string, counter: number): string {
|
||||
// 将 Base32 密钥转换为字节
|
||||
const key = this.base32ToBytes(secret);
|
||||
|
||||
// 将计数器转换为 8 字节大端序
|
||||
const counterBytes = Buffer.alloc(8);
|
||||
let tempCounter = counter;
|
||||
for (let i = 7; i >= 0; i--) {
|
||||
counterBytes[i] = tempCounter & 0xff;
|
||||
tempCounter = Math.floor(tempCounter / 256);
|
||||
}
|
||||
|
||||
// 计算 HMAC-SHA1
|
||||
const hmac = crypto.createHmac('sha1', key);
|
||||
hmac.update(counterBytes);
|
||||
const hash = hmac.digest();
|
||||
|
||||
// 动态截断
|
||||
const hashLength = hash.length;
|
||||
const lastByte = hash[hashLength - 1];
|
||||
if (lastByte === undefined) {
|
||||
return '000000';
|
||||
}
|
||||
const offset = lastByte & 0x0f;
|
||||
const byte0 = hash[offset] ?? 0;
|
||||
const byte1 = hash[offset + 1] ?? 0;
|
||||
const byte2 = hash[offset + 2] ?? 0;
|
||||
const byte3 = hash[offset + 3] ?? 0;
|
||||
const binary =
|
||||
((byte0 & 0x7f) << 24) |
|
||||
((byte1 & 0xff) << 16) |
|
||||
((byte2 & 0xff) << 8) |
|
||||
(byte3 & 0xff);
|
||||
|
||||
// 生成 6 位数字
|
||||
const otp = binary % 1000000;
|
||||
return otp.toString().padStart(6, '0');
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成 QR Code URL
|
||||
* @param secret Base32编码的密钥
|
||||
* @param account 账户名称
|
||||
* @param issuer 发行方名称
|
||||
* @returns otpauth:// URL
|
||||
*/
|
||||
static generateQrCodeUrl(
|
||||
secret: string,
|
||||
account: string,
|
||||
issuer: string
|
||||
): string {
|
||||
const encodedIssuer = encodeURIComponent(issuer);
|
||||
const encodedAccount = encodeURIComponent(`${issuer}:${account}`);
|
||||
return `otpauth://totp/${encodedAccount}?secret=${secret}&issuer=${encodedIssuer}&algorithm=SHA1&digits=6&period=30`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将字节数组转换为 Base32 编码
|
||||
* @param buffer 字节数组
|
||||
* @returns Base32编码字符串
|
||||
*/
|
||||
private static toBase32(buffer: Buffer): string {
|
||||
const base32Alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
|
||||
let output = '';
|
||||
|
||||
for (let i = 0; i < buffer.length; i += 5) {
|
||||
const b0 = buffer[i] ?? 0;
|
||||
const b1 = buffer[i + 1] ?? 0;
|
||||
const b2 = buffer[i + 2] ?? 0;
|
||||
const b3 = buffer[i + 3] ?? 0;
|
||||
const b4 = buffer[i + 4] ?? 0;
|
||||
|
||||
output += base32Alphabet[(b0 >> 3) & 0x1f];
|
||||
output += base32Alphabet[((b0 << 2) | (b1 >> 6)) & 0x1f];
|
||||
output += base32Alphabet[(b1 >> 1) & 0x1f];
|
||||
output += base32Alphabet[((b1 << 4) | (b2 >> 4)) & 0x1f];
|
||||
output += base32Alphabet[((b2 << 1) | (b3 >> 7)) & 0x1f];
|
||||
output += base32Alphabet[(b3 >> 2) & 0x1f];
|
||||
output += base32Alphabet[((b3 << 3) | (b4 >> 5)) & 0x1f];
|
||||
output += base32Alphabet[b4 & 0x1f];
|
||||
}
|
||||
|
||||
// 移除填充的等号
|
||||
return output.replace(/=+$/, '');
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 Base32 字符串转换为字节数组
|
||||
* @param base32 Base32编码字符串
|
||||
* @returns 字节数组
|
||||
*/
|
||||
private static base32ToBytes(base32: string): Buffer {
|
||||
const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
|
||||
const base32Clean = base32.toUpperCase().replace(/=+$/, '');
|
||||
|
||||
const bytes: number[] = [];
|
||||
let buffer = 0;
|
||||
let bitsLeft = 0;
|
||||
|
||||
for (const char of base32Clean) {
|
||||
const value = alphabet.indexOf(char);
|
||||
if (value === -1) continue;
|
||||
|
||||
buffer = (buffer << 5) | value;
|
||||
bitsLeft += 5;
|
||||
|
||||
if (bitsLeft >= 8) {
|
||||
bytes.push((buffer >> (bitsLeft - 8)) & 0xff);
|
||||
bitsLeft -= 8;
|
||||
}
|
||||
}
|
||||
|
||||
return Buffer.from(bytes);
|
||||
}
|
||||
}
|
||||
@@ -33,6 +33,10 @@ const WebUiConfigSchema = Type.Object({
|
||||
ipBlacklist: Type.Array(Type.String(), { default: [] }),
|
||||
// 是否启用 X-Forwarded-For 获取真实IP
|
||||
enableXForwardedFor: Type.Boolean({ default: false }),
|
||||
// 是否启用双因素认证(2FA)
|
||||
enable2FA: Type.Boolean({ default: false }),
|
||||
// TOTP 密钥
|
||||
totpSecret: Type.String({ default: '' }),
|
||||
});
|
||||
|
||||
export type WebUiConfigType = Static<typeof WebUiConfigSchema>;
|
||||
|
||||
@@ -9,6 +9,10 @@ import {
|
||||
VerifyPasskeyRegistrationHandler,
|
||||
GeneratePasskeyAuthenticationOptionsHandler,
|
||||
VerifyPasskeyAuthenticationHandler,
|
||||
Get2FAStatusHandler,
|
||||
Generate2FASecretHandler,
|
||||
Enable2FAHandler,
|
||||
Disable2FAHandler,
|
||||
} from '@/napcat-webui-backend/src/api/Auth';
|
||||
|
||||
const router: Router = Router();
|
||||
@@ -28,5 +32,13 @@ router.post('/passkey/verify-registration', VerifyPasskeyRegistrationHandler);
|
||||
router.post('/passkey/generate-authentication-options', GeneratePasskeyAuthenticationOptionsHandler);
|
||||
// router:验证Passkey认证
|
||||
router.post('/passkey/verify-authentication', VerifyPasskeyAuthenticationHandler);
|
||||
// router:获取2FA状态
|
||||
router.get('/2fa/status', Get2FAStatusHandler);
|
||||
// router:生成2FA密钥
|
||||
router.post('/2fa/generate-secret', Generate2FASecretHandler);
|
||||
// router:启用2FA
|
||||
router.post('/2fa/enable', Enable2FAHandler);
|
||||
// router:禁用2FA
|
||||
router.post('/2fa/disable', Disable2FAHandler);
|
||||
|
||||
export { router as AuthRouter };
|
||||
|
||||
@@ -17,13 +17,43 @@ export default class WebUIManager {
|
||||
return data.data;
|
||||
}
|
||||
|
||||
public static async loginWithToken (token: string) {
|
||||
public static async loginWithToken (token: string, totpCode?: string) {
|
||||
const sha256 = CryptoJS.SHA256(token + '.napcat').toString();
|
||||
const { data } = await serverRequest.post<ServerResponse<AuthResponse>>(
|
||||
'/auth/login',
|
||||
{ hash: sha256 }
|
||||
{ hash: sha256, totpCode }
|
||||
);
|
||||
return data.data.Credential;
|
||||
return data.data;
|
||||
}
|
||||
|
||||
public static async get2FAStatus () {
|
||||
const { data } = await serverRequest.get<ServerResponse<{ enable2FA: boolean; hasSecret: boolean; }>>(
|
||||
'/auth/2fa/status'
|
||||
);
|
||||
return data.data;
|
||||
}
|
||||
|
||||
public static async generate2FASecret () {
|
||||
const { data } = await serverRequest.post<ServerResponse<{ secret: string; qrCodeUrl: string; }>>(
|
||||
'/auth/2fa/generate-secret'
|
||||
);
|
||||
return data.data;
|
||||
}
|
||||
|
||||
public static async enable2FA (secret: string, totpCode: string) {
|
||||
const { data } = await serverRequest.post<ServerResponse<{ message: string; }>>(
|
||||
'/auth/2fa/enable',
|
||||
{ secret, totpCode }
|
||||
);
|
||||
return data.data;
|
||||
}
|
||||
|
||||
public static async disable2FA (totpCode: string) {
|
||||
const { data } = await serverRequest.post<ServerResponse<{ message: string; }>>(
|
||||
'/auth/2fa/disable',
|
||||
{ totpCode }
|
||||
);
|
||||
return data.data;
|
||||
}
|
||||
|
||||
public static async changePassword (oldToken: string, newToken: string) {
|
||||
|
||||
@@ -5,6 +5,8 @@ import { useEffect, useState } from 'react';
|
||||
import { Controller, useForm } from 'react-hook-form';
|
||||
import toast from 'react-hot-toast';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { IoQrCode } from 'react-icons/io5';
|
||||
import { QRCodeSVG } from 'qrcode.react';
|
||||
|
||||
import key from '@/const/key';
|
||||
|
||||
@@ -52,6 +54,85 @@ const WebUIConfigCard = () => {
|
||||
const [registrationOptions, setRegistrationOptions] = useState<any>(null);
|
||||
const [isLoadingOptions, setIsLoadingOptions] = useState(false);
|
||||
|
||||
// 2FA 相关状态
|
||||
const [twoFAStatus, setTwoFAStatus] = useState<{ enable2FA: boolean; hasSecret: boolean }>({ enable2FA: false, hasSecret: false });
|
||||
const [twoFASecret, setTwoFASecret] = useState<string>('');
|
||||
const [twoFAQrCodeUrl, setTwoFAQrCodeUrl] = useState<string>('');
|
||||
const [twoFATotpCode, setTwoFATotpCode] = useState<string>('');
|
||||
const [disableTotpCode, setDisableTotpCode] = useState<string>('');
|
||||
const [isGeneratingSecret, setIsGeneratingSecret] = useState(false);
|
||||
const [isEnabling2FA, setIsEnabling2FA] = useState(false);
|
||||
const [isDisabling2FA, setIsDisabling2FA] = useState(false);
|
||||
|
||||
const loadTwoFAStatus = async () => {
|
||||
try {
|
||||
const status = await WebUIManager.get2FAStatus();
|
||||
setTwoFAStatus(status);
|
||||
} catch (error) {
|
||||
console.error('获取2FA状态失败:', error);
|
||||
}
|
||||
};
|
||||
|
||||
const generateTwoFASecret = async () => {
|
||||
setIsGeneratingSecret(true);
|
||||
try {
|
||||
const data = await WebUIManager.generate2FASecret();
|
||||
setTwoFASecret(data.secret);
|
||||
setTwoFAQrCodeUrl(data.qrCodeUrl);
|
||||
toast.success('密钥已生成,请使用Authenticator应用扫码');
|
||||
} catch (error) {
|
||||
toast.error(`生成密钥失败: ${(error as Error).message}`);
|
||||
} finally {
|
||||
setIsGeneratingSecret(false);
|
||||
}
|
||||
};
|
||||
|
||||
const enableTwoFA = async () => {
|
||||
if (!twoFASecret || !twoFATotpCode) {
|
||||
toast.error('请先生成密钥并输入验证码');
|
||||
return;
|
||||
}
|
||||
if (twoFATotpCode.length !== 6) {
|
||||
toast.error('验证码必须是6位数字');
|
||||
return;
|
||||
}
|
||||
setIsEnabling2FA(true);
|
||||
try {
|
||||
await WebUIManager.enable2FA(twoFASecret, twoFATotpCode);
|
||||
await loadTwoFAStatus();
|
||||
setTwoFASecret('');
|
||||
setTwoFAQrCodeUrl('');
|
||||
setTwoFATotpCode('');
|
||||
toast.success('双因素认证已启用');
|
||||
} catch (error) {
|
||||
toast.error(`启用失败: ${(error as Error).message}`);
|
||||
} finally {
|
||||
setIsEnabling2FA(false);
|
||||
}
|
||||
};
|
||||
|
||||
const disableTwoFA = async () => {
|
||||
if (!disableTotpCode || disableTotpCode.length !== 6) {
|
||||
toast.error('请输入6位验证码');
|
||||
return;
|
||||
}
|
||||
setIsDisabling2FA(true);
|
||||
try {
|
||||
await WebUIManager.disable2FA(disableTotpCode);
|
||||
await loadTwoFAStatus();
|
||||
setDisableTotpCode('');
|
||||
toast.success('双因素认证已禁用');
|
||||
} catch (error) {
|
||||
toast.error(`禁用失败: ${(error as Error).message}`);
|
||||
} finally {
|
||||
setIsDisabling2FA(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
loadTwoFAStatus();
|
||||
}, []);
|
||||
|
||||
// 修改密码独立表单
|
||||
const navigate = useNavigate();
|
||||
const [, setToken] = useLocalStorage(key.token, '');
|
||||
@@ -367,6 +448,110 @@ const WebUIConfigCard = () => {
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 双因素认证 (2FA) */}
|
||||
<div className='flex flex-col gap-2'>
|
||||
<div className='flex-shrink-0 w-full font-bold text-default-600 dark:text-default-400 px-1 flex items-center gap-2'>
|
||||
<span>双因素认证 (2FA)</span>
|
||||
<span className={`text-sm px-2 py-0.5 rounded-full ${twoFAStatus.enable2FA ? 'bg-green-100 text-green-700' : 'bg-default-200 text-default-600'}`}>
|
||||
{twoFAStatus.enable2FA ? '已启用' : '已禁用'}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{twoFAStatus.enable2FA ? (
|
||||
<div className='bg-green-50 border border-green-200 rounded-lg p-4'>
|
||||
<div className='text-sm text-green-700 mb-3'>✅ 双因素认证已启用</div>
|
||||
<div className='mb-3'>
|
||||
<div className='text-sm text-default-600 mb-2'>输入验证码以禁用</div>
|
||||
<input
|
||||
type='text'
|
||||
inputMode='numeric'
|
||||
pattern='[0-9]*'
|
||||
maxLength={6}
|
||||
value={disableTotpCode}
|
||||
onChange={(e) => setDisableTotpCode(e.target.value.replace(/\D/g, ''))}
|
||||
placeholder='000000'
|
||||
className='w-32 px-3 py-2 border border-default-300 rounded-lg text-center text-lg tracking-widest'
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
color='danger'
|
||||
variant='flat'
|
||||
onPress={disableTwoFA}
|
||||
isLoading={isDisabling2FA}
|
||||
disabled={!disableTotpCode || disableTotpCode.length !== 6}
|
||||
className='w-fit'
|
||||
>
|
||||
禁用双因素认证
|
||||
</Button>
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<div className='text-sm text-default-400 mb-2'>
|
||||
启用双因素认证后,登录时需要额外输入Authenticator应用生成的验证码
|
||||
</div>
|
||||
<div className='bg-default-50 border border-default-200 rounded-lg p-4'>
|
||||
<Button
|
||||
color='secondary'
|
||||
variant='flat'
|
||||
onPress={generateTwoFASecret}
|
||||
isLoading={isGeneratingSecret}
|
||||
className='w-fit mb-4'
|
||||
>
|
||||
<IoQrCode className='mr-2' />
|
||||
生成密钥
|
||||
</Button>
|
||||
|
||||
{twoFASecret && (
|
||||
<>
|
||||
<div className='mb-4'>
|
||||
<div className='text-sm text-default-600 mb-2'>请使用 Authenticator 应用扫描下方二维码</div>
|
||||
<div className='flex items-center gap-4'>
|
||||
<div className='bg-white border border-default-300 rounded-lg p-3'>
|
||||
<QRCodeSVG
|
||||
value={twoFAQrCodeUrl}
|
||||
size={128}
|
||||
level='M'
|
||||
includeMargin={false}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<div className='text-xs text-default-500 mb-1'>密钥(手动输入用)</div>
|
||||
<div className='font-mono text-sm bg-default-100 px-3 py-2 rounded break-all max-w-[200px]'>
|
||||
{twoFASecret}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className='mb-4'>
|
||||
<div className='text-sm text-default-600 mb-2'>输入Authenticator验证码</div>
|
||||
<input
|
||||
type='text'
|
||||
inputMode='numeric'
|
||||
pattern='[0-9]*'
|
||||
maxLength={6}
|
||||
value={twoFATotpCode}
|
||||
onChange={(e) => setTwoFATotpCode(e.target.value.replace(/\D/g, ''))}
|
||||
placeholder='000000'
|
||||
className='w-32 px-3 py-2 border border-default-300 rounded-lg text-center text-lg tracking-widest'
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
color='primary'
|
||||
variant='flat'
|
||||
onPress={enableTwoFA}
|
||||
isLoading={isEnabling2FA}
|
||||
disabled={!twoFATotpCode || twoFATotpCode.length !== 6}
|
||||
className='w-fit'
|
||||
>
|
||||
启用双因素认证
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<SaveButtons
|
||||
onSubmit={onSubmit}
|
||||
reset={reset}
|
||||
|
||||
@@ -5,7 +5,7 @@ import { Input } from '@heroui/input';
|
||||
import { useLocalStorage } from '@uidotdev/usehooks';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { toast } from 'react-hot-toast';
|
||||
import { IoKeyOutline } from 'react-icons/io5';
|
||||
import { IoKeyOutline, IoArrowBack } from 'react-icons/io5';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
import logo from '@/assets/images/logo.png';
|
||||
@@ -29,6 +29,11 @@ export default function WebLoginPage () {
|
||||
const [isPasskeyLoading, setIsPasskeyLoading] = useState<boolean>(true); // 初始为true,表示正在检查passkey
|
||||
const [, setLocalToken] = useLocalStorage<string>(key.token, '');
|
||||
|
||||
// 2FA相关状态
|
||||
const [require2FA, setRequire2FA] = useState<boolean>(false);
|
||||
const [totpCode, setTotpCode] = useState<string>('');
|
||||
const [pendingToken, setPendingToken] = useState<string>('');
|
||||
|
||||
// Helper function to decode base64url
|
||||
function base64UrlToUint8Array (base64Url: string): Uint8Array {
|
||||
const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
|
||||
@@ -102,10 +107,10 @@ export default function WebLoginPage () {
|
||||
return false; // 登录失败
|
||||
};
|
||||
|
||||
const onSubmit = async () => {
|
||||
// 第一次登录(输入token)
|
||||
const onSubmitToken = async () => {
|
||||
if (!tokenValue) {
|
||||
toast.error('请输入token');
|
||||
|
||||
return;
|
||||
}
|
||||
setIsLoading(true);
|
||||
@@ -113,7 +118,18 @@ export default function WebLoginPage () {
|
||||
const data = await WebUIManager.loginWithToken(tokenValue);
|
||||
|
||||
if (data) {
|
||||
setLocalToken(data);
|
||||
if (data.require2FA) {
|
||||
// 需要2FA验证
|
||||
setRequire2FA(true);
|
||||
setPendingToken(tokenValue);
|
||||
setIsLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
// 不需要2FA,直接登录
|
||||
if (data.Credential) {
|
||||
setLocalToken(data.Credential);
|
||||
}
|
||||
navigate('/qq_login', { replace: true });
|
||||
}
|
||||
} catch (error) {
|
||||
@@ -123,10 +139,42 @@ export default function WebLoginPage () {
|
||||
}
|
||||
};
|
||||
|
||||
// 2FA验证提交
|
||||
const onSubmit2FA = async () => {
|
||||
if (!totpCode || totpCode.length !== 6) {
|
||||
toast.error('Please enter 6-digit code');
|
||||
return;
|
||||
}
|
||||
setIsLoading(true);
|
||||
try {
|
||||
const data = await WebUIManager.loginWithToken(pendingToken, totpCode);
|
||||
|
||||
if (data && data.Credential) {
|
||||
setLocalToken(data.Credential);
|
||||
navigate('/qq_login', { replace: true });
|
||||
}
|
||||
} catch (error) {
|
||||
toast.error((error as Error).message);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
// 返回token输入步骤
|
||||
const goBackToToken = () => {
|
||||
setRequire2FA(false);
|
||||
setTotpCode('');
|
||||
setPendingToken('');
|
||||
};
|
||||
|
||||
// 处理全局键盘事件
|
||||
const handleKeyDown = (e: KeyboardEvent) => {
|
||||
if (e.key === 'Enter' && !isLoading && !isPasskeyLoading) {
|
||||
onSubmit();
|
||||
if (require2FA) {
|
||||
onSubmit2FA();
|
||||
} else {
|
||||
onSubmitToken();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -137,14 +185,14 @@ export default function WebLoginPage () {
|
||||
return () => {
|
||||
document.removeEventListener('keydown', handleKeyDown);
|
||||
};
|
||||
}, [tokenValue, isLoading, isPasskeyLoading]); // 依赖项包含用于登录的状态
|
||||
}, [tokenValue, totpCode, isLoading, isPasskeyLoading, require2FA]); // 依赖项包含用于登录的状态
|
||||
|
||||
useEffect(() => {
|
||||
// 如果URL中有token,直接登录
|
||||
if (token) {
|
||||
// 不需要检查passkey,立即清除loading状态,避免登录失败后输入框被永久禁用
|
||||
setIsPasskeyLoading(false);
|
||||
onSubmit();
|
||||
onSubmitToken();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -188,86 +236,161 @@ export default function WebLoginPage () {
|
||||
🔐 正在检查Passkey...
|
||||
</div>
|
||||
)}
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
onSubmit();
|
||||
}}
|
||||
>
|
||||
{/* 隐藏的用户名字段,帮助浏览器识别登录表单 */}
|
||||
<input
|
||||
type='text'
|
||||
name='username'
|
||||
value='napcat-webui'
|
||||
autoComplete='username'
|
||||
className='absolute -left-[9999px] opacity-0 pointer-events-none'
|
||||
readOnly
|
||||
tabIndex={-1}
|
||||
aria-label='Username'
|
||||
/>
|
||||
<Input
|
||||
isClearable
|
||||
type='password'
|
||||
name='password'
|
||||
autoComplete='current-password'
|
||||
classNames={{
|
||||
label: 'text-black/50 dark:text-white/90',
|
||||
input: [
|
||||
'bg-transparent',
|
||||
'text-black/90 dark:text-white/90',
|
||||
'placeholder:text-default-700/50 dark:placeholder:text-white/60',
|
||||
],
|
||||
innerWrapper: 'bg-transparent',
|
||||
inputWrapper: [
|
||||
'shadow-xl',
|
||||
'bg-default-100/70',
|
||||
'dark:bg-default/60',
|
||||
'backdrop-blur-xl',
|
||||
'backdrop-saturate-200',
|
||||
'hover:bg-default-0/70',
|
||||
'dark:hover:bg-default/70',
|
||||
'group-data-[focus=true]:bg-default-100/50',
|
||||
'dark:group-data-[focus=true]:bg-default/60',
|
||||
'!cursor-text',
|
||||
],
|
||||
}}
|
||||
isDisabled={isLoading || isPasskeyLoading}
|
||||
label='Token'
|
||||
placeholder='请输入token'
|
||||
radius='lg'
|
||||
size='lg'
|
||||
startContent={
|
||||
<IoKeyOutline className='text-black/50 mb-0.5 dark:text-white/90 text-slate-400 pointer-events-none flex-shrink-0' />
|
||||
}
|
||||
value={tokenValue}
|
||||
onChange={(e) => setTokenValue(e.target.value)}
|
||||
onClear={() => setTokenValue('')}
|
||||
/>
|
||||
</form>
|
||||
<div className='text-center text-small text-default-600 dark:text-default-400 px-2'>
|
||||
💡 提示:请从 NapCat 启动日志中查看登录密钥
|
||||
</div>
|
||||
<Button
|
||||
className='mx-10 mt-10 text-lg py-7'
|
||||
color='primary'
|
||||
isLoading={isLoading}
|
||||
radius='full'
|
||||
size='lg'
|
||||
variant='shadow'
|
||||
onPress={onSubmit}
|
||||
>
|
||||
{!isLoading && (
|
||||
<Image
|
||||
alt='logo'
|
||||
classNames={{
|
||||
wrapper: '-ml-8',
|
||||
|
||||
{/* 2FA验证步骤 */}
|
||||
{require2FA ? (
|
||||
<>
|
||||
<Button
|
||||
isIconOnly
|
||||
variant='light'
|
||||
className='self-start -ml-2'
|
||||
onPress={goBackToToken}
|
||||
>
|
||||
<IoArrowBack size={20} />
|
||||
</Button>
|
||||
<div className='text-center text-default-600 dark:text-default-400'>
|
||||
请输入Authenticator中的验证码
|
||||
</div>
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
onSubmit2FA();
|
||||
}}
|
||||
height='2em'
|
||||
src={logo}
|
||||
/>
|
||||
)}
|
||||
登录
|
||||
</Button>
|
||||
>
|
||||
<Input
|
||||
type='text'
|
||||
inputMode='numeric'
|
||||
pattern='[0-9]*'
|
||||
maxLength={6}
|
||||
classNames={{
|
||||
label: 'text-black/50 dark:text-white/90',
|
||||
input: [
|
||||
'bg-transparent',
|
||||
'text-black/90 dark:text-white/90',
|
||||
'placeholder:text-default-700/50 dark:placeholder:text-white/60',
|
||||
],
|
||||
innerWrapper: 'bg-transparent',
|
||||
inputWrapper: [
|
||||
'shadow-xl',
|
||||
'bg-default-100/70',
|
||||
'dark:bg-default/60',
|
||||
'backdrop-blur-xl',
|
||||
'backdrop-saturate-200',
|
||||
'hover:bg-default-0/70',
|
||||
'dark:hover:bg-default/70',
|
||||
'group-data-[focus=true]:bg-default-100/50',
|
||||
'dark:group-data-[focus=true]:bg-default/60',
|
||||
'!cursor-text',
|
||||
],
|
||||
}}
|
||||
isDisabled={isLoading}
|
||||
label='验证码'
|
||||
placeholder='请输入6位验证码'
|
||||
radius='lg'
|
||||
size='lg'
|
||||
startContent={
|
||||
<IoKeyOutline className='text-black/50 mb-0.5 dark:text-white/90 text-slate-400 pointer-events-none flex-shrink-0' />
|
||||
}
|
||||
value={totpCode}
|
||||
onChange={(e) => setTotpCode(e.target.value.replace(/\D/g, ''))}
|
||||
/>
|
||||
</form>
|
||||
<Button
|
||||
className='mx-10 mt-10 text-lg py-7'
|
||||
color='primary'
|
||||
isLoading={isLoading}
|
||||
radius='full'
|
||||
size='lg'
|
||||
variant='shadow'
|
||||
onPress={onSubmit2FA}
|
||||
>
|
||||
验证
|
||||
</Button>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<form
|
||||
onSubmit={(e) => {
|
||||
e.preventDefault();
|
||||
onSubmitToken();
|
||||
}}
|
||||
>
|
||||
{/* 隐藏的用户名字段,帮助浏览器识别登录表单 */}
|
||||
<input
|
||||
type='text'
|
||||
name='username'
|
||||
value='napcat-webui'
|
||||
autoComplete='username'
|
||||
className='absolute -left-[9999px] opacity-0 pointer-events-none'
|
||||
readOnly
|
||||
tabIndex={-1}
|
||||
aria-label='Username'
|
||||
/>
|
||||
<Input
|
||||
isClearable
|
||||
type='password'
|
||||
name='password'
|
||||
autoComplete='current-password'
|
||||
classNames={{
|
||||
label: 'text-black/50 dark:text-white/90',
|
||||
input: [
|
||||
'bg-transparent',
|
||||
'text-black/90 dark:text-white/90',
|
||||
'placeholder:text-default-700/50 dark:placeholder:text-white/60',
|
||||
],
|
||||
innerWrapper: 'bg-transparent',
|
||||
inputWrapper: [
|
||||
'shadow-xl',
|
||||
'bg-default-100/70',
|
||||
'dark:bg-default/60',
|
||||
'backdrop-blur-xl',
|
||||
'backdrop-saturate-200',
|
||||
'hover:bg-default-0/70',
|
||||
'dark:hover:bg-default/70',
|
||||
'group-data-[focus=true]:bg-default-100/50',
|
||||
'dark:group-data-[focus=true]:bg-default/60',
|
||||
'!cursor-text',
|
||||
],
|
||||
}}
|
||||
isDisabled={isLoading || isPasskeyLoading}
|
||||
label='Token'
|
||||
placeholder='请输入token'
|
||||
radius='lg'
|
||||
size='lg'
|
||||
startContent={
|
||||
<IoKeyOutline className='text-black/50 mb-0.5 dark:text-white/90 text-slate-400 pointer-events-none flex-shrink-0' />
|
||||
}
|
||||
value={tokenValue}
|
||||
onChange={(e) => setTokenValue(e.target.value)}
|
||||
onClear={() => setTokenValue('')}
|
||||
/>
|
||||
</form>
|
||||
<div className='text-center text-small text-default-600 dark:text-default-400 px-2'>
|
||||
💡 提示:请从 NapCat 启动日志中查看登录密钥
|
||||
</div>
|
||||
<Button
|
||||
className='mx-10 mt-10 text-lg py-7'
|
||||
color='primary'
|
||||
isLoading={isLoading}
|
||||
radius='full'
|
||||
size='lg'
|
||||
variant='shadow'
|
||||
onPress={onSubmitToken}
|
||||
>
|
||||
{!isLoading && (
|
||||
<Image
|
||||
alt='logo'
|
||||
classNames={{
|
||||
wrapper: '-ml-8',
|
||||
}}
|
||||
height='2em'
|
||||
src={logo}
|
||||
/>
|
||||
)}
|
||||
登录
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
</CardBody>
|
||||
</HoverEffectCard>
|
||||
</motion.div>
|
||||
|
||||
+3
-1
@@ -5,7 +5,9 @@ interface ServerResponse<T> {
|
||||
}
|
||||
|
||||
interface AuthResponse {
|
||||
Credential: string;
|
||||
Credential?: string;
|
||||
require2FA?: boolean;
|
||||
message?: string;
|
||||
}
|
||||
|
||||
interface LoginListItem {
|
||||
|
||||
Reference in New Issue
Block a user