feat(api): 账户资料与密码安全

This commit is contained in:
R524809
2026-09-03 16:56:20 +08:00
parent 46d98ab11e
commit a5b89ddb1d
13 changed files with 552 additions and 14 deletions
+170 -4
View File
@@ -2,12 +2,15 @@ import { Inject, Injectable, UnauthorizedException } from '@nestjs/common';
import type {
AuthSessionResponse,
AuthUser,
ChangePasswordRequest,
LoginRequest,
RegisterRequest,
UpdateCurrentUserRequest,
Workspace,
} from '@atlas/contracts';
import type { Database, DatabaseTransaction } from '@atlas/database';
import { ApiError } from '../common/api-error.js';
import { IdempotencyService } from '../common/idempotency.service.js';
import { APP_CONFIG, type AppConfig } from '../config/app-config.module.js';
import { DATABASE } from '../database/database.module.js';
import { AuthRateLimiter } from '../security/auth-rate-limiter.service.js';
@@ -24,8 +27,10 @@ type UserRow = {
id: string;
email: string;
display_name: string | null;
avatar_asset_id: string | null;
email_verified_at: Date | null;
created_at: Date;
revision: number;
status: 'active' | 'disabled' | 'pending_review';
password_hash: string;
};
@@ -42,6 +47,8 @@ export class AuthService {
@Inject(APP_CONFIG) private readonly config: AppConfig,
@Inject(AuthRateLimiter)
private readonly rateLimiter: AuthRateLimiter,
@Inject(IdempotencyService)
private readonly idempotency: IdempotencyService,
) {}
public async register(input: RegisterRequest, metadata: RequestMetadata) {
@@ -105,7 +112,7 @@ export class AuthService {
// 限流与 citext 查询使用同一规范化邮箱,避免大小写绕过限流桶。
await this.rateLimiter.consume('login', { ip: metadata.ip, email });
const result = await this.database.query<UserRow>(
'SELECT id, email, display_name, email_verified_at, created_at, status, password_hash FROM atlas.users WHERE email = $1',
'SELECT id, email, display_name, avatar_asset_id, email_verified_at, created_at, revision, status, password_hash FROM atlas.users WHERE email = $1',
[email],
);
const user = result.rows[0];
@@ -143,7 +150,7 @@ export class AuthService {
const sessions = await transaction.query<
UserRow & { session_id: string }
>(
`SELECT u.id, u.email, u.display_name, u.email_verified_at, u.created_at, u.status, u.password_hash, s.id AS session_id
`SELECT u.id, u.email, u.display_name, u.avatar_asset_id, u.email_verified_at, u.created_at, u.revision, u.status, u.password_hash, s.id AS session_id
FROM atlas.user_sessions s JOIN atlas.users u ON u.id = s.user_id
WHERE s.refresh_token_hash = $1 AND s.revoked_at IS NULL AND s.expires_at > now() FOR UPDATE`,
[tokenHash(refreshToken)],
@@ -194,7 +201,7 @@ export class AuthService {
public async me(userId: string, workspace: Workspace) {
// workspace 由全局守卫解析,避免控制器或服务各自选择租户造成边界不一致。
const users = await this.database.query<UserRow>(
'SELECT id, email, display_name, email_verified_at, created_at, status, password_hash FROM atlas.users WHERE id = $1',
'SELECT id, email, display_name, avatar_asset_id, email_verified_at, created_at, revision, status, password_hash FROM atlas.users WHERE id = $1',
[userId],
);
const user = users.rows[0];
@@ -223,6 +230,139 @@ export class AuthService {
};
}
public async updateProfile(
workspace: Workspace,
userId: string,
idempotencyKey: string,
revision: number,
input: UpdateCurrentUserRequest,
) {
return this.idempotency.run(
{
workspaceId: workspace.id,
userId,
method: 'PATCH',
path: '/api/auth/me',
key: idempotencyKey,
request: { if_match: revision, ...input },
},
async (transaction) => {
const user = await findUserInTransaction(
transaction,
userId,
true,
);
if (user.revision !== revision) {
throw versionConflict(user.revision);
}
if (input.avatar_asset_id) {
// 头像只能引用当前工作空间内已完成入库的素材,不能接受任意对象路径或 URL。
const asset = await transaction.query<{ id: string }>(
`SELECT id FROM atlas.media_assets WHERE id = $1`,
[input.avatar_asset_id],
);
if (!asset.rows[0]) {
throw new ApiError(
422,
'AVATAR_ASSET_UNAVAILABLE',
'头像素材不存在或不属于当前工作空间',
);
}
}
const updated = await transaction.query<UserRow>(
`UPDATE atlas.users
SET display_name = CASE WHEN $1 THEN $2 ELSE display_name END,
avatar_asset_id = CASE WHEN $3 THEN $4::uuid ELSE avatar_asset_id END,
revision = revision + 1, updated_at = now()
WHERE id = $5
RETURNING id, email, display_name, avatar_asset_id, email_verified_at,
created_at, revision, status, password_hash`,
[
Object.hasOwn(input, 'display_name'),
input.display_name ?? null,
Object.hasOwn(input, 'avatar_asset_id'),
input.avatar_asset_id ?? null,
userId,
],
);
return {
status: 200,
body: { data: publicUser(updated.rows[0]) },
};
},
);
}
public async changePassword(
workspace: Workspace,
userId: string,
sessionId: string,
input: ChangePasswordRequest,
metadata: RequestMetadata,
) {
if (input.password !== input.password_confirmation) {
throw validationError(
'password_confirmation',
'PASSWORD_CONFIRMATION_MISMATCH',
'两次输入的密码不一致',
);
}
if (input.password.length < this.config.AUTH_PASSWORD_MIN_LENGTH) {
throw validationError(
'password',
'PASSWORD_TOO_SHORT',
`密码至少需要 ${this.config.AUTH_PASSWORD_MIN_LENGTH} 个字符`,
);
}
// 修改密码按已认证用户和来源 IP 双维度限流,避免已泄露会话被用于高频猜测旧密码。
await this.rateLimiter.consume('change_password', {
ip: metadata.ip,
userId,
});
return this.database.transaction(async (transaction) => {
const session = await transaction.query<{ id: string }>(
`SELECT id FROM atlas.user_sessions
WHERE id = $1 AND user_id = $2 AND revoked_at IS NULL AND expires_at > now()
FOR UPDATE`,
[sessionId, userId],
);
if (!session.rows[0]) throw new UnauthorizedException();
const user = await findUserInTransaction(transaction, userId, true);
if (user.status !== 'active') {
throw new ApiError(403, 'ACCOUNT_DISABLED', '账户已停用');
}
if (
!(await verifyPassword(input.old_password, user.password_hash))
) {
throw validationError(
'old_password',
'CURRENT_PASSWORD_INVALID',
'当前密码错误',
);
}
const passwordHash = await hashPassword(input.password);
const updated = await transaction.query<UserRow>(
`UPDATE atlas.users SET password_hash = $1, updated_at = now()
WHERE id = $2
RETURNING id, email, display_name, avatar_asset_id, email_verified_at,
created_at, revision, status, password_hash`,
[passwordHash, userId],
);
// 先撤销所有旧 session,再创建新 session;旧 access token 会立即失效。
await transaction.query(
`UPDATE atlas.user_sessions SET revoked_at = now()
WHERE user_id = $1 AND revoked_at IS NULL`,
[userId],
);
return this.createSessionResponse(
transaction,
updated.rows[0],
workspace,
metadata,
);
});
}
private async findWorkspace(userId: string) {
const result = await this.database.query<WorkspaceRow>(
`SELECT w.id, w.name, m.role FROM atlas.workspace_memberships m JOIN atlas.workspaces w ON w.id = m.workspace_id WHERE m.user_id = $1 AND w.status = 'active' ORDER BY m.joined_at LIMIT 1`,
@@ -287,14 +427,40 @@ function isUniqueViolation(error: unknown): error is { code: string } {
(error as { code: string }).code === '23505'
);
}
async function findUserInTransaction(
transaction: DatabaseTransaction,
userId: string,
lock: boolean,
): Promise<UserRow> {
const result = await transaction.query<UserRow>(
`SELECT id, email, display_name, avatar_asset_id, email_verified_at, created_at,
revision, status, password_hash
FROM atlas.users WHERE id = $1${lock ? ' FOR UPDATE' : ''}`,
[userId],
);
if (!result.rows[0]) throw new UnauthorizedException();
return result.rows[0];
}
function versionConflict(currentRevision: number) {
return new ApiError(409, 'VERSION_CONFLICT', '账户资料已被其他操作更新', [
{
field: 'If-Match',
code: 'VERSION_CONFLICT',
message: `当前版本为 ${currentRevision}`,
current_revision: currentRevision,
},
]);
}
function publicUser(user: UserRow): AuthUser {
// 白名单映射防止 password_hash 等内部字段随查询结果泄露给客户端。
return {
id: user.id,
email: user.email,
display_name: user.display_name,
avatar_asset_id: user.avatar_asset_id,
email_verified_at: user.email_verified_at?.toISOString() ?? null,
created_at: user.created_at.toISOString(),
revision: user.revision,
};
}
async function insertUser(
@@ -305,7 +471,7 @@ async function insertUser(
) {
// slug 使用用户 UUID,显示名称变化不会影响个人工作空间的稳定标识。
const result = await transaction.query<UserRow>(
'INSERT INTO atlas.users (email, password_hash, display_name) VALUES ($1, $2, $3) RETURNING id, email, display_name, email_verified_at, created_at, status, password_hash',
'INSERT INTO atlas.users (email, password_hash, display_name) VALUES ($1, $2, $3) RETURNING id, email, display_name, avatar_asset_id, email_verified_at, created_at, revision, status, password_hash',
[email, passwordHash, displayName],
);
return result.rows[0];