Skip to content

Commit 83e0a84

Browse files
mwolsonJulius Marminge
authored andcommitted
fix(desktop): Preserve SSH HTTP auth status
1 parent b440dd1 commit 83e0a84

2 files changed

Lines changed: 91 additions & 5 deletions

File tree

‎apps/desktop/src/ipc/methods/sshEnvironment.test.ts‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstab
1010
import {
1111
DesktopSshEnvironmentRequestError,
1212
fetchSshEnvironmentDescriptor,
13+
fetchSshSessionState,
1314
} from "./sshEnvironment.ts";
1415

1516
function jsonResponse(request: HttpClientRequest.HttpClientRequest, body: unknown, status = 200) {
@@ -112,4 +113,39 @@ describe("SSH environment IPC", () => {
112113
assert.equal(requestCount, 0);
113114
}).pipe(Effect.provide(layer));
114115
});
116+
117+
it.effect("preserves SSH HTTP status in top-level request error messages", () => {
118+
const layer = makeHttpClientLayer((request) =>
119+
Effect.succeed(
120+
jsonResponse(
121+
request,
122+
{
123+
_tag: "EnvironmentAuthInvalidError",
124+
code: "auth_invalid",
125+
reason: "invalid_credential",
126+
traceId: "11111111111111111111111111111111",
127+
},
128+
401,
129+
),
130+
),
131+
);
132+
133+
return Effect.gen(function* () {
134+
const exit = yield* Effect.exit(
135+
fetchSshSessionState.handler({
136+
bearerToken: "stale-bearer-token",
137+
httpBaseUrl: "http://127.0.0.1:41773/",
138+
}),
139+
);
140+
assert(Exit.isFailure(exit));
141+
const failure = Cause.findErrorOption(exit.cause);
142+
assert(Option.isSome(failure));
143+
const error = failure.value;
144+
145+
assert.instanceOf(error, DesktopSshEnvironmentRequestError);
146+
assert.equal(error.operation, "fetch-session-state");
147+
assert.equal(error.sshHttpStatus, 401);
148+
assert.match(error.message, /^\[ssh_http:401\] /u);
149+
}).pipe(Effect.provide(layer));
150+
});
115151
});

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

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import {
33
fetchRemoteEnvironmentDescriptor,
44
fetchRemoteSessionState,
55
issueRemoteWebSocketTicket,
6+
RemoteEnvironmentAuthUndeclaredStatusError,
7+
type RemoteEnvironmentAuthError,
68
} from "@t3tools/client-runtime";
79
import {
10+
EnvironmentAuthInvalidError,
811
DesktopDiscoveredSshHostSchema,
912
DesktopSshBearerBootstrapInputSchema,
1013
DesktopSshBearerRequestInputSchema,
@@ -15,10 +18,15 @@ import {
1518
DesktopSshPasswordPromptCancelledType,
1619
DesktopSshPasswordPromptResolutionInputSchema,
1720
ExecutionEnvironmentDescriptor,
21+
EnvironmentInternalError,
22+
EnvironmentOperationForbiddenError,
23+
EnvironmentRequestInvalidError,
24+
EnvironmentScopeRequiredError,
1825
AuthAccessTokenResult,
1926
AuthSessionState,
2027
AuthWebSocketTicketResult,
2128
} from "@t3tools/contracts";
29+
import { SshHttpBridgeError } from "@t3tools/ssh/errors";
2230
import { resolveLoopbackSshHttpBaseUrl } from "@t3tools/ssh/tunnel";
2331
import * as Data from "effect/Data";
2432
import * as Effect from "effect/Effect";
@@ -35,26 +43,68 @@ type DesktopSshEnvironmentRequestOperation =
3543
| "fetch-session-state"
3644
| "issue-websocket-ticket";
3745

46+
type DesktopSshEnvironmentRequestCause = RemoteEnvironmentAuthError | SshHttpBridgeError;
47+
48+
const isEnvironmentAuthInvalidError = Schema.is(EnvironmentAuthInvalidError);
49+
const isEnvironmentInternalError = Schema.is(EnvironmentInternalError);
50+
const isEnvironmentOperationForbiddenError = Schema.is(EnvironmentOperationForbiddenError);
51+
const isEnvironmentRequestInvalidError = Schema.is(EnvironmentRequestInvalidError);
52+
const isEnvironmentScopeRequiredError = Schema.is(EnvironmentScopeRequiredError);
53+
54+
function readSshHttpStatus(cause: DesktopSshEnvironmentRequestCause): number | null {
55+
if (
56+
cause instanceof RemoteEnvironmentAuthUndeclaredStatusError ||
57+
cause instanceof SshHttpBridgeError
58+
) {
59+
return cause.status ?? null;
60+
}
61+
if (isEnvironmentRequestInvalidError(cause)) {
62+
return 400;
63+
}
64+
if (isEnvironmentAuthInvalidError(cause)) {
65+
return 401;
66+
}
67+
if (isEnvironmentScopeRequiredError(cause)) {
68+
return 403;
69+
}
70+
if (isEnvironmentOperationForbiddenError(cause)) {
71+
return 403;
72+
}
73+
if (isEnvironmentInternalError(cause)) {
74+
return 500;
75+
}
76+
return null;
77+
}
78+
3879
export class DesktopSshEnvironmentRequestError extends Data.TaggedError(
3980
"DesktopSshEnvironmentRequestError",
4081
)<{
4182
readonly operation: DesktopSshEnvironmentRequestOperation;
42-
readonly cause: unknown;
83+
readonly cause: DesktopSshEnvironmentRequestCause;
84+
readonly sshHttpStatus: number | null;
4385
}> {
4486
override get message() {
45-
return `SSH remote API request failed during ${this.operation}.`;
87+
const prefix = this.sshHttpStatus === null ? "" : `[ssh_http:${this.sshHttpStatus}] `;
88+
return `${prefix}SSH remote API request failed during ${this.operation}.`;
4689
}
4790
}
4891

4992
const withLoopbackSshApi =
50-
<A, E, R>(
93+
<A, R>(
5194
operation: DesktopSshEnvironmentRequestOperation,
52-
use: (httpBaseUrl: string) => Effect.Effect<A, E, R>,
95+
use: (httpBaseUrl: string) => Effect.Effect<A, RemoteEnvironmentAuthError, R>,
5396
) =>
5497
(httpBaseUrl: string): Effect.Effect<A, DesktopSshEnvironmentRequestError, R> =>
5598
resolveLoopbackSshHttpBaseUrl(httpBaseUrl).pipe(
5699
Effect.flatMap(use),
57-
Effect.mapError((cause) => new DesktopSshEnvironmentRequestError({ operation, cause })),
100+
Effect.mapError(
101+
(cause) =>
102+
new DesktopSshEnvironmentRequestError({
103+
operation,
104+
cause,
105+
sshHttpStatus: readSshHttpStatus(cause),
106+
}),
107+
),
58108
);
59109

60110
export const discoverSshHosts = makeIpcMethod({

0 commit comments

Comments
 (0)