github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-10 22:34:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dedupe redact snapshot restore prelude

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-19 14:18:28 +00:00
parent ffd4e85873
commit 3179097a1f
2 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/config/redact-snapshot.ts
View File

@@ -404,6 +404,20 @@ function toObjectRecord(value: unknown): Record<string, unknown> {
return {};
}
function shouldPassThroughRestoreValue(incoming: unknown): boolean {
return incoming === null || incoming === undefined || typeof incoming !== "object";
}
function toRestoreArrayContext(
incoming: unknown,
prefix: string,
): { incoming: unknown[]; path: string } | null {
if (!Array.isArray(incoming)) {
return null;
}
return { incoming, path: `${prefix}[]` };
}
function restoreArrayItemWithLookup(params: {
item: unknown;
index: number;
@@ -478,26 +492,25 @@ function restoreRedactedValuesWithLookup(
prefix: string,
hints: ConfigUiHints,
): unknown {
if (incoming === null || incoming === undefined) {
if (shouldPassThroughRestoreValue(incoming)) {
return incoming;
}
if (typeof incoming !== "object") {
return incoming;
}
if (Array.isArray(incoming)) {
const arrayContext = toRestoreArrayContext(incoming, prefix);
if (arrayContext) {
// Note: If the user removed an item in the middle of the array,
// we have no way of knowing which one. In this case, the last
// element(s) get(s) chopped off. Not good, so please don't put
// sensitive string array in the config...
const path = `${prefix}[]`;
const { incoming: incomingArray, path } = arrayContext;
if (!lookup.has(path)) {
if (!isExtensionPath(prefix)) {
return incoming;
return incomingArray;
}
return restoreRedactedValuesGuessing(incoming, original, prefix, hints);
return restoreRedactedValuesGuessing(incomingArray, original, prefix, hints);
}
return mapRedactedArray({
incoming,
incoming: incomingArray,
original,
path,
mapItem: (item, index, originalArray) =>
@@ -551,19 +564,18 @@ function restoreRedactedValuesGuessing(
prefix: string,
hints?: ConfigUiHints,
): unknown {
if (incoming === null || incoming === undefined) {
if (shouldPassThroughRestoreValue(incoming)) {
return incoming;
}
if (typeof incoming !== "object") {
return incoming;
}
if (Array.isArray(incoming)) {
const arrayContext = toRestoreArrayContext(incoming, prefix);
if (arrayContext) {
// Note: If the user removed an item in the middle of the array,
// we have no way of knowing which one. In this case, the last
// element(s) get(s) chopped off. Not good, so please don't put
// sensitive string array in the config...
const path = `${prefix}[]`;
return restoreGuessingArray(incoming, original, path, hints);
const { incoming: incomingArray, path } = arrayContext;
return restoreGuessingArray(incomingArray, original, path, hints);
}
const orig = toObjectRecord(original);
const result: Record<string, unknown> = {};