Skip to content

Commit 511ba2a

Browse files
Merge remote-tracking branch 'origin/main' into server-persistence-03/startup-scheduling
2 parents 2390269 + 760cdec commit 511ba2a

246 files changed

Lines changed: 11620 additions & 1224 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/desktop/src/app/DesktopApp.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@ const bootstrap = Effect.gen(function* () {
239239
}
240240

241241
if (!(yield* Ref.get(state.quitting))) {
242-
if (settings.wslOnly === true && settings.wslBackendEnabled === true) {
243-
yield* desktopWindow.showConnectingSplash;
244-
}
242+
yield* desktopWindow.showConnectingSplash;
245243
yield* primaryBackend.start;
246244
yield* logBootstrapInfo("bootstrap backend start requested");
247245
yield* appActivation.start.pipe(

‎apps/desktop/src/electron/ElectronShell.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ describe("ElectronShell", () => {
7878

7979
const electronShell = yield* ElectronShell.ElectronShell;
8080
const result = yield* electronShell.openExternal(
81-
"vscode://vscode-remote/ssh-remote+example.com/home/user/project",
81+
"vscode://vscode-remote/ssh-remote+user%40example.com/home/user/project",
8282
);
8383

8484
assert.equal(result, true);
8585
assert.deepEqual(openExternalMock.mock.calls, [
86-
["vscode://vscode-remote/ssh-remote+example.com/home/user/project"],
86+
["vscode://vscode-remote/ssh-remote+user%40example.com/home/user/project"],
8787
]);
8888
}).pipe(Effect.provide(ElectronShell.layer)),
8989
);
@@ -94,13 +94,13 @@ describe("ElectronShell", () => {
9494

9595
const electronShell = yield* ElectronShell.ElectronShell;
9696
const results = yield* Effect.all([
97-
electronShell.openExternal("zed://ssh/example.com/home/user/project"),
97+
electronShell.openExternal("zed://ssh/user@example.com/home/user/project"),
9898
electronShell.openExternal("zed://ssh/example.com/"),
9999
]);
100100

101101
assert.deepEqual(results, [true, true]);
102102
assert.deepEqual(openExternalMock.mock.calls, [
103-
["zed://ssh/example.com/home/user/project"],
103+
["zed://ssh/user@example.com/home/user/project"],
104104
["zed://ssh/example.com/"],
105105
]);
106106
}).pipe(Effect.provide(ElectronShell.layer)),
@@ -111,7 +111,7 @@ describe("ElectronShell", () => {
111111
openExternalMock.mockResolvedValue(undefined);
112112

113113
const url =
114-
"jetbrains://gateway/ssh/environment?h=example.com&launchIde=true&ideHint=IU&projectHint=%2Fhome%2Fuser%2Fproject";
114+
"jetbrains://gateway/ssh/environment?h=example.com&launchIde=true&ideHint=IU&projectHint=%2Fhome%2Fuser%2Fproject&u=user";
115115
const electronShell = yield* ElectronShell.ElectronShell;
116116
const result = yield* electronShell.openExternal(url);
117117

@@ -150,7 +150,7 @@ describe("ElectronShell", () => {
150150
electronShell.openExternal(
151151
"vscode://:secret@vscode-remote/ssh-remote+example.com/home/user/project",
152152
),
153-
electronShell.openExternal("zed://ssh/[email protected]/home/user/project"),
153+
electronShell.openExternal("zed://ssh/user:secret@example.com/home/user/project"),
154154
electronShell.openExternal("jetbrains://user@gateway/ssh/environment?h=example.com"),
155155
]);
156156

‎apps/desktop/src/electron/ElectronShell.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const REMOTE_EDITOR_PROTOCOLS = new Set(
2222
}),
2323
);
2424

25-
// Zed's host sits in the first path segment, so it needs its own userinfo ban.
26-
const ZED_SSH_PATHNAME = /^\/[^/@:]+\/.*$/;
25+
// Zed embeds [user@]host in the path; reject passwords and ports there.
26+
const ZED_SSH_PATHNAME = /^\/(?:[^/@:]+@)?[^/@:]+\/.*$/;
2727

2828
const isRemoteEditorUrl = (url: URL) =>
2929
REMOTE_EDITOR_PROTOCOLS.has(url.protocol) &&

‎apps/desktop/src/electron/ElectronUpdater.test.ts‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { assert, describe, it } from "@effect/vitest";
22
import * as Effect from "effect/Effect";
3+
import type { VerifyUpdateCodeSignature } from "electron-updater";
34
import { beforeEach, vi } from "vite-plus/test";
45

56
const { autoUpdaterMock } = vi.hoisted(() => ({
@@ -13,6 +14,8 @@ const { autoUpdaterMock } = vi.hoisted(() => ({
1314
fullChangelog: false,
1415
checkForUpdates: vi.fn(() => Promise.resolve(null)),
1516
downloadUpdate: vi.fn(() => Promise.resolve([])),
17+
logger: { info: vi.fn(), warn: vi.fn(), error: vi.fn() },
18+
verifyUpdateCodeSignature: undefined as VerifyUpdateCodeSignature | undefined,
1619
on: vi.fn(),
1720
quitAndInstall: vi.fn(),
1821
removeListener: vi.fn(),
@@ -43,6 +46,7 @@ describe("ElectronUpdater", () => {
4346
autoUpdaterMock.quitAndInstall.mockClear();
4447
autoUpdaterMock.removeListener.mockClear();
4548
autoUpdaterMock.setFeedURL.mockClear();
49+
autoUpdaterMock.verifyUpdateCodeSignature = undefined;
4650
});
4751

4852
it.effect("scopes updater event listeners", () =>
@@ -136,4 +140,84 @@ describe("ElectronUpdater", () => {
136140
assert.deepEqual(autoUpdaterMock.quitAndInstall.mock.calls, [[true, false]]);
137141
}).pipe(Effect.provide(ElectronUpdater.layer)),
138142
);
143+
144+
describe("Windows update signature check", () => {
145+
const publisherNames = ["T3 Tools Inc"];
146+
const installerPath = "C:\\updater\\pending\\temp-T3-Code-x64.exe";
147+
// execFile marks the error killed when the verifier exceeds its 20-second timeout.
148+
const timedOut = () =>
149+
Object.assign(new Error("Command failed: powershell.exe"), { killed: true });
150+
151+
const downloadVerifyingSignature = () => {
152+
autoUpdaterMock.downloadUpdate.mockImplementationOnce(async () => {
153+
const rejection = await autoUpdaterMock.verifyUpdateCodeSignature!(
154+
publisherNames,
155+
installerPath,
156+
);
157+
// NSIS accepts only null as a successful signature check.
158+
if (rejection !== null) throw new Error(`Invalid signature: ${rejection}`);
159+
return [];
160+
});
161+
return Effect.flatMap(ElectronUpdater.ElectronUpdater, (updater) => updater.downloadUpdate);
162+
};
163+
164+
it.effect("retries a timed-out signature check with the same verifier and installer", () =>
165+
Effect.gen(function* () {
166+
const verify = vi
167+
.fn<VerifyUpdateCodeSignature>()
168+
.mockRejectedValueOnce(timedOut())
169+
.mockResolvedValueOnce(null);
170+
autoUpdaterMock.verifyUpdateCodeSignature = verify;
171+
172+
yield* downloadVerifyingSignature();
173+
174+
assert.deepEqual(verify.mock.calls, [
175+
[publisherNames, installerPath],
176+
[publisherNames, installerPath],
177+
]);
178+
}).pipe(Effect.provide(ElectronUpdater.layer)),
179+
);
180+
181+
it.effect("fails on invalid signatures, other errors and two timeouts on each download", () =>
182+
Effect.gen(function* () {
183+
const cases = [
184+
{ outcome: () => Promise.resolve("Invalid publisher"), calls: 1 },
185+
{ outcome: () => Promise.reject(new Error("Cannot execute PowerShell")), calls: 1 },
186+
{ outcome: () => Promise.reject(timedOut()), calls: 2 },
187+
];
188+
for (const { outcome, calls } of cases) {
189+
const verify = vi.fn<VerifyUpdateCodeSignature>(outcome);
190+
autoUpdaterMock.verifyUpdateCodeSignature = verify;
191+
192+
// Reusing the installed verifier must neither stack retries nor exhaust future retries.
193+
for (let download = 1; download <= 2; download++) {
194+
const error = yield* downloadVerifyingSignature().pipe(Effect.flip);
195+
assert.instanceOf(error, ElectronUpdater.ElectronUpdaterDownloadUpdateError);
196+
assert.equal(verify.mock.calls.length, calls * download);
197+
}
198+
}
199+
}).pipe(Effect.provide(ElectronUpdater.layer)),
200+
);
201+
202+
it.effect("rejects a retry when the upstream capability probe skips verification", () =>
203+
Effect.gen(function* () {
204+
const verify = vi
205+
.fn<VerifyUpdateCodeSignature>()
206+
.mockRejectedValueOnce(timedOut())
207+
.mockImplementationOnce(async () => {
208+
// Upstream resolves null even though its failed capability probe skips verification.
209+
autoUpdaterMock.logger.warn(
210+
"Cannot execute ConvertTo-Json: spawnSync powershell.exe ETIMEDOUT. Ignoring signature validation due to unsupported powershell version. Please upgrade to powershell 3 or higher.",
211+
);
212+
return null;
213+
});
214+
autoUpdaterMock.verifyUpdateCodeSignature = verify;
215+
216+
const error = yield* downloadVerifyingSignature().pipe(Effect.flip);
217+
218+
assert.instanceOf(error, ElectronUpdater.ElectronUpdaterDownloadUpdateError);
219+
assert.equal(verify.mock.calls.length, 2);
220+
}).pipe(Effect.provide(ElectronUpdater.layer)),
221+
);
222+
});
139223
});

‎apps/desktop/src/electron/ElectronUpdater.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as Schema from "effect/Schema";
55
import * as Scope from "effect/Scope";
66

77
import { autoUpdater } from "electron-updater";
8+
import type { NsisUpdater, VerifyUpdateCodeSignature } from "electron-updater";
89

910
type AutoUpdater = typeof autoUpdater;
1011

@@ -80,6 +81,45 @@ export class ElectronUpdater extends Context.Service<
8081
}
8182
>()("@t3tools/desktop/electron/ElectronUpdater") {}
8283

84+
const signatureChecksWithRetry = new WeakSet<VerifyUpdateCodeSignature>();
85+
86+
const retrySignatureCheckAfterTimeout = () => {
87+
// Only the Windows NSIS updater exposes this hook; its PowerShell check times out after 20 s.
88+
const updater = autoUpdater as AutoUpdater &
89+
Partial<Pick<NsisUpdater, "verifyUpdateCodeSignature">>;
90+
const verify = updater.verifyUpdateCodeSignature;
91+
if (verify === undefined || signatureChecksWithRetry.has(verify)) return;
92+
93+
const verifyWithRetry: VerifyUpdateCodeSignature = async (publisherNames, path) => {
94+
try {
95+
return await verify(publisherNames, path);
96+
} catch (error) {
97+
if (!(error instanceof Error && "killed" in error && error.killed === true)) throw error;
98+
}
99+
100+
const logger = updater.logger;
101+
let skipped = false;
102+
updater.logger = {
103+
info: (message) => logger?.info(message),
104+
warn: (message) => {
105+
// A failed capability probe makes electron-updater warn and return null without checking.
106+
skipped ||= String(message).includes("Ignoring signature validation");
107+
logger?.warn(message);
108+
},
109+
error: (message) => logger?.error(message),
110+
debug: (message) => logger?.debug?.(message),
111+
};
112+
try {
113+
const result = await verify(publisherNames, path);
114+
return skipped ? "Signature validation was skipped after a timed-out check." : result;
115+
} finally {
116+
updater.logger = logger;
117+
}
118+
};
119+
signatureChecksWithRetry.add(verifyWithRetry);
120+
updater.verifyUpdateCodeSignature = verifyWithRetry;
121+
};
122+
83123
/** @public Service construction is part of the canonical Effect module API. */
84124
export const make = ElectronUpdater.of({
85125
setFeedURL: (options) =>
@@ -131,6 +171,7 @@ export const make = ElectronUpdater.of({
131171
}).pipe(Effect.asVoid);
132172
}),
133173
downloadUpdate: Effect.suspend(() => {
174+
retrySignatureCheckAfterTimeout();
134175
const channel = autoUpdater.channel;
135176
return Effect.tryPromise({
136177
try: () => autoUpdater.downloadUpdate(),

‎apps/desktop/src/ipc/DesktopIpcHandlers.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {
4040
import {
4141
getAppBranding,
4242
getLocalEnvironmentBootstraps,
43+
readLocalEnvironmentBootstraps,
4344
getLocalEnvironmentBearerToken,
4445
getRelayTelemetryEnabled,
4546
getSystemLocale,
@@ -100,6 +101,7 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
100101
yield* ipc.handleSync(getSystemLocale);
101102
yield* ipc.handleSync(getWindowFullscreenState);
102103
yield* ipc.handleSync(getLocalEnvironmentBootstraps);
104+
yield* ipc.handle(readLocalEnvironmentBootstraps);
103105
yield* ipc.handleSync(getLocalEnvironmentEnabled);
104106
yield* ipc.handle(setLocalEnvironmentEnabled);
105107
yield* ipc.handle(getLocalEnvironmentBearerToken);

‎apps/desktop/src/ipc/methods/window.ts‎

Lines changed: 58 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -99,57 +99,68 @@ export const getWindowFullscreenState = DesktopIpc.makeSyncIpcMethod({
9999
}),
100100
});
101101

102-
export const getLocalEnvironmentBootstraps = DesktopIpc.makeSyncIpcMethod({
103-
channel: IpcChannels.GET_LOCAL_ENVIRONMENT_BOOTSTRAPS_CHANNEL,
104-
result: Schema.Array(DesktopEnvironmentBootstrapSchema),
105-
handler: Effect.fn("desktop.ipc.window.getLocalEnvironmentBootstraps")(function* () {
106-
const pool = yield* DesktopBackendPool.DesktopBackendPool;
107-
const configuration = yield* DesktopBackendConfiguration.DesktopBackendConfiguration;
108-
const instances = yield* pool.list;
109-
const bootstraps: DesktopEnvironmentBootstrap[] = [];
110-
for (const instance of instances) {
111-
const isPrimary = instance.id === PRIMARY_LOCAL_ENVIRONMENT_ID;
112-
const config = yield* instance.currentConfig;
113-
const snapshot = yield* instance.snapshot;
114-
if (Option.isNone(config) || Option.isSome(config.value.preflightFailure)) {
115-
const fatalPreflight =
116-
Option.isSome(config) &&
117-
Option.isSome(config.value.preflightFailure) &&
118-
config.value.preflightFailure.value.fatal;
119-
const stoppedPreflight =
120-
Option.isSome(config) &&
121-
Option.isSome(config.value.preflightFailure) &&
122-
(!snapshot.desiredRunning || !snapshot.restartScheduled);
123-
if (isPrimary || fatalPreflight || stoppedPreflight) continue;
124-
bootstraps.push({
125-
id: instance.id,
126-
label: yield* instance.label,
127-
runningDistro: null,
128-
httpBaseUrl: null,
129-
wsBaseUrl: null,
130-
});
131-
continue;
132-
}
133-
const { bootstrap, httpBaseUrl } = config.value;
134-
const runningDistro = config.value.runningDistro ?? null;
102+
const readLocalEnvironmentBootstrapSnapshot = Effect.fn(
103+
"desktop.ipc.window.getLocalEnvironmentBootstraps",
104+
)(function* () {
105+
const pool = yield* DesktopBackendPool.DesktopBackendPool;
106+
const configuration = yield* DesktopBackendConfiguration.DesktopBackendConfiguration;
107+
const instances = yield* pool.list;
108+
const bootstraps: DesktopEnvironmentBootstrap[] = [];
109+
for (const instance of instances) {
110+
const isPrimary = instance.id === PRIMARY_LOCAL_ENVIRONMENT_ID;
111+
const config = yield* instance.currentConfig;
112+
const snapshot = yield* instance.snapshot;
113+
if (Option.isNone(config) || Option.isSome(config.value.preflightFailure)) {
114+
const fatalPreflight =
115+
Option.isSome(config) &&
116+
Option.isSome(config.value.preflightFailure) &&
117+
config.value.preflightFailure.value.fatal;
118+
const stoppedPreflight =
119+
Option.isSome(config) &&
120+
Option.isSome(config.value.preflightFailure) &&
121+
(!snapshot.desiredRunning || !snapshot.restartScheduled);
122+
if (isPrimary || fatalPreflight || stoppedPreflight) continue;
135123
bootstraps.push({
136124
id: instance.id,
137-
label: runningDistro === null ? yield* instance.label : `WSL (${runningDistro})`,
138-
runningDistro,
139-
httpBaseUrl: httpBaseUrl.href,
140-
wsBaseUrl: toWebSocketBaseUrl(httpBaseUrl),
141-
// A backend launched with the desktop secret accepts whichever token the secret derives
142-
// for the current window, so hand out that one rather than the token frozen into its
143-
// launch config.
144-
...(bootstrap.desktopBootstrapSecret
145-
? { bootstrapToken: yield* configuration.currentBootstrapToken }
146-
: bootstrap.desktopBootstrapToken
147-
? { bootstrapToken: bootstrap.desktopBootstrapToken }
148-
: {}),
125+
label: yield* instance.label,
126+
runningDistro: null,
127+
httpBaseUrl: null,
128+
wsBaseUrl: null,
149129
});
130+
continue;
150131
}
151-
return bootstraps;
152-
}),
132+
const { bootstrap, httpBaseUrl } = config.value;
133+
const runningDistro = config.value.runningDistro ?? null;
134+
bootstraps.push({
135+
id: instance.id,
136+
label: runningDistro === null ? yield* instance.label : `WSL (${runningDistro})`,
137+
runningDistro,
138+
httpBaseUrl: httpBaseUrl.href,
139+
wsBaseUrl: toWebSocketBaseUrl(httpBaseUrl),
140+
// A backend launched with the desktop secret accepts whichever token the secret derives
141+
// for the current window, so hand out that one rather than the token frozen into its
142+
// launch config.
143+
...(bootstrap.desktopBootstrapSecret
144+
? { bootstrapToken: yield* configuration.currentBootstrapToken }
145+
: bootstrap.desktopBootstrapToken
146+
? { bootstrapToken: bootstrap.desktopBootstrapToken }
147+
: {}),
148+
});
149+
}
150+
return bootstraps;
151+
});
152+
153+
export const getLocalEnvironmentBootstraps = DesktopIpc.makeSyncIpcMethod({
154+
channel: IpcChannels.GET_LOCAL_ENVIRONMENT_BOOTSTRAPS_CHANNEL,
155+
result: Schema.Array(DesktopEnvironmentBootstrapSchema),
156+
handler: readLocalEnvironmentBootstrapSnapshot,
157+
});
158+
159+
export const readLocalEnvironmentBootstraps = DesktopIpc.makeIpcMethod({
160+
channel: IpcChannels.GET_LOCAL_ENVIRONMENT_BOOTSTRAPS_CHANNEL,
161+
payload: Schema.Void,
162+
result: Schema.Array(DesktopEnvironmentBootstrapSchema),
163+
handler: readLocalEnvironmentBootstrapSnapshot,
153164
});
154165

155166
function extractWslDistroFromEnvironmentId(envId: string): string | null {

0 commit comments

Comments
 (0)