feat(web): token 数以 K 输入显示,已存凭证显示掩码占位(FIX-8)
- 新增 UnitInput 与 kind=tokens:上下文预算、单次 token 上限、自定义模型上下文窗口以 K 输入(允许小数),存储仍为原始 token 数;校验与提示用 K 表述;列表/详情 token 数统一 K/M 简写(formatTokens) - 新增 SecretInput 与 kind=secret:已保存时显示「已设置 ••••••••」(有服务端掩码时带末 4 位),聚焦直接输入替换,留空保持,「清除」确认后保存生效;替换模型服务、TMDB、网页搜索、下载器、媒体服务器、浏览器服务、站点账号、Passkey、本机 Token 各处 - 统一只写凭证服务端语义:省略或空串 = 不变,null = 清除(contracts secretInput);下载器/媒体服务器新增清除;站点凭证同类更新可留空保持密码/Cookie/API Key/TOTP,TOTP 可 null 清除,不再误删 TOTP 与 UA - contextBudget 最小值 4096→4000、contextWindow 1024→1000,便于按 K 填写 - 测试:换算与校验、SecretInput 渲染与状态、各接口留空不变/显式清除 Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
rootandClaude Opus 5.5 committed
1 parent
68f53390f6
commit
fa344a7184
39 files changed
+1175
-232
No files matched your search
@@ -0,0 +1,144 @@
|
||||
import { afterAll, beforeAll, describe, expect, it } from "vitest";
|
||||
import { DEV_KEY, json } from "../helpers.ts";
|
||||
import { bearer, createHarness, type Harness, pgAvailable } from "./harness.ts";
|
||||
|
||||
// FIX-8 只写凭证统一语义:省略或空串 = 保持原值,null = 清除,非空 = 替换;明文不出 API。
|
||||
|
||||
const hasPg = await pgAvailable();
|
||||
|
||||
describe.skipIf(!hasPg)("只写凭证:留空不变 / 显式清除(真实 PG)", () => {
|
||||
let h: Harness;
|
||||
let admin: ReturnType<typeof bearer>;
|
||||
|
||||
beforeAll(async () => {
|
||||
h = await createHarness({ engine: false });
|
||||
admin = bearer(h.app, DEV_KEY);
|
||||
}, 60_000);
|
||||
afterAll(async () => {
|
||||
await h?.close();
|
||||
});
|
||||
|
||||
const secretOf = (ref: string) => h.ctx.secrets.resolve(ref);
|
||||
|
||||
it("下载器(账密):空串保持;null 清除;新值原地替换", async () => {
|
||||
const c = (
|
||||
await json(
|
||||
await admin("POST", "/downloader-instances", {
|
||||
name: "qb-keep",
|
||||
baseUrl: "http://127.0.0.1:1",
|
||||
authKind: "password",
|
||||
username: "u",
|
||||
credential: "pw-original",
|
||||
}),
|
||||
)
|
||||
).data;
|
||||
const ref = c.secretRef as string;
|
||||
expect(ref).toBeTruthy();
|
||||
|
||||
const kept = (await json(await admin("PATCH", `/downloader-instances/${c.id}`, { credential: "", name: "qb-k2" })))
|
||||
.data;
|
||||
expect(kept.secretRef).toBe(ref);
|
||||
expect(await secretOf(ref)).toBe("pw-original");
|
||||
|
||||
const ws = (await json(await admin("PATCH", `/downloader-instances/${c.id}`, { credential: " " }))).data;
|
||||
expect(ws.secretRef).toBe(ref);
|
||||
|
||||
const replaced = (await json(await admin("PATCH", `/downloader-instances/${c.id}`, { credential: "pw-new" }))).data;
|
||||
expect(replaced.secretRef).toBe(ref);
|
||||
expect(await secretOf(ref)).toBe("pw-new");
|
||||
|
||||
const cleared = (await json(await admin("PATCH", `/downloader-instances/${c.id}`, { credential: null }))).data;
|
||||
expect(cleared.secretRef).toBeNull();
|
||||
await expect(secretOf(ref)).rejects.toThrow(/不存在/);
|
||||
expect(JSON.stringify(cleared)).not.toContain("pw-");
|
||||
});
|
||||
|
||||
it("下载器(API Key):不能清除 Key(422),留空保持", async () => {
|
||||
const c = (
|
||||
await json(
|
||||
await admin("POST", "/downloader-instances", {
|
||||
name: "qb-key",
|
||||
baseUrl: "http://127.0.0.1:1",
|
||||
authKind: "api_key",
|
||||
credential: "qbt_key_1",
|
||||
}),
|
||||
)
|
||||
).data;
|
||||
expect((await admin("PATCH", `/downloader-instances/${c.id}`, { credential: null })).status).toBe(422);
|
||||
const kept = (await json(await admin("PATCH", `/downloader-instances/${c.id}`, { credential: "" }))).data;
|
||||
expect(kept.secretRef).toBe(c.secretRef);
|
||||
// 新建时空串 = 没填:API Key 认证必须有 Key
|
||||
expect(
|
||||
(
|
||||
await admin("POST", "/downloader-instances", {
|
||||
name: "qb-empty",
|
||||
baseUrl: "http://127.0.0.1:1",
|
||||
authKind: "api_key",
|
||||
credential: "",
|
||||
})
|
||||
).status,
|
||||
).toBe(422);
|
||||
});
|
||||
|
||||
it("媒体服务器:空串保持;null 清除", async () => {
|
||||
const c = (
|
||||
await json(
|
||||
await admin("POST", "/media-server-instances", {
|
||||
name: "emby-keep",
|
||||
baseUrl: "http://127.0.0.1:1",
|
||||
credential: "emby-key-1",
|
||||
}),
|
||||
)
|
||||
).data;
|
||||
const ref = c.secretRef as string;
|
||||
const kept = (await json(await admin("PATCH", `/media-server-instances/${c.id}`, { credential: "" }))).data;
|
||||
expect(kept.secretRef).toBe(ref);
|
||||
expect(await secretOf(ref)).toBe("emby-key-1");
|
||||
const cleared = (await json(await admin("PATCH", `/media-server-instances/${c.id}`, { credential: null }))).data;
|
||||
expect(cleared.secretRef).toBeNull();
|
||||
await expect(secretOf(ref)).rejects.toThrow(/不存在/);
|
||||
// 空串新建 = 不存 key
|
||||
const n = (
|
||||
await json(
|
||||
await admin("POST", "/media-server-instances", {
|
||||
name: "emby-nokey",
|
||||
baseUrl: "http://127.0.0.1:1",
|
||||
credential: "",
|
||||
}),
|
||||
)
|
||||
).data;
|
||||
expect(n.secretRef).toBeNull();
|
||||
});
|
||||
|
||||
it("设置(TMDB / 网页搜索 Key):空串保持;null 清除;审计不留明文", async () => {
|
||||
const set = (await json(await admin("PATCH", "/settings", { metadata: { tmdbApiKey: "tmdb-secret-1" } }))).data;
|
||||
const ref = set.metadata.tmdbApiKeySecretRef as string;
|
||||
expect(ref).toBeTruthy();
|
||||
const kept = (
|
||||
await json(await admin("PATCH", "/settings", { metadata: { tmdbApiKey: "", tmdbBaseUrl: "https://t.local" } }))
|
||||
).data;
|
||||
expect(kept.metadata.tmdbApiKeySecretRef).toBe(ref);
|
||||
expect(kept.metadata.tmdbBaseUrl).toBe("https://t.local");
|
||||
expect(await secretOf(ref)).toBe("tmdb-secret-1");
|
||||
const cleared = (await json(await admin("PATCH", "/settings", { metadata: { tmdbApiKey: null } }))).data;
|
||||
expect(cleared.metadata.tmdbApiKeySecretRef).toBeNull();
|
||||
|
||||
const ws = (
|
||||
await json(await admin("PATCH", "/settings", { agent: { webSearch: { provider: "brave", apiKey: "brave-1" } } }))
|
||||
).data;
|
||||
const wref = ws.agent.webSearch.apiKeySecretRef as string;
|
||||
const wkept = (await json(await admin("PATCH", "/settings", { agent: { webSearch: { apiKey: "" } } }))).data;
|
||||
expect(wkept.agent.webSearch.apiKeySecretRef).toBe(wref);
|
||||
const wcleared = (await json(await admin("PATCH", "/settings", { agent: { webSearch: { apiKey: null } } }))).data;
|
||||
expect(wcleared.agent.webSearch.apiKeySecretRef).toBeNull();
|
||||
|
||||
const audits = await h.db
|
||||
.selectFrom("audit_event")
|
||||
.select("payload")
|
||||
.where("action", "=", "settings.update")
|
||||
.execute();
|
||||
const text = JSON.stringify(audits);
|
||||
expect(text).not.toContain("tmdb-secret-1");
|
||||
expect(text).not.toContain("brave-1");
|
||||
});
|
||||
});
|
||||
@@ -148,6 +148,11 @@ describe.skipIf(!hasPg)("Pi 上游(真实 PG)", () => {
|
||||
(await req("POST", "/pi/upstreams", { name: "OpenAI 主号", provider: "openai", authKind: "api_key" })).status,
|
||||
).toBe(409);
|
||||
|
||||
// 空串 = 保持原 key(FIX-8 只写凭证统一语义);掩码只给前后 4 位
|
||||
const kept = (await req("PATCH", `/pi/upstreams/${a.id}`, { apiKey: "", name: "OpenAI 主号" })).body.data;
|
||||
expect(kept).toMatchObject({ hasCredential: true });
|
||||
expect(kept.credentialMask).toMatch(/^.{4}….{4}$/);
|
||||
expect(JSON.stringify(kept)).not.toMatch(/secret-\d/);
|
||||
// 清 key → auth_required;测试报 auth
|
||||
const cleared = (await req("PATCH", `/pi/upstreams/${a.id}`, { apiKey: null })).body.data;
|
||||
expect(cleared).toMatchObject({ status: "auth_required", hasCredential: false });
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
import { afterAll, beforeAll, describe, expect, it } from "vitest";
|
||||
import { createHarness, type Harness, pgAvailable } from "./harness.ts";
|
||||
|
||||
// FIX-8 站点账号凭证:同类账号更新时密码 / Cookie / API Key 留空 = 保持,TOTP 省略保持、null 清除;
|
||||
// 新账号或换类型时必须填。明文不出 API。
|
||||
|
||||
const up = await pgAvailable();
|
||||
|
||||
// biome-ignore lint/suspicious/noExplicitAny: 响应体断言
|
||||
const json = async (r: Response): Promise<any> => {
|
||||
const body = await r.json();
|
||||
if (!r.ok) throw new Error(`${r.status} ${JSON.stringify(body)}`);
|
||||
return body.data;
|
||||
};
|
||||
|
||||
describe.skipIf(!up)("站点凭证留空不变 / 显式清除", () => {
|
||||
let h: Harness;
|
||||
let siteId: string;
|
||||
const put = (body: unknown) => h.req(`/sites/${siteId}/credentials`, { method: "PUT", body });
|
||||
const account = () =>
|
||||
h.db
|
||||
.selectFrom("site_account")
|
||||
.selectAll()
|
||||
.where("site_id", "=", siteId)
|
||||
.where("label", "=", "default")
|
||||
.executeTakeFirstOrThrow();
|
||||
|
||||
beforeAll(async () => {
|
||||
h = await createHarness("credkeep");
|
||||
const site = await json(
|
||||
await h.req("/sites", {
|
||||
body: { key: "audiences", name: "观众", adapter: "nexusphp", baseUrl: "http://127.0.0.1:1/" },
|
||||
}),
|
||||
);
|
||||
siteId = site.id;
|
||||
}, 60_000);
|
||||
afterAll(async () => {
|
||||
await h?.close();
|
||||
});
|
||||
|
||||
it("新账号不填密码 → 422", async () => {
|
||||
expect((await put({ kind: "password", username: "alice" })).status).toBe(422);
|
||||
expect((await put({ kind: "password", username: "alice", password: " " })).status).toBe(422);
|
||||
});
|
||||
|
||||
it("账密:改登录名不填密码 = 保持密码与 TOTP;null 清除 TOTP", async () => {
|
||||
const r = await json(await put({ kind: "password", username: "alice", password: "pw-1", totpSecret: "JBSWY3DP" }));
|
||||
expect(JSON.stringify(r)).not.toContain("pw-1");
|
||||
const a1 = await account();
|
||||
expect(h.secrets.plain.get(a1.secret_ref!)).toBe("pw-1");
|
||||
expect(a1.totp_secret_ref).toBeTruthy();
|
||||
|
||||
await json(await put({ kind: "password", username: "alice2", password: "", userAgent: "UA/1" }));
|
||||
const a2 = await account();
|
||||
expect(a2.secret_ref).toBe(a1.secret_ref);
|
||||
expect(h.secrets.plain.get(a2.secret_ref!)).toBe("pw-1");
|
||||
expect(a2.totp_secret_ref).toBe(a1.totp_secret_ref);
|
||||
expect(a2.login_name).toBe("alice2");
|
||||
expect(a2.user_agent).toBe("UA/1");
|
||||
|
||||
await json(await put({ kind: "password", username: "alice2", totpSecret: null }));
|
||||
const a3 = await account();
|
||||
expect(a3.totp_secret_ref).toBeNull();
|
||||
expect(h.secrets.plain.get(a3.secret_ref!)).toBe("pw-1");
|
||||
expect(h.secrets.plain.has(a1.totp_secret_ref!)).toBe(false);
|
||||
|
||||
await json(await put({ kind: "password", username: "alice2", password: "pw-2" }));
|
||||
expect(h.secrets.plain.get((await account()).secret_ref!)).toBe("pw-2");
|
||||
});
|
||||
|
||||
it("换类型必须填新凭证;同类 Cookie / API Key 留空保持", async () => {
|
||||
expect((await put({ kind: "cookie" })).status).toBe(422);
|
||||
await json(await put({ kind: "cookie", cookie: "a=1" }));
|
||||
const c1 = await account();
|
||||
await json(await put({ kind: "cookie", cookie: "", userAgent: "UA/2" }));
|
||||
const c2 = await account();
|
||||
expect(c2.secret_ref).toBe(c1.secret_ref);
|
||||
expect(h.secrets.plain.get(c2.secret_ref!)).toBe("a=1");
|
||||
|
||||
expect((await put({ kind: "api_key", apiKey: "" })).status).toBe(422);
|
||||
await json(await put({ kind: "api_key", apiKey: "k-1" }));
|
||||
const k1 = await account();
|
||||
await json(await put({ kind: "api_key" }));
|
||||
expect(h.secrets.plain.get((await account()).secret_ref!)).toBe("k-1");
|
||||
expect((await account()).secret_ref).toBe(k1.secret_ref);
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user