feat(nacos): add access control and namespace administration
This commit is contained in:
59 files changed
+4563
-479
No files matched your search
Vendored
+136
-1
@@ -1,13 +1,30 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import { shallowRef } from "vue";
|
||||
import type { TreeNode } from "@/types/database";
|
||||
import { createNacosNamespaceDesc, createNacosNamespaceId, createNacosNamespaceLoading, createNacosNamespaceName, showCreateNacosNamespaceDialog, sidebarFormTarget } from "@/components/sidebar/sidebarTreeDialogState";
|
||||
import {
|
||||
createNacosNamespaceDesc,
|
||||
createNacosNamespaceId,
|
||||
createNacosNamespaceLoading,
|
||||
createNacosNamespaceName,
|
||||
editNacosNamespaceDesc,
|
||||
editNacosNamespaceLoading,
|
||||
editNacosNamespaceName,
|
||||
deleteNacosNamespaceLoading,
|
||||
showCreateNacosNamespaceDialog,
|
||||
showDeleteNacosNamespaceConfirm,
|
||||
showEditNacosNamespaceDialog,
|
||||
sidebarDangerTarget,
|
||||
sidebarFormTarget,
|
||||
} from "@/components/sidebar/sidebarTreeDialogState";
|
||||
|
||||
const mocks = vi.hoisted(() => ({
|
||||
toast: vi.fn(),
|
||||
nacosCreateNamespace: vi.fn(),
|
||||
nacosDeleteNamespace: vi.fn(),
|
||||
nacosUpdateNamespace: vi.fn(),
|
||||
notifyNacosNamespacesChanged: vi.fn(),
|
||||
loadNacosNamespaces: vi.fn(),
|
||||
updateConnection: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("vue-i18n", () => ({
|
||||
@@ -22,6 +39,12 @@ vi.mock("@/composables/useToast", () => ({
|
||||
|
||||
vi.mock("@/lib/backend/api", () => ({
|
||||
nacosCreateNamespace: (...args: unknown[]) => mocks.nacosCreateNamespace(...args),
|
||||
nacosDeleteNamespace: (...args: unknown[]) => mocks.nacosDeleteNamespace(...args),
|
||||
nacosUpdateNamespace: (...args: unknown[]) => mocks.nacosUpdateNamespace(...args),
|
||||
}));
|
||||
|
||||
vi.mock("@/lib/database/productionExecutionGuard", () => ({
|
||||
executeWithProductionContextGuard: vi.fn(async ({ execute }: { execute: () => Promise<unknown> }) => execute()),
|
||||
}));
|
||||
|
||||
vi.mock("@/lib/nacos/nacosNamespaceCache", () => ({
|
||||
@@ -40,6 +63,17 @@ function connectionNode(): TreeNode {
|
||||
};
|
||||
}
|
||||
|
||||
function namespaceNode(): TreeNode {
|
||||
return {
|
||||
id: "conn-1:nacos:existing-space",
|
||||
label: "Existing Space",
|
||||
type: "nacos-namespace",
|
||||
connectionId: "conn-1",
|
||||
nacosNamespace: "existing-space",
|
||||
nacosNamespaceName: "Existing Space",
|
||||
};
|
||||
}
|
||||
|
||||
describe("Nacos namespace creation cache invalidation", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
@@ -94,3 +128,104 @@ describe("Nacos namespace creation cache invalidation", () => {
|
||||
expect(createNacosNamespaceLoading.value).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("Nacos namespace edit cache invalidation", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
mocks.nacosUpdateNamespace.mockResolvedValue(undefined);
|
||||
mocks.loadNacosNamespaces.mockResolvedValue(undefined);
|
||||
sidebarFormTarget.value = namespaceNode();
|
||||
editNacosNamespaceName.value = "Renamed Space";
|
||||
editNacosNamespaceDesc.value = "Updated during sync";
|
||||
editNacosNamespaceLoading.value = false;
|
||||
showEditNacosNamespaceDialog.value = true;
|
||||
});
|
||||
|
||||
it("notifies open views before refreshing the sidebar after an edit", async () => {
|
||||
const { confirmEditNacosNamespace } = useSidebarDatabaseSpecificMutationRuntime({
|
||||
activeNode: shallowRef(namespaceNode()),
|
||||
connectionStore: {
|
||||
treeNodes: [],
|
||||
loadNacosNamespaces: mocks.loadNacosNamespaces,
|
||||
getConfig: () => undefined,
|
||||
} as any,
|
||||
});
|
||||
|
||||
await confirmEditNacosNamespace();
|
||||
|
||||
expect(mocks.nacosUpdateNamespace).toHaveBeenCalledWith("conn-1", {
|
||||
namespaceId: "existing-space",
|
||||
namespaceName: "Renamed Space",
|
||||
namespaceDesc: "Updated during sync",
|
||||
});
|
||||
expect(mocks.notifyNacosNamespacesChanged).toHaveBeenCalledWith("conn-1");
|
||||
expect(mocks.notifyNacosNamespacesChanged.mock.invocationCallOrder[0]).toBeLessThan(mocks.loadNacosNamespaces.mock.invocationCallOrder[0]);
|
||||
expect(showEditNacosNamespaceDialog.value).toBe(false);
|
||||
});
|
||||
|
||||
it("keeps namespace caches intact when an edit fails", async () => {
|
||||
mocks.nacosUpdateNamespace.mockRejectedValueOnce(new Error("edit failed"));
|
||||
const { confirmEditNacosNamespace } = useSidebarDatabaseSpecificMutationRuntime({
|
||||
activeNode: shallowRef(namespaceNode()),
|
||||
connectionStore: {
|
||||
treeNodes: [],
|
||||
loadNacosNamespaces: mocks.loadNacosNamespaces,
|
||||
getConfig: () => undefined,
|
||||
} as any,
|
||||
});
|
||||
|
||||
await confirmEditNacosNamespace();
|
||||
|
||||
expect(mocks.notifyNacosNamespacesChanged).not.toHaveBeenCalled();
|
||||
expect(mocks.loadNacosNamespaces).not.toHaveBeenCalled();
|
||||
expect(showEditNacosNamespaceDialog.value).toBe(true);
|
||||
expect(editNacosNamespaceLoading.value).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("Nacos namespace deletion scope rollback", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
mocks.nacosDeleteNamespace.mockRejectedValue(new Error("remote delete failed"));
|
||||
mocks.loadNacosNamespaces.mockResolvedValue(undefined);
|
||||
sidebarDangerTarget.value = namespaceNode();
|
||||
deleteNacosNamespaceLoading.value = false;
|
||||
showDeleteNacosNamespaceConfirm.value = true;
|
||||
});
|
||||
|
||||
it("restores the last managed namespace when the remote deletion fails", async () => {
|
||||
let currentConfig: any = {
|
||||
id: "conn-1",
|
||||
db_type: "nacos",
|
||||
visible_databases: ["existing-space"],
|
||||
external_config: {
|
||||
serverAddr: "http://127.0.0.1:8848",
|
||||
managedNamespaces: ["existing-space"],
|
||||
},
|
||||
};
|
||||
mocks.updateConnection.mockImplementation(async (config: any) => {
|
||||
currentConfig = config;
|
||||
});
|
||||
const { confirmDeleteNacosNamespace } = useSidebarDatabaseSpecificMutationRuntime({
|
||||
activeNode: shallowRef(namespaceNode()),
|
||||
connectionStore: {
|
||||
treeNodes: [],
|
||||
loadNacosNamespaces: mocks.loadNacosNamespaces,
|
||||
getConfig: () => currentConfig,
|
||||
updateConnection: mocks.updateConnection,
|
||||
} as any,
|
||||
});
|
||||
|
||||
await confirmDeleteNacosNamespace();
|
||||
|
||||
expect(mocks.nacosDeleteNamespace).toHaveBeenCalledWith("conn-1", "existing-space");
|
||||
expect(mocks.updateConnection).toHaveBeenCalledTimes(2);
|
||||
expect(mocks.updateConnection.mock.calls[0][0].visible_databases).toEqual([]);
|
||||
expect(mocks.updateConnection.mock.calls[0][0].external_config.managedNamespaces).toEqual([]);
|
||||
expect(currentConfig.visible_databases).toEqual(["existing-space"]);
|
||||
expect(currentConfig.external_config.managedNamespaces).toEqual(["existing-space"]);
|
||||
expect(mocks.notifyNacosNamespacesChanged).not.toHaveBeenCalled();
|
||||
expect(showDeleteNacosNamespaceConfirm.value).toBe(true);
|
||||
expect(deleteNacosNamespaceLoading.value).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -35,7 +35,9 @@ import {
|
||||
import { supportsMongoAllDriverMutations, supportsMongoIndexMutations, supportsNativeMongoDriverMutations } from "@/lib/mongo/mongoCapabilities";
|
||||
import { runMongoSidebarMutation } from "@/lib/sidebar/runMongoSidebarMutation";
|
||||
import { executeWithProductionContextGuard } from "@/lib/database/productionExecutionGuard";
|
||||
import { uuid } from "@/lib/common/utils";
|
||||
import { refreshLoadedMongoIndexes } from "@/lib/mongo/mongoIndexMetadata";
|
||||
import type { NacosAdminConfig } from "@/types/nacos";
|
||||
import {
|
||||
sidebarDangerTarget,
|
||||
sidebarFormTarget,
|
||||
@@ -48,6 +50,8 @@ import {
|
||||
editNacosNamespaceName,
|
||||
editNacosNamespaceDesc,
|
||||
editNacosNamespaceLoading,
|
||||
showDeleteNacosNamespaceConfirm,
|
||||
deleteNacosNamespaceLoading,
|
||||
showDropMongoCollectionConfirm,
|
||||
dropMongoCollectionLoading,
|
||||
showDropMongoIndexConfirm,
|
||||
@@ -668,11 +672,70 @@ export function useSidebarDatabaseSpecificMutationRuntime(options: SidebarDataba
|
||||
showCreateNacosNamespaceDialog.value = true;
|
||||
}
|
||||
|
||||
interface ExplicitNacosNamespaceScopeSnapshot {
|
||||
visibleDatabases?: string[];
|
||||
managedNamespaces?: string[];
|
||||
}
|
||||
|
||||
function snapshotExplicitNacosNamespaceScope(connectionId: string): ExplicitNacosNamespaceScopeSnapshot {
|
||||
const config = connectionStore.getConfig(connectionId);
|
||||
if (!config || config.db_type !== "nacos") return {};
|
||||
const externalConfig = (config.external_config || {}) as NacosAdminConfig;
|
||||
return {
|
||||
visibleDatabases: Array.isArray(config.visible_databases) ? [...config.visible_databases] : undefined,
|
||||
managedNamespaces: Array.isArray(externalConfig.managedNamespaces) && externalConfig.managedNamespaces.length > 0 ? [...externalConfig.managedNamespaces] : undefined,
|
||||
};
|
||||
}
|
||||
|
||||
async function restoreExplicitNacosNamespaceScope(connectionId: string, snapshot: ExplicitNacosNamespaceScopeSnapshot): Promise<void> {
|
||||
if (!snapshot.visibleDatabases && !snapshot.managedNamespaces) return;
|
||||
const config = connectionStore.getConfig(connectionId);
|
||||
if (!config || config.db_type !== "nacos") return;
|
||||
const externalConfig = (config.external_config || {}) as NacosAdminConfig;
|
||||
await connectionStore.updateConnection({
|
||||
...config,
|
||||
visible_databases: snapshot.visibleDatabases ? [...snapshot.visibleDatabases] : config.visible_databases,
|
||||
external_config: snapshot.managedNamespaces ? { ...externalConfig, managedNamespaces: [...snapshot.managedNamespaces] } : externalConfig,
|
||||
});
|
||||
}
|
||||
|
||||
async function updateExplicitNacosNamespaceScope(connectionId: string, namespaceId: string, action: "add" | "remove"): Promise<boolean> {
|
||||
const config = connectionStore.getConfig(connectionId);
|
||||
if (!config || config.db_type !== "nacos") return false;
|
||||
const externalConfig = (config.external_config || {}) as NacosAdminConfig;
|
||||
const hasVisibleScope = Array.isArray(config.visible_databases);
|
||||
const hasManagedScope = Array.isArray(externalConfig.managedNamespaces) && externalConfig.managedNamespaces.length > 0;
|
||||
if (!hasVisibleScope && !hasManagedScope) return false;
|
||||
|
||||
const mutate = (values: string[] | undefined) => {
|
||||
const normalized = new Set((values || []).map((value) => value.trim()).filter(Boolean));
|
||||
if (action === "add") normalized.add(namespaceId);
|
||||
else normalized.delete(namespaceId);
|
||||
return [...normalized];
|
||||
};
|
||||
await connectionStore.updateConnection({
|
||||
...config,
|
||||
visible_databases: hasVisibleScope ? mutate(config.visible_databases) : config.visible_databases,
|
||||
external_config: hasManagedScope ? { ...externalConfig, managedNamespaces: mutate(externalConfig.managedNamespaces) } : externalConfig,
|
||||
});
|
||||
return true;
|
||||
}
|
||||
|
||||
async function refreshNacosNamespacesAfterMutation(connectionId: string) {
|
||||
try {
|
||||
await connectionStore.loadNacosNamespaces(connectionId, { force: true });
|
||||
return true;
|
||||
} catch (error: any) {
|
||||
toast(translateBackendError(t, error), 5000);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async function confirmCreateNacosNamespace() {
|
||||
const node = sidebarFormTarget.value ?? activeNode.value;
|
||||
const namespaceName = createNacosNamespaceName.value.trim();
|
||||
if (!node.connectionId || !namespaceName || createNacosNamespaceLoading.value) return;
|
||||
const namespaceId = createNacosNamespaceId.value.trim();
|
||||
const namespaceId = createNacosNamespaceId.value.trim() || uuid();
|
||||
const confirmed = await executeWithProductionContextGuard({
|
||||
connection: connectionStore.getConfig(node.connectionId),
|
||||
database: namespaceId || undefined,
|
||||
@@ -684,16 +747,22 @@ export function useSidebarDatabaseSpecificMutationRuntime(options: SidebarDataba
|
||||
createNacosNamespaceLoading.value = true;
|
||||
try {
|
||||
await api.nacosCreateNamespace(node.connectionId, {
|
||||
namespaceId: namespaceId || undefined,
|
||||
namespaceId,
|
||||
namespaceName,
|
||||
namespaceDesc: createNacosNamespaceDesc.value.trim() || namespaceName,
|
||||
});
|
||||
try {
|
||||
await updateExplicitNacosNamespaceScope(node.connectionId, namespaceId, "add");
|
||||
} catch (error: any) {
|
||||
toast(t("connection.saveFailed", { message: translateBackendError(t, error) }), 5000);
|
||||
}
|
||||
notifyNacosNamespacesChanged(node.connectionId);
|
||||
showCreateNacosNamespaceDialog.value = false;
|
||||
await connectionStore.loadNacosNamespaces(node.connectionId, { force: true });
|
||||
const liveNode = findSidebarActionTarget(connectionStore.treeNodes, node);
|
||||
if (liveNode) liveNode.isExpanded = true;
|
||||
toast(t("nacos.namespaceCreated", { name: namespaceName }), 3000);
|
||||
if (await refreshNacosNamespacesAfterMutation(node.connectionId)) {
|
||||
const liveNode = findSidebarActionTarget(connectionStore.treeNodes, node);
|
||||
if (liveNode) liveNode.isExpanded = true;
|
||||
}
|
||||
} catch (error: any) {
|
||||
toast(t("contextMenu.tableOperationFailed", { message: translateBackendError(t, error) }), 5000);
|
||||
} finally {
|
||||
@@ -727,9 +796,10 @@ export function useSidebarDatabaseSpecificMutationRuntime(options: SidebarDataba
|
||||
namespaceName,
|
||||
namespaceDesc: editNacosNamespaceDesc.value.trim() || namespaceName,
|
||||
});
|
||||
notifyNacosNamespacesChanged(node.connectionId);
|
||||
showEditNacosNamespaceDialog.value = false;
|
||||
await connectionStore.loadNacosNamespaces(node.connectionId, { force: true });
|
||||
toast(t("nacos.namespaceUpdated", { name: namespaceName }), 3000);
|
||||
await refreshNacosNamespacesAfterMutation(node.connectionId);
|
||||
} catch (error: any) {
|
||||
toast(t("contextMenu.tableOperationFailed", { message: translateBackendError(t, error) }), 5000);
|
||||
} finally {
|
||||
@@ -737,6 +807,50 @@ export function useSidebarDatabaseSpecificMutationRuntime(options: SidebarDataba
|
||||
}
|
||||
}
|
||||
|
||||
function openDeleteNacosNamespaceConfirm() {
|
||||
deleteNacosNamespaceLoading.value = false;
|
||||
showDeleteNacosNamespaceConfirm.value = true;
|
||||
}
|
||||
|
||||
async function confirmDeleteNacosNamespace() {
|
||||
const node = sidebarDangerTarget.value ?? activeNode.value;
|
||||
const namespaceId = node.nacosNamespace?.trim() || "";
|
||||
if (node.type !== "nacos-namespace" || !node.connectionId || !namespaceId || deleteNacosNamespaceLoading.value) return;
|
||||
const confirmed = await executeWithProductionContextGuard({
|
||||
connection: connectionStore.getConfig(node.connectionId),
|
||||
database: namespaceId,
|
||||
reviewText: `${t("nacos.deleteNamespace")}: ${node.nacosNamespaceName || node.label}`,
|
||||
source: t("production.sourceSidebar"),
|
||||
execute: async () => true,
|
||||
});
|
||||
if (confirmed !== true) return;
|
||||
deleteNacosNamespaceLoading.value = true;
|
||||
const scopeSnapshot = snapshotExplicitNacosNamespaceScope(node.connectionId);
|
||||
let scopeUpdated = false;
|
||||
try {
|
||||
// Persist the local scope first. A local save failure must abort before
|
||||
// the irreversible remote deletion. If Nacos rejects the deletion, the
|
||||
// original scope is restored below.
|
||||
scopeUpdated = await updateExplicitNacosNamespaceScope(node.connectionId, namespaceId, "remove");
|
||||
await api.nacosDeleteNamespace(node.connectionId, namespaceId);
|
||||
notifyNacosNamespacesChanged(node.connectionId);
|
||||
showDeleteNacosNamespaceConfirm.value = false;
|
||||
toast(t("nacos.namespaceDeleted", { name: node.nacosNamespaceName || node.label }), 3000);
|
||||
await refreshNacosNamespacesAfterMutation(node.connectionId);
|
||||
} catch (error: any) {
|
||||
if (scopeUpdated) {
|
||||
try {
|
||||
await restoreExplicitNacosNamespaceScope(node.connectionId, scopeSnapshot);
|
||||
} catch (rollbackError: any) {
|
||||
toast(t("connection.saveFailed", { message: translateBackendError(t, rollbackError) }), 5000);
|
||||
}
|
||||
}
|
||||
toast(t("contextMenu.tableOperationFailed", { message: translateBackendError(t, error) }), 5000);
|
||||
} finally {
|
||||
deleteNacosNamespaceLoading.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
function dropMongoCollection() {
|
||||
dropMongoCollectionLoading.value = false;
|
||||
showDropMongoCollectionConfirm.value = true;
|
||||
@@ -1047,6 +1161,8 @@ export function useSidebarDatabaseSpecificMutationRuntime(options: SidebarDataba
|
||||
confirmCreateNacosNamespace,
|
||||
openEditNacosNamespaceDialog,
|
||||
confirmEditNacosNamespace,
|
||||
openDeleteNacosNamespaceConfirm,
|
||||
confirmDeleteNacosNamespace,
|
||||
dropMongoCollection,
|
||||
dropMongoIndex,
|
||||
dropAllMongoIndexes,
|
||||
|
||||
Reference in new issue
Block a user