@sleep2agi/commhub-server 0.9.0-preview.213 → 0.9.0-preview.215
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sleep2agi/commhub-server",
|
|
3
|
-
"version": "0.9.0-preview.
|
|
3
|
+
"version": "0.9.0-preview.215",
|
|
4
4
|
"description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and MCP tools (17 collaboration-core + node/provider ops tools; authoritative list: docs-site/docs/api/mcp-tools.md).",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.ts",
|
|
@@ -614,6 +614,20 @@ describe("#2719 凭据台账", () => {
|
|
|
614
614
|
expect(bound.unbound_node).toBe(false);
|
|
615
615
|
});
|
|
616
616
|
|
|
617
|
+
// 🔴 线上第一次真实调用就抓到的 bug:`?limit=5` 时 summary.total 报 5,
|
|
618
|
+
// 而那个网络实际有 580 个令牌。分页只该影响 tokens 数组,不该影响计数。
|
|
619
|
+
test("分页只截断 tokens,不影响 summary(summary 必须是全量)", async () => {
|
|
620
|
+
const full = await call(user.boss.token, "GET", `/api/networks/${net}/token-ledger?limit=1000`);
|
|
621
|
+
expect(full.status).toBe(200);
|
|
622
|
+
const page = await call(user.boss.token, "GET", `/api/networks/${net}/token-ledger?limit=1`);
|
|
623
|
+
expect(page.status).toBe(200);
|
|
624
|
+
expect(page.body.tokens.length).toBe(1);
|
|
625
|
+
expect(page.body.returned).toBe(1);
|
|
626
|
+
// 两个请求的 summary 必须完全一样
|
|
627
|
+
expect(page.body.summary).toEqual(full.body.summary);
|
|
628
|
+
expect(page.body.summary.total).toBeGreaterThan(1);
|
|
629
|
+
});
|
|
630
|
+
|
|
617
631
|
test("成员(非 owner/admin)看不到;节点令牌也看不到", async () => {
|
|
618
632
|
const r = await call(user.mem.token, "GET", `/api/networks/${net}/token-ledger`);
|
|
619
633
|
expect(r.status).toBe(403);
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { afterAll, beforeAll, expect, test } from "bun:test";
|
|
2
|
+
import { mkdtempSync } from "node:fs";
|
|
3
|
+
|
|
4
|
+
process.env.COMMHUB_DB ||= `${mkdtempSync("/tmp/req-echo-")}/hub.db`;
|
|
5
|
+
|
|
6
|
+
let hub: any;
|
|
7
|
+
let base = "";
|
|
8
|
+
let owner: any;
|
|
9
|
+
let outsider: any;
|
|
10
|
+
|
|
11
|
+
async function rest(token: string, path: string) {
|
|
12
|
+
const r = await fetch(`${base}${path}`, { headers: { Authorization: `Bearer ${token}` } });
|
|
13
|
+
return { status: r.status, body: await r.json() as any };
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
beforeAll(async () => {
|
|
17
|
+
const { register } = await import("./auth.js");
|
|
18
|
+
owner = register("echo_owner", "Fixture-Strong1!");
|
|
19
|
+
outsider = register("echo_outsider", "Fixture-Strong1!");
|
|
20
|
+
const { bootServer } = await import("./server.js");
|
|
21
|
+
hub = bootServer({ port: 0, hostname: "127.0.0.1" });
|
|
22
|
+
base = `http://127.0.0.1:${hub.port}`;
|
|
23
|
+
await rest(owner.token, `/api/requirements/projects?network_id=${owner.network_id}`); // warm
|
|
24
|
+
}, 60_000);
|
|
25
|
+
afterAll(() => hub?.stop(true));
|
|
26
|
+
|
|
27
|
+
// #2899 —— 三条复核的共同点:响应码不携带「你问的是不是这个网络」。
|
|
28
|
+
// 只加一个回显字段,不改鉴权、不改返回内容、不引入新的 4xx。
|
|
29
|
+
test("projects 列表回显实际使用的 network_id", async () => {
|
|
30
|
+
const r = await rest(owner.token, `/api/requirements/projects?network_id=${owner.network_id}`);
|
|
31
|
+
expect(r.status).toBe(200);
|
|
32
|
+
expect(r.body.network_id).toBe(owner.network_id);
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
test("不带 network_id(单一成员可被自动推断)时,回显推断出来的那个网络", async () => {
|
|
36
|
+
const r = await rest(owner.token, "/api/requirements/projects");
|
|
37
|
+
expect(r.status).toBe(200);
|
|
38
|
+
expect(r.body.network_id).toBe(owner.network_id);
|
|
39
|
+
// 没有跨网泄漏:项目都属于回显的那个网络
|
|
40
|
+
for (const p of r.body.projects) expect(p.network_id ?? owner.network_id).toBe(owner.network_id);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
test("节点令牌传别人网络的 id 时,回显的是**它自己**的网络(调用方可据此发现不一致)", async () => {
|
|
44
|
+
const { db } = await import("./db.js");
|
|
45
|
+
const nodeId = `n_echo_${Date.now()}`;
|
|
46
|
+
db.run(`INSERT INTO nodes(node_id,node_name,alias,network_id,owner_user_id,lifecycle_state)
|
|
47
|
+
VALUES(?1,?1,?1,?2,?3,'active')`, [nodeId, owner.network_id, owner.user.user_id]);
|
|
48
|
+
const { generateNetworkToken, hashToken } = await import("./db.js");
|
|
49
|
+
const raw = generateNetworkToken();
|
|
50
|
+
db.run(`INSERT INTO api_tokens(token_id,user_id,network_id,scope,name,token_hash,bound_node_id,node_identity_epoch)
|
|
51
|
+
VALUES(?1,?2,?3,'network','node:echo',?4,?1,2)`, [nodeId, owner.user.user_id, owner.network_id, hashToken(raw)]);
|
|
52
|
+
|
|
53
|
+
const r = await rest(raw, "/api/requirements/projects?network_id=net_someone_else");
|
|
54
|
+
expect(r.status).toBe(200);
|
|
55
|
+
// 关键:不是 net_someone_else,而是令牌自己的网络 —— 客户端可据此判定「拿到的不是我问的」
|
|
56
|
+
expect(r.body.network_id).toBe(owner.network_id);
|
|
57
|
+
});
|
package/src/requirements.ts
CHANGED
|
@@ -431,7 +431,22 @@ async function handleProjects(ctx: RequirementsRequestContext): Promise<Response
|
|
|
431
431
|
// (canWrite + projectRef 拒归档 + canUseProject)。只加字段;客户端据此只列能编辑的项目(app 任务页审计 L13)。
|
|
432
432
|
const writable = canWrite(ctx, networkId);
|
|
433
433
|
const canUse = projectUseResolver(taskCaller(ctx), networkId);
|
|
434
|
-
|
|
434
|
+
// #2899 —— 回显**实际使用的** network_id。
|
|
435
|
+
//
|
|
436
|
+
// 现场(2026-10-30,两个独立复核):
|
|
437
|
+
// ① 用户令牌 + 非成员 network_id → 200 + 空数组
|
|
438
|
+
// ② 用户令牌属于多网络、不带 network_id → 400 network_id_required(这才是当时那个 400)
|
|
439
|
+
// ③ 网络作用域节点令牌 + 任意 network_id → 200 + **它自己网络的数据**
|
|
440
|
+
// 三条共同点:响应码不携带「你问的是不是这个网络」。
|
|
441
|
+
// ③ 尤其危险 —— 客户端以为在看 A 的项目,实际拿到的是 B 的(自己的)。
|
|
442
|
+
//
|
|
443
|
+
// 只加一个回显字段:不改鉴权、不改返回内容、不引入新的 4xx。
|
|
444
|
+
// 调用方(dashboard / MCP)可以据此判定「拿到的到底是谁的网络」。
|
|
445
|
+
return Response.json({
|
|
446
|
+
ok: true,
|
|
447
|
+
network_id: networkId,
|
|
448
|
+
projects: rows.map((row) => ({ ...projectPublic(row), viewer_can: { edit: writable && !row.archived && canUse(row.project_id) } })),
|
|
449
|
+
});
|
|
435
450
|
}
|
|
436
451
|
if (!canWrite(ctx, networkId)) return jsonError("permission_denied", 403);
|
|
437
452
|
// 项目管理(建 / 改名 / 归档 / 删)只给不受任务范围限制的人。
|
package/src/server.ts
CHANGED
|
@@ -3256,20 +3256,42 @@ return Bun.serve({
|
|
|
3256
3256
|
top_tools: tools.slice(0, 3),
|
|
3257
3257
|
};
|
|
3258
3258
|
});
|
|
3259
|
-
|
|
3259
|
+
// 🔴 summary 必须按**全量**算,不能按这一页算。
|
|
3260
|
+
// 2026-10-30 上线后第一次真实调用就抓到了:`?limit=5` 时 summary.total 报 5,
|
|
3261
|
+
// 而那个网络实际有 580 个令牌 —— 管理员会以为「只有 5 把钥匙」。
|
|
3262
|
+
// 分页只应影响 tokens 数组,不应影响计数。
|
|
3263
|
+
const agg = db.get<{ total: number | string; bound: number | string; unbound_node: number | string; unbound_node_in_use: number | string; unused_24h: number | string }>(
|
|
3264
|
+
`SELECT
|
|
3265
|
+
COUNT(*) AS total,
|
|
3266
|
+
SUM(CASE WHEN bound_node_id IS NOT NULL THEN 1 ELSE 0 END) AS bound,
|
|
3267
|
+
SUM(CASE WHEN name LIKE 'node:%' AND bound_node_id IS NULL THEN 1 ELSE 0 END) AS unbound_node,
|
|
3268
|
+
SUM(CASE WHEN name LIKE 'node:%' AND bound_node_id IS NULL
|
|
3269
|
+
AND EXISTS (SELECT 1 FROM node_tool_calls k
|
|
3270
|
+
WHERE k.node_id = 'token:' || t.token_id AND k.hour >= ?2)
|
|
3271
|
+
THEN 1 ELSE 0 END) AS unbound_node_in_use,
|
|
3272
|
+
SUM(CASE WHEN NOT EXISTS (SELECT 1 FROM node_tool_calls k
|
|
3273
|
+
WHERE k.node_id = 'token:' || t.token_id AND k.hour >= ?2)
|
|
3274
|
+
THEN 1 ELSE 0 END) AS unused_24h
|
|
3275
|
+
FROM api_tokens t
|
|
3276
|
+
WHERE t.network_id = ?1 AND t.revoked_at IS NULL`,
|
|
3277
|
+
networkId, sinceHour,
|
|
3278
|
+
);
|
|
3279
|
+
const num = (v: number | string | null | undefined) => Number(v ?? 0);
|
|
3260
3280
|
return withCors(req, Response.json({
|
|
3261
3281
|
ok: true,
|
|
3262
3282
|
network_id: networkId,
|
|
3263
3283
|
since: new Date(Date.now() - 86_400_000).toISOString(),
|
|
3264
3284
|
limit,
|
|
3285
|
+
// summary 是全量;tokens 只是这一页(returned 一眼能看出被截断没有)
|
|
3265
3286
|
summary: {
|
|
3266
|
-
total:
|
|
3267
|
-
bound:
|
|
3268
|
-
unbound_node:
|
|
3287
|
+
total: num(agg?.total),
|
|
3288
|
+
bound: num(agg?.bound),
|
|
3289
|
+
unbound_node: num(agg?.unbound_node),
|
|
3269
3290
|
// 「名义上还在、实际上没人用」的数量:这才是能不能吊销的判据
|
|
3270
|
-
unused_24h:
|
|
3271
|
-
unbound_node_in_use:
|
|
3291
|
+
unused_24h: num(agg?.unused_24h),
|
|
3292
|
+
unbound_node_in_use: num(agg?.unbound_node_in_use),
|
|
3272
3293
|
},
|
|
3294
|
+
returned: tokens.length,
|
|
3273
3295
|
tokens,
|
|
3274
3296
|
}));
|
|
3275
3297
|
}
|