Skip to content

Commit 18c3a75

Browse files
committed
fix(daemon): contain session paths during recovery
1 parent 5a836c0 commit 18c3a75

4 files changed

Lines changed: 58 additions & 5 deletions

File tree

‎packages/daemon-contracts/src/device-claim-reconciliation.test.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,3 +355,35 @@ function makeClaim(stateDir: string): DeviceClaim {
355355
updatedAtMs: 1,
356356
};
357357
}
358+
359+
test.each(['.', '..'])(
360+
'invalid claim session %s retains evidence without inspecting outside resources',
361+
async (session) => {
362+
const stateDir = mkdtempForTestSync('claim-contained-');
363+
const claim = { ...makeClaim(stateDir), session };
364+
const env = { AGENT_DEVICE_CLAIMS_DIR: path.join(stateDir, 'claims') };
365+
writeDeviceClaim(claim, env);
366+
const claimPath = resolveDeviceClaimPath(claim.deviceKey, env);
367+
const claimEvidence = fs.readFileSync(claimPath);
368+
const outside = appLogResourceStore.resolvePath(
369+
path.join(stateDir, ...(session === '.' ? ['sessions'] : [])),
370+
);
371+
fs.mkdirSync(path.dirname(outside), { recursive: true });
372+
fs.writeFileSync(outside, '{');
373+
const bind = vi.fn();
374+
const gateway = {
375+
bind,
376+
shutdown: async () => {},
377+
} as unknown as DeviceRuntimeGateway<PlatformRuntimeOperations>;
378+
const retained = { status: 'retained', reason: 'durable-resource-reconciliation-failed' };
379+
expect(inspectDeviceClaimRecovery(claim)).toEqual(retained);
380+
const reconcile = createDeviceClaimReconciler({ gateway, scope });
381+
await expect(settleVerifiedOrphanedClaim(claim, reconcile, env)).resolves.toEqual(retained);
382+
await expect(
383+
reconcile(claim, { status: 'inspectable', recoveryKinds: [], ownedResources: [] }),
384+
).resolves.toEqual(retained);
385+
expect(bind).not.toHaveBeenCalled();
386+
expect(fs.readFileSync(outside, 'utf8')).toBe('{');
387+
expect(fs.readFileSync(claimPath)).toEqual(claimEvidence);
388+
},
389+
);

‎packages/daemon-contracts/src/device-claim-reconciliation.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { appLogDurableResource } from '@agent-device/capture-kit/app-log-durable-resource';
22
import { recoverAppLogResourceAfterDaemonLock } from '@agent-device/capture-kit/app-log-resource-recovery';
3-
import path from 'node:path';
43
import type { DeviceRuntimeGateway } from '@agent-device/contracts/platform-runtime';
54
import type { PlatformRequestScope } from '@agent-device/contracts/platform-runtime-host';
65
import type { PlatformRuntimeOperations } from '@agent-device/contracts/platform-runtime-operations';
@@ -16,7 +15,7 @@ import { recoverPerfCaptureResourceAfterDaemonLock } from '@agent-device/capture
1615
import { perfCaptureDurableResource } from '@agent-device/capture-kit/perf-capture-session-resource';
1716
import { recoverScreenRecordingResourceAfterDaemonLock } from '@agent-device/capture-kit/screen-recording-recovery';
1817
import { screenRecordingDurableResource } from '@agent-device/capture-kit/screen-recording-session-resource';
19-
import { safeSessionName } from '@agent-device/host-kit/session-paths';
18+
import { resolveSessionDir } from './session-artifact-paths.ts';
2019

2120
export function createDeviceClaimReconciler(params: {
2221
gateway: DeviceRuntimeGateway<PlatformRuntimeOperations>;
@@ -30,7 +29,7 @@ export function createDeviceClaimReconciler(params: {
3029
if (inspection.status === 'retained') return inspection;
3130
try {
3231
const sessionsDir = resolveDaemonPaths(claim.stateDir).sessionsDir;
33-
const sessionDir = path.join(sessionsDir, safeSessionName(claim.session));
32+
const sessionDir = resolveSessionDir(sessionsDir, claim.session);
3433
for (const { resourceKind, resourcePath } of inspection.ownedResources) {
3534
const resource = DEVICE_CLAIM_DURABLE_RESOURCES[resourceKind];
3635
const currentOwnership = inspectResourceOwnership(resource, claim, sessionDir);
@@ -89,7 +88,7 @@ export type ClaimRecoveryInspection =
8988
export function inspectDeviceClaimRecovery(claim: DeviceClaim): ClaimRecoveryInspection {
9089
try {
9190
const sessionsDir = resolveDaemonPaths(claim.stateDir).sessionsDir;
92-
const sessionDir = path.join(sessionsDir, safeSessionName(claim.session));
91+
const sessionDir = resolveSessionDir(sessionsDir, claim.session);
9392
const recoveryKinds: DurableSessionResourceKind[] = [];
9493
const ownedResources: { resourceKind: DurableSessionResourceKind; resourcePath: string }[] = [];
9594
for (const resource of Object.values(DEVICE_CLAIM_DURABLE_RESOURCES)) {

‎packages/daemon-contracts/src/session-artifact-paths.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function resolveRemoteRequestDiagnosticsPath(
5252
ref: DiagnosticsRecordRef,
5353
): string {
5454
return resolveSessionRequestLogPath(
55-
path.join(stateDir, 'remote-diagnostics', safeSessionName(ref.session)),
55+
resolveSessionDir(path.join(stateDir, 'remote-diagnostics'), ref.session),
5656
ref.requestId,
5757
);
5858
}

‎packages/remote/src/__tests__/remote-request-diagnostics.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,3 +179,25 @@ test('the record fetch names the held lease and sends no lease header without on
179179
fs.rmSync(stateDir, { recursive: true, force: true });
180180
}
181181
});
182+
183+
test.each(['.', '..'])(
184+
'invalid remote session %s cannot write or remove outside records',
185+
async (session) => {
186+
const stateDir = mkdtempForTestSync('remote-diagnostics-contained-');
187+
const outside = path.join(
188+
stateDir,
189+
...(session === '.' ? ['remote-diagnostics'] : []),
190+
'requests',
191+
'abc123.ndjson',
192+
);
193+
fs.mkdirSync(path.dirname(outside), { recursive: true });
194+
fs.writeFileSync(outside, 'sentinel');
195+
const localized = await localizeRemoteDaemonError(
196+
{ ...remoteError(), diagnosticsRecord: { session, requestId: 'abc123' } },
197+
{ endpoint: { baseUrl: 'http://127.0.0.1:1', token: 'secret' }, stateDir },
198+
);
199+
assert.equal(localized.logPath, undefined);
200+
assert.equal(typeof localized.logPathUnavailable, 'string');
201+
assert.equal(fs.readFileSync(outside, 'utf8'), 'sentinel');
202+
},
203+
);

0 commit comments

Comments
 (0)