mirror of
https://github.com/Termix-SSH/Termix.git
synced 2026-10-31 07:35:24 +00:00
fix(tunnels): support TOTP for client tunnels and jump hosts (#1508)
This commit is contained in:
1 parent
ec7c2c2835
commit
9b690b9935
19 files changed
+1203
-58
No files matched your search
@@ -0,0 +1,155 @@
|
||||
import { EventEmitter } from "node:events";
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import type { WebSocket } from "ws";
|
||||
import type {
|
||||
PluginContext,
|
||||
PluginSshConnectOptions,
|
||||
} from "@termix/plugin-sdk/backend";
|
||||
import { createC2SPrompt } from "../../src/backend/c2s-auth.js";
|
||||
import { createC2SConnections } from "../../src/backend/c2s-connections.js";
|
||||
|
||||
class Socket extends EventEmitter {
|
||||
readyState = 1;
|
||||
send = vi.fn();
|
||||
close() {
|
||||
this.readyState = 3;
|
||||
this.emit("close");
|
||||
}
|
||||
get ws() {
|
||||
return this as unknown as WebSocket;
|
||||
}
|
||||
answer(requestId: string, answer: string | null) {
|
||||
this.emit(
|
||||
"message",
|
||||
Buffer.from(JSON.stringify({ type: "auth-response", requestId, answer })),
|
||||
false,
|
||||
);
|
||||
}
|
||||
}
|
||||
const flush = async () => {
|
||||
await Promise.resolve();
|
||||
await Promise.resolve();
|
||||
};
|
||||
afterEach(() => vi.useRealTimers());
|
||||
|
||||
describe("client tunnel authentication", () => {
|
||||
it("accepts only the current challenge on its socket and removes answer listeners", async () => {
|
||||
const socket = new Socket();
|
||||
const prompt = createC2SPrompt(socket.ws);
|
||||
const result = prompt.ask({ kind: "totp", prompt: "Code:", retry: false });
|
||||
const sent = JSON.parse(socket.send.mock.calls[0][0]);
|
||||
socket.answer("stale", "wrong");
|
||||
expect(socket.listenerCount("message")).toBe(1);
|
||||
socket.answer(sent.requestId, "123456");
|
||||
await expect(result).resolves.toBe("123456");
|
||||
expect(socket.listenerCount("message")).toBe(0);
|
||||
expect(socket.send).toHaveBeenCalledTimes(1);
|
||||
const retry = prompt.ask({ kind: "totp", prompt: "Code:", retry: true });
|
||||
socket.answer(sent.requestId, "old");
|
||||
socket.close();
|
||||
await expect(retry).rejects.toThrow("cancelled");
|
||||
});
|
||||
|
||||
it("cancels on a null answer and bounds unanswered prompts", async () => {
|
||||
vi.useFakeTimers();
|
||||
const cancelled = new Socket();
|
||||
const request = createC2SPrompt(cancelled.ws).ask({
|
||||
kind: "input",
|
||||
prompt: "Password:",
|
||||
echo: false,
|
||||
isPush: false,
|
||||
});
|
||||
cancelled.answer(
|
||||
JSON.parse(cancelled.send.mock.calls[0][0]).requestId,
|
||||
null,
|
||||
);
|
||||
await expect(request).rejects.toThrow("cancelled");
|
||||
expect(cancelled.readyState).toBe(3);
|
||||
const socket = new Socket();
|
||||
const result = createC2SPrompt(socket.ws).ask({
|
||||
kind: "totp",
|
||||
prompt: "Code:",
|
||||
retry: false,
|
||||
});
|
||||
const failed = expect(result).rejects.toThrow("timed out");
|
||||
await vi.advanceTimersByTimeAsync(60_000);
|
||||
await failed;
|
||||
expect(socket.readyState).toBe(3);
|
||||
expect(socket.listenerCount("message")).toBe(0);
|
||||
});
|
||||
|
||||
it("reuses one authenticated source for concurrent streams, scoped to user, host and desktop runtime", async () => {
|
||||
let actor = "alice";
|
||||
const disposals: Array<() => void> = [];
|
||||
const connections: Array<{
|
||||
client: EventEmitter;
|
||||
dispose: ReturnType<typeof vi.fn>;
|
||||
}> = [];
|
||||
const connect = vi.fn(
|
||||
async (_id: number, options: PluginSshConnectOptions) => {
|
||||
expect(options.prompt).toBeDefined();
|
||||
const result = {
|
||||
client: new EventEmitter(),
|
||||
host: {},
|
||||
jumpClient: null,
|
||||
dispose: vi.fn(),
|
||||
};
|
||||
connections.push(result);
|
||||
return result;
|
||||
},
|
||||
);
|
||||
const acquire = createC2SConnections({
|
||||
currentActor: () => actor,
|
||||
disposables: { add: (fn: () => void) => disposals.push(fn) },
|
||||
ssh: { connect },
|
||||
} as unknown as PluginContext);
|
||||
const anchor = new Socket();
|
||||
const first = new Socket();
|
||||
const second = new Socket();
|
||||
await Promise.all([
|
||||
acquire(anchor.ws, 1, "runtime-a"),
|
||||
acquire(first.ws, 1, "runtime-a"),
|
||||
acquire(second.ws, 1, "runtime-a"),
|
||||
]);
|
||||
expect(connect).toHaveBeenCalledTimes(1);
|
||||
first.close();
|
||||
second.close();
|
||||
await flush();
|
||||
expect(connections[0].dispose).not.toHaveBeenCalled();
|
||||
await acquire(new Socket().ws, 1, "runtime-b");
|
||||
await acquire(new Socket().ws, 2, "runtime-a");
|
||||
actor = "bob";
|
||||
await acquire(new Socket().ws, 1, "runtime-a");
|
||||
expect(connect).toHaveBeenCalledTimes(4);
|
||||
anchor.close();
|
||||
await flush();
|
||||
expect(connections[0].dispose).toHaveBeenCalledOnce();
|
||||
disposals.forEach((dispose) => dispose());
|
||||
await flush();
|
||||
expect(
|
||||
connections.every((entry) => entry.dispose.mock.calls.length === 1),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("disposes a connection that authenticates after the desktop stopped", async () => {
|
||||
let ready!: (value: unknown) => void;
|
||||
const source = { client: new EventEmitter(), dispose: vi.fn() };
|
||||
const acquire = createC2SConnections({
|
||||
currentActor: () => "alice",
|
||||
disposables: { add: vi.fn() },
|
||||
ssh: {
|
||||
connect: () =>
|
||||
new Promise((resolve) => {
|
||||
ready = resolve;
|
||||
}),
|
||||
},
|
||||
} as unknown as PluginContext);
|
||||
const socket = new Socket();
|
||||
const pending = acquire(socket.ws, 1, "stopped");
|
||||
socket.close();
|
||||
ready(source);
|
||||
await expect(pending).rejects.toThrow("closed");
|
||||
await flush();
|
||||
expect(source.dispose).toHaveBeenCalledOnce();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,108 @@
|
||||
import { EventEmitter } from "node:events";
|
||||
import { PassThrough } from "node:stream";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import type { WebSocket } from "ws";
|
||||
import type { PluginSshConnectOptions } from "@termix/plugin-sdk/backend";
|
||||
import { createMockCtx } from "@termix/plugin-sdk/testing";
|
||||
import { createC2SRelay } from "../../src/backend/c2s-relay.js";
|
||||
import { host, manifest } from "./helpers.js";
|
||||
class Socket extends EventEmitter {
|
||||
readyState = 1;
|
||||
send = vi.fn();
|
||||
close() {
|
||||
this.readyState = 3;
|
||||
this.emit("close");
|
||||
}
|
||||
message(value: unknown) {
|
||||
this.emit("message", Buffer.from(JSON.stringify(value)), false);
|
||||
}
|
||||
get ws() {
|
||||
return this as unknown as WebSocket;
|
||||
}
|
||||
messages() {
|
||||
return this.send.mock.calls.map(([data]) => JSON.parse(String(data)));
|
||||
}
|
||||
}
|
||||
|
||||
describe("interactive client relay", () => {
|
||||
it("authenticates preflight once and forwards subsequent SOCKS streams on the retained connection", async () => {
|
||||
const mock = createMockCtx({
|
||||
pluginId: "tunnels",
|
||||
manifest,
|
||||
capabilities: manifest.capabilities,
|
||||
permissions: ["tunnels.use"],
|
||||
hosts: [host()],
|
||||
});
|
||||
const stream = new PassThrough();
|
||||
const client = Object.assign(new EventEmitter(), {
|
||||
forwardOut: vi.fn((_ip, _port, _target, _targetPort, callback) =>
|
||||
callback(null, stream),
|
||||
),
|
||||
});
|
||||
const dispose = vi.fn();
|
||||
const connect = vi.fn(
|
||||
async (_id: number, options: PluginSshConnectOptions) => {
|
||||
expect(
|
||||
await options.prompt!.ask({
|
||||
kind: "totp",
|
||||
prompt: "Verification code:",
|
||||
retry: false,
|
||||
}),
|
||||
).toBe("123456");
|
||||
return { client, dispose, host: host(), jumpClient: null };
|
||||
},
|
||||
);
|
||||
mock.ctx.ssh.connect = connect as typeof mock.ctx.ssh.connect;
|
||||
const handle = createC2SRelay(mock.ctx);
|
||||
const anchor = new Socket();
|
||||
const socket = new Socket();
|
||||
const tunnelConfig = {
|
||||
sourceHostId: 7,
|
||||
mode: "dynamic",
|
||||
sessionId: "desktop-runtime",
|
||||
};
|
||||
try {
|
||||
handle(anchor.ws, "user-1");
|
||||
anchor.message({ type: "test", keepAlive: true, tunnelConfig });
|
||||
await vi.waitFor(() =>
|
||||
expect(anchor.messages()[0]?.type).toBe("auth-prompt"),
|
||||
);
|
||||
anchor.message({
|
||||
type: "auth-response",
|
||||
requestId: anchor.messages()[0].requestId,
|
||||
answer: "123456",
|
||||
});
|
||||
await vi.waitFor(() =>
|
||||
expect(anchor.messages().at(-1)?.type).toBe("ready"),
|
||||
);
|
||||
expect(dispose).not.toHaveBeenCalled();
|
||||
handle(socket.ws, "user-1");
|
||||
socket.message({
|
||||
type: "open",
|
||||
tunnelConfig,
|
||||
targetHost: "internal.example",
|
||||
targetPort: 443,
|
||||
});
|
||||
await vi.waitFor(() =>
|
||||
expect(socket.messages().at(-1)?.type).toBe("ready"),
|
||||
);
|
||||
expect(connect).toHaveBeenCalledOnce();
|
||||
expect(client.forwardOut).toHaveBeenCalledWith(
|
||||
"127.0.0.1",
|
||||
0,
|
||||
"internal.example",
|
||||
443,
|
||||
expect.any(Function),
|
||||
);
|
||||
socket.close();
|
||||
expect(dispose).not.toHaveBeenCalled();
|
||||
anchor.close();
|
||||
await vi.waitFor(() => expect(dispose).toHaveBeenCalledOnce());
|
||||
} finally {
|
||||
socket.close();
|
||||
anchor.close();
|
||||
stream.destroy();
|
||||
for (const cleanup of mock.disposals) await cleanup();
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,84 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { act, fireEvent, screen } from "@testing-library/react";
|
||||
import {
|
||||
renderWithApp,
|
||||
type RenderedPluginApp,
|
||||
} from "@termix/plugin-sdk/testing";
|
||||
import type { PluginManifest } from "@termix/plugin-sdk/manifest";
|
||||
import * as plugin from "../../src/frontend/index";
|
||||
import manifestJson from "../../manifest.json";
|
||||
import locales from "../../locales/en.json";
|
||||
let rendered: RenderedPluginApp | null = null;
|
||||
const original = window.electronAPI;
|
||||
afterEach(async () => {
|
||||
await act(async () => {
|
||||
await rendered?.deactivate();
|
||||
});
|
||||
rendered = null;
|
||||
window.electronAPI = original;
|
||||
});
|
||||
|
||||
describe("tunnel prompt overlay", () => {
|
||||
it("queues challenges, clears the previous code, and cancels on plugin disposal", async () => {
|
||||
type Event = Parameters<
|
||||
Parameters<typeof window.electronAPI.onC2SAuthPrompt>[0]
|
||||
>[0];
|
||||
let receive!: (event: Event) => void;
|
||||
const answer = vi.fn().mockResolvedValue(true);
|
||||
const unsubscribe = vi.fn();
|
||||
window.electronAPI = {
|
||||
...original,
|
||||
answerC2SAuth: answer,
|
||||
onC2SAuthPrompt: (fn) => {
|
||||
receive = fn;
|
||||
return unsubscribe;
|
||||
},
|
||||
};
|
||||
rendered = await renderWithApp(plugin, {
|
||||
manifest: manifestJson as unknown as PluginManifest,
|
||||
locales,
|
||||
});
|
||||
rendered.renderSlot("shell.overlay");
|
||||
act(() => {
|
||||
receive({
|
||||
id: "one",
|
||||
tunnelName: "SOCKS",
|
||||
request: { kind: "totp", prompt: "Code:", retry: false },
|
||||
});
|
||||
receive({
|
||||
id: "two",
|
||||
tunnelName: "Other",
|
||||
request: { kind: "totp", prompt: "Code:", retry: true },
|
||||
});
|
||||
});
|
||||
const input = screen.getByLabelText("Authentication response");
|
||||
expect(input.getAttribute("type")).toBe("password");
|
||||
fireEvent.change(input, { target: { value: "123456" } });
|
||||
fireEvent.click(screen.getByText("Continue"));
|
||||
expect(answer).toHaveBeenCalledWith("one", "123456");
|
||||
expect(
|
||||
(screen.getByLabelText("Authentication response") as HTMLInputElement)
|
||||
.value,
|
||||
).toBe("");
|
||||
expect(screen.getByRole("alert").textContent).toContain("previous code");
|
||||
act(() => receive({ id: "two", closed: true }));
|
||||
expect(screen.queryByRole("dialog")).toBeNull();
|
||||
act(() =>
|
||||
receive({
|
||||
id: "three",
|
||||
request: {
|
||||
kind: "input",
|
||||
prompt: "Password:",
|
||||
echo: false,
|
||||
isPush: false,
|
||||
},
|
||||
}),
|
||||
);
|
||||
await act(async () => {
|
||||
await rendered!.deactivate();
|
||||
});
|
||||
rendered = null;
|
||||
expect(answer).toHaveBeenCalledWith("three", null);
|
||||
expect(unsubscribe).toHaveBeenCalledOnce();
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user