feat: improve account deletion and Agent authorization review

This commit is contained in:
陈煜 committed 2026-10-04 11:06:15 +08:00
1 parent 5ad64460f7
commit 91365ee315
21 files changed
+2276 -713

No files matched your search

+3 -3
View File
@@ -5,13 +5,13 @@
"dev": "node scripts/dev.cjs",
"build": "tsc",
"typecheck": "tsc --noEmit",
"test": "tsx --test --test-concurrency=1 test/calculation.test.ts test/update.test.ts test/zip.test.ts test/metals.test.ts ../web/test/i18n.test.ts",
"test": "tsx --test --test-concurrency=1 test/calculation.test.ts test/update.test.ts test/zip.test.ts test/metals.test.ts ../web/test/i18n.test.ts test/account-deletion.test.ts",
"db:generate": "prisma generate",
"db:migrate": "node scripts/database.cjs deploy",
"db:status": "node scripts/database.cjs status",
"test:integration": "tsx --test --test-concurrency=1 test/integration.test.ts test/privacy.test.ts test/icons.test.ts test/transfers.test.ts test/queries.test.ts test/debts.test.ts test/update-integration.test.ts test/record-edit.test.ts test/security-backup.test.ts test/credit-balance.test.ts test/group-order.test.ts test/settings-plans.test.ts test/inclusion-metals.test.ts",
"test:integration": "tsx --test --test-concurrency=1 test/integration.test.ts test/privacy.test.ts test/icons.test.ts test/transfers.test.ts test/queries.test.ts test/debts.test.ts test/update-integration.test.ts test/record-edit.test.ts test/security-backup.test.ts test/credit-balance.test.ts test/group-order.test.ts test/settings-plans.test.ts test/inclusion-metals.test.ts test/account-deletion-integration.test.ts",
"test:performance": "tsx scripts/performance.ts after",
"test:mcp": "tsx --test --test-concurrency=1 test/mcp.test.ts",
"test:mcp": "tsx --test --test-concurrency=1 test/mcp.test.ts test/oauth-duration.test.ts",
"mcp:probe": "tsx scripts/mcp-probe.ts",
"icons:seed": "node scripts/seed-icons.cjs",
"test:mcp:codex": "tsx --test --test-concurrency=1 test/codex-oauth.test.ts"
@@ -0,0 +1 @@
ALTER TABLE `AgentGrant` MODIFY `refreshExpiresAt` DATETIME(3) NULL COMMENT '刷新授权到期时间,UTC;空表示永久 OAuth 授权或个人令牌不适用';
+1 -1
View File
@@ -127,7 +127,7 @@ model AgentGrant {
refreshDigest String? @unique @db.Char(64)
/// 访问令牌到期时间,UTC;空表示可撤销的永久个人令牌
expiresAt DateTime?
/// 刷新授权到期时间,UTC
/// 刷新授权到期时间,UTC;空表示永久 OAuth 授权或个人令牌不适用
refreshExpiresAt DateTime?
/// 撤销时间,UTC;空表示未撤销
revokedAt DateTime?
+5 -4
View File
@@ -15,7 +15,7 @@ import { Response } from 'express';
import { z } from 'zod';
import { Database } from '../database';
import { AuthService, UserRequest } from '../auth';
import { AgentOAuth, urls, scopeInput } from './oauth';
import { AgentOAuth, urls, scopeInput, oauthDays } from './oauth';
import { AgentOperations } from './operations';
import { protocolTools, tokenDays } from './information';
@Controller('api/agent')
@@ -34,6 +34,7 @@ export class AgentManagementController {
name: true,
scopes: true,
expiresAt: true,
refreshExpiresAt: true,
createdAt: true,
revokedAt: true,
clientId: true,
@@ -110,11 +111,11 @@ export class AgentManagementController {
@Param('id') id: string,
@Body() raw: unknown,
) {
const { approve, scopes } = z
.object({ approve: z.boolean(), scopes: scopeInput.optional() })
const { approve, scopes, days } = z
.object({ approve: z.boolean(), scopes: scopeInput.optional(), days: oauthDays.default(30) })
.strict()
.parse(raw);
return this.oauth.consent(r.userId, z.string().uuid().parse(id), approve, scopes);
return this.oauth.consent(r.userId, z.string().uuid().parse(id), approve, scopes, days);
}
@Get('operations/:id') preview(@Req() r: UserRequest, @Param('id') id: string) {
return this.operations.preview(r.userId, z.string().uuid().parse(id));
+57 -9
View File
@@ -33,6 +33,14 @@ export const scopeInput = z
(!v.includes('hidden_write') ||
(v.includes('hidden_read') && (v.includes('draft') || v.includes('write')))),
);
export const oauthDays = z.union([
z.literal(1),
z.literal(3),
z.literal(7),
z.literal(30),
z.literal(365),
z.literal(null),
]);
export const digest = (s: string) => createHash('sha256').update(s).digest('hex');
const secret = () => randomBytes(32).toString('base64url');
export function urls() {
@@ -63,6 +71,9 @@ export function urls() {
}
export function webLink(key: string, id: string) {
const u = new URL(urls().web);
u.pathname =
u.pathname.replace(/\/$/, '') +
(key === 'agent_authorization' ? '/agent/authorize' : '/agent/operation');
u.searchParams.set(key, id);
return u.toString();
}
@@ -156,11 +167,18 @@ export class AgentOAuth implements OAuthServerProvider {
resource: p.resource,
};
}
async consent(userId: string, id: string, approved: boolean, selected?: string[]) {
async consent(
userId: string,
id: string,
approved: boolean,
selected?: string[],
days: number | null = 30,
) {
return this.db.atomic(async () => {
await this.pending(id);
const row = await this.db.agentAuthorization.findUniqueOrThrow({ where: { id } });
const parameters = row.parameters as any;
const authorizationDays = oauthDays.parse(days);
const allowed = selected || ['read'];
scopeInput.parse(allowed);
if (allowed.some((scope: string) => !parameters.scopes.includes(scope)))
@@ -172,7 +190,7 @@ export class AgentOAuth implements OAuthServerProvider {
userId,
status: approved ? 'approved' : 'denied',
codeDigest: approved ? digest(code) : null,
parameters: { ...parameters, scopes: allowed },
parameters: { ...parameters, scopes: allowed, authorizationDays },
},
});
if (!changed.count) throw new BadRequestException('授权请求已处理');
@@ -202,18 +220,23 @@ export class AgentOAuth implements OAuthServerProvider {
selected: string[],
days: number | null,
clientId?: string,
authorizationDays: number | null = 30,
) {
if (clientId && days === null) throw new BadRequestException('OAuth 连接必须有期限');
const access = secret(),
refresh = clientId ? secret() : undefined,
sessionId = digest(secret());
const expiresAt = days === null ? null : new Date(Date.now() + days * 86400000),
refreshExpiresAt = clientId ? new Date(Date.now() + 30 * 86400000) : null;
const expiresAt = days === null ? null : new Date(Date.now() + days * 86400000);
const lifetime = oauthDays.parse(authorizationDays);
const refreshExpiresAt =
clientId && lifetime !== null ? new Date(Date.now() + lifetime * 86400000) : null;
await this.db.session.create({
data: {
id: sessionId,
userId,
expiresAt: refreshExpiresAt || expiresAt || new Date(Date.now() + 86400000),
expiresAt: clientId
? refreshExpiresAt || new Date(Date.now() + 30 * 86400000)
: expiresAt || new Date(Date.now() + 86400000),
},
});
const grant = await this.db.agentGrant.create({
@@ -274,6 +297,7 @@ export class AgentOAuth implements OAuthServerProvider {
p.scopes,
1 / 24,
client.client_id,
p.authorizationDays === undefined ? 30 : p.authorizationDays,
)
).tokens;
});
@@ -291,8 +315,7 @@ export class AgentOAuth implements OAuthServerProvider {
!row ||
row.clientId !== client.client_id ||
row.revokedAt ||
!row.refreshExpiresAt ||
row.refreshExpiresAt <= new Date()
(row.refreshExpiresAt && row.refreshExpiresAt <= new Date())
)
throw new InvalidGrantError('Invalid refresh token');
const current = row.scopes as string[];
@@ -303,21 +326,36 @@ export class AgentOAuth implements OAuthServerProvider {
throw new InvalidScopeError('Scope escalation rejected');
const access = secret(),
refresh = secret();
const accessExpiresAt = new Date(
Math.min(Date.now() + 3600000, row.refreshExpiresAt ? +row.refreshExpiresAt : Infinity),
);
const changed = await this.db.agentGrant.updateMany({
where: { id: row.id, refreshDigest: digest(token), revokedAt: null },
data: {
accessDigest: digest(access),
refreshDigest: digest(refresh),
expiresAt: new Date(Date.now() + 3600000),
expiresAt: accessExpiresAt,
scopes: selected || current,
},
});
if (!changed.count) throw new InvalidGrantError('Refresh token already used');
// Permanent OAuth keeps a bounded business session, renewed only after a valid refresh.
const sessionExpiresAt = row.refreshExpiresAt || new Date(Date.now() + 30 * 86400000);
await this.db.session.upsert({
where: { id: row.sessionId },
create: { id: row.sessionId, userId: row.userId, expiresAt: sessionExpiresAt },
update: {
expiresAt: sessionExpiresAt,
revealUntil: null,
backupDigest: null,
backupExpiresAt: null,
},
});
return {
access_token: access,
refresh_token: refresh,
token_type: 'Bearer',
expires_in: 3600,
expires_in: Math.max(0, Math.floor((+accessExpiresAt - Date.now()) / 1000)),
scope: (selected || current).join(' '),
};
});
@@ -328,6 +366,7 @@ export class AgentOAuth implements OAuthServerProvider {
if (
!row ||
row.revokedAt ||
(row.clientId && row.refreshExpiresAt && row.refreshExpiresAt <= new Date()) ||
(row.expiresAt ? row.expiresAt <= new Date() : !!row.clientId) ||
row.resource !== urls().resource.toString()
)
@@ -358,6 +397,15 @@ export class AgentOAuth implements OAuthServerProvider {
id,
...(userId ? { userId } : {}),
revokedAt: null,
AND: [
{
OR: [
{ clientId: null },
{ refreshExpiresAt: null },
{ refreshExpiresAt: { gt: new Date() } },
],
},
],
OR: [{ expiresAt: { gt: new Date() } }, { expiresAt: null, clientId: null }],
},
});
+85 -1
View File
@@ -219,10 +219,94 @@ export class AgentOperations {
if (!row) throw new NotFoundException('操作不存在');
const t = this.get(row.tool),
grant = await this.oauth.grant(row.grantId, userId);
let impact: unknown = { parameters: row.parameters, message: t.description };
const selected = grant.scopes as string[];
const ids = new Set<string>();
const collect = (value: unknown) => {
if (typeof value === 'string' && /^[a-f0-9-]{36}$/i.test(value)) ids.add(value);
else if (Array.isArray(value)) value.forEach(collect);
else if (value && typeof value === 'object') Object.values(value).forEach(collect);
};
collect(row.parameters);
const visible = { userId, ...(selected.includes('hidden_read') ? {} : { hidden: false }) };
const positions = await this.db.position.findMany({
where: { ...visible, id: { in: [...ids] } },
select: { id: true, name: true, currency: true, side: true, kind: true },
});
const schedules = await this.db.schedule.findMany({
where: { userId, id: { in: [...ids] } },
select: { id: true, name: true, sourceId: true, targetId: true },
});
const visibleScheduleIds = new Set(
(
await this.db.position.findMany({
where: {
...visible,
id: { in: schedules.flatMap((s) => [s.sourceId, ...(s.targetId ? [s.targetId] : [])]) },
},
select: { id: true },
})
).map((p) => p.id),
);
const references = Object.fromEntries([
...positions.map((p) => [p.id, p]),
...schedules
.filter(
(s) =>
visibleScheduleIds.has(s.sourceId) &&
(!s.targetId || visibleScheduleIds.has(s.targetId)),
)
.map((s) => [s.id, { name: s.name, kind: 'schedule' }]),
]);
const p = row.parameters as Record<string, any>;
let current: Record<string, unknown> | undefined;
if (['movement_update', 'movement_delete'].includes(row.tool)) {
const movement = await this.db.transfer.findFirst({
where: { id: p.id, userId, source: visible, target: visible },
include: { source: true, target: true },
});
if (movement) {
references[movement.sourceId] = {
name: movement.source.name,
currency: movement.source.currency,
};
references[movement.targetId] = {
name: movement.target.name,
currency: movement.target.currency,
};
current = {
operation: movement.operation,
sourceId: movement.sourceId,
targetId: movement.targetId,
amount: movement.amount.toString(),
received: movement.received.toString(),
fee: movement.fee.toString(),
date: new Date(+movement.effectiveDate + 8 * 3600000).toISOString().slice(0, 16),
notes: movement.notes,
};
}
} else if (['history_update', 'history_delete', 'balance_record'].includes(row.tool)) {
const revision = await this.db.revision.findFirst({
where: {
positionId: p.id,
position: visible,
...(p.revisionId ? { id: p.revisionId } : {}),
},
orderBy: [{ effectiveDate: 'desc' }, { sequence: 'desc' }],
});
if (revision)
current = {
id: p.id,
amount: revision.amount.toString(),
date: new Date(+revision.effectiveDate + 8 * 3600000).toISOString().slice(0, 16),
notes: revision.notes,
};
}
const impact = { parameters: row.parameters, references, current };
return {
...this.view(row),
impact,
connectionName: grant.name,
destructive: !!t.destructive,
description: t.description,
};
}
+1
View File
@@ -209,6 +209,7 @@ export class AgentTransport {
name: g.name,
scopes: g.scopes,
expiresAt: g.expiresAt,
authorizationExpiresAt: g.clientId ? g.refreshExpiresAt : g.expiresAt,
resource: g.resource,
permission: (g.scopes as string[]).includes('write')
? 'write'
+67
View File
@@ -158,6 +158,63 @@ export class PortfolioBusinessService {
});
return { ok: true };
}
async deletion(r: UserRequest, id: string) {
const p = await this.own(r.userId, id, r.revealed);
if (p.kind !== 'account') throw new BadRequestException('此功能仅用于删除账户');
const [historyCount, movementCount, scheduleCount, linkCount] = await Promise.all([
this.db.revision.count({ where: { positionId: id } }),
this.db.transfer.count({
where: { userId: r.userId, OR: [{ sourceId: id }, { targetId: id }] },
}),
this.db.schedule.count({
where: { userId: r.userId, OR: [{ sourceId: id }, { targetId: id }] },
}),
this.db.positionLink.count({ where: { OR: [{ sourceId: id }, { targetId: id }] } }),
]);
return {
name: p.name,
historyCount,
movementCount,
scheduleCount,
linkCount,
canDelete: movementCount === 0 && scheduleCount === 0,
};
}
async remove(r: UserRequest, id: string, raw: unknown) {
const input = z
.object({ confirmation: z.string().min(1).max(100) })
.strict()
.parse(raw);
const result = await this.db.serial(async (tx) => {
await tx.$queryRaw(
Prisma.sql`SELECT id FROM Position WHERE id = ${id} AND userId = ${r.userId} FOR UPDATE`,
);
const p = await tx.position.findFirst({
where: { id, userId: r.userId, ...(r.revealed ? {} : { hidden: false }) },
});
if (!p) throw new NotFoundException('账户不存在');
if (p.kind !== 'account') throw new BadRequestException('此功能仅用于删除账户');
if (input.confirmation !== p.name)
throw new BadRequestException('请输入完整账户名称确认删除');
// Paired movements must be removed through replay, never via cascade.
if (
await tx.transfer.count({
where: { userId: r.userId, OR: [{ sourceId: id }, { targetId: id }] },
})
)
throw new ConflictException('账户存在资金往来,请先撤销相关记录,或选择归档保留历史');
if (
await tx.schedule.count({
where: { userId: r.userId, OR: [{ sourceId: id }, { targetId: id }] },
})
)
throw new ConflictException('账户被定时计划使用,请先删除相关计划,或选择归档');
await tx.position.delete({ where: { id } });
return { ok: true };
});
this.fx.invalidate(r.userId);
return result;
}
async revise(r: UserRequest, id: string, b: unknown) {
const v = revisionInput.parse(b);
if (pairedReasons.includes(v.reason)) throw new BadRequestException('请使用账户转账接口');
@@ -351,6 +408,16 @@ export class PortfolioController {
) {
return this.service.edit(r, id, b);
}
@Get('positions/:id/deletion') async deletion(@Req() r: UserRequest, @Param('id') id: string) {
return this.service.deletion(r, id);
}
@Delete('positions/:id') async remove(
@Req() r: UserRequest,
@Param('id') id: string,
@Body() b: unknown,
) {
return this.service.remove(r, id, b);
}
@Post('positions/:id/revisions') async revise(
@Req() r: UserRequest,
@Param('id') id: string,
@@ -0,0 +1,249 @@
import 'dotenv/config';
import { test } from 'node:test';
import assert from 'node:assert/strict';
import { randomUUID, randomBytes, createHash } from 'node:crypto';
import { PrismaClient } from '@prisma/client';
import { today } from '../src/validation';
const base = process.env.TEST_API_URL || 'http://127.0.0.1:3100/api';
const origin = process.env.WEB_ORIGIN === '*' ? 'http://localhost:5173' : process.env.WEB_ORIGIN!;
test('real REST account deletion preserves paired balances, blocks schedules, cascades own history and isolates users', async () => {
const db = new PrismaClient(),
users: string[] = [];
async function fixture() {
const u = await db.user.create({
data: { username: 'delete_' + randomUUID(), passwordHash: 'unused', idleMinutes: 0 },
});
users.push(u.id);
const token = randomBytes(32).toString('hex');
const sessionId = createHash('sha256').update(token).digest('hex');
await db.session.create({
data: { id: sessionId, userId: u.id, expiresAt: new Date(Date.now() + 3600000) },
});
return { id: u.id, cookie: 'wp_session=' + token, sessionId };
}
async function call(u: any, path: string, method = 'GET', data?: unknown) {
const r = await fetch(base + path, {
method,
headers: {
Cookie: u.cookie,
Origin: origin,
...(data ? { 'Content-Type': 'application/json' } : {}),
},
body: data ? JSON.stringify(data) : undefined,
});
return { status: r.status, data: await r.json() };
}
try {
const a = await fixture(),
b = await fixture();
const input = {
kind: 'account',
side: 'asset',
category: 'cash',
name: '删除测试账户',
currency: 'CNY',
amount: '100',
date: today(),
};
const first = await call(a, '/positions', 'POST', input);
assert.equal(first.status, 201);
const id = first.data.id;
assert.equal((await call(b, '/positions/' + id + '/deletion')).status, 404);
assert.equal(
(await call(b, '/positions/' + id, 'DELETE', { confirmation: input.name })).status,
404,
);
assert.equal(
(await call(a, '/positions/' + id, 'DELETE', { confirmation: '错误名称' })).status,
400,
);
assert.equal(
(
await call(a, '/positions/' + id + '/revisions', 'POST', {
amount: '125.87654321',
date: today(),
})
).status,
201,
);
const debt = await call(a, '/positions', 'POST', {
...input,
kind: 'debt',
side: 'liability',
name: '关联债务',
amount: '10',
});
assert.equal(debt.status, 201);
assert.equal(
(await call(a, '/positions/' + debt.data.id + '/links', 'PUT', { targetIds: [id] })).status,
200,
);
const impact = await call(a, '/positions/' + id + '/deletion');
assert.equal(impact.data.historyCount, 2);
assert.equal(impact.data.linkCount, 1);
assert.equal(impact.data.canDelete, true);
assert.equal(
(await call(a, '/positions/' + id, 'DELETE', { confirmation: input.name })).status,
200,
);
assert.equal((await call(a, '/positions/' + id)).status, 404);
assert.equal(await db.revision.count({ where: { positionId: id } }), 0);
assert.equal(await db.positionLink.count({ where: { targetId: id } }), 0);
const overview = await call(a, '/overview');
assert.equal(overview.data.assets, '0.00');
assert.equal(overview.data.liabilities, '10.00');
assert.ok(!(await call(a, '/history')).data.items.some((h: any) => h.positionId === id));
assert.ok(
!(await call(a, '/calendar/day?date=' + today())).data.items.some(
(h: any) => h.positionId === id,
),
);
const source = (await call(a, '/positions', 'POST', input)).data.id;
const target = (
await call(a, '/positions', 'POST', { ...input, name: '收款测试账户', amount: '0' })
).data.id;
const movement = await call(a, '/transfers', 'POST', {
sourceId: source,
targetId: target,
amount: '20',
received: '20',
date: today(),
});
assert.equal(movement.status, 201);
assert.equal((await call(a, '/positions/' + source + '/deletion')).data.canDelete, false);
assert.equal(
(await call(a, '/positions/' + source, 'DELETE', { confirmation: input.name })).status,
409,
);
assert.equal((await call(a, '/positions/' + target)).data.amount, '20');
assert.equal((await call(a, '/transfers/' + movement.data.id, 'DELETE')).status, 200);
assert.equal((await call(a, '/positions/' + target)).data.amount, '0');
const schedule = await call(a, '/schedules', 'POST', {
name: '未来计划',
operation: 'expense',
sourceId: source,
amount: '5',
nextAt: '2099-01-01T10:00',
intervalDays: 0,
});
assert.equal(schedule.status, 201);
assert.equal((await call(a, '/positions/' + source + '/deletion')).data.scheduleCount, 1);
assert.equal(
(await call(a, '/positions/' + source, 'DELETE', { confirmation: input.name })).status,
409,
);
assert.equal((await call(a, '/schedules/' + schedule.data.id, 'DELETE')).status, 200);
assert.equal(
(await call(a, '/positions/' + source, 'DELETE', { confirmation: input.name })).status,
200,
);
const hidden = (await call(a, '/positions', 'POST', { ...input, hidden: true })).data.id;
assert.equal((await call(a, '/positions/' + hidden + '/deletion')).status, 404);
assert.equal(
(await call(a, '/positions/' + hidden, 'DELETE', { confirmation: input.name })).status,
404,
);
await db.session.update({
where: { id: a.sessionId },
data: { revealUntil: new Date(Date.now() + 600000) },
});
assert.equal(
(await call(a, '/positions/' + hidden, 'DELETE', { confirmation: input.name })).status,
200,
);
assert.equal(
(await call(a, '/positions/' + debt.data.id, 'DELETE', { confirmation: '关联债务' })).status,
400,
);
} finally {
await db.user.deleteMany({ where: { id: { in: users } } });
await db.$disconnect();
}
});
test('draft review resolves only referenced visible names and canonical standalone confirmation URL', async () => {
const db = new PrismaClient();
let userId = '';
try {
const u = await db.user.create({
data: { username: 'review_' + randomUUID(), passwordHash: 'unused', idleMinutes: 0 },
});
userId = u.id;
const token = randomBytes(32).toString('hex'),
sid = createHash('sha256').update(token).digest('hex');
await db.session.create({
data: { id: sid, userId, expiresAt: new Date(Date.now() + 3600000) },
});
const grant = await db.agentGrant.create({
data: {
userId,
name: '草稿审阅测试',
scopes: ['read', 'draft'],
resource: process.env.MCP_PUBLIC_URL || 'http://localhost:3100/mcp',
sessionId: sid,
accessDigest: createHash('sha256').update(randomUUID()).digest('hex'),
expiresAt: new Date(Date.now() + 3600000),
},
});
const visible = await db.position.create({
data: {
userId,
name: '可见账户',
kind: 'account',
side: 'asset',
category: 'cash',
currency: 'CNY',
notes: '',
},
});
const hidden = await db.position.create({
data: {
userId,
name: '隐藏名称不能泄露',
hidden: true,
kind: 'account',
side: 'asset',
category: 'cash',
currency: 'CNY',
notes: '',
},
});
const unrelated = await db.position.create({
data: {
userId,
name: '无关账户',
kind: 'account',
side: 'asset',
category: 'cash',
currency: 'CNY',
notes: '',
},
});
const op = await db.agentOperation.create({
data: {
userId,
grantId: grant.id,
key: randomUUID(),
hash: '0'.repeat(64),
snapshot: '0'.repeat(64),
tool: 'debt_links_set',
parameters: { id: visible.id, targetIds: [hidden.id] },
expiresAt: new Date(Date.now() + 600000),
},
});
const res = await fetch(base + '/agent/operations/' + op.id, {
headers: { Cookie: 'wp_session=' + token },
});
assert.equal(res.status, 200);
const preview = await res.json();
assert.equal(preview.connectionName, '草稿审阅测试');
assert.equal(preview.impact.references[visible.id].name, '可见账户');
assert.ok(!preview.impact.references[hidden.id]);
assert.ok(!preview.impact.references[unrelated.id]);
assert.equal(new URL(preview.confirmationUrl).pathname, '/agent/operation');
} finally {
if (userId) await db.user.deleteMany({ where: { id: userId } });
await db.$disconnect();
}
});
+97
View File
@@ -0,0 +1,97 @@
import { test } from 'node:test';
import assert from 'node:assert/strict';
import { PortfolioBusinessService } from '../src/portfolio';
import { NotFoundException, ConflictException, BadRequestException } from '@nestjs/common';
function fixture() {
const row = { id: 'account', userId: 'owner', name: '测试账户', kind: 'account', hidden: false };
let movements = 0,
schedules = 0,
deleted = false,
invalidated = false;
const db: any = {
serial: async (fn: any) => fn(db),
$queryRaw: async () => [],
position: {
findFirst: async ({ where }: any) =>
where.id === row.id &&
where.userId === row.userId &&
!(where.hidden === false && row.hidden) &&
!deleted
? row
: null,
delete: async () => {
deleted = true;
return row;
},
},
transfer: { count: async () => movements },
schedule: { count: async () => schedules },
};
const service = new PortfolioBusinessService(
db,
{
invalidate: () => {
invalidated = true;
},
} as any,
{} as any,
{} as any,
);
return {
service,
row,
setMovements: (v: number) => {
movements = v;
},
setSchedules: (v: number) => {
schedules = v;
},
state: () => ({ deleted, invalidated }),
};
}
const owner = { userId: 'owner', revealed: false } as any;
test('account deletion checks ownership and hidden visibility before deleting or invalidating', async () => {
const f = fixture();
await assert.rejects(
() => f.service.remove({ ...owner, userId: 'other' }, 'account', { confirmation: '测试账户' }),
NotFoundException,
);
f.row.hidden = true;
await assert.rejects(
() => f.service.remove(owner, 'account', { confirmation: '测试账户' }),
NotFoundException,
);
assert.deepEqual(f.state(), { deleted: false, invalidated: false });
await f.service.remove({ ...owner, revealed: true }, 'account', { confirmation: '测试账户' });
assert.deepEqual(f.state(), { deleted: true, invalidated: true });
});
test('wrong confirmation, non-accounts, paired movements and schedules cannot cascade', async () => {
const f = fixture();
await assert.rejects(
() => f.service.remove(owner, 'account', { confirmation: '错误名称' }),
BadRequestException,
);
f.row.kind = 'asset';
await assert.rejects(
() => f.service.remove(owner, 'account', { confirmation: '测试账户' }),
BadRequestException,
);
f.row.kind = 'account';
f.setMovements(1);
await assert.rejects(
() => f.service.remove(owner, 'account', { confirmation: '测试账户' }),
ConflictException,
);
f.setMovements(0);
f.setSchedules(1);
await assert.rejects(
() => f.service.remove(owner, 'account', { confirmation: '测试账户' }),
ConflictException,
);
assert.deepEqual(f.state(), { deleted: false, invalidated: false });
f.setSchedules(0);
assert.deepEqual(await f.service.remove(owner, 'account', { confirmation: '测试账户' }), {
ok: true,
});
assert.deepEqual(f.state(), { deleted: true, invalidated: true });
});
+282
View File
@@ -0,0 +1,282 @@
import 'dotenv/config';
import { test } from 'node:test';
import assert from 'node:assert/strict';
import { randomUUID, randomBytes, createHash } from 'node:crypto';
import { PrismaClient } from '@prisma/client';
const root = process.env.TEST_API_URL?.replace(/\/api$/, '') || 'http://127.0.0.1:3100';
const resource = process.env.MCP_PUBLIC_URL || 'http://localhost:3100/mcp';
const origin = process.env.WEB_ORIGIN === '*' ? 'http://localhost:5173' : process.env.WEB_ORIGIN!;
test('OAuth consent persists selected lifetime; refresh rotates and cannot extend authorization or access past its end', async () => {
const db = new PrismaClient();
let userId = '',
clientId = '';
try {
const u = await db.user.create({
data: { username: 'oauth_days_' + randomUUID(), passwordHash: 'unused', idleMinutes: 0 },
});
userId = u.id;
const session = randomBytes(32).toString('hex'),
sid = createHash('sha256').update(session).digest('hex');
await db.session.create({
data: { id: sid, userId, expiresAt: new Date(Date.now() + 3600000) },
});
const cookie = 'wp_session=' + session;
clientId = randomUUID();
const callback = 'http://127.0.0.1:47891/callback';
await db.agentClient.create({
data: {
id: clientId,
metadata: {
client_id: clientId,
client_name: '期限测试',
redirect_uris: [callback],
token_endpoint_auth_method: 'none',
grant_types: ['authorization_code', 'refresh_token'],
response_types: ['code'],
},
},
});
async function authorization() {
const verifier = randomBytes(32).toString('base64url'),
id = randomUUID();
await db.agentAuthorization.create({
data: {
id,
clientId,
expiresAt: new Date(Date.now() + 600000),
parameters: {
redirectUri: callback,
resource,
scopes: ['read', 'draft'],
codeChallenge: createHash('sha256').update(verifier).digest('base64url'),
},
},
});
return { id, verifier };
}
async function consent(id: string, days?: number) {
const r = await fetch(root + '/api/agent/authorizations/' + id, {
method: 'POST',
headers: { Cookie: cookie, Origin: origin, 'Content-Type': 'application/json' },
body: JSON.stringify({
approve: true,
scopes: ['read', 'draft'],
...(days === undefined ? {} : { days }),
}),
});
return { status: r.status, data: await r.json() };
}
async function token(data: Record<string, string>) {
const r = await fetch(root + '/token', {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: new URLSearchParams({ client_id: clientId, resource, ...data }),
});
return { status: r.status, data: await r.json() };
}
for (const days of [1, 3, 7, 30, 365, undefined]) {
const a = await authorization(),
approved = await consent(a.id, days);
assert.equal(approved.status, 201);
const code = new URL(approved.data.redirect).searchParams.get('code')!;
const issued = await token({
grant_type: 'authorization_code',
code,
code_verifier: a.verifier,
redirect_uri: callback,
});
assert.equal(issued.status, 200);
assert.equal(issued.data.expires_in, 3600);
let grant = await db.agentGrant.findUniqueOrThrow({
where: {
accessDigest: createHash('sha256').update(issued.data.access_token).digest('hex'),
},
});
const ending = +grant.refreshExpiresAt!;
assert.ok(Math.abs(ending - Date.now() - (days ?? 30) * 86400000) < 5000);
const sessionRow = await db.session.findUniqueOrThrow({ where: { id: grant.sessionId } });
assert.equal(+sessionRow.expiresAt, ending);
const refreshed = await token({
grant_type: 'refresh_token',
refresh_token: issued.data.refresh_token,
});
assert.equal(refreshed.status, 200);
grant = await db.agentGrant.findUniqueOrThrow({ where: { id: grant.id } });
assert.equal(+grant.refreshExpiresAt!, ending);
const nearEnd = new Date(Date.now() + 50000);
await db.agentGrant.update({ where: { id: grant.id }, data: { refreshExpiresAt: nearEnd } });
const finalRefresh = await token({
grant_type: 'refresh_token',
refresh_token: refreshed.data.refresh_token,
});
assert.equal(finalRefresh.status, 200);
assert.ok(finalRefresh.data.expires_in <= 50);
grant = await db.agentGrant.findUniqueOrThrow({ where: { id: grant.id } });
assert.equal(+grant.expiresAt!, +nearEnd);
await db.agentGrant.update({
where: { id: grant.id },
data: { refreshExpiresAt: new Date(0) },
});
assert.equal(
(
await token({
grant_type: 'refresh_token',
refresh_token: finalRefresh.data.refresh_token,
})
).status,
400,
);
const request = await fetch(resource, {
method: 'POST',
headers: {
Authorization: 'Bearer ' + finalRefresh.data.access_token,
'Content-Type': 'application/json',
},
body: '{}',
});
assert.equal(request.status, 401);
}
for (const days of [0, 2, 366]) {
const a = await authorization();
assert.equal((await consent(a.id, days)).status, 400);
assert.equal(
(await db.agentAuthorization.findUniqueOrThrow({ where: { id: a.id } })).status,
'pending',
);
}
} finally {
if (userId) await db.user.deleteMany({ where: { id: userId } });
if (clientId) {
await db.agentAuthorization.deleteMany({ where: { clientId } });
await db.agentClient.deleteMany({ where: { id: clientId } });
}
await db.$disconnect();
}
});
test('permanent OAuth rotates credentials, renews deleted business session and remains revocable', async () => {
const db = new PrismaClient();
let userId = '',
clientId = '';
try {
const u = await db.user.create({
data: { username: 'oauth_permanent_' + randomUUID(), passwordHash: 'unused', idleMinutes: 0 },
});
userId = u.id;
const cookieToken = randomBytes(32).toString('hex'),
sid = createHash('sha256').update(cookieToken).digest('hex');
await db.session.create({
data: { id: sid, userId, expiresAt: new Date(Date.now() + 3600000) },
});
clientId = randomUUID();
const redirectUri = 'http://127.0.0.1:47891/callback';
await db.agentClient.create({
data: {
id: clientId,
metadata: {
client_id: clientId,
client_name: '永久授权测试',
redirect_uris: [redirectUri],
token_endpoint_auth_method: 'none',
grant_types: ['authorization_code', 'refresh_token'],
response_types: ['code'],
},
},
});
const id = randomUUID(),
verifier = randomBytes(32).toString('base64url');
await db.agentAuthorization.create({
data: {
id,
clientId,
parameters: {
redirectUri,
resource,
scopes: ['read'],
codeChallenge: createHash('sha256').update(verifier).digest('base64url'),
},
expiresAt: new Date(Date.now() + 600000),
},
});
const res = await fetch(root + '/api/agent/authorizations/' + id, {
method: 'POST',
headers: {
Cookie: 'wp_session=' + cookieToken,
Origin: origin,
'Content-Type': 'application/json',
},
body: JSON.stringify({ approve: true, scopes: ['read'], days: null }),
});
assert.equal(res.status, 201);
const consent = await res.json();
async function token(data: Record<string, string>) {
const r = await fetch(root + '/token', {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: new URLSearchParams({ client_id: clientId, resource, ...data }),
});
return { status: r.status, data: await r.json() };
}
const issued = await token({
grant_type: 'authorization_code',
code: new URL(consent.redirect).searchParams.get('code')!,
code_verifier: verifier,
redirect_uri: redirectUri,
});
assert.equal(issued.status, 200);
assert.equal(issued.data.expires_in, 3600);
const grant = await db.agentGrant.findUniqueOrThrow({
where: { accessDigest: createHash('sha256').update(issued.data.access_token).digest('hex') },
});
assert.equal(grant.refreshExpiresAt, null);
assert.ok(grant.expiresAt);
assert.equal(
((await db.agentAuthorization.findUniqueOrThrow({ where: { id } })).parameters as any)
.authorizationDays,
null,
);
await db.session.delete({ where: { id: grant.sessionId } });
const refreshed = await token({
grant_type: 'refresh_token',
refresh_token: issued.data.refresh_token,
});
assert.equal(refreshed.status, 200);
const renewed = await db.session.findUniqueOrThrow({ where: { id: grant.sessionId } });
assert.ok(+renewed.expiresAt > Date.now() + 29 * 86400000);
assert.equal(
(await db.agentGrant.findUniqueOrThrow({ where: { id: grant.id } })).refreshExpiresAt,
null,
);
assert.equal(
(await token({ grant_type: 'refresh_token', refresh_token: issued.data.refresh_token }))
.status,
400,
);
const revoke = await fetch(root + '/revoke', {
method: 'POST',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: new URLSearchParams({ client_id: clientId, token: refreshed.data.access_token }),
});
assert.equal(revoke.status, 200);
assert.equal(
(await token({ grant_type: 'refresh_token', refresh_token: refreshed.data.refresh_token }))
.status,
400,
);
const denied = await fetch(resource, {
method: 'POST',
headers: {
Authorization: 'Bearer ' + refreshed.data.access_token,
'Content-Type': 'application/json',
},
body: '{}',
});
assert.equal(denied.status, 401);
} finally {
if (userId) await db.user.deleteMany({ where: { id: userId } });
if (clientId) {
await db.agentAuthorization.deleteMany({ where: { clientId } });
await db.agentClient.deleteMany({ where: { id: clientId } });
}
await db.$disconnect();
}
});