Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(companions): redact private and signing key fields

Chris00df8ecc89b6
diff --git a/apps/desktop/src/main/bot-import/__tests__/automationRuntime.test.ts b/apps/desktop/src/main/bot-import/__tests__/automationRuntime.test.ts
index eb539d5c5c..1c783cc324 100644
--- a/apps/desktop/src/main/bot-import/__tests__/automationRuntime.test.ts
+++ b/apps/desktop/src/main/bot-import/__tests__/automationRuntime.test.ts
@@ -249,10 +249,13 @@ it.each(['stdin', 'argv', 'assignment'] as const)('masks nested JSON credentials
const secret = 'fixture-nested-"quoted"\n-secret';
const arraySecret = 'fixture-array-secret';
const containerSecret = 'fixture-container-secret';
- const input = JSON.stringify({ credentials: [{ token: secret, api_key: [arraySecret] }, containerSecret], city: 'Paris', cities: ['Paris', 'London'], count: 7 });
+ const privateKey = 'fixture-private-"quoted"\n-key';
+ const keyField = source === 'stdin' ? 'private_key' : source === 'argv' ? 'privateKey' : 'signing_key';
+ const input = JSON.stringify({ credentials: [{ token: secret, api_key: [arraySecret] }, containerSecret],
+ [keyField]: privateKey, city: 'Paris', cities: ['Paris', 'London'], count: 7 });
const read = source === 'stdin' ? 'require("node:fs").readFileSync(0,"utf8")'
: source === 'assignment' ? 'process.argv[1].slice("--config=".length)' : 'process.argv[1]';
- const code = `const input=JSON.parse(${read}); process.stdout.write(JSON.stringify({token:input.credentials[0].token,arrayToken:input.credentials[0].api_key[0],containerToken:input.credentials[1],city:input.city,cities:input.cities,count:input.count}));`;
+ const code = `const input=JSON.parse(${read}); process.stdout.write(JSON.stringify({token:input.credentials[0].token,arrayToken:input.credentials[0].api_key[0],containerToken:input.credentials[1],privateKey:input.${keyField},city:input.city,cities:input.cities,count:input.count}));`;
const original = { payload: { kind: 'command', argv: [process.execPath, '-e', code,
...(source === 'stdin' ? [] : ['--', source === 'assignment' ? `--config=${input}` : input])],
...(source === 'stdin' ? { input } : {}), cwd: root } };
@@ -261,12 +264,12 @@ it.each(['stdin', 'argv', 'assignment'] as const)('masks nested JSON credentials
} }, () => {});
const signal = new AbortController().signal;
const prepared = await prepareImportedAutomation(root, routine, 'structured-run', signal, () => {});
- expect(JSON.parse(prepared!.direct!)).toEqual({ token: expect.stringMatching(/^\[command_literal_/), arrayToken: expect.stringMatching(/^\[command_literal_/), containerToken: expect.stringMatching(/^\[command_literal_/), city: 'Paris', cities: ['Paris', 'London'], count: 7 });
+ expect(JSON.parse(prepared!.direct!)).toEqual({ token: expect.stringMatching(/^\[command_literal_/), arrayToken: expect.stringMatching(/^\[command_literal_/), containerToken: expect.stringMatching(/^\[command_literal_/), privateKey: expect.stringMatching(/^\[command_literal_/), city: 'Paris', cities: ['Paris', 'London'], count: 7 });
const saved = (await shared.store.read(root, 'bot', () => {}))!.automations!.routine!;
expect(saved.original).toEqual(original);
expect(saved.prepared?.direct).toBe(prepared!.direct);
// Old private output must be masked even when no process is executed again.
- const legacy = JSON.stringify({ token: secret, arrayToken: arraySecret, containerToken: containerSecret, city: 'Paris', cities: ['Paris', 'London'], count: 7 });
+ const legacy = JSON.stringify({ token: secret, arrayToken: arraySecret, containerToken: containerSecret, privateKey, city: 'Paris', cities: ['Paris', 'London'], count: 7 });
await shared.store.update(root, 'bot', () => {}, env => {
env.automations!.routine!.prepared = { runId: 'structured-run', prompt: '', direct: legacy };
});
diff --git a/apps/desktop/src/main/bot-import/__tests__/process.test.ts b/apps/desktop/src/main/bot-import/__tests__/process.test.ts
index c737753751..859451080b 100644
--- a/apps/desktop/src/main/bot-import/__tests__/process.test.ts
+++ b/apps/desktop/src/main/bot-import/__tests__/process.test.ts
@@ -41,15 +41,18 @@ it('keeps credential context through array and object values without masking ord
});
it.each(['credential', 'credentials', 'clientCredentials', 'tokens', 'access_tokens', 'refreshTokens',
- 'secrets', 'passwords', 'passwds', 'keys', 'api_keys', 'API-KEYS', 'auth', 'authorization', 'cookies'])(
+ 'secrets', 'passwords', 'passwds', 'keys', 'api_keys', 'API-KEYS', 'auth', 'authorization', 'cookies',
+ 'private_key', 'privateKey', 'privateKeys', 'SSH_PRIVATE_KEY', 'signing_key', 'signing-key', 'signingKey',
+ 'encryption_key', 'decryptionKey', 'awsSecretAccessKey', 'serviceApiKey'])(
'masks scalar and nested string descendants of the %s credential field', field => {
const original = { [field]: ['fixture-container-secret', { nested: ['fixture-nested-secret'] }],
- scalar: { [field]: 'fixture-scalar-secret' }, cities: ['Paris', 'London'], monkeys: ['capuchin'] };
+ scalar: { [field]: 'fixture-scalar-secret' }, cities: ['Paris', 'London'], monkeys: ['capuchin'],
+ public_key: 'fixture-public-key', sort_key: 'name', keyboard: 'qwerty' };
const before = JSON.stringify(original);
const masks = importedContentRedactions({ env: {}, mcp: [], credentials: [{ id: 'fixture', format: 'json', value: original }] });
- const output = redactEnvironmentValues('fixture-container-secret fixture-nested-secret fixture-scalar-secret Paris London capuchin', masks);
+ const output = redactEnvironmentValues('fixture-container-secret fixture-nested-secret fixture-scalar-secret Paris London capuchin fixture-public-key name qwerty', masks);
for (const secret of ['fixture-container-secret', 'fixture-nested-secret', 'fixture-scalar-secret']) expect(output).not.toContain(secret);
- expect(output).toContain('Paris London capuchin');
+ expect(output).toContain('Paris London capuchin fixture-public-key name qwerty');
expect(JSON.stringify(original)).toBe(before);
},
);
diff --git a/apps/desktop/src/main/bot-import/connectionCatalog.ts b/apps/desktop/src/main/bot-import/connectionCatalog.ts
index bcf1b31650..f977454c28 100644
--- a/apps/desktop/src/main/bot-import/connectionCatalog.ts
+++ b/apps/desktop/src/main/bot-import/connectionCatalog.ts
@@ -9,7 +9,7 @@ const PUBLIC_MCP_ROUTES = new Set(['api', 'v1', 'v2', 'mcp', 'sse', 'messages',
const LOCAL_MCP_ENDPOINTS = new Set(['native-mcp', 'touchdesigner-mcp']);
const CAPABILITY_PATH_PREFIXES = new Set(['hooks', 'webhooks', 'token', 'secret', 'credential', 'key']);
// Credential containers use the same classification as their scalar forms.
-const CREDENTIAL_FIELD = /^(?:keys?|api[_-]?keys?|.*(?:tokens?|secrets?|passwords?|passwds?|credentials?)|auth(?:orization)?|access|refresh|cookies?)$/i;
+const CREDENTIAL_FIELD = /^(?:keys?|.*(?:api|private|signing|encryption|decryption|secret|access)[_-]?keys?|.*(?:tokens?|secrets?|passwords?|passwds?|credentials?)|auth(?:orization)?|access|refresh|cookies?)$/i;
/** Include resolved connection-local values without overwriting same-named imports. */
export function connectionRedactions(server: ImportedMcpServer, environment: Record<string, string>): Record<string, string> {