Skip to content

Commit 3b1e534

Browse files
committed
fix(cli): validate desktop socket directory before connecting
1 parent b5560a9 commit 3b1e534

2 files changed

Lines changed: 84 additions & 8 deletions

File tree

‎apps/server/src/cli/app.test.ts‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ async function startFakeDesktop(input: {
108108
});
109109

110110
return {
111+
directory: target.directory,
111112
received,
112113
close: async () => {
113114
await new Promise<void>((resolve) => server.close(() => resolve()));
@@ -134,9 +135,10 @@ const fakeDesktop = Effect.fn(function* (
134135
const withTempDirectory = <A, E, R>(
135136
prefix: string,
136137
use: (root: string) => Effect.Effect<A, E, R>,
138+
tempDir = NodeOS.tmpdir(),
137139
) =>
138140
Effect.acquireUseRelease(
139-
Effect.promise(() => NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), prefix))),
141+
Effect.promise(() => NodeFSP.mkdtemp(NodePath.join(tempDir, prefix))),
140142
use,
141143
(root) => Effect.promise(() => NodeFSP.rm(root, { recursive: true, force: true })),
142144
);
@@ -215,6 +217,58 @@ describe("t3 server command safety", () => {
215217
});
216218

217219
describe("t3 app", () => {
220+
it.live.each(["permissions", "owner", "symlink", "missing owner"] as const)(
221+
"rejects unsafe %s on the socket directory before sending",
222+
(unsafe) =>
223+
withTempDirectory(
224+
"t3-app-unsafe-",
225+
(root) =>
226+
Effect.gen(function* () {
227+
const platform = yield* HostProcess.Platform;
228+
if (platform === "win32") return;
229+
const previousTmpdir = process.env.TMPDIR;
230+
yield* Effect.acquireRelease(
231+
Effect.sync(() => {
232+
process.env.TMPDIR = root;
233+
}),
234+
() =>
235+
Effect.sync(() => {
236+
if (previousTmpdir === undefined) delete process.env.TMPDIR;
237+
else process.env.TMPDIR = previousTmpdir;
238+
}),
239+
);
240+
const baseDir = NodePath.join(root, ".t3");
241+
const userId = yield* HostProcess.UserId;
242+
assert(userId !== undefined);
243+
const expectedUserId =
244+
unsafe === "missing owner" ? undefined : unsafe === "owner" ? userId + 1 : userId;
245+
const desktop = yield* fakeDesktop({ baseDir }).pipe(
246+
Effect.provideService(HostProcess.UserId, expectedUserId),
247+
);
248+
const directory = desktop.directory;
249+
assert(directory !== null);
250+
if (unsafe === "permissions") {
251+
yield* Effect.promise(() => NodeFSP.chmod(directory, 0o755));
252+
} else if (unsafe === "symlink") {
253+
const moved = NodePath.join(root, "moved");
254+
yield* Effect.promise(() => NodeFSP.rename(directory, moved));
255+
yield* Effect.promise(() => NodeFSP.symlink(moved, directory));
256+
}
257+
const result = yield* runCli(["app"]).pipe(
258+
Effect.provideService(HostProcess.HomeDirectory, root),
259+
Effect.provideService(HostProcess.UserId, expectedUserId),
260+
Effect.result,
261+
);
262+
expect(desktop.received).toEqual([]);
263+
expect(result).toMatchObject({
264+
_tag: "Failure",
265+
failure: { _tag: "DesktopAppUnreachableError" },
266+
});
267+
}).pipe(Effect.scoped),
268+
process.platform === "win32" ? NodeOS.tmpdir() : "/tmp",
269+
),
270+
);
271+
218272
it.effect("uses T3CODE_HOME or --base-dir and sends the default or explicit path", () =>
219273
withTempDirectory("t3-app-command-test-", (root) =>
220274
Effect.gen(function* () {

‎apps/server/src/cli/app.ts‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
// @effect-diagnostics globalTimers:off -- The Node socket client owns its response deadline and clears it on every completion path.
2+
// @effect-diagnostics-next-line nodeBuiltinImport:off -- Effect stat follows symlinks; IPC ownership validation requires lstat.
3+
import * as NodeFSP from "node:fs/promises";
24
import * as NodeNet from "node:net";
35
import * as NodeOS from "node:os";
46

@@ -9,7 +11,10 @@ import {
911
type DesktopAppActivationPlatform,
1012
type DesktopAppActivationRequest,
1113
} from "@t3tools/contracts";
12-
import { resolveDesktopAppControlAddress } from "@t3tools/shared/desktopAppControl";
14+
import {
15+
resolveDesktopAppControlAddress,
16+
type DesktopAppControlAddress,
17+
} from "@t3tools/shared/desktopAppControl";
1318
import * as HostProcess from "@t3tools/shared/HostProcess";
1419
import * as Config from "effect/Config";
1520
import * as Console from "effect/Console";
@@ -77,14 +82,26 @@ function isDesktopPlatform(platform: NodeJS.Platform): platform is DesktopAppAct
7782
return platform === "darwin" || platform === "linux" || platform === "win32";
7883
}
7984

80-
function sendDesktopAppActivationRequest(input: {
81-
readonly address: string;
82-
readonly fallbackAddress?: string;
85+
async function sendDesktopAppActivationRequest(input: {
86+
readonly address: DesktopAppControlAddress;
87+
readonly fallbackAddress?: DesktopAppControlAddress;
88+
readonly userId: number | undefined;
8389
readonly request: DesktopAppActivationRequest;
8490
readonly timeoutMs?: number;
8591
}): Promise<DesktopAppActivationResponse> {
92+
if (input.address.directory !== null) {
93+
const stat = await NodeFSP.lstat(input.address.directory);
94+
if (
95+
!stat.isDirectory() ||
96+
input.userId === undefined ||
97+
stat.uid !== input.userId ||
98+
(stat.mode & 0o077) !== 0
99+
) {
100+
throw new Error("The desktop app socket directory is not private or owned by this user.");
101+
}
102+
}
86103
return new Promise((resolve, reject) => {
87-
const socket = NodeNet.createConnection(input.address);
104+
const socket = NodeNet.createConnection(input.address.address);
88105
socket.setEncoding("utf8");
89106
let buffer = "";
90107
let settled = false;
@@ -159,6 +176,7 @@ function sendDesktopAppActivationRequest(input: {
159176
resolve(
160177
sendDesktopAppActivationRequest({
161178
address: input.fallbackAddress,
179+
userId: input.userId,
162180
request: input.request,
163181
...(input.timeoutMs === undefined ? {} : { timeoutMs: input.timeoutMs }),
164182
}),
@@ -207,7 +225,7 @@ const runAppCommand = Effect.fn("cli.app")(function* (flags: {
207225
tempDir: NodeOS.tmpdir(),
208226
userId,
209227
joinPath: path.join,
210-
}).address;
228+
});
211229
const crypto = yield* Crypto.Crypto;
212230
const requestId = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
213231
const request: DesktopAppActivationRequest = {
@@ -224,12 +242,16 @@ const runAppCommand = Effect.fn("cli.app")(function* (flags: {
224242
try: () =>
225243
sendDesktopAppActivationRequest({
226244
address,
245+
userId,
227246
...(fallbackAddress === undefined ? {} : { fallbackAddress }),
228247
request,
229248
}),
230249
catch: (cause) =>
231250
new DesktopAppUnreachableError({
232-
candidateAddresses: fallbackAddress === undefined ? [address] : [address, fallbackAddress],
251+
candidateAddresses:
252+
fallbackAddress === undefined
253+
? [address.address]
254+
: [address.address, fallbackAddress.address],
233255
requestId: request.requestId,
234256
workspaceRoot,
235257
cause,

0 commit comments

Comments
 (0)