Skip to content

Commit 50e829a

Browse files
fix(server): an empty duplicate after an inline secret no longer hides it
The inline value a redacted row falls back on came from the last row with that name, so an inline secret followed by an empty duplicate in settings.json was lost on the next save. It now comes from the last non-empty sensitive inline row. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 7334ac0 commit 50e829a

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,13 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
12951295
{
12961296
label: "inline seed, redacted then empty sensitive",
12971297
duplicate: { value: "", sensitive: true },
1298-
inline: true,
1298+
inline: '[{"name":"FOO","value":"stored-foo","sensitive":true}]',
1299+
},
1300+
{
1301+
label: "inline seed with an empty duplicate, redacted then empty sensitive",
1302+
duplicate: { value: "", sensitive: true },
1303+
inline:
1304+
'[{"name":"FOO","value":"stored-foo","sensitive":true},{"name":"FOO","value":"","sensitive":true}]',
12991305
},
13001306
].map((testCase) => [testCase.label, testCase] as const),
13011307
)(
@@ -1315,7 +1321,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
13151321
const fs = yield* FileSystem.FileSystem;
13161322
yield* fs.writeFileString(
13171323
config.settingsPath,
1318-
'{"providerInstances":{"codex_personal":{"driver":"codex","environment":[{"name":"FOO","value":"stored-foo","sensitive":true}],"config":{}}}}',
1324+
`{"providerInstances":{"codex_personal":{"driver":"codex","environment":${inline},"config":{}}}}`,
13191325
);
13201326
yield* service.getSettings;
13211327
} else {

‎apps/server/src/serverSettings.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,8 +1027,12 @@ const make = Effect.gen(function* () {
10271027
const persistSettingsSecrets = (current: ServerSettings, next: ServerSettings) =>
10281028
Effect.sync(() => {
10291029
const previous = new Map<string, SettingsSecret>();
1030+
const inlineValues = new Map<string, string>();
10301031
mapSettingsSecrets(current, (secret) => {
10311032
previous.set(secret.secretName, secret);
1033+
if (secret.sensitive && !secret.redacted && secret.value.length > 0) {
1034+
inlineValues.set(secret.secretName, secret.value);
1035+
}
10321036
return secret;
10331037
});
10341038
const changes: SecretChange[] = [];
@@ -1049,10 +1053,7 @@ const make = Effect.gen(function* () {
10491053
return { value: secret.value, redacted: false };
10501054
}
10511055
if (secret.redacted) keptSecretNames.add(secret.secretName);
1052-
const old = previous.get(secret.secretName);
1053-
const inlineValue =
1054-
old?.sensitive && !old.redacted && old.value.length > 0 ? old.value : undefined;
1055-
const value = secret.redacted ? inlineValue : secret.value;
1056+
const value = secret.redacted ? inlineValues.get(secret.secretName) : secret.value;
10561057
if (value === undefined) {
10571058
nextSecretNames.add(secret.secretName);
10581059
return { value: "", redacted: true };

0 commit comments

Comments
 (0)