Skip to content

Commit deaad47

Browse files
committed
feat(device): read the EAS access token from a secret provider
An EAS host's access token can now name a secret provider reference. Refreshing secrets re-reads it, and a named secret that cannot be read fails instead of falling back to another Expo login. Signed-off-by: Yordis Prieto <[email protected]>
1 parent a81b2bc commit deaad47

9 files changed

Lines changed: 180 additions & 25 deletions

File tree

‎apps/server/src/device/DeviceService.test.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import * as Exit from "effect/Exit";
1818
import * as Deferred from "effect/Deferred";
1919
import * as Fiber from "effect/Fiber";
2020
import * as FileSystem from "effect/FileSystem";
21+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
2122
import * as Layer from "effect/Layer";
2223
import * as Option from "effect/Option";
2324
import * as PubSub from "effect/PubSub";
@@ -534,6 +535,11 @@ describe("device setup consent", () => {
534535
);
535536
});
536537

538+
const layerSecretResolver = Layer.succeed(SecretResolver.SecretResolver, {
539+
read: (references) => Effect.succeed(references.map(() => undefined)),
540+
invalidate: () => Effect.void,
541+
});
542+
537543
it.effect("publishes boot progress and does not restore sessions after support is disabled", () =>
538544
Effect.gen(function* () {
539545
const started = yield* Deferred.make<void>();
@@ -1436,7 +1442,9 @@ it.effect("reconciles SSH host settings without publishing no-op changes", () =>
14361442
expect(removedFiles).toHaveLength(1);
14371443
}).pipe(
14381444
Effect.scoped,
1439-
Effect.provide(Layer.mergeAll(ServerSettings.layerTest(), NodeServices.layer)),
1445+
Effect.provide(
1446+
Layer.mergeAll(ServerSettings.layerTest(), layerSecretResolver, NodeServices.layer),
1447+
),
14401448
),
14411449
);
14421450

@@ -1494,6 +1502,7 @@ it.effect("a failed tool update reports npm's exit code but not its output", ()
14941502
Effect.provide(
14951503
Layer.mergeAll(
14961504
ServerSettings.layerTest({ enableDeviceSupport: true }),
1505+
layerSecretResolver,
14971506
ServerConfig.layerTest(process.cwd(), { prefix: "t3-device-update-" }),
14981507
NodeCrypto.layer,
14991508
NetService.layer,

‎apps/server/src/device/DeviceService.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@ import { isLocalSshDeviceHost, remoteSshDeviceHosts } from "./localSshDeviceHost
6868

6969
import { readDeviceDetail, runDeviceAction } from "./DeviceActions.ts";
7070
import * as ProcessRunner from "../processRunner.ts";
71+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
72+
import * as SecretResolverLayer from "../secrets/SecretResolver.ts";
7173
import * as DeviceHost from "./DeviceHost.ts";
7274
import * as SshDeviceHost from "./SshDeviceHost.ts";
7375
import * as EasDeviceHost from "./EasDeviceHost.ts";
7476
import * as SimlockDeviceHost from "./SimlockDeviceHost.ts";
7577
import * as HostProcess from "@t3tools/shared/HostProcess";
76-
import { makeExpoApi, resolveExpoCredential } from "./ExpoApi.ts";
78+
import { makeExpoApi } from "./ExpoApi.ts";
7779
import * as Exit from "effect/Exit";
7880
import * as LocalDeviceHost from "./LocalDeviceHost.ts";
7981

@@ -1220,6 +1222,7 @@ export const make = Effect.gen(function* () {
12201222
const path = yield* Path.Path;
12211223
const runner = yield* ProcessRunner.ProcessRunner;
12221224
const settings = yield* ServerSettings.ServerSettingsService;
1225+
const secrets = yield* SecretResolver.SecretResolver;
12231226
const scope = yield* Scope.Scope;
12241227
const hosts = new Map<DeviceHostId, DeviceHost.DeviceHost["Service"]>([
12251228
[localHost.id, localHost],
@@ -1537,7 +1540,10 @@ export const make = Effect.gen(function* () {
15371540
? ""
15381541
: ((yield* settings.getSettings).easDeviceHosts.find((host) => host.id === input.hostId)
15391542
?.accessToken ?? "");
1540-
const credential = yield* resolveExpoCredential(input.accessToken ?? saved);
1543+
const credential = yield* EasDeviceHost.resolveSavedExpoCredential(
1544+
secrets,
1545+
input.accessToken ?? saved,
1546+
);
15411547
const viewer = yield* makeExpoApi(yield* HttpClient.HttpClient, credential).viewer;
15421548
return { signedInAs: viewer.name, credentialSource: credential.source, apps: viewer.apps };
15431549
},
@@ -1618,7 +1624,10 @@ export const make = Effect.gen(function* () {
16181624
};
16191625
});
16201626

1621-
export const layer = Layer.effect(DeviceService, make).pipe(Layer.provide(LocalDeviceHost.layer));
1627+
export const layer = Layer.effect(DeviceService, make).pipe(
1628+
Layer.provide(LocalDeviceHost.layer),
1629+
Layer.provide(SecretResolverLayer.layer),
1630+
);
16221631

16231632
export const stateStream = (service: DeviceService["Service"]): Stream.Stream<DeviceServiceState> =>
16241633
Stream.unwrap(

‎apps/server/src/device/EasDeviceHost.test.ts‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { describe, expect, it } from "@effect/vitest";
22
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
33
import * as NodeServices from "@effect/platform-node/NodeServices";
4-
import { type EasDeviceHostConfig, ThreadId } from "@t3tools/contracts";
5-
import * as HostProcess from "@t3tools/shared/HostProcess";
4+
import { type EasDeviceHostConfig, SecretProviderId, ThreadId } from "@t3tools/contracts";
5+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
66
import * as Deferred from "effect/Deferred";
77
import * as Effect from "effect/Effect";
88
import * as Fiber from "effect/Fiber";
@@ -13,6 +13,7 @@ import * as Path from "effect/Path";
1313
import * as Scope from "effect/Scope";
1414
import * as TestClock from "effect/testing/TestClock";
1515
import { HttpClient, HttpClientResponse } from "effect/http";
16+
import * as HostProcess from "@t3tools/shared/HostProcess";
1617

1718
import * as ServerConfig from "../config.ts";
1819
import * as ProcessRunner from "../processRunner.ts";
@@ -228,9 +229,24 @@ const fakeExpo = (
228229
return { http, named, stopped, allowPreview, allowCreate, releases, previews };
229230
};
230231

232+
const makeSecretResolver = (values: Record<string, string> = {}) =>
233+
Layer.succeed(SecretResolver.SecretResolver, {
234+
read: (references) =>
235+
Effect.succeed(references.map((reference) => values[reference.reference])),
236+
invalidate: () => Effect.void,
237+
});
238+
239+
const layerWith = (secrets: Layer.Layer<SecretResolver.SecretResolver>) =>
240+
Layer.mergeAll(
241+
ProcessRunner.layer,
242+
ServerConfig.layerTest(process.cwd(), { prefix: "t3-eas-host-" }),
243+
secrets,
244+
).pipe(Layer.provideMerge(NodeServices.layer));
245+
231246
const layer = Layer.mergeAll(
232247
ProcessRunner.layer,
233248
ServerConfig.layerTest(process.cwd(), { prefix: "t3-eas-host-" }),
249+
makeSecretResolver(),
234250
).pipe(Layer.provideMerge(NodeServices.layer));
235251

236252
const makeHost = (
@@ -299,6 +315,35 @@ describe("EAS Simulator host", () => {
299315
}).pipe(Effect.scoped, Effect.provide(layer)),
300316
);
301317

318+
it.effect("reads its token from the secret provider the setting names", () =>
319+
Effect.gen(function* () {
320+
const expo = fakeExpo();
321+
const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
322+
const host = yield* makeHost(expo, config({ accessToken: source }), yield* Scope.make());
323+
const ready = yield* host.ensureReady(() => Effect.void);
324+
const [catalogDevice] = (yield* ready.devices.list).devices;
325+
expect(yield* ready.devices.boot(catalogDevice!)).toBe("session-1");
326+
}).pipe(
327+
Effect.scoped,
328+
Effect.provide(layerWith(makeSecretResolver({ "expo#token": "expo-token" }))),
329+
),
330+
);
331+
332+
it.effect("fails instead of using another Expo login when its secret cannot be read", () =>
333+
Effect.gen(function* () {
334+
const expo = fakeExpo();
335+
const source = { provider: SecretProviderId.make("homelab"), reference: "expo#token" };
336+
const host = yield* makeHost(expo, config({ accessToken: source }), yield* Scope.make()).pipe(
337+
Effect.provideService(HostProcess.Environment, { EXPO_TOKEN: "expo-token" }),
338+
);
339+
const ready = yield* host.ensureReady(() => Effect.void);
340+
const [catalogDevice] = (yield* ready.devices.list).devices;
341+
const failure = yield* ready.devices.boot(catalogDevice!).pipe(Effect.flip);
342+
expect(failure.message).toContain('secret provider "homelab"');
343+
expect(expo.named("T3CreateEasSimulatorSession")).toHaveLength(0);
344+
}).pipe(Effect.scoped, Effect.provide(layer)),
345+
);
346+
302347
it.effect("runs an Android session through serve-emu beside an iOS one", () =>
303348
Effect.gen(function* () {
304349
const expo = fakeExpo();

‎apps/server/src/device/EasDeviceHost.ts‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
DeviceOperationError,
1212
type DevicePlatform,
1313
type EasDeviceHostConfig,
14+
type SettingsSecretValue,
1415
} from "@t3tools/contracts";
1516
import * as Cause from "effect/Cause";
1617
import * as Clock from "effect/Clock";
@@ -32,6 +33,8 @@ import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite";
3233
import * as HostProcess from "@t3tools/shared/HostProcess";
3334

3435
import * as ServerConfig from "../config.ts";
36+
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
37+
import { requireSettingsSecret } from "../secrets/settingsSecretValue.ts";
3538
import { releaseAgentDeviceSession } from "./AgentDeviceTarget.ts";
3639
import * as DeviceHost from "./DeviceHost.ts";
3740
import { findEasProjectId } from "./easProjectId.ts";
@@ -140,11 +143,21 @@ const decodePathSegment = (segment: string): string | null => {
140143
}
141144
};
142145

146+
/**
147+
* The Expo credential a host's setting holds or names. Every session bills the account behind
148+
* it, so a named secret that cannot be read fails rather than falling back to another login.
149+
*/
150+
export const resolveSavedExpoCredential = (
151+
secrets: SecretResolver.SecretResolver["Service"],
152+
saved: SettingsSecretValue,
153+
) => requireSettingsSecret(secrets, saved).pipe(Effect.flatMap(resolveExpoCredential));
154+
143155
export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDeviceHostConfig) {
144156
const http = yield* HttpClient.HttpClient;
145157
const fs = yield* FileSystem.FileSystem;
146158
const path = yield* Path.Path;
147159
const server = yield* ServerConfig.ServerConfig;
160+
const secrets = yield* SecretResolver.SecretResolver;
148161
const services = yield* Effect.context<
149162
FileSystem.FileSystem | Path.Path | Effect.Services<ReturnType<typeof findEasProjectId>>
150163
>();
@@ -198,7 +211,8 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
198211
...(cause === undefined ? {} : { cause }),
199212
});
200213

201-
const api: Effect.Effect<ExpoApi, DeviceHostUnavailableError> = resolveExpoCredential(
214+
const api: Effect.Effect<ExpoApi, DeviceHostUnavailableError> = resolveSavedExpoCredential(
215+
secrets,
202216
config.accessToken,
203217
).pipe(
204218
Effect.map((credential) => makeExpoApi(http, credential)),
@@ -884,7 +898,7 @@ export const make = Effect.fn("EasDeviceHost.make")(function* (config: EasDevice
884898
// Each server signs in on its own, so one with no Expo credential answers for itself. Reading
885899
// the credential is local; whether Expo accepts it is only known once a session starts.
886900
const platformAvailability = (platform: DevicePlatform) =>
887-
resolveExpoCredential(config.accessToken).pipe(
901+
resolveSavedExpoCredential(secrets, config.accessToken).pipe(
888902
Effect.provide(services),
889903
Effect.as({ platform, available: true }),
890904
Effect.catch((error) =>

‎apps/server/src/secrets/settingsSecretValue.ts‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import { secretReferencesInSettings, withSettingsSecrets } from "@t3tools/contracts";
1+
import {
2+
isSecretReference,
3+
secretReferencesInSettings,
4+
type SettingsSecretValue,
5+
withSettingsSecrets,
6+
} from "@t3tools/contracts";
27
import type * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
38
import * as Effect from "effect/Effect";
4-
import type * as Schema from "effect/Schema";
9+
import * as Schema from "effect/Schema";
510

611
/**
712
* Replaces each reference in the slots `schema` declares as `SettingsSecretValue` with the secret
@@ -18,3 +23,29 @@ export const resolveSettingsSecrets = Effect.fn("SettingsSecrets.resolve")(funct
1823
pending.map((slot, index) => ({ ...slot, value: values[index] ?? "" })),
1924
);
2025
});
26+
27+
export class SettingsSecretUnresolvedError extends Schema.TaggedError<SettingsSecretUnresolvedError>()(
28+
"SettingsSecretUnresolvedError",
29+
{ provider: Schema.String },
30+
) {
31+
override get message(): string {
32+
return `Could not read the credential from the secret provider "${this.provider}". Unlock or fix it in Settings, then try again.`;
33+
}
34+
}
35+
36+
/**
37+
* The secret a credential setting holds or names. A named secret that cannot be read, or reads
38+
* empty, fails instead of passing for a missing token, so callers that would fall back to another
39+
* credential cannot silently switch accounts.
40+
*/
41+
export const requireSettingsSecret = Effect.fn("SettingsSecrets.require")(function* (
42+
resolver: SecretResolver.SecretResolver["Service"],
43+
value: SettingsSecretValue,
44+
) {
45+
if (!isSecretReference(value)) return value;
46+
const [secret] = yield* resolver.read([value]);
47+
if (secret === undefined || secret.trim() === "") {
48+
return yield* new SettingsSecretUnresolvedError({ provider: value.provider });
49+
}
50+
return secret;
51+
});

‎apps/server/src/sourceControl/sourceControlHostSecrets.test.ts‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { assert, it } from "@effect/vitest";
2-
import { SecretProviderId, UsageLimitSourceId } from "@t3tools/contracts";
2+
import { DeviceHostId, SecretProviderId, UsageLimitSourceId } from "@t3tools/contracts";
33
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
44
import * as Effect from "effect/Effect";
55

@@ -132,7 +132,7 @@ it.effect("reads a collected reference again once it is invalidated", () =>
132132
current = "rotated";
133133
yield* invalidateSettingsSecrets(
134134
resolver,
135-
Effect.succeed({ sourceControlHosts: hosts, usageLimitSources: {} }),
135+
Effect.succeed({ sourceControlHosts: hosts, usageLimitSources: {}, easDeviceHosts: [] }),
136136
);
137137
assert.deepEqual((yield* read()).bitbucket, {
138138
@@ -147,7 +147,7 @@ it.effect("reads a collected reference again once it is invalidated", () =>
147147
}),
148148
);
149149

150-
it.effect("invalidates the management keys of usage limit sources with the host tokens", () =>
150+
it.effect("invalidates the references of every settings field that holds a secret", () =>
151151
Effect.gen(function* () {
152152
const invalidated: Array<ReadonlyArray<string> | undefined> = [];
153153
const resolver = SecretResolver.SecretResolver.of({
@@ -159,6 +159,26 @@ it.effect("invalidates the management keys of usage limit sources with the host
159159
resolver,
160160
Effect.succeed({
161161
sourceControlHosts: hosts,
162+
easDeviceHosts: [
163+
{
164+
kind: "eas" as const,
165+
id: DeviceHostId.make("ref"),
166+
label: "Ref",
167+
maxSessionMinutes: 30,
168+
idleMinutes: 10,
169+
maxConcurrentSessions: 2,
170+
accessToken: source("expo#token"),
171+
},
172+
{
173+
kind: "eas" as const,
174+
id: DeviceHostId.make("lit"),
175+
label: "Lit",
176+
maxSessionMinutes: 30,
177+
idleMinutes: 10,
178+
maxConcurrentSessions: 2,
179+
accessToken: "literal-token",
180+
},
181+
],
162182
usageLimitSources: {
163183
[UsageLimitSourceId.make("referenced")]: {
164184
kind: "cliproxy",
@@ -175,6 +195,8 @@ it.effect("invalidates the management keys of usage limit sources with the host
175195
},
176196
}),
177197
);
178-
assert.deepEqual(invalidated, [["missing#token", "bitbucket#token", "cliproxy#key"]]);
198+
assert.deepEqual(invalidated, [
199+
["missing#token", "bitbucket#token", "cliproxy#key", "expo#token"],
200+
]);
179201
}),
180202
);

‎apps/server/src/sourceControl/sourceControlHostSecrets.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,24 @@ const collectUsageLimitSecretReferences = (
104104
isSecretReference(managementKey) ? [managementKey] : [],
105105
);
106106

107+
const collectEasSecretReferences = (
108+
hosts: ServerSettings["easDeviceHosts"],
109+
): ReadonlyArray<SecretReference> =>
110+
hosts.flatMap(({ accessToken }) => (isSecretReference(accessToken) ? [accessToken] : []));
111+
107112
/** Settings that cannot be read clear every cached secret, so a refresh never keeps a stale one. */
108113
export const invalidateSettingsSecrets = Effect.fn("SettingsSecrets.invalidate")(function* <E>(
109114
resolver: SecretResolver.SecretResolver["Service"],
110-
settings: Effect.Effect<Pick<ServerSettings, "sourceControlHosts" | "usageLimitSources">, E>,
115+
settings: Effect.Effect<
116+
Pick<ServerSettings, "sourceControlHosts" | "usageLimitSources" | "easDeviceHosts">,
117+
E
118+
>,
111119
) {
112120
const references = yield* settings.pipe(
113121
Effect.map((current) => [
114122
...collectSourceControlHostSecretReferences(current.sourceControlHosts),
115123
...collectUsageLimitSecretReferences(current.usageLimitSources),
124+
...collectEasSecretReferences(current.easDeviceHosts),
116125
]),
117126
Effect.orElseSucceed(() => undefined),
118127
);

0 commit comments

Comments
 (0)