完善系统设置隔离并补充会话竞争与权限回归
This commit is contained in:
1 parent
8b26cbf5a1
commit
3ff59ddd5f
11 files changed
+127
-12
No files matched your search
@@ -1075,16 +1075,24 @@ export function useDashboard() {
|
||||
if (failedResponse) {
|
||||
throw new Error(await responseError(failedResponse, "读取管理数据失败"));
|
||||
}
|
||||
status.value = await statusResponse.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 || [];
|
||||
const nextSettings = settingsResponse ? await settingsResponse.json() : null;
|
||||
const [nextStatus, nextDomains, nextServers, nextCertificates, nextTasks, nextAudit, nextSettings, providerResult] = await Promise.all([
|
||||
statusResponse.json(),
|
||||
domainResponse.json(),
|
||||
serverResponse.json(),
|
||||
certificateResponse.json(),
|
||||
taskResponse.json(),
|
||||
auditResponse.json(),
|
||||
settingsResponse ? settingsResponse.json() : Promise.resolve(null),
|
||||
dnsProviderResponse.json(),
|
||||
]);
|
||||
if (version !== loadDataVersion) return;
|
||||
status.value = nextStatus;
|
||||
domains.value = nextDomains.items || [];
|
||||
servers.value = nextServers.items || [];
|
||||
certificates.value = nextCertificates.items || [];
|
||||
tasks.value = nextTasks.items || [];
|
||||
auditLogs.value = nextAudit.items || [];
|
||||
settings.value = nextSettings;
|
||||
const providerResult = await dnsProviderResponse.json();
|
||||
dnsProviderCatalog.value = (providerResult.items || []).map((item) => ({
|
||||
...item,
|
||||
value: item.id,
|
||||
|
||||
@@ -719,6 +719,9 @@ test("settingsReadEditSaveContract", async (t) => {
|
||||
};
|
||||
let submitted;
|
||||
const { state } = await mountComposable(t, useDashboard, async (path, options = {}) => {
|
||||
if (path.endsWith("/auth/session")) {
|
||||
return Response.json({ account: "test-admin", role: "super_admin" });
|
||||
}
|
||||
if (path.endsWith("/settings")) {
|
||||
if (options.method === "PUT") {
|
||||
submitted = JSON.parse(options.body);
|
||||
|
||||
@@ -69,3 +69,53 @@ test("会话查询失败不能继续获取系统设置或使用旧角色", async
|
||||
assert.equal(state.currentUser.value, null);
|
||||
assert.match(state.error.value, /会话服务异常/);
|
||||
});
|
||||
|
||||
test("旧超级管理员响应不能覆盖新普通管理员工作台", async (t) => {
|
||||
let role = "super_admin";
|
||||
const pending = deferred();
|
||||
const decoding = deferred();
|
||||
const { state } = await mountComposable(t, useDashboard, async (path) => {
|
||||
if (path.endsWith("/auth/session")) return Response.json({ role });
|
||||
if (path.endsWith("/settings")) {
|
||||
return {
|
||||
ok: true,
|
||||
json() {
|
||||
decoding.resolve();
|
||||
return pending.promise;
|
||||
},
|
||||
};
|
||||
}
|
||||
if (path.endsWith("/status")) return Response.json({ owner: role });
|
||||
return Response.json({ items: [] });
|
||||
});
|
||||
await decoding.promise;
|
||||
role = "admin";
|
||||
await state.loadData();
|
||||
pending.resolve({ notification: { smtp_username: "old-system-account" } });
|
||||
await new Promise((resolve) => setImmediate(resolve));
|
||||
assert.equal(state.currentUser.value.role, "admin");
|
||||
assert.equal(state.settings.value, null);
|
||||
assert.equal(state.settingsForm.value.notification.smtp_username, "");
|
||||
assert.equal(state.status.value.owner, "admin");
|
||||
assert.equal(state.loading.value, false);
|
||||
assert.equal(state.error.value, "");
|
||||
});
|
||||
|
||||
test("系统设置拒绝访问时清除已加载的角色和配置", async (t) => {
|
||||
let denied = false;
|
||||
const { state } = await mountComposable(t, useDashboard, async (path) => {
|
||||
if (path.endsWith("/auth/session")) return Response.json({ role: "super_admin" });
|
||||
if (path.endsWith("/settings")) {
|
||||
return denied
|
||||
? Response.json({ error: "系统设置访问被拒绝" }, { status: 403 })
|
||||
: Response.json({ notification: { smtp_username: "system-account" } });
|
||||
}
|
||||
return Response.json({ items: [] });
|
||||
});
|
||||
denied = true;
|
||||
await state.loadData();
|
||||
assert.equal(state.currentUser.value, null);
|
||||
assert.equal(state.settings.value, null);
|
||||
assert.equal(state.settingsForm.value.notification.smtp_username, "");
|
||||
assert.match(state.error.value, /系统设置访问被拒绝/);
|
||||
});
|
||||
Reference in new issue
Block a user