Skip to content

Commit

Permalink
remove secretgroup from default config (#1288)
Browse files Browse the repository at this point in the history 
* remove secretgroup from default config

* update test data and AWS

* leave secretgroup
  • Loading branch information
@zricethezav
zricethezav committed Nov 10, 2023
1 parent 20fcf50 commit e63b657
Show file tree
Hide file tree
Showing 93 changed files with 146 additions and 284 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Expand Up @@ -35,7 +35,7 @@ If you want to add a new rule to the [default Gitleaks configuration](https://gi
RuleID: "beamer-api-token",

// Regex capture group for the actual secret
SecretGroup: 1,



// Regex used for detecting secrets. See regex section below for more details
Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/adafruit.go
View file
Expand Up @@ -11,7 +11,6 @@ func AdafruitAPIKey() *config.Rule {
Description: "Adafruit API Key",
RuleID: "adafruit-api-key",
Regex: generateSemiGenericRegex([]string{"adafruit"}, alphaNumericExtendedShort("32"), true),
SecretGroup: 1,
Keywords: []string{"adafruit"},
}

Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/adobe.go
View file
Expand Up @@ -11,7 +11,6 @@ func AdobeClientID() *config.Rule {
Description: "Adobe Client ID (OAuth Web)",
RuleID: "adobe-client-id",
Regex: generateSemiGenericRegex([]string{"adobe"}, hex("32"), true),
SecretGroup: 1,
Keywords: []string{"adobe"},
}

Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/airtable.go
View file
Expand Up @@ -11,7 +11,6 @@ func Airtable() *config.Rule {
Description: "Airtable API Key",
RuleID: "airtable-api-key",
Regex: generateSemiGenericRegex([]string{"airtable"}, alphaNumeric("17"), true),
SecretGroup: 1,
Keywords: []string{"airtable"},
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/generate/config/rules/alibaba.go
View file
Expand Up @@ -29,8 +29,8 @@ func AlibabaSecretKey() *config.Rule {
RuleID: "alibaba-secret-key",
Regex: generateSemiGenericRegex([]string{"alibaba"},
alphaNumeric("30"), true),
SecretGroup: 1,
Keywords: []string{"alibaba"},

Keywords: []string{"alibaba"},
}

// validate
Expand Down
5 changes: 2 additions & 3 deletions cmd/generate/config/rules/asana.go
View file
Expand Up @@ -11,7 +11,6 @@ func AsanaClientID() *config.Rule {
Description: "Asana Client ID",
RuleID: "asana-client-id",
Regex: generateSemiGenericRegex([]string{"asana"}, numeric("16"), true),
SecretGroup: 1,
Keywords: []string{"asana"},
}

Expand All @@ -28,8 +27,8 @@ func AsanaClientSecret() *config.Rule {
Description: "Asana Client Secret",
RuleID: "asana-client-secret",
Regex: generateSemiGenericRegex([]string{"asana"}, alphaNumeric("32"), true),
SecretGroup: 1,
Keywords: []string{"asana"},

Keywords: []string{"asana"},
}

// validate
Expand Down
3 changes: 1 addition & 2 deletions cmd/generate/config/rules/atlassian.go
View file
Expand Up @@ -12,8 +12,7 @@ func Atlassian() *config.Rule {
RuleID: "atlassian-api-token",
Regex: generateSemiGenericRegex([]string{
"atlassian", "confluence", "jira"}, alphaNumeric("24"), true),
SecretGroup: 1,
Keywords: []string{"atlassian", "confluence", "jira"},
Keywords: []string{"atlassian", "confluence", "jira"},
}

// validate
Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/authress.go
View file
Expand Up @@ -13,7 +13,6 @@ func Authress() *config.Rule {
r := config.Rule{
Description: "Authress Service Client Access Key",
RuleID: "authress-service-client-access-key",
SecretGroup: 1,
Regex: generateUniqueTokenRegex(`(?:sc|ext|scauth|authress)_[a-z0-9]{5,30}\.[a-z0-9]{4,6}\.acc[_-][a-z0-9-]{10,32}\.[a-z0-9+/_=-]{30,120}`, true),
Keywords: []string{"sc_", "ext_", "scauth_", "authress_"},
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/aws.go
View file
Expand Up @@ -12,7 +12,7 @@ func AWS() *config.Rule {
Description: "AWS",
RuleID: "aws-access-token",
Regex: regexp.MustCompile(
"(A3T[A-Z0-9]|AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16}"),
"(?:A3T[A-Z0-9]|AKIA|AGPA|AIDA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16}"),
Keywords: []string{
"AKIA",
"AGPA",
Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/beamer.go
View file
Expand Up @@ -10,7 +10,6 @@ func Beamer() *config.Rule {
r := config.Rule{
Description: "Beamer API token",
RuleID: "beamer-api-token",
SecretGroup: 1,
Regex: generateSemiGenericRegex([]string{"beamer"},
`b_[a-z0-9=_\-]{44}`, true),
Keywords: []string{"beamer"},
Expand Down
5 changes: 2 additions & 3 deletions cmd/generate/config/rules/bitbucket.go
View file
Expand Up @@ -11,7 +11,6 @@ func BitBucketClientID() *config.Rule {
Description: "Bitbucket Client ID",
RuleID: "bitbucket-client-id",
Regex: generateSemiGenericRegex([]string{"bitbucket"}, alphaNumeric("32"), true),
SecretGroup: 1,
Keywords: []string{"bitbucket"},
}

Expand All @@ -28,8 +27,8 @@ func BitBucketClientSecret() *config.Rule {
Description: "Bitbucket Client Secret",
RuleID: "bitbucket-client-secret",
Regex: generateSemiGenericRegex([]string{"bitbucket"}, alphaNumericExtended("64"), true),
SecretGroup: 1,
Keywords: []string{"bitbucket"},

Keywords: []string{"bitbucket"},
}

// validate
Expand Down
5 changes: 2 additions & 3 deletions cmd/generate/config/rules/bittrex.go
View file
Expand Up @@ -11,7 +11,6 @@ func BittrexAccessKey() *config.Rule {
Description: "Bittrex Access Key",
RuleID: "bittrex-access-key",
Regex: generateSemiGenericRegex([]string{"bittrex"}, alphaNumeric("32"), true),
SecretGroup: 1,
Keywords: []string{"bittrex"},
}

Expand All @@ -28,8 +27,8 @@ func BittrexSecretKey() *config.Rule {
Description: "Bittrex Secret Key",
RuleID: "bittrex-secret-key",
Regex: generateSemiGenericRegex([]string{"bittrex"}, alphaNumeric("32"), true),
SecretGroup: 1,
Keywords: []string{"bittrex"},

Keywords: []string{"bittrex"},
}

// validate
Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/codecov.go
View file
Expand Up @@ -11,7 +11,6 @@ func CodecovAccessToken() *config.Rule {
RuleID: "codecov-access-token",
Description: "Codecov Access Token",
Regex: generateSemiGenericRegex([]string{"codecov"}, alphaNumeric("32"), true),
SecretGroup: 1,
Keywords: []string{
"codecov",
},
Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/coinbase.go
View file
Expand Up @@ -12,7 +12,6 @@ func CoinbaseAccessToken() *config.Rule {
Description: "Coinbase Access Token",
Regex: generateSemiGenericRegex([]string{"coinbase"},
alphaNumericExtendedShort("64"), true),
SecretGroup: 1,
Keywords: []string{
"coinbase",
},
Expand Down
3 changes: 1 addition & 2 deletions cmd/generate/config/rules/confluent.go
View file
Expand Up @@ -11,7 +11,6 @@ func ConfluentSecretKey() *config.Rule {
RuleID: "confluent-secret-key",
Description: "Confluent Secret Key",
Regex: generateSemiGenericRegex([]string{"confluent"}, alphaNumeric("64"), true),
SecretGroup: 1,
Keywords: []string{
"confluent",
},
Expand All @@ -30,7 +29,7 @@ func ConfluentAccessToken() *config.Rule {
RuleID: "confluent-access-token",
Description: "Confluent Access Token",
Regex: generateSemiGenericRegex([]string{"confluent"}, alphaNumeric("16"), true),
SecretGroup: 1,

Keywords: []string{
"confluent",
},
Expand Down
3 changes: 1 addition & 2 deletions cmd/generate/config/rules/contentful.go
View file
Expand Up @@ -12,8 +12,7 @@ func Contentful() *config.Rule {
RuleID: "contentful-delivery-api-token",
Regex: generateSemiGenericRegex([]string{"contentful"},
alphaNumericExtended("43"), true),
SecretGroup: 1,
Keywords: []string{"contentful"},
Keywords: []string{"contentful"},
}

// validate
Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/datadog.go
View file
Expand Up @@ -12,7 +12,6 @@ func DatadogtokenAccessToken() *config.Rule {
Description: "Datadog Access Token",
Regex: generateSemiGenericRegex([]string{"datadog"},
alphaNumeric("40"), true),
SecretGroup: 1,
Keywords: []string{
"datadog",
},
Expand Down
3 changes: 0 additions & 3 deletions cmd/generate/config/rules/definednetworking.go
View file
Expand Up @@ -14,9 +14,6 @@ func DefinedNetworkingAPIToken() *config.Rule {
// Unique ID for the rule
RuleID: "defined-networking-api-token",

// Regex capture group for the actual secret
SecretGroup: 1,

// Regex used for detecting secrets. See regex section below for more details
Regex: generateSemiGenericRegex([]string{"dnkey"}, `dnkey-[a-z0-9=_\-]{26}-[a-z0-9=_\-]{52}`, true),

Expand Down
13 changes: 6 additions & 7 deletions cmd/generate/config/rules/digitalocean.go
View file
Expand Up @@ -9,7 +9,6 @@ func DigitalOceanPAT() *config.Rule {
r := config.Rule{
Description: "DigitalOcean Personal Access Token",
RuleID: "digitalocean-pat",
SecretGroup: 1,
Regex: generateUniqueTokenRegex(`dop_v1_[a-f0-9]{64}`, true),
Keywords: []string{"dop_v1_"},
}
Expand All @@ -24,9 +23,9 @@ func DigitalOceanOAuthToken() *config.Rule {
r := config.Rule{
Description: "DigitalOcean OAuth Access Token",
RuleID: "digitalocean-access-token",
SecretGroup: 1,
Regex: generateUniqueTokenRegex(`doo_v1_[a-f0-9]{64}`, true),
Keywords: []string{"doo_v1_"},

Regex: generateUniqueTokenRegex(`doo_v1_[a-f0-9]{64}`, true),
Keywords: []string{"doo_v1_"},
}

tps := []string{
Expand All @@ -39,9 +38,9 @@ func DigitalOceanRefreshToken() *config.Rule {
r := config.Rule{
Description: "DigitalOcean OAuth Refresh Token",
RuleID: "digitalocean-refresh-token",
SecretGroup: 1,
Regex: generateUniqueTokenRegex(`dor_v1_[a-f0-9]{64}`, true),
Keywords: []string{"dor_v1_"},

Regex: generateUniqueTokenRegex(`dor_v1_[a-f0-9]{64}`, true),
Keywords: []string{"dor_v1_"},
}

tps := []string{
Expand Down
3 changes: 0 additions & 3 deletions cmd/generate/config/rules/discord.go
View file
Expand Up @@ -11,7 +11,6 @@ func DiscordAPIToken() *config.Rule {
Description: "Discord API key",
RuleID: "discord-api-token",
Regex: generateSemiGenericRegex([]string{"discord"}, hex("64"), true),
SecretGroup: 1,
Keywords: []string{"discord"},
}

Expand All @@ -28,7 +27,6 @@ func DiscordClientID() *config.Rule {
Description: "Discord client ID",
RuleID: "discord-client-id",
Regex: generateSemiGenericRegex([]string{"discord"}, numeric("18"), true),
SecretGroup: 1,
Keywords: []string{"discord"},
}

Expand All @@ -45,7 +43,6 @@ func DiscordClientSecret() *config.Rule {
Description: "Discord client secret",
RuleID: "discord-client-secret",
Regex: generateSemiGenericRegex([]string{"discord"}, alphaNumericExtended("32"), true),
SecretGroup: 1,
Keywords: []string{"discord"},
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/droneci.go
View file
Expand Up @@ -11,7 +11,7 @@ func DroneciAccessToken() *config.Rule {
RuleID: "droneci-access-token",
Description: "Droneci Access Token",
Regex: generateSemiGenericRegex([]string{"droneci"}, alphaNumeric("32"), true),
SecretGroup: 1,

Keywords: []string{
"droneci",
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/generate/config/rules/dropbox.go
View file
Expand Up @@ -11,8 +11,8 @@ func DropBoxAPISecret() *config.Rule {
Description: "Dropbox API secret",
RuleID: "dropbox-api-token",
Regex: generateSemiGenericRegex([]string{"dropbox"}, alphaNumeric("15"), true),
SecretGroup: 1,
Keywords: []string{"dropbox"},

Keywords: []string{"dropbox"},
}

// validate
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/etsy.go
View file
Expand Up @@ -11,7 +11,7 @@ func EtsyAccessToken() *config.Rule {
RuleID: "etsy-access-token",
Description: "Etsy Access Token",
Regex: generateSemiGenericRegex([]string{"etsy"}, alphaNumeric("24"), true),
SecretGroup: 1,

Keywords: []string{
"etsy",
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/generate/config/rules/facebook.go
View file
Expand Up @@ -11,8 +11,8 @@ func Facebook() *config.Rule {
Description: "Facebook Access Token",
RuleID: "facebook",
Regex: generateSemiGenericRegex([]string{"facebook"}, hex("32"), true),
SecretGroup: 1,
Keywords: []string{"facebook"},

Keywords: []string{"facebook"},
}

// validate
Expand Down
4 changes: 2 additions & 2 deletions cmd/generate/config/rules/fastly.go
View file
Expand Up @@ -11,8 +11,8 @@ func FastlyAPIToken() *config.Rule {
Description: "Fastly API key",
RuleID: "fastly-api-token",
Regex: generateSemiGenericRegex([]string{"fastly"}, alphaNumericExtended("32"), true),
SecretGroup: 1,
Keywords: []string{"fastly"},

Keywords: []string{"fastly"},
}

// validate
Expand Down
8 changes: 4 additions & 4 deletions cmd/generate/config/rules/finicity.go
View file
Expand Up @@ -11,8 +11,8 @@ func FinicityClientSecret() *config.Rule {
Description: "Finicity Client Secret",
RuleID: "finicity-client-secret",
Regex: generateSemiGenericRegex([]string{"finicity"}, alphaNumeric("20"), true),
SecretGroup: 1,
Keywords: []string{"finicity"},

Keywords: []string{"finicity"},
}

// validate
Expand All @@ -28,8 +28,8 @@ func FinicityAPIToken() *config.Rule {
Description: "Finicity API token",
RuleID: "finicity-api-token",
Regex: generateSemiGenericRegex([]string{"finicity"}, hex("32"), true),
SecretGroup: 1,
Keywords: []string{"finicity"},

Keywords: []string{"finicity"},
}

// validate
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/finnhub.go
View file
Expand Up @@ -11,7 +11,7 @@ func FinnhubAccessToken() *config.Rule {
RuleID: "finnhub-access-token",
Description: "Finnhub Access Token",
Regex: generateSemiGenericRegex([]string{"finnhub"}, alphaNumeric("20"), true),
SecretGroup: 1,

Keywords: []string{
"finnhub",
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/flickr.go
View file
Expand Up @@ -11,7 +11,7 @@ func FlickrAccessToken() *config.Rule {
RuleID: "flickr-access-token",
Description: "Flickr Access Token",
Regex: generateSemiGenericRegex([]string{"flickr"}, alphaNumeric("32"), true),
SecretGroup: 1,

Keywords: []string{
"flickr",
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/freshbooks.go
View file
Expand Up @@ -11,7 +11,7 @@ func FreshbooksAccessToken() *config.Rule {
RuleID: "freshbooks-access-token",
Description: "Freshbooks Access Token",
Regex: generateSemiGenericRegex([]string{"freshbooks"}, alphaNumeric("64"), true),
SecretGroup: 1,

Keywords: []string{
"freshbooks",
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/gcp.go
View file
Expand Up @@ -30,7 +30,7 @@ func GCPAPIKey() *config.Rule {
RuleID: "gcp-api-key",
Description: "GCP API key",
Regex: generateUniqueTokenRegex(`AIza[0-9A-Za-z\\-_]{35}`, true),
SecretGroup: 1,

Keywords: []string{
"AIza",
},
Expand Down
1 change: 0 additions & 1 deletion cmd/generate/config/rules/generic.go
View file
Expand Up @@ -20,7 +20,6 @@ func GenericCredential() *config.Rule {
"auth",
"access",
}, `[0-9a-z\-_.=]{10,150}`, true),
SecretGroup: 1,
Keywords: []string{
"key",
"api",
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/gitter.go
View file
Expand Up @@ -12,7 +12,7 @@ func GitterAccessToken() *config.Rule {
Description: "Gitter Access Token",
Regex: generateSemiGenericRegex([]string{"gitter"},
alphaNumericExtendedShort("40"), true),
SecretGroup: 1,

Keywords: []string{
"gitter",
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate/config/rules/gocardless.go
View file
Expand Up @@ -11,7 +11,7 @@ func GoCardless() *config.Rule {
RuleID: "gocardless-api-token",
Description: "GoCardless API token",
Regex: generateSemiGenericRegex([]string{"gocardless"}, `live_(?i)[a-z0-9\-_=]{40}`, true),
SecretGroup: 1,

Keywords: []string{
"live_",
"gocardless",
Expand Down

0 comments on commit e63b657

Please sign in to comment.