feat(etcd): restrict key browsing and writes by auth permissions
This commit is contained in:
32 files changed
+1404
-100
No files matched your search
@@ -696,14 +696,23 @@ function isGroupLabel(node: TreeNode): boolean {
|
||||
async function openDirectNavigationNode(node: TreeNode, requestId: number) {
|
||||
if (!node.connectionId) return;
|
||||
const isNacosNavigation = node.type === "nacos-namespace" || node.type === "nacos-access-control";
|
||||
await connectionStore.ensureConnected(node.connectionId, isNacosNavigation ? { verifyHealth: false } : undefined);
|
||||
const isEtcdNavigation = node.type === "etcd-root" || node.type === "etcd-dashboard" || node.type === "etcd-access-control";
|
||||
await connectionStore.ensureConnected(node.connectionId, isNacosNavigation || isEtcdNavigation ? { verifyHealth: false } : undefined);
|
||||
if (!isCurrentNavigationRequest(requestId)) return;
|
||||
const connectionName = connectionStore.getConfig(node.connectionId)?.name || (isNacosNavigation ? "Nacos" : "Consul");
|
||||
if ((node.type === "etcd-dashboard" || node.type === "etcd-access-control") && !connectionStore.getEtcdAccessCapabilities(node.connectionId).admin) return;
|
||||
const connectionName = connectionStore.getConfig(node.connectionId)?.name || (isNacosNavigation ? "Nacos" : isEtcdNavigation ? "etcd" : "Consul");
|
||||
if (node.type === "consul-root") {
|
||||
queryStore.createTab(node.connectionId, "", `${connectionName}:keys`, "consul");
|
||||
refreshActiveKvBrowserAfterOpen("consul", node.connectionId);
|
||||
} else if (node.type === "consul-overview") {
|
||||
queryStore.createTab(node.connectionId, "", `${connectionName}:${t("consul.ui.overview")}`, "consul-overview");
|
||||
} else if (node.type === "etcd-root") {
|
||||
queryStore.createTab(node.connectionId, "", `${connectionName}:keys`, "etcd");
|
||||
refreshActiveKvBrowserAfterOpen("etcd", node.connectionId);
|
||||
} else if (node.type === "etcd-dashboard") {
|
||||
queryStore.createTab(node.connectionId, "", `${connectionName}:dashboard`, "etcd-dashboard");
|
||||
} else if (node.type === "etcd-access-control") {
|
||||
queryStore.createTab(node.connectionId, "", `${connectionName}:access-control`, "etcd-access-control");
|
||||
} else if (node.type === "nacos-namespace") {
|
||||
queryStore.openNacosAdmin(node.connectionId, { namespace: node.nacosNamespace || "", namespaceName: node.nacosNamespaceName || node.label });
|
||||
} else if (node.type === "nacos-access-control") {
|
||||
@@ -918,19 +927,6 @@ async function toggle(requestId = beginNavigationRequest()) {
|
||||
await connectionStore.ensureConnected(node.connectionId);
|
||||
const topicFromId = node.id.endsWith(":mqtt-topic:__console__") ? undefined : node.id.split(":mqtt-topic:")[1] || node.label;
|
||||
queryStore.openMqttAdmin(node.connectionId, topicFromId ? { initialTopic: topicFromId } : undefined);
|
||||
} else if (node.type === "etcd-root" && node.connectionId) {
|
||||
await connectionStore.ensureConnected(node.connectionId);
|
||||
const tabTitle = `${connectionStore.getConfig(node.connectionId)?.name || "etcd"}:keys`;
|
||||
queryStore.createTab(node.connectionId, "", tabTitle, "etcd");
|
||||
refreshActiveKvBrowserAfterOpen("etcd", node.connectionId);
|
||||
} else if (node.type === "etcd-dashboard" && node.connectionId) {
|
||||
await connectionStore.ensureConnected(node.connectionId);
|
||||
const tabTitle = `${connectionStore.getConfig(node.connectionId)?.name || "etcd"}:dashboard`;
|
||||
queryStore.createTab(node.connectionId, "", tabTitle, "etcd-dashboard");
|
||||
} else if (node.type === "etcd-access-control" && node.connectionId) {
|
||||
await connectionStore.ensureConnected(node.connectionId);
|
||||
const tabTitle = `${connectionStore.getConfig(node.connectionId)?.name || "etcd"}:access-control`;
|
||||
queryStore.createTab(node.connectionId, "", tabTitle, "etcd-access-control");
|
||||
} else if (node.type === "zookeeper-root" && node.connectionId) {
|
||||
await connectionStore.ensureConnected(node.connectionId);
|
||||
const tabTitle = `${connectionStore.getConfig(node.connectionId)?.name || "ZooKeeper"}:keys`;
|
||||
@@ -6239,6 +6235,14 @@ function handleRowClick(node: TreeNode, clickDetail: number) {
|
||||
}
|
||||
|
||||
function handleRowDoubleClick(node: TreeNode, event: MouseEvent) {
|
||||
// Direct-navigation rows already handle every click in the click sequence.
|
||||
// Starting a new request for their trailing dblclick would invalidate the
|
||||
// still-pending single-click navigation without providing a replacement in
|
||||
// single-click activation mode.
|
||||
if (isDirectNavigationTreeNode(node.type)) {
|
||||
activateRuntimeNode(node);
|
||||
return;
|
||||
}
|
||||
beginNavigationRequest();
|
||||
activateRuntimeNode(node);
|
||||
onDoubleClick(event);
|
||||
|
||||
+92
@@ -16,6 +16,7 @@ const connectionStore = {
|
||||
canUseLoadedTreeNodeToggle: vi.fn(() => true),
|
||||
releaseCollapsedTreeNodeChildren: vi.fn(),
|
||||
getConfig: vi.fn(() => ({ db_type: "mysql", name: "connection" })),
|
||||
getEtcdAccessCapabilities: vi.fn(() => ({ admin: true, writable: true, writePermissions: null })),
|
||||
ensureConnected: vi.fn(async () => undefined),
|
||||
loadPackageMembers: vi.fn(async (node: TreeNode) => {
|
||||
node.isExpanded = true;
|
||||
@@ -63,6 +64,7 @@ afterEach(() => {
|
||||
vi.clearAllMocks();
|
||||
connectionStore.canUseLoadedTreeNodeToggle.mockReturnValue(true);
|
||||
connectionStore.getConfig.mockReturnValue({ db_type: "mysql", name: "connection" });
|
||||
connectionStore.getEtcdAccessCapabilities.mockReturnValue({ admin: true, writable: true, writePermissions: null });
|
||||
});
|
||||
|
||||
describe("SidebarTreeRuntimeHost expansion", () => {
|
||||
@@ -264,6 +266,96 @@ describe("SidebarTreeRuntimeHost expansion", () => {
|
||||
expect(systemNode.isExpanded).toBe(true);
|
||||
});
|
||||
|
||||
it("opens etcd workspaces without waiting for a connection health probe", async () => {
|
||||
connectionStore.getConfig.mockReturnValue({ db_type: "etcd", name: "local-etcd-v3" });
|
||||
connectionStore.ensureConnected.mockImplementation(async (...args: any[]) => {
|
||||
const options = args[1] as { verifyHealth?: boolean } | undefined;
|
||||
if (options?.verifyHealth === false) return;
|
||||
await new Promise<void>(() => undefined);
|
||||
});
|
||||
const nodes: TreeNode[] = [
|
||||
{ id: "etcd:root", label: "Keys", type: "etcd-root", connectionId: "etcd" },
|
||||
{ id: "etcd:access-control", label: "Users & Roles", type: "etcd-access-control", connectionId: "etcd" },
|
||||
{ id: "etcd:dashboard", label: "Dashboard", type: "etcd-dashboard", connectionId: "etcd" },
|
||||
];
|
||||
connectionStore.treeNodes = nodes;
|
||||
|
||||
const host = ref<InstanceType<typeof SidebarTreeRuntimeHost> | null>(null);
|
||||
const app = createApp(
|
||||
defineComponent({
|
||||
setup: () => () => h(SidebarTreeRuntimeHost, { ref: host, node: nodes[0], depth: 0 }),
|
||||
}),
|
||||
);
|
||||
mountedApps.push(app);
|
||||
const container = document.createElement("div");
|
||||
document.body.append(container);
|
||||
app.use(i18n);
|
||||
app.mount(container);
|
||||
await nextTick();
|
||||
|
||||
for (const [index, node] of nodes.entries()) {
|
||||
host.value!.handleRowClick(node, index + 1);
|
||||
await vi.waitFor(() => expect(queryStore.createTab).toHaveBeenCalledTimes(index + 1));
|
||||
}
|
||||
|
||||
expect(connectionStore.ensureConnected).toHaveBeenNthCalledWith(1, "etcd", { verifyHealth: false });
|
||||
expect(connectionStore.ensureConnected).toHaveBeenNthCalledWith(2, "etcd", { verifyHealth: false });
|
||||
expect(connectionStore.ensureConnected).toHaveBeenNthCalledWith(3, "etcd", { verifyHealth: false });
|
||||
expect(queryStore.createTab).toHaveBeenNthCalledWith(1, "etcd", "", "local-etcd-v3:keys", "etcd");
|
||||
expect(queryStore.createTab).toHaveBeenNthCalledWith(2, "etcd", "", "local-etcd-v3:access-control", "etcd-access-control");
|
||||
expect(queryStore.createTab).toHaveBeenNthCalledWith(3, "etcd", "", "local-etcd-v3:dashboard", "etcd-dashboard");
|
||||
});
|
||||
|
||||
it("does not let the trailing dblclick cancel a pending etcd navigation", async () => {
|
||||
let resolveConnection!: () => void;
|
||||
const connection = new Promise<void>((resolve) => {
|
||||
resolveConnection = resolve;
|
||||
});
|
||||
connectionStore.ensureConnected.mockReturnValue(connection);
|
||||
connectionStore.getConfig.mockReturnValue({ db_type: "etcd", name: "local-etcd-v3" });
|
||||
const node: TreeNode = { id: "etcd:dashboard", label: "Dashboard", type: "etcd-dashboard", connectionId: "etcd" };
|
||||
connectionStore.treeNodes = [node];
|
||||
|
||||
const host = ref<InstanceType<typeof SidebarTreeRuntimeHost> | null>(null);
|
||||
const app = createApp(
|
||||
defineComponent({
|
||||
setup: () => () => h(SidebarTreeRuntimeHost, { ref: host, node, depth: 0 }),
|
||||
}),
|
||||
);
|
||||
mountedApps.push(app);
|
||||
const container = document.createElement("div");
|
||||
document.body.append(container);
|
||||
app.use(i18n);
|
||||
app.mount(container);
|
||||
await nextTick();
|
||||
|
||||
host.value!.handleRowClick(node, 1);
|
||||
host.value!.handleRowDoubleClick(node, new MouseEvent("dblclick", { detail: 2 }));
|
||||
resolveConnection();
|
||||
|
||||
await vi.waitFor(() => expect(queryStore.createTab).toHaveBeenCalledWith("etcd", "", "local-etcd-v3:dashboard", "etcd-dashboard"));
|
||||
});
|
||||
|
||||
it("does not reopen a stale etcd admin node after access becomes restricted", async () => {
|
||||
connectionStore.getConfig.mockReturnValue({ db_type: "etcd", name: "local-etcd-v3" });
|
||||
connectionStore.getEtcdAccessCapabilities.mockReturnValue({ admin: false, writable: true, writePermissions: [] });
|
||||
const node: TreeNode = { id: "etcd:dashboard", label: "Dashboard", type: "etcd-dashboard", connectionId: "etcd" };
|
||||
connectionStore.treeNodes = [node];
|
||||
|
||||
const host = ref<InstanceType<typeof SidebarTreeRuntimeHost> | null>(null);
|
||||
const app = createApp(defineComponent({ setup: () => () => h(SidebarTreeRuntimeHost, { ref: host, node, depth: 0 }) }));
|
||||
mountedApps.push(app);
|
||||
const container = document.createElement("div");
|
||||
document.body.append(container);
|
||||
app.use(i18n);
|
||||
app.mount(container);
|
||||
await nextTick();
|
||||
|
||||
host.value!.handleRowClick(node, 1);
|
||||
await vi.waitFor(() => expect(connectionStore.ensureConnected).toHaveBeenCalled());
|
||||
expect(queryStore.createTab).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("expands an unloaded object group without leaking the regex source as a search filter", async () => {
|
||||
const group: TreeNode = {
|
||||
id: "mysql:basic:__tables",
|
||||
|
||||
+22
@@ -503,3 +503,25 @@ describe("TreeItem searched connection activation", () => {
|
||||
expect(host.handleRowDoubleClick).toHaveBeenCalledWith(node, expect.any(MouseEvent));
|
||||
});
|
||||
});
|
||||
|
||||
describe("TreeItem etcd workspace activation", () => {
|
||||
it.each([
|
||||
["etcd-root", 1],
|
||||
["etcd-access-control", 2],
|
||||
["etcd-dashboard", 3],
|
||||
] as const)("activates %s with click detail %i even in double-click mode", async (type, detail) => {
|
||||
settingsStore.editorSettings.sidebarActivation = "double";
|
||||
const node: TreeNode = {
|
||||
id: `connection-1:${type}`,
|
||||
label: type,
|
||||
type,
|
||||
connectionId: "connection-1",
|
||||
};
|
||||
const { row, host } = await mountTreeItem(node);
|
||||
|
||||
row.dispatchEvent(new MouseEvent("click", { bubbles: true, detail }));
|
||||
|
||||
expect(host.handleRowClick).toHaveBeenCalledWith(node, detail);
|
||||
expect(host.handleRowDoubleClick).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user