mirror of
https://github.com/affaan-m/ECC.git
synced 2026-11-17 05:22:17 +00:00
fix(hooks): redact bare API keys, JWTs and PEM blocks in bash command logs
sanitizeCommand only redacted keyword- or flag-shaped secrets, so a bare Anthropic/OpenAI sk- key, a JWT, a PEM private key block, or a secret= / api_key= / x-api-key: value was written verbatim to bash-commands.log and cost-tracker.log. Add value-shape patterns for these and keep the key name and separator for assignments so the log stays readable. Refs #3846
This commit is contained in:
1 parent
b38be6a7f6
commit
08fb3c8a1c
2 files changed
+106
No files matched your search
@@ -22,6 +22,10 @@ const MODE_CONFIG = {
|
||||
function sanitizeCommand(command) {
|
||||
return String(command || '')
|
||||
.replace(/\n/g, ' ')
|
||||
.replace(/-----BEGIN [A-Z0-9 ]*PRIVATE KEY-----[\s\S]*?(?:-----END [A-Z0-9 ]*PRIVATE KEY-----|$)/g, '<REDACTED>')
|
||||
.replace(/\bsk-[A-Za-z0-9_-]{20,}/g, '<REDACTED>')
|
||||
.replace(/\beyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]*/g, '<REDACTED>')
|
||||
.replace(/(\b|_)(secret|api[_-]?key)(\s*[:=]\s*)("[^"]*"|'[^']*'|[^\s"']+)/gi, '$1$2$3<REDACTED>')
|
||||
.replace(/--token[= ][^ ]*/g, '--token=<REDACTED>')
|
||||
.replace(/Authorization:[: ]*[^ ]*[: ]*[^ ]*/gi, 'Authorization:<REDACTED>')
|
||||
.replace(/\bAKIA[A-Z0-9]{16}\b/g, '<REDACTED>')
|
||||
|
||||
@@ -50,6 +50,108 @@ if (
|
||||
passed++;
|
||||
else failed++;
|
||||
|
||||
// Synthetic secrets, assembled at runtime so secret scanners do not flag
|
||||
// this file. None of these are real credentials.
|
||||
const FAKE_ANTHROPIC_KEY = ['sk', 'ant', 'api03', 'FAKEFAKEFAKEFAKEFAKEFAKEFAKE_x-y'].join('-');
|
||||
const FAKE_OPENAI_KEY = ['sk', 'proj', 'FAKEfakeFAKEfakeFAKEfakeFAKE'].join('-');
|
||||
const FAKE_JWT = ['eyJhbGciOiJIUzI1NiJ9', 'eyJzdWIiOiJmYWtlIn0', 'ZmFrZXNpZ25hdHVyZQ'].join('.');
|
||||
const PEM_BEGIN = ['-----BEGIN', 'PRIVATE', 'KEY-----'].join(' ');
|
||||
const PEM_END = ['-----END', 'PRIVATE', 'KEY-----'].join(' ');
|
||||
const FAKE_VALUE = ['not', 'a', 'real', 'value'].join('-');
|
||||
|
||||
if (
|
||||
test('sanitizeCommand redacts bare sk- API keys wherever they appear (#3846)', () => {
|
||||
const commands = [
|
||||
`ANTHROPIC_API_KEY=${FAKE_ANTHROPIC_KEY} claude -p hi`,
|
||||
`curl -H "x-api-key: ${FAKE_ANTHROPIC_KEY}" https://api.example.com`,
|
||||
`echo ${FAKE_ANTHROPIC_KEY} > key.txt`,
|
||||
`OPENAI_API_KEY=${FAKE_OPENAI_KEY} node app.js`,
|
||||
];
|
||||
for (const command of commands) {
|
||||
const sanitized = sanitizeCommand(command);
|
||||
assert.ok(!sanitized.includes('FAKEFAKE'), `key leaked: ${sanitized}`);
|
||||
assert.ok(!sanitized.includes('FAKEfake'), `key leaked: ${sanitized}`);
|
||||
assert.ok(sanitized.includes('<REDACTED>'), `no redaction marker: ${sanitized}`);
|
||||
}
|
||||
assert.strictEqual(sanitizeCommand(`echo ${FAKE_ANTHROPIC_KEY} > key.txt`), 'echo <REDACTED> > key.txt');
|
||||
})
|
||||
)
|
||||
passed++;
|
||||
else failed++;
|
||||
|
||||
if (
|
||||
test('sanitizeCommand redacts JWTs and PEM private key blocks (#3846)', () => {
|
||||
assert.strictEqual(sanitizeCommand(`export TOKEN_VALUE=${FAKE_JWT}`), 'export TOKEN_VALUE=<REDACTED>');
|
||||
|
||||
const pem = `printf '${PEM_BEGIN}\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASC\n${PEM_END}' > id_rsa`;
|
||||
const sanitizedPem = sanitizeCommand(pem);
|
||||
assert.ok(!sanitizedPem.includes('MIIEvQ'), sanitizedPem);
|
||||
assert.strictEqual(sanitizedPem, "printf '<REDACTED>' > id_rsa");
|
||||
|
||||
const truncated = sanitizeCommand(`echo "${PEM_BEGIN}\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASC`);
|
||||
assert.ok(!truncated.includes('MIIEvQ'), truncated);
|
||||
})
|
||||
)
|
||||
passed++;
|
||||
else failed++;
|
||||
|
||||
if (
|
||||
test('sanitizeCommand redacts secret= and api_key= assignments (#3846)', () => {
|
||||
assert.strictEqual(
|
||||
sanitizeCommand(`app --secret=${FAKE_VALUE} --api_key=${FAKE_VALUE} --api-key="${FAKE_VALUE} two"`),
|
||||
'app --secret=<REDACTED> --api_key=<REDACTED> --api-key=<REDACTED>'
|
||||
);
|
||||
assert.strictEqual(sanitizeCommand(`CLIENT_SECRET=${FAKE_VALUE} run`), 'CLIENT_SECRET=<REDACTED> run');
|
||||
assert.strictEqual(
|
||||
sanitizeCommand(`curl -H "x-api-key: ${FAKE_VALUE}" https://api.example.com`),
|
||||
'curl -H "x-api-key: <REDACTED>" https://api.example.com'
|
||||
);
|
||||
})
|
||||
)
|
||||
passed++;
|
||||
else failed++;
|
||||
|
||||
if (
|
||||
test('sanitizeCommand leaves ordinary commands untouched', () => {
|
||||
const commands = [
|
||||
'gh secret set DEPLOY_KEY --repo owner/name',
|
||||
'git commit -m "rotate the secret handling"',
|
||||
'npm run task-runner-with-a-very-long-script-name',
|
||||
'cat config/api_key.example.json',
|
||||
'grep -rn "eyJ" src/',
|
||||
];
|
||||
for (const command of commands) {
|
||||
assert.strictEqual(sanitizeCommand(command), command);
|
||||
}
|
||||
})
|
||||
)
|
||||
passed++;
|
||||
else failed++;
|
||||
|
||||
if (
|
||||
test('audit mode does not write bare API keys to the log (#3846)', () => {
|
||||
const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ecc-bash-log-'));
|
||||
const payload = {
|
||||
tool_input: {
|
||||
command: `echo ${FAKE_ANTHROPIC_KEY} > key.txt`,
|
||||
},
|
||||
};
|
||||
|
||||
try {
|
||||
const result = runHook('audit', payload, homeDir);
|
||||
assert.strictEqual(result.status, 0, result.stdout + result.stderr);
|
||||
|
||||
const logContent = fs.readFileSync(path.join(homeDir, '.claude', 'bash-commands.log'), 'utf8');
|
||||
assert.ok(logContent.includes('echo <REDACTED> > key.txt'), logContent);
|
||||
assert.ok(!logContent.includes(FAKE_ANTHROPIC_KEY), logContent);
|
||||
} finally {
|
||||
fs.rmSync(homeDir, { recursive: true, force: true });
|
||||
}
|
||||
})
|
||||
)
|
||||
passed++;
|
||||
else failed++;
|
||||
|
||||
if (
|
||||
test('audit mode logs sanitized bash commands and preserves stdout', () => {
|
||||
const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ecc-bash-log-'));
|
||||
|
||||
Reference in new issue
Block a user