Skip to content

Commit 4328c1e

Browse files
committed
fix(server): preserve stored secrets on settings echo
1 parent 67eebac commit 4328c1e

2 files changed

Lines changed: 51 additions & 0 deletions

File tree

‎apps/server/src/serverSettings.test.ts‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,45 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
13071307
next.providerInstances[instanceId]?.environment?.find((v) => v.sensitive)?.value,
13081308
sensitiveLast ? "secret-last" : "",
13091309
);
1310+
const client = ServerSettingsModule.redactServerSettingsForClient(next, {
1311+
secretReferences: true,
1312+
});
1313+
const echoed = yield* service.updateSettings({
1314+
providerInstances: client.providerInstances,
1315+
});
1316+
assert.equal(
1317+
echoed.providerInstances[instanceId]?.environment?.find((v) => v.sensitive)?.value,
1318+
sensitiveLast ? "secret-last" : "",
1319+
);
1320+
if (sensitiveLast) {
1321+
const redacted = client.providerInstances[instanceId]!.environment![1]!;
1322+
const save = (
1323+
environment: NonNullable<
1324+
NonNullable<(typeof client.providerInstances)[typeof instanceId]>["environment"]
1325+
>,
1326+
) =>
1327+
service.updateSettings({
1328+
providerInstances: {
1329+
[instanceId]: { driver: ProviderDriverKind.make("codex"), environment, config: {} },
1330+
},
1331+
});
1332+
const replaced = yield* save([{ ...secret, value: "replacement" }, redacted]);
1333+
assert.equal(
1334+
replaced.providerInstances[instanceId]?.environment?.[1]?.value,
1335+
"replacement",
1336+
);
1337+
const cleared = yield* save([{ ...secret, value: "another" }, plain, redacted]);
1338+
assert.equal(cleared.providerInstances[instanceId]?.environment?.[2]?.value, "");
1339+
yield* save([secret]);
1340+
const explicitlyCleared = yield* save([redacted, plain]);
1341+
assert.equal(
1342+
explicitlyCleared.providerInstances[instanceId]?.environment?.[0]?.value,
1343+
"",
1344+
);
1345+
yield* save([secret]);
1346+
const emptyCleared = yield* save([redacted, { ...secret, value: "" }]);
1347+
assert.equal(emptyCleared.providerInstances[instanceId]?.environment?.[0]?.value, "");
1348+
}
13101349
}).pipe(Effect.provide(layerServerSettings())),
13111350
);
13121351

‎apps/server/src/serverSettings.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,6 +1052,18 @@ const make = Effect.gen(function* () {
10521052
old?.sensitive && !old.redacted && old.value.length > 0 ? old.value : undefined;
10531053
const value = secret.redacted ? inlineValue : secret.value;
10541054
if (value === undefined) {
1055+
// An echoed stored environment secret must survive earlier duplicate rows.
1056+
// Keep the original ordering when this update also contains an explicit write.
1057+
if (
1058+
secret.kind === "environment" &&
1059+
!changes.some(
1060+
(change) => change.secretName === secret.secretName && change.kind === "write",
1061+
)
1062+
) {
1063+
for (let i = changes.length - 1; i >= 0; i--) {
1064+
if (changes[i]?.secretName === secret.secretName) changes.splice(i, 1);
1065+
}
1066+
}
10551067
nextSecretNames.add(secret.secretName);
10561068
return { value: "", redacted: true };
10571069
}

0 commit comments

Comments
 (0)