保存系统设置权限隔离修复检查点

This commit is contained in:
xuans committed 2026-10-04 03:36:32 +08:00
1 parent 6d425259f6
commit 8b26cbf5a1
5 files changed
+166 -10

No files matched your search

+27 -8
View File
@@ -1023,13 +1023,27 @@ export function useDashboard() {
}
}
let loadDataVersion = 0;
async function loadData() {
const version = ++loadDataVersion;
loading.value = true;
error.value = "";
currentUser.value = null;
settings.value = null;
settingsForm.value = normalizeSettings(null);
showSettings.value = false;
try {
const authResponse = await fetchAdmin("/api/v1/auth/session");
if (version !== loadDataVersion) return;
if (!authResponse.ok) {
throw new Error(await responseError(authResponse, "读取登录会话失败"));
}
const session = await authResponse.json();
if (version !== loadDataVersion) return;
currentUser.value = session;
const [
statusResponse,
authResponse,
domainResponse,
serverResponse,
certificateResponse,
@@ -1039,15 +1053,15 @@ export function useDashboard() {
dnsProviderResponse,
] = await Promise.all([
fetchAdmin("/api/v1/status"),
fetchAdmin("/api/v1/auth/session"),
fetchAdmin("/api/v1/domains"),
fetchAdmin("/api/v1/servers"),
fetchAdmin("/api/v1/certificates"),
fetchAdmin("/api/v1/tasks?limit=20"),
fetchAdmin("/api/v1/audit-logs?limit=20"),
fetchAdmin("/api/v1/settings"),
session.role === "super_admin" ? fetchAdmin("/api/v1/settings") : Promise.resolve(null),
fetchAdmin("/api/v1/dns/providers"),
]);
if (version !== loadDataVersion) return;
const failedResponse = [
statusResponse,
domainResponse,
@@ -1057,18 +1071,19 @@ export function useDashboard() {
auditResponse,
settingsResponse,
dnsProviderResponse,
].find((response) => !response.ok);
].find((response) => response && !response.ok);
if (failedResponse) {
throw new Error(await responseError(failedResponse, "读取管理数据失败"));
}
status.value = await statusResponse.json();
currentUser.value = await authResponse.json();
domains.value = (await domainResponse.json()).items || [];
servers.value = (await serverResponse.json()).items || [];
certificates.value = (await certificateResponse.json()).items || [];
tasks.value = (await taskResponse.json()).items || [];
auditLogs.value = (await auditResponse.json()).items || [];
settings.value = await settingsResponse.json();
const nextSettings = settingsResponse ? await settingsResponse.json() : null;
if (version !== loadDataVersion) return;
settings.value = nextSettings;
const providerResult = await dnsProviderResponse.json();
dnsProviderCatalog.value = (providerResult.items || []).map((item) => ({
...item,
@@ -1087,11 +1102,15 @@ export function useDashboard() {
];
}),
);
domainServers.value = Object.fromEntries(associations);
if (version === loadDataVersion) domainServers.value = Object.fromEntries(associations);
} catch (err) {
if (version !== loadDataVersion) return;
currentUser.value = null;
settings.value = null;
settingsForm.value = normalizeSettings(null);
error.value = err.message || "无法连接核心服务,请先启动 scert serve";
} finally {
loading.value = false;
if (version === loadDataVersion) loading.value = false;
}
}
@@ -3,6 +3,7 @@ import "./DeploymentResult.test.js";
import "./TaskMonitor.test.js";
import "./RenewalAction.test.js";
import "./DashboardLogout.test.js";
import "./SettingsAccess.test.js";
import "./DomainModal.test.js";
import "./DomainForm.test.js";
import test from "node:test";
@@ -435,6 +436,7 @@ test("导入执行中阻止重复提交,成功后展示实际部署结果", as
async function setup(t, request) {
const mounted = await mountComposable(t, useDashboard, async (path) => {
if (path.endsWith("/auth/session")) return Response.json({ account: "test-admin", role: "super_admin" });
if (path === "/api/v1/dns/test") return request();
if (path.endsWith("/dns/providers")) return Response.json({ items: [aliyunProvider] });
if (path.endsWith("/settings")) return Response.json({ dns: { provider: "aliyun", credential_configured: true, verification_state: "verified" } });
@@ -0,0 +1,71 @@
import assert from "node:assert/strict";
import test from "node:test";
import { useDashboard } from "./Dashboard.js";
import { deferred, mountComposable } from "../../test-support/mount.js";
for (const role of ["admin", "user", "super_admin"]) {
test(`工作台按实时会话加载系统设置:${role}`, async (t) => {
const requests = [];
const { state } = await mountComposable(t, useDashboard, async (path) => {
requests.push(path);
if (path.endsWith("/auth/session")) return Response.json({ role });
if (path.endsWith("/settings")) {
if (role !== "super_admin") return Response.json({ error: "无系统权限" }, { status: 403 });
return Response.json({ notification: { smtp_username: "system-account" } });
}
return Response.json({ items: [] });
});
assert.equal(state.error.value, "");
assert.equal(requests.includes("/api/v1/settings"), role === "super_admin");
assert.equal(state.settings.value?.notification?.smtp_username || "", role === "super_admin" ? "system-account" : "");
});
}
test("工作台重载在确认角色之前清除旧系统配置", async (t) => {
let session = { role: "super_admin" };
let pending;
let reads = 0;
const { state } = await mountComposable(t, useDashboard, async (path) => {
if (path.endsWith("/auth/session")) return pending ? pending.promise : Response.json(session);
if (path.endsWith("/settings")) {
reads += 1;
return Response.json({ notification: { smtp_username: "system-account" } });
}
return Response.json({ items: [] });
});
state.showSettings.value = true;
state.settingsForm.value.notification.smtp_password = "unsaved-secret";
pending = deferred();
const reload = state.loadData();
assert.equal(state.currentUser.value, null);
assert.equal(state.settings.value, null);
assert.equal(state.showSettings.value, false);
assert.equal(state.settingsForm.value.notification.smtp_password, "");
session = { role: "admin" };
pending.resolve(Response.json(session));
await reload;
assert.equal(reads, 1);
assert.equal(state.error.value, "");
assert.equal(state.canManageSystemSettings.value, false);
});
test("会话查询失败不能继续获取系统设置或使用旧角色", async (t) => {
let fail = false;
let reads = 0;
const { state } = await mountComposable(t, useDashboard, async (path) => {
if (path.endsWith("/auth/session")) {
return fail ? Response.json({ error: "会话服务异常" }, { status: 503 }) : Response.json({ role: "super_admin" });
}
if (path.endsWith("/settings")) {
reads += 1;
return Response.json({ dns: { project_id: "system-project" } });
}
return Response.json({ items: [] });
});
fail = true;
await state.loadData();
assert.equal(reads, 1);
assert.equal(state.settings.value, null);
assert.equal(state.currentUser.value, null);
assert.match(state.error.value, /会话服务异常/);
});