feat(nacos): add access control and namespace administration
This commit is contained in:
59 files changed
+4563
-479
No files matched your search
@@ -13,6 +13,13 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(source).not.toContain("dockerNacosConsoleFallbackUrl");
|
||||
});
|
||||
|
||||
it("persists the explicit Nacos 3 Admin or Console API selection", () => {
|
||||
expect(source).toContain('const nacosApiPlane = ref<NacosApiPlane>("admin")');
|
||||
expect(source).toContain('config?.apiPlane || "admin"');
|
||||
expect(source).toContain('apiPlane: nacosImplementation.value === "nacos" && nacosVersionMode.value === "v3" ? nacosApiPlane.value : undefined');
|
||||
expect(source).toContain("nacos.nacosConsoleServiceAddressHint");
|
||||
});
|
||||
|
||||
it("keeps the primary form focused on endpoints and authentication", () => {
|
||||
const mainStart = source.indexOf("data-nacos-profile-selector");
|
||||
const mainEnd = source.indexOf("<!-- Redis: host, port, user, password, ssl -->", mainStart);
|
||||
@@ -24,13 +31,11 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(main).toContain('t("nacos.nacosAdvancedHint")');
|
||||
expect(main).toContain("@click=\"configTab = 'advanced'\"");
|
||||
expect(main).toContain('v-model="nacosServerAddr"');
|
||||
expect(main).toContain('v-model="nacosManagedNamespacesText"');
|
||||
expect(main).toContain('t("nacos.nacosManagedNamespacesHint")');
|
||||
expect(main).toContain("data-nacos-ordinary-user-toggle");
|
||||
expect(main).toContain('v-model="nacosOrdinaryAccount"');
|
||||
expect(main).not.toContain('v-model="nacosManagedNamespacesText"');
|
||||
expect(main).not.toContain("data-nacos-namespace-access-scope");
|
||||
expect(main).not.toContain("data-nacos-ordinary-user-toggle");
|
||||
expect(main).not.toContain("nacosOrdinaryAccount");
|
||||
expect(main).toContain("nacosAuthKind === 'usernamePassword'");
|
||||
expect(main).toContain("nacosImplementation === 'nacos' && nacosAuthKind === 'usernamePassword'");
|
||||
expect(main).not.toContain("nacosVersionMode === 'v3' && nacosAuthKind === 'usernamePassword'");
|
||||
expect(main).not.toContain('v-model="nacosNamespace"');
|
||||
expect(main).toContain('t("nacos.nacosAuthHint")');
|
||||
expect(main).not.toContain('v-model="nacosMetricsMode"');
|
||||
@@ -44,6 +49,8 @@ describe("Nacos connection dialog layout", () => {
|
||||
|
||||
expect(advanced).not.toContain('v-model="nacosContextPathInput"');
|
||||
expect(advanced).not.toContain("配置上下文路径");
|
||||
expect(advanced).toContain('v-model="nacosContextPath"');
|
||||
expect(advanced).toContain('t("nacos.nacosContextPathHint")');
|
||||
expect(advanced).toContain('v-model="nacosMetricsMode"');
|
||||
expect(advanced).toContain('v-model="nacosRNacosConsoleAddr"');
|
||||
expect(advanced).toContain('v-if="nacosRNacosConsoleAddr.trim()"');
|
||||
@@ -58,17 +65,68 @@ describe("Nacos connection dialog layout", () => {
|
||||
expect(source).not.toContain("DBX 不需要配置该地址");
|
||||
const mainStart = source.indexOf("data-nacos-profile-selector");
|
||||
const mainEnd = source.indexOf("<!-- Redis: host, port, user, password, ssl -->", mainStart);
|
||||
expect(source.slice(mainStart, mainEnd)).toContain("data-nacos-managed-namespaces");
|
||||
expect(source.slice(mainStart, mainEnd)).not.toContain("data-nacos-managed-namespaces");
|
||||
expect(source.slice(mainStart, mainEnd)).not.toContain('placeholder="http://127.0.0.1:8080"');
|
||||
expect(source).not.toContain("http://127.0.0.1:8010");
|
||||
expect(source).not.toContain("http://127.0.0.1:8818");
|
||||
});
|
||||
|
||||
it("uses a dedicated namespace selector instead of the database selector", () => {
|
||||
expect(source).toContain('t("nacos.nacosVisibleNamespacesTitle")');
|
||||
expect(source).toContain("t(nacosNamespacePickerTitleKey)");
|
||||
expect(source).toContain('"nacos.nacosDetectAccessibleNamespaces"');
|
||||
expect(source).toContain("openVisibleNacosNamespacesPicker");
|
||||
expect(source).toContain("loadReadableNacosNamespaces(draftId, api)");
|
||||
expect(source).toContain("showVisibleNacosNamespacesDialog");
|
||||
expect(source).toContain('v-model="visibleNacosNamespaceAccessMode"');
|
||||
expect(source).toContain('TabsTrigger value="automatic"');
|
||||
expect(source).toContain('TabsTrigger v-if="canDetectNacosNamespaceAccess" value="manual"');
|
||||
expect(source).toContain('v-model="nacosManagedNamespacesText"');
|
||||
expect(source).not.toContain("!isNacosV3AdminPlane.value");
|
||||
expect(source).toContain('visibleNacosNamespaceAccessMode.value === "manual"');
|
||||
});
|
||||
|
||||
it("guides namespace listing permission failures to manual scope entry", () => {
|
||||
expect(source).toContain("function isNacosNamespaceListingPermissionError(error: unknown): boolean");
|
||||
expect(source).toContain("NACOS_ERROR\\[(?:v3ManagedNamespacesRequired|managedNamespacesRequired)\\]");
|
||||
expect(source).toContain("/\\/v3\\/(?:admin|console)\\/core\\/namespace\\/list/");
|
||||
expect(source).toContain("visibleNacosNamespaceListingPermissionDenied.value = isNacosNamespaceListingPermissionError(e)");
|
||||
expect(source).toContain('t("nacos.nacosManagedNamespacesRequired")');
|
||||
expect(source).toContain('v-else-if="visibleNacosNamespaceListingPermissionDenied"');
|
||||
expect(source).toContain("@click=\"visibleNacosNamespaceAccessMode = 'manual'\"");
|
||||
});
|
||||
|
||||
it("resolves unique manually entered namespace names to their Nacos IDs", () => {
|
||||
expect(source).toContain("function normalizeManualNacosNamespaceNames(namespaces: string[], availableNamespaces: NacosNamespaceInfo[]): string[]");
|
||||
expect(source).toContain("matchingNames.length === 1 ? matchingNames[0] : namespace");
|
||||
expect(source).toContain("async function resolveManualNacosNamespaceNames(namespaces: string[]): Promise<string[]>");
|
||||
expect(source).toContain("managedNamespaces: undefined");
|
||||
expect(source).toContain(": await resolveManualNacosNamespaceNames(manualNamespaces)");
|
||||
});
|
||||
|
||||
it("distinguishes the manual namespace input for the V3 Admin and Console API planes", () => {
|
||||
expect(source).toContain("const isNacosV3ConsolePlane = computed(");
|
||||
expect(source).toContain('isNacosV3AdminPlane.value ? "nacos.nacosManagedNamespaces" : "nacos.nacosManagedNamespacesNameOrId"');
|
||||
expect(source).toContain('isNacosV3AdminPlane.value ? "nacos.nacosManagedNamespacesIdPlaceholder" : "nacos.nacosManagedNamespacesPlaceholder"');
|
||||
expect(source).toContain('if (isNacosV3AdminPlane.value) return "nacos.nacosV3AdminManagedNamespacesHint"');
|
||||
expect(source).toContain('if (isNacosV3ConsolePlane.value) return "nacos.nacosV3ConsoleManagedNamespacesHint"');
|
||||
expect(source).toContain('v-if="isNacosV3AdminPlane" class="flex gap-2 rounded-md border border-amber-500/30');
|
||||
expect(source).toMatch(/const resolvedNamespaces = isNacosV3AdminPlane\.value\s*\?\s*manualNamespaces\s*:\s*await resolveManualNacosNamespaceNames\(manualNamespaces\);/);
|
||||
});
|
||||
|
||||
it("opens namespace access setup instead of showing a save validation error", () => {
|
||||
expect(source).toContain("if (!hasNacosNamespaceScopeForSave()) {");
|
||||
expect(source).toContain("await openVisibleNacosNamespacesPicker();");
|
||||
expect(source).not.toContain('message: t("nacos.nacosNamespaceScopeRequiredBeforeSave")');
|
||||
});
|
||||
|
||||
it("stores automatic full access as a dynamic namespace scope", () => {
|
||||
expect(source).toContain("const nacosDynamicAllNamespaces = ref(false)");
|
||||
expect(source).toContain("const useDynamicAll = selectsEntireReadableList && visibleNacosNamespaceDynamicAllSupported.value");
|
||||
expect(source).toContain("const readableSet = new Set(readableIds.map(nacosNamespaceIdentity))");
|
||||
expect(source).toContain("readableSet.size === sidebarSet.size");
|
||||
expect(source).toContain("form.value.visible_databases = useDynamicAll ? undefined : selected");
|
||||
expect(source).toContain("nacosDynamicAllNamespaces.value = useDynamicAll");
|
||||
expect(source).toContain("function showAllVisibleNacosNamespaces()");
|
||||
});
|
||||
|
||||
it("uses namespaces when scoping Nacos production safeguards", () => {
|
||||
|
||||
@@ -51,6 +51,16 @@ describe("nacosAdmin helpers", () => {
|
||||
contextPath: "/nacos",
|
||||
detectedVersion: "v3",
|
||||
});
|
||||
expect(normalizeNacosEndpoint("http://127.0.0.1:8080", { implementation: "nacos", versionMode: "v3", apiPlane: "console" })).toMatchObject({
|
||||
serverAddr: "http://127.0.0.1:8080",
|
||||
contextPath: "",
|
||||
detectedVersion: "v3",
|
||||
});
|
||||
expect(normalizeNacosEndpoint("http://127.0.0.1:18080/console", { implementation: "nacos", versionMode: "v3", apiPlane: "console" })).toMatchObject({
|
||||
serverAddr: "http://127.0.0.1:18080",
|
||||
contextPath: "/console",
|
||||
detectedVersion: "v3",
|
||||
});
|
||||
expect(normalizeNacosEndpoint("http://127.0.0.1:8848", { implementation: "nacos", versionMode: "v3", contextPath: "/" })).toMatchObject({
|
||||
serverAddr: "http://127.0.0.1:8848",
|
||||
contextPath: "/",
|
||||
|
||||
@@ -60,6 +60,7 @@ export const connectionFinalProxyPort = forward("connectionFinalProxyPort");
|
||||
export const disconnectDb = forward("disconnectDb");
|
||||
export const sessionCredentialStatus = forward("sessionCredentialStatus");
|
||||
export const forgetSessionCredential = forward("forgetSessionCredential");
|
||||
export const replaceNacosSessionCredential = forward("replaceNacosSessionCredential");
|
||||
export const checkConnectionHealth = forward("checkConnectionHealth");
|
||||
export const connectionIdentifierQuote = forward("connectionIdentifierQuote");
|
||||
export const closeDatabaseConnection = forward("closeDatabaseConnection");
|
||||
@@ -368,6 +369,7 @@ export const nacosListNamespaces = forward("nacosListNamespaces");
|
||||
export const nacosSidebarSnapshot = forward("nacosSidebarSnapshot");
|
||||
export const nacosCreateNamespace = forward("nacosCreateNamespace");
|
||||
export const nacosUpdateNamespace = forward("nacosUpdateNamespace");
|
||||
export const nacosDeleteNamespace = forward("nacosDeleteNamespace");
|
||||
export const nacosListConfigs = forward("nacosListConfigs");
|
||||
export const nacosGetConfig = forward("nacosGetConfig");
|
||||
export const nacosPublishConfig = forward("nacosPublishConfig");
|
||||
|
||||
@@ -409,6 +409,10 @@ export async function forgetSessionCredential(connectionId: string): Promise<voi
|
||||
return post("/api/connection/forget-session-credential", { connectionId });
|
||||
}
|
||||
|
||||
export async function replaceNacosSessionCredential(connectionId: string, username: string, password: string): Promise<void> {
|
||||
return post("/api/connection/replace-nacos-session-credential", { connectionId, username, password });
|
||||
}
|
||||
|
||||
export async function checkConnectionHealth(connectionId: string): Promise<void> {
|
||||
return post("/api/connection/check-health", { connectionId });
|
||||
}
|
||||
@@ -3258,8 +3262,8 @@ export async function consulMeshExportedServicesApply(connectionId: string, name
|
||||
// Nacos
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export async function nacosTestConnection(connectionId: string): Promise<NacosConnectionInfo> {
|
||||
return post("/api/nacos/test-connection", { connectionId });
|
||||
export async function nacosTestConnection(connectionId: string, forceRefresh = false): Promise<NacosConnectionInfo> {
|
||||
return post("/api/nacos/test-connection", { connectionId, forceRefresh });
|
||||
}
|
||||
|
||||
export async function nacosListNamespaces(connectionId: string): Promise<NacosNamespaceInfo[]> {
|
||||
@@ -3278,6 +3282,10 @@ export async function nacosUpdateNamespace(connectionId: string, req: NacosNames
|
||||
return post("/api/nacos/namespaces/update", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosDeleteNamespace(connectionId: string, namespaceId: string): Promise<void> {
|
||||
return post("/api/nacos/namespaces/delete", { connectionId, namespaceId });
|
||||
}
|
||||
|
||||
export async function nacosListConfigs(connectionId: string, query: NacosConfigQuery): Promise<NacosConfigList> {
|
||||
return post("/api/nacos/configs/list", { connectionId, query });
|
||||
}
|
||||
|
||||
@@ -49,8 +49,8 @@ import type {
|
||||
NacosSearchProgress,
|
||||
} from "@/types/nacos";
|
||||
|
||||
export async function nacosTestConnection(connectionId: string): Promise<NacosConnectionInfo> {
|
||||
return invoke("nacos_test_connection", { connectionId });
|
||||
export async function nacosTestConnection(connectionId: string, forceRefresh = false): Promise<NacosConnectionInfo> {
|
||||
return invoke("nacos_test_connection", { connectionId, forceRefresh });
|
||||
}
|
||||
|
||||
export async function nacosListNamespaces(connectionId: string): Promise<NacosNamespaceInfo[]> {
|
||||
@@ -69,6 +69,10 @@ export async function nacosUpdateNamespace(connectionId: string, req: NacosNames
|
||||
return invoke("nacos_update_namespace", { connectionId, req });
|
||||
}
|
||||
|
||||
export async function nacosDeleteNamespace(connectionId: string, namespaceId: string): Promise<void> {
|
||||
return invoke("nacos_delete_namespace", { connectionId, namespaceId });
|
||||
}
|
||||
|
||||
export async function nacosListConfigs(connectionId: string, query: NacosConfigQuery): Promise<NacosConfigList> {
|
||||
return invoke("nacos_list_configs", { connectionId, query });
|
||||
}
|
||||
|
||||
@@ -953,6 +953,10 @@ export async function forgetSessionCredential(connectionId: string): Promise<voi
|
||||
return invokeBackend("forget_session_credential", { connectionId });
|
||||
}
|
||||
|
||||
export async function replaceNacosSessionCredential(connectionId: string, username: string, password: string): Promise<void> {
|
||||
return invokeBackend("replace_nacos_session_credential", { connectionId, username, password });
|
||||
}
|
||||
|
||||
export async function checkConnectionHealth(connectionId: string): Promise<void> {
|
||||
return invokeBackend("check_connection_health", { connectionId });
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { NacosConfigHistoryItem, NacosConfigItem, NacosConfigKey, NacosContentMatch, NacosImplementation, NacosInstanceInfo, NacosPermissionInfo, NacosRawRequest, NacosServiceInfo, NacosVersionMode } from "@/types/nacos";
|
||||
import type { NacosApiPlane, NacosConfigHistoryItem, NacosConfigItem, NacosConfigKey, NacosContentMatch, NacosImplementation, NacosInstanceInfo, NacosPermissionInfo, NacosRawRequest, NacosServiceInfo, NacosVersionMode } from "@/types/nacos";
|
||||
import { diffArrays, diffChars } from "diff";
|
||||
|
||||
export type NacosRawTemplateKey = "serverState" | "namespaceList" | "configDetail" | "serviceList" | "instanceList";
|
||||
@@ -58,6 +58,7 @@ export interface NacosEndpointNormalization {
|
||||
export interface NacosEndpointNormalizationOptions {
|
||||
implementation?: NacosImplementation;
|
||||
versionMode?: NacosVersionMode;
|
||||
apiPlane?: NacosApiPlane;
|
||||
contextPath?: string;
|
||||
}
|
||||
|
||||
@@ -78,6 +79,7 @@ export function normalizeNacosEndpoint(input: string, options: NacosEndpointNorm
|
||||
const rawPath = url.pathname.replace(/\/+$/, "");
|
||||
const implementation = options.implementation;
|
||||
const versionMode = options.versionMode || "auto";
|
||||
const apiPlane = options.apiPlane || "admin";
|
||||
const warnings: string[] = [];
|
||||
const hasRNacosSuffix = /\/rnacos$/i.test(rawPath);
|
||||
const hasNacosSuffix = /\/nacos$/i.test(rawPath);
|
||||
@@ -91,7 +93,7 @@ export function normalizeNacosEndpoint(input: string, options: NacosEndpointNorm
|
||||
contextPath = hasNacosSuffix ? rawPath : options.contextPath?.trim() || "/nacos";
|
||||
} else if (detectedVersion === "v3" || hasNacos3UiSuffix) {
|
||||
contextPath = rawPath.replace(/\/(?:next(?:\/index\.html)?|index\.html)$/i, "");
|
||||
if (!contextPath) contextPath = options.contextPath?.trim() || "/nacos";
|
||||
if (!contextPath) contextPath = options.contextPath?.trim() || (apiPlane === "console" ? "" : "/nacos");
|
||||
if (hasNacos3UiSuffix) warnings.push("The Nacos 3 console route was removed from the API context.");
|
||||
} else if (!contextPath) {
|
||||
contextPath = options.contextPath?.trim() || (versionMode === "v2" ? "/nacos" : "");
|
||||
|
||||
@@ -4,7 +4,11 @@ type NacosNamespaceAccessClient = {
|
||||
nacosListNamespaces(connectionId: string): Promise<NacosNamespaceInfo[]>;
|
||||
};
|
||||
|
||||
/** The backend applies account authorization or an explicitly configured namespace scope. */
|
||||
/**
|
||||
* The backend returns namespaces verified through authorization metadata, or,
|
||||
* for this explicit user action, by checking configuration and service reads.
|
||||
* It never returns merely enumerable namespaces as selectable access scope.
|
||||
*/
|
||||
export async function loadReadableNacosNamespaces(connectionId: string, client: NacosNamespaceAccessClient): Promise<NacosNamespaceInfo[]> {
|
||||
return normalizeNacosNamespacesForDisplay(await client.nacosListNamespaces(connectionId));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user