Skip to content

armgit / ruflo

Public Imported from GitHub
0

🌊 The original agent harness. Deploy intelligent multi-player swarms, coordinate autonomous workflows, and build conversational AI systems. Features adaptive memory, self-learning intelligence, federation, vector RAG integration, and native Claude Code / Codex / Hermes and many more Integrated

fix(mods): secret screen — a 20+ char value under a secret-named key is a secret even all-letter or UUID-shaped, unless a clear reference (ADR-445)

ruvf2190b38ad2c
diff --git a/plugins/ruflo-adr/hooks/screen.ts b/plugins/ruflo-adr/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-adr/hooks/screen.ts
+++ b/plugins/ruflo-adr/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-agent/hooks/screen.ts b/plugins/ruflo-agent/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-agent/hooks/screen.ts
+++ b/plugins/ruflo-agent/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-agentdb/hooks/screen.ts b/plugins/ruflo-agentdb/hooks/screen.ts
index 170d85f804..b5f05f7cc6 100644
--- a/plugins/ruflo-agentdb/hooks/screen.ts
+++ b/plugins/ruflo-agentdb/hooks/screen.ts
@@ -69,7 +69,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -81,21 +81,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-agentdb/tests/screen.test.ts b/plugins/ruflo-agentdb/tests/screen.test.ts
index 72e2c665b7..c563fc5899 100644
--- a/plugins/ruflo-agentdb/tests/screen.test.ts
+++ b/plugins/ruflo-agentdb/tests/screen.test.ts
@@ -52,7 +52,11 @@ describe('screen quality: false positives', () => {
'apiKey = process.env.ANTHROPIC_API_KEY',
'secret: my-k8s-secret-name-for-database',
'token: <uuid>',
- 'token: 123e4567-e89b-12d3-a456-426614174000',
+ 'id: 123e4567-e89b-12d3-a456-426614174000',
+ 'request_id: 9b2d6c1e-4f3a-4c8e-9d71-2a5b8e0f6c13',
+ 'trace: 9b2d6c1e-4f3a-4c8e-9d71-2a5b8e0f6c13',
+ 'auth_url: https://login.company.com/oauth/authorize',
+ 'author: someone-wrote-this-long-name-here',
'Authorization: Bearer YOUR_TOKEN_GOES_HERE_PLACEHOLDER',
'use sk-learn-pipeline-stage-preprocessing-step-one for the preprocessing stage',
'password: stored-in-1password-vault-item',
@@ -73,6 +77,41 @@ describe('screen quality: false positives', () => {
}
})
+describe('screen quality: secret-named key with a low-variety value (regression vs the old screen)', () => {
+ const flagged = [
+ 'password: correcthorsebatterystaple',
+ 'api_key = abcdefghijklmnopqrstuvwxyzabcdef',
+ '{"secret": "correcthorsebatterystaple"}',
+ 'api_key: 123e4567-e89b-12d3-a456-426614174000',
+ 'token: 9b2d6c1e-4f3a-4c8e-9d71-2a5b8e0f6c13',
+ 'SECRET_KEY=mqkwzxvbnplhgfdsatyrewoiu',
+ 'auth: mqkwzxvbnplhgfdsatyrewoiu',
+ ]
+ for (const text of flagged) {
+ test('flags: ' + text, () => {
+ expect(scan(text).secrets).toContain('key assignment')
+ })
+ }
+ const refs = [
+ 'password: ${DB_PASSWORD_FROM_VAULT_STORE}',
+ 'token: getTokenFromTheVaultService(ctx)',
+ 'secret: arn:aws:secretsmanager:us-east-1:1:secret:x',
+ 'password: YOUR_PASSWORD_GOES_HERE_PLEASE',
+ 'secret: my-k8s-secret-name-for-database',
+ 'password: stored-in-1password-vault-item',
+ 'token: a.b.c.d.e.f.g.h.i.j.k.l',
+ 'password: vault:secret/data/app/db/pw1',
+ ]
+ for (const text of refs) {
+ test('still a reference: ' + text, () => {
+ expect(scan(text).secrets).toEqual([])
+ })
+ }
+ test('a 19-character single-class value stays below the keyed threshold', () => {
+ expect(scan('password: abcdefghijklmnopqrs').secrets).toEqual([])
+ })
+})
+
describe('screen quality: false negatives', () => {
const pw = 'Tr0ub4dor&3xKcd9876'
const found: readonly (readonly [string, string, string])[] = [
diff --git a/plugins/ruflo-agntcy/hooks/screen.ts b/plugins/ruflo-agntcy/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-agntcy/hooks/screen.ts
+++ b/plugins/ruflo-agntcy/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-ai-team/hooks/screen.ts b/plugins/ruflo-ai-team/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-ai-team/hooks/screen.ts
+++ b/plugins/ruflo-ai-team/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-aidefence/hooks/screen.ts b/plugins/ruflo-aidefence/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-aidefence/hooks/screen.ts
+++ b/plugins/ruflo-aidefence/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-arena/hooks/screen.ts b/plugins/ruflo-arena/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-arena/hooks/screen.ts
+++ b/plugins/ruflo-arena/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-autopilot/hooks/screen.ts b/plugins/ruflo-autopilot/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-autopilot/hooks/screen.ts
+++ b/plugins/ruflo-autopilot/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-bbs-federation/hooks/screen.ts b/plugins/ruflo-bbs-federation/hooks/screen.ts
index aa16d4f4f4..bb62ab536e 100644
--- a/plugins/ruflo-bbs-federation/hooks/screen.ts
+++ b/plugins/ruflo-bbs-federation/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-browser/hooks/screen.ts b/plugins/ruflo-browser/hooks/screen.ts
index 82577449c9..63e6ec1625 100644
--- a/plugins/ruflo-browser/hooks/screen.ts
+++ b/plugins/ruflo-browser/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-business-pods/hooks/screen.ts b/plugins/ruflo-business-pods/hooks/screen.ts
index 53d058fc1e..e3210a7b59 100644
--- a/plugins/ruflo-business-pods/hooks/screen.ts
+++ b/plugins/ruflo-business-pods/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-chatgpt-federation/hooks/screen.ts b/plugins/ruflo-chatgpt-federation/hooks/screen.ts
index daae6df822..3051fa0e27 100644
--- a/plugins/ruflo-chatgpt-federation/hooks/screen.ts
+++ b/plugins/ruflo-chatgpt-federation/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-daa/hooks/screen.ts b/plugins/ruflo-daa/hooks/screen.ts
index 2f07bcdbed..396818c23d 100644
--- a/plugins/ruflo-daa/hooks/screen.ts
+++ b/plugins/ruflo-daa/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-ddd/hooks/screen.ts b/plugins/ruflo-ddd/hooks/screen.ts
index 2f07bcdbed..396818c23d 100644
--- a/plugins/ruflo-ddd/hooks/screen.ts
+++ b/plugins/ruflo-ddd/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-deepseek-harness/hooks/screen.ts b/plugins/ruflo-deepseek-harness/hooks/screen.ts
index 2f07bcdbed..396818c23d 100644
--- a/plugins/ruflo-deepseek-harness/hooks/screen.ts
+++ b/plugins/ruflo-deepseek-harness/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-docs/hooks/screen.ts b/plugins/ruflo-docs/hooks/screen.ts
index 2f07bcdbed..396818c23d 100644
--- a/plugins/ruflo-docs/hooks/screen.ts
+++ b/plugins/ruflo-docs/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-federation/hooks/screen.ts b/plugins/ruflo-federation/hooks/screen.ts
index 2f07bcdbed..396818c23d 100644
--- a/plugins/ruflo-federation/hooks/screen.ts
+++ b/plugins/ruflo-federation/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-goals/hooks/screen.ts b/plugins/ruflo-goals/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-goals/hooks/screen.ts
+++ b/plugins/ruflo-goals/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-graph-intelligence/hooks/screen.ts b/plugins/ruflo-graph-intelligence/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-graph-intelligence/hooks/screen.ts
+++ b/plugins/ruflo-graph-intelligence/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-intelligence/hooks/screen.ts b/plugins/ruflo-intelligence/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-intelligence/hooks/screen.ts
+++ b/plugins/ruflo-intelligence/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-iot-cognitum/hooks/screen.ts b/plugins/ruflo-iot-cognitum/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-iot-cognitum/hooks/screen.ts
+++ b/plugins/ruflo-iot-cognitum/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-jujutsu/hooks/screen.ts b/plugins/ruflo-jujutsu/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-jujutsu/hooks/screen.ts
+++ b/plugins/ruflo-jujutsu/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-knowledge-graph/hooks/screen.ts b/plugins/ruflo-knowledge-graph/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-knowledge-graph/hooks/screen.ts
+++ b/plugins/ruflo-knowledge-graph/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-loop-workers/hooks/screen.ts b/plugins/ruflo-loop-workers/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-loop-workers/hooks/screen.ts
+++ b/plugins/ruflo-loop-workers/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-market-data/hooks/screen.ts b/plugins/ruflo-market-data/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-market-data/hooks/screen.ts
+++ b/plugins/ruflo-market-data/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-metaharness/hooks/screen.ts b/plugins/ruflo-metaharness/hooks/screen.ts
index daa743e23c..2b734d2efd 100644
--- a/plugins/ruflo-metaharness/hooks/screen.ts
+++ b/plugins/ruflo-metaharness/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-migrations/hooks/screen.ts b/plugins/ruflo-migrations/hooks/screen.ts
index d18268021b..ed10089ec2 100644
--- a/plugins/ruflo-migrations/hooks/screen.ts
+++ b/plugins/ruflo-migrations/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-music/hooks/screen.ts b/plugins/ruflo-music/hooks/screen.ts
index d2ee44e167..5eb5d4d7e9 100644
--- a/plugins/ruflo-music/hooks/screen.ts
+++ b/plugins/ruflo-music/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-neural-trader/hooks/screen.ts b/plugins/ruflo-neural-trader/hooks/screen.ts
index f543dfb133..cd5169a8d0 100644
--- a/plugins/ruflo-neural-trader/hooks/screen.ts
+++ b/plugins/ruflo-neural-trader/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-observability/hooks/screen.ts b/plugins/ruflo-observability/hooks/screen.ts
index cee50e7951..2232300754 100644
--- a/plugins/ruflo-observability/hooks/screen.ts
+++ b/plugins/ruflo-observability/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-rag-memory/hooks/screen.ts b/plugins/ruflo-rag-memory/hooks/screen.ts
index 1662eed60c..c6584493ad 100644
--- a/plugins/ruflo-rag-memory/hooks/screen.ts
+++ b/plugins/ruflo-rag-memory/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-ruvector/hooks/screen.ts b/plugins/ruflo-ruvector/hooks/screen.ts
index a862aa3811..06227bdcb6 100644
--- a/plugins/ruflo-ruvector/hooks/screen.ts
+++ b/plugins/ruflo-ruvector/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-ruvllm/hooks/screen.ts b/plugins/ruflo-ruvllm/hooks/screen.ts
index f8a0cbba85..7c67e93cf1 100644
--- a/plugins/ruflo-ruvllm/hooks/screen.ts
+++ b/plugins/ruflo-ruvllm/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-rvf/hooks/screen.ts b/plugins/ruflo-rvf/hooks/screen.ts
index 5be98c0c10..e95deac7dc 100644
--- a/plugins/ruflo-rvf/hooks/screen.ts
+++ b/plugins/ruflo-rvf/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-security-audit/hooks/screen.ts b/plugins/ruflo-security-audit/hooks/screen.ts
index 87f8461382..3a97683355 100644
--- a/plugins/ruflo-security-audit/hooks/screen.ts
+++ b/plugins/ruflo-security-audit/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-sparc/hooks/screen.ts b/plugins/ruflo-sparc/hooks/screen.ts
index fca7544d2d..9b0fe5adeb 100644
--- a/plugins/ruflo-sparc/hooks/screen.ts
+++ b/plugins/ruflo-sparc/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-workflows/hooks/screen.ts b/plugins/ruflo-workflows/hooks/screen.ts
index d3d01c6d14..577fec4dd6 100644
--- a/plugins/ruflo-workflows/hooks/screen.ts
+++ b/plugins/ruflo-workflows/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}
diff --git a/plugins/ruflo-x-gateway/hooks/screen.ts b/plugins/ruflo-x-gateway/hooks/screen.ts
index e8471fa2d4..7944914dac 100644
--- a/plugins/ruflo-x-gateway/hooks/screen.ts
+++ b/plugins/ruflo-x-gateway/hooks/screen.ts
@@ -65,7 +65,7 @@ function entropy(v: string): number {
/** True when `v` is a name, call, path or placeholder rather than a literal credential. */
function isReference(v: string): boolean {
- if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v)) return true
+ if (PLACEHOLDER.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v)) return true
return NAME_LIKE.test(v) && v.replace(/\D/g, '').length / v.length < 0.15
}
@@ -77,21 +77,41 @@ export function plausibleSecret(v: string): boolean {
return classes >= 2 && (digit || symbol) && entropy(v) >= 2.5
}
-const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key)s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
+/** Under a secret-named key a literal this long is a secret even with one character class or a UUID shape, unless it is a clear reference. */
+const KEYED_MIN = 20
+const PLACEHOLDER_WORD = /(?:^|[^a-z])(?:your|placeholder|changeme|change[-_]?me|example|redacted|dummy|replace[-_]?me|insert)(?:[^a-z]|$)|\*{3,}|x{5,}|\.{3}|^(?:none|null|undefined|true|false)$/i
+const URL_NO_CREDS = /^[a-z][a-z0-9+.-]{1,20}:\/\/[^\s@]*$/i
+
+/** Three or more lowercase hyphen-separated words (no hex or digit-only run of 8+, few digits), such as my-k8s-secret-name-for-database. */
+function hyphenName(v: string): boolean {
+ const parts = v.split('-')
+ return parts.length >= 3 && parts.every(p => /^[a-z0-9]{2,}$/.test(p) && !/^[0-9a-f]{8,}$/.test(p)) && v.replace(/\D/g, '').length / v.length < 0.15
+}
+
+function keyedSecret(v: string): boolean {
+ if (v.length < KEYED_MIN || v.length > 256 || /\s/.test(v)) return false
+ return !(PLACEHOLDER_WORD.test(v) || REFERENCE.test(v) || CALL.test(v) || IDENT_PATH.test(v) || URL_NO_CREDS.test(v) || (!UUID.test(v) && hyphenName(v)))
+}
+
+const KEY_NAME = /(?:api[_-]?key|secret|token|passw(?:or)?d|passwd|pwd|credential|private[_-]?key|auth(?!or))s?[A-Za-z0-9_-]{0,40}["']?\s*[:=]\s*/gi
const QUOTED = /(["'\x60])((?:(?!\1)[^\n]){1,256})\1/y
const BARE_VALUE = /[^\s"'\x60,;]{1,256}/y
const QUERY_VALUE = /[^\s"'\x60,;&]{1,256}/y
/** A secret-named key assigned a literal value: env style, JSON, YAML, code. Values that are calls, references or placeholders do not count. */
function assignmentSecret(text: string): boolean {
+ let valueEnd = 0
for (const m of text.matchAll(KEY_NAME)) {
+ if (m.index < valueEnd) continue // a key-looking word inside the previous value, such as secretsmanager in an ARN
const at = m.index + m[0].length
let back = m.index
while (back > 0 && m.index - back < 64 && /[A-Za-z0-9_.-]/.test(text.charAt(back - 1))) back--
const re = /["'\x60]/.test(text.charAt(at)) ? QUOTED : /[?&]/.test(text.charAt(back - 1)) ? QUERY_VALUE : BARE_VALUE
re.lastIndex = at
const hit = re.exec(text)
- if (hit && plausibleSecret(hit[2] ?? hit[0])) return true
+ const v = hit && (hit[2] ?? hit[0])
+ valueEnd = hit ? at + hit[0].length : at
+ if (v && (plausibleSecret(v) || keyedSecret(v))) return true
}
return false
}