Skip to content

Commit c8b99d6

Browse files
committed
fix: harden integrated device leasing
1 parent 1381c13 commit c8b99d6

18 files changed

Lines changed: 427 additions & 126 deletions

‎src/__tests__/remote-connection.test.ts‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,63 @@ test('connect proxy writes normal remote state with generated non-secret profile
246246
fs.rmSync(tempRoot, { recursive: true, force: true });
247247
});
248248

249+
test('connect proxy scopes generated client identity by explicit session', async () => {
250+
const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-connect-proxy-sessions-'));
251+
const stateDir = path.join(tempRoot, '.state');
252+
253+
for (const session of ['agent-a', 'agent-b']) {
254+
await captureStdout(async () => {
255+
await connectCommand({
256+
positionals: ['proxy'],
257+
flags: {
258+
json: true,
259+
help: false,
260+
version: false,
261+
stateDir,
262+
daemonBaseUrl: 'http://proxy.example.test/agent-device',
263+
platform: 'android',
264+
session,
265+
},
266+
client: createTestClient(),
267+
});
268+
});
269+
}
270+
271+
const first = readRemoteConnectionState({ stateDir, session: 'agent-a' });
272+
const second = readRemoteConnectionState({ stateDir, session: 'agent-b' });
273+
assert.ok(first);
274+
assert.ok(second);
275+
assert.notEqual(first.clientId, second.clientId);
276+
assert.notEqual(first.runId, second.runId);
277+
fs.rmSync(tempRoot, { recursive: true, force: true });
278+
});
279+
280+
test('connect proxy notice only advertises open as the lease allocator', async () => {
281+
const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-connect-proxy-notice-'));
282+
const stateDir = path.join(tempRoot, '.state');
283+
284+
const stdout = await captureStdout(async () => {
285+
await connectCommand({
286+
positionals: ['proxy'],
287+
flags: {
288+
json: false,
289+
help: false,
290+
version: false,
291+
stateDir,
292+
daemonBaseUrl: 'http://proxy.example.test/agent-device',
293+
platform: 'android',
294+
},
295+
client: createTestClient(),
296+
});
297+
});
298+
299+
assert.match(stdout, /Proxy lease allocation is pending/);
300+
assert.match(stdout, /run open when ready/);
301+
assert.doesNotMatch(stdout, /snapshot/);
302+
assert.doesNotMatch(stdout, /install-from-source/);
303+
fs.rmSync(tempRoot, { recursive: true, force: true });
304+
});
305+
249306
test('generated remote config writer strips secret fields', () => {
250307
const tempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-generated-profile-'));
251308
const configPath = writeGeneratedRemoteConfig({
@@ -599,6 +656,7 @@ test('proxy open resolves device key before allocating lease', async () => {
599656
assert.equal(allocateRequest?.ttlMs, PROXY_REMOTE_LEASE_TTL_MS);
600657
assert.equal(allocateRequest?.leaseBackend, 'ios-instance');
601658
assert.equal(materialized.flags.leaseId, 'abc123abc123abc1');
659+
assert.equal(materialized.flags.udid, 'SIM-001');
602660
assert.equal(materialized.connection?.deviceKey, 'ios:mobile:SIM-001');
603661
const state = readRemoteConnectionState({ stateDir, session: 'adc-proxy' });
604662
assert.equal(state?.leaseId, 'abc123abc123abc1');

‎src/cli/cloud-connection-profile.ts‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import type { RemoteConfigProfile } from '../remote-config-schema.ts';
2-
import { profileToCliFlags } from '../utils/remote-config.ts';
32
import { AppError } from '../utils/errors.ts';
43
import type { CliFlags } from '../utils/cli-flags.ts';
54
import type { EnvMap } from '../utils/env-map.ts';
65
import { resolveCloudAccessForConnect } from './auth-session.ts';
76
import { readCloudJsonResponse } from './cloud-response.ts';
8-
import {
9-
resolveGeneratedRemoteConfigProfile,
10-
writeGeneratedRemoteConfig,
11-
} from './generated-remote-config.ts';
7+
import { persistAndResolveGeneratedProfile } from './generated-remote-config.ts';
128

139
const CONNECTION_PROFILE_PATH = '/api/control-plane/connection-profile';
1410
const HTTP_TIMEOUT_MS = 15_000;
@@ -40,26 +36,17 @@ export async function resolveCloudConnectProfile(options: {
4036
accessToken: auth.accessToken,
4137
fetchImpl: options.fetchImpl,
4238
});
43-
const remoteConfigPath = writeGeneratedRemoteConfig({
39+
return persistAndResolveGeneratedProfile({
4440
stateDir: options.stateDir,
4541
provider: 'cloud',
4642
profile,
47-
});
48-
const remoteConfig = resolveGeneratedRemoteConfigProfile({
49-
configPath: remoteConfigPath,
5043
cwd: options.cwd,
5144
env: options.env,
52-
provider: 'Cloud',
53-
});
54-
return {
55-
flags: {
56-
...profileToCliFlags(remoteConfig.profile),
57-
...options.flags,
58-
remoteConfig: remoteConfig.resolvedPath,
45+
flags: options.flags,
46+
extraFlags: {
5947
daemonAuthToken: auth.accessToken,
6048
},
61-
remoteConfigPath: remoteConfig.resolvedPath,
62-
};
49+
});
6350
}
6451

6552
async function fetchConnectionProfile(options: {

‎src/cli/commands/connection-runtime.ts‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,17 @@ export async function materializeRemoteConnectionForCommand(options: {
9797
if (shouldAllocateLeaseForCommand(command, nextState)) {
9898
const preliminaryLeaseBackend = state.leaseBackend ?? resolveRequestedLeaseBackend(nextFlags);
9999
if (nextState.leaseProvider === 'proxy') {
100-
nextState = (
101-
await resolveProxyLeaseState({
102-
command,
103-
client,
104-
state: nextState,
105-
flags: nextFlags,
106-
leaseBackend: preliminaryLeaseBackend,
107-
})
108-
).state;
100+
const resolvedProxyLease = await resolveProxyLeaseState({
101+
command,
102+
client,
103+
state: nextState,
104+
flags: nextFlags,
105+
leaseBackend: preliminaryLeaseBackend,
106+
});
107+
nextState = resolvedProxyLease.state;
108+
if (resolvedProxyLease.device) {
109+
applyResolvedDeviceSelector(nextFlags, resolvedProxyLease.device);
110+
}
109111
}
110112
const leaseBackend =
111113
nextState.leaseBackend ??
@@ -475,7 +477,7 @@ async function resolveProxyLeaseState(options: {
475477
state: RemoteConnectionState;
476478
flags: CliFlags;
477479
leaseBackend?: LeaseBackend;
478-
}): Promise<{ state: RemoteConnectionState }> {
480+
}): Promise<{ state: RemoteConnectionState; device?: DeviceInfo }> {
479481
if (options.command !== 'open') {
480482
if (options.state.leaseId && options.state.deviceKey) return { state: options.state };
481483
throw new AppError(
@@ -495,9 +497,22 @@ async function resolveProxyLeaseState(options: {
495497
target: options.state.target ?? device.target,
496498
updatedAt: new Date().toISOString(),
497499
},
500+
device,
498501
};
499502
}
500503

504+
function applyResolvedDeviceSelector(flags: CliFlags, device: DeviceInfo): void {
505+
flags.platform = device.platform;
506+
flags.target = device.target ?? flags.target;
507+
if (device.platform === 'ios') {
508+
flags.udid = device.id;
509+
return;
510+
}
511+
if (device.platform === 'android') {
512+
flags.serial = device.id;
513+
}
514+
}
515+
501516
async function resolveSelectedDevice(
502517
client: AgentDeviceClient,
503518
flags: CliFlags,

‎src/cli/commands/connection.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,14 @@ function buildLeasePreparationNotice(
382382
state: RemoteConnectionState,
383383
): LeasePreparationNotice | undefined {
384384
if (state.leaseId) return undefined;
385+
if (state.leaseProvider === 'proxy') {
386+
return {
387+
status: 'deferred',
388+
nextSteps: ['agent-device open <app-id> --relaunch', 'agent-device devices'],
389+
message:
390+
'Proxy lease allocation is pending; run open when ready to allocate or refresh the device lease. Devices can inspect inventory but do not allocate a proxy lease.',
391+
};
392+
}
385393
const needsPlatform =
386394
state.platform === undefined && state.leaseBackend === undefined
387395
? ' Add --platform ios|android if the profile does not set a platform.'

‎src/cli/generated-remote-config.ts‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import { resolveRemoteConfigProfile } from '../remote-config.ts';
55
import type { RemoteConfigProfile, ResolvedRemoteConfigProfile } from '../remote-config-schema.ts';
66
import { AppError, asAppError } from '../utils/errors.ts';
77
import type { EnvMap } from '../utils/env-map.ts';
8+
import type { CliFlags } from '../utils/cli-flags.ts';
9+
import { profileToCliFlags } from '../utils/remote-config.ts';
810

911
const GENERATED_REMOTE_CONFIG_SECRET_KEYS = new Set(['daemonAuthToken', 'metroBearerToken']);
1012

@@ -29,7 +31,7 @@ export function writeGeneratedRemoteConfig(options: {
2931
return configPath;
3032
}
3133

32-
export function resolveGeneratedRemoteConfigProfile(options: {
34+
function resolveGeneratedRemoteConfigProfile(options: {
3335
configPath: string;
3436
cwd: string;
3537
env?: EnvMap;
@@ -52,6 +54,37 @@ export function resolveGeneratedRemoteConfigProfile(options: {
5254
}
5355
}
5456

57+
export function persistAndResolveGeneratedProfile(options: {
58+
stateDir: string;
59+
cwd: string;
60+
env?: EnvMap;
61+
provider: string;
62+
profile: RemoteConfigProfile;
63+
flags: CliFlags;
64+
extraFlags?: Partial<CliFlags>;
65+
}): { flags: CliFlags; remoteConfigPath: string } {
66+
const remoteConfigPath = writeGeneratedRemoteConfig({
67+
stateDir: options.stateDir,
68+
provider: options.provider,
69+
profile: options.profile,
70+
});
71+
const remoteConfig = resolveGeneratedRemoteConfigProfile({
72+
configPath: remoteConfigPath,
73+
cwd: options.cwd,
74+
env: options.env,
75+
provider: titleCaseProvider(options.provider),
76+
});
77+
return {
78+
flags: {
79+
...profileToCliFlags(remoteConfig.profile),
80+
...options.flags,
81+
...(options.extraFlags ?? {}),
82+
remoteConfig: remoteConfig.resolvedPath,
83+
},
84+
remoteConfigPath: remoteConfig.resolvedPath,
85+
};
86+
}
87+
5588
function stripGeneratedProfileSecrets(profile: RemoteConfigProfile): RemoteConfigProfile {
5689
return Object.fromEntries(
5790
Object.entries(profile).filter(([key]) => !GENERATED_REMOTE_CONFIG_SECRET_KEYS.has(key)),
@@ -80,3 +113,8 @@ function normalizeJson(value: unknown): unknown {
80113
function safeProviderName(value: string): string {
81114
return value.replaceAll(/[^a-zA-Z0-9._-]/g, '_') || 'generated';
82115
}
116+
117+
function titleCaseProvider(value: string): string {
118+
const [first = '', ...rest] = value;
119+
return `${first.toUpperCase()}${rest.join('')}`;
120+
}

‎src/cli/proxy-connection-profile.ts‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import crypto from 'node:crypto';
22
import type { RemoteConfigProfile } from '../remote-config-schema.ts';
3-
import { profileToCliFlags } from '../utils/remote-config.ts';
43
import { AppError } from '../utils/errors.ts';
54
import type { CliFlags } from '../utils/cli-flags.ts';
65
import type { EnvMap } from '../utils/env-map.ts';
7-
import {
8-
resolveGeneratedRemoteConfigProfile,
9-
writeGeneratedRemoteConfig,
10-
} from './generated-remote-config.ts';
6+
import { persistAndResolveGeneratedProfile } from './generated-remote-config.ts';
117
import { resolveRequestedLeaseBackend } from './commands/connection-runtime.ts';
128

139
export function resolveProxyConnectProfile(options: {
@@ -23,7 +19,7 @@ export function resolveProxyConnectProfile(options: {
2319
'connect proxy requires --daemon-base-url <url> or AGENT_DEVICE_DAEMON_BASE_URL.',
2420
);
2521
}
26-
const clientId = buildProxyClientId(options.stateDir, daemonBaseUrl);
22+
const clientId = buildProxyClientId(options.stateDir, daemonBaseUrl, options.flags.session);
2723
const profile: RemoteConfigProfile = {
2824
daemonBaseUrl,
2925
daemonTransport: options.flags.daemonTransport ?? 'http',
@@ -59,33 +55,28 @@ export function resolveProxyConnectProfile(options: {
5955
metroNoReuseExisting: options.flags.metroNoReuseExisting,
6056
metroNoInstallDeps: options.flags.metroNoInstallDeps,
6157
};
62-
const remoteConfigPath = writeGeneratedRemoteConfig({
58+
return persistAndResolveGeneratedProfile({
6359
stateDir: options.stateDir,
6460
provider: 'proxy',
6561
profile,
66-
});
67-
const remoteConfig = resolveGeneratedRemoteConfigProfile({
68-
configPath: remoteConfigPath,
6962
cwd: options.cwd,
7063
env: options.env,
71-
provider: 'Proxy',
72-
});
73-
return {
74-
flags: {
75-
...profileToCliFlags(remoteConfig.profile),
76-
...options.flags,
77-
remoteConfig: remoteConfig.resolvedPath,
64+
flags: options.flags,
65+
extraFlags: {
7866
daemonBaseUrl,
7967
daemonTransport: options.flags.daemonTransport ?? 'http',
8068
},
81-
remoteConfigPath: remoteConfig.resolvedPath,
82-
};
69+
});
8370
}
8471

85-
function buildProxyClientId(stateDir: string, daemonBaseUrl: string): string {
72+
function buildProxyClientId(
73+
stateDir: string,
74+
daemonBaseUrl: string,
75+
session: string | undefined,
76+
): string {
8677
return crypto
8778
.createHash('sha256')
88-
.update(`${stateDir}\0${daemonBaseUrl}`)
79+
.update(`${stateDir}\0${daemonBaseUrl}\0${session ?? ''}`)
8980
.digest('hex')
9081
.slice(0, 16);
9182
}

0 commit comments

Comments
 (0)