Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .2ms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1388,4 +1388,6 @@ ignore-result:
- 0ee50cf76ca12b4b03bfb8f233527d846965ae8a # unit test from generic_credential_test.go (remove later)
- 1ab798f14ecce9ea8a9229803c33f06e0093306a # unit test from generic_credential_test.go (remove later)
- 4154ccf54f5d43a54103495dcf0e228353dc02f4 # unit test from generic_credential_test.go (remove later)
- 783d3aa8f0e14f6d1527879bbcb3ae6195134b33 # unit test from generic_credential_test.go (remove later)
- 783d3aa8f0e14f6d1527879bbcb3ae6195134b33 # unit test from generic_credential_test.go (remove later)
- 4b68fb6117b9245a27ff07671dbad3b7734ad9f3 # unit test from generic_credential_test.go
- de0438bff48b729dad27525d63839271790dca00 # unit test from generic_credential_test.go
2 changes: 1 addition & 1 deletion .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- run: mkdir -p kics-results

- name: Run KICS scan
uses: checkmarx/kics-github-action@03c9abe351b01c3e4dbe60fa00ff79ee07d73f44 # master
uses: checkmarx/kics-github-action@05aa5eb70eede1355220f4ca5238d96b397e30a6 # 2.1.20
with:
path: .
output_path: kics-results
Expand Down
2 changes: 2 additions & 0 deletions engine/rules/ruledefine/generic_credential.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ func GenericCredential() *Rule {
regexp.MustCompile(`--mount=type=secret,`).String(),
// https://github.com/gitleaks/gitleaks/issues/1800
regexp.MustCompile(`import[ \t]+{[ \t\w,]+}[ \t]+from[ \t]+['"][^'"]+['"]`).String(),
// Example case: name="authenticity_token" value="..."
regexp.MustCompile(`(?i)name\s*=\s*["']authenticity_token["']`).String(),
},
},
{
Expand Down
2 changes: 2 additions & 0 deletions engine/rules/ruledefine/generic_credential_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ func TestGenericCredential(t *testing.T) {
" utils.GetEnvOrDefault(\"api_token\", \"dafa7817-e246-48f3-91a7-e87653d587b8\")",
// xml cases
"<key>API_KEY</key>\n<string>AIzaSyATDL7Wz3Ze6BU31Yv3fVVth30Skyib29g</string>",
`<Parameter name="github_token" value="ghp_1234567890abcdefghijklmnopqrstuv"/>`,
`<Parameter name="jwt_secret" value="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9"/>`,
},
falsePositives: []string{
"issuerKeyHash=npmXsmT2_C1iJZ-SD7RuL8exZ=6ucd",
Expand Down
6 changes: 5 additions & 1 deletion engine/rules/ruledefine/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ const (
// operator = `(?:=|>|:{1,3}=|\|\|:|<=|=>|:|\?=)`
operator = `(?:=|>|:{1,3}=|\|\||:|=>|\?=|,)`

// operatorOrXmlValue requires either a normal assignment operator (YAML, JSON, plist `>` after
// <string>) or XML attribute value="..." (<Parameter name="github_token" value="..."/>).
operatorOrXmlValue = `(?:(?:\s*value\s*=\s*["'])|(?:` + operator + `))`

// boundaries for the secret
// \x60 = `
secretPrefixUnique = `\b(`
Expand Down Expand Up @@ -80,7 +84,7 @@ func generateSemiGenericRegexIncludingXml(identifiers []string, secretRegex stri
writeIdentifiersIncludingXml(&sb, identifiers)
sb.WriteString(identifierCaseInsensitiveSuffix)
}
sb.WriteString(operator)
sb.WriteString(operatorOrXmlValue)
sb.WriteString(secretPrefix)
sb.WriteString(secretRegex)
sb.WriteString(secretSuffixIncludingXml)
Expand Down
Loading