Просмотр исходного кода

updating generic regex and algoia regex (#875)

Zachary Rice 3 лет назад
Родитель
Сommit
469cd22f61

+ 1 - 2
cmd/generate/config/rules/algolia.go

@@ -10,7 +10,7 @@ func AlgoliaApiKey() *config.Rule {
 	r := config.Rule{
 		Description: "Algolia API Key",
 		RuleID:      "algolia-api-key",
-		Regex:       generateUniqueTokenRegex(`[a-z0-9]{32}`),
+		Regex:       generateSemiGenericRegex([]string{"algolia"}, `[a-z0-9]{32}`),
 		Keywords:    []string{"algolia"},
 	}
 
@@ -20,4 +20,3 @@ func AlgoliaApiKey() *config.Rule {
 	}
 	return validate(r, tps, nil)
 }
-

+ 2 - 2
cmd/generate/config/rules/generic.go

@@ -13,9 +13,9 @@ func GenericCredential() *config.Rule {
 			"key",
 			"api[^Version]",
 			"token",
-			"pat",
 			"secret",
 			"client",
+			"passwd",
 			"password",
 			"auth",
 		}, `[0-9a-z\-_.=]{10,150}`),
@@ -26,7 +26,7 @@ func GenericCredential() *config.Rule {
 			"token",
 			"secret",
 			"client",
-			"pat",
+			"passwd",
 			"password",
 			"auth",
 		},

+ 3 - 3
config/gitleaks.toml

@@ -45,7 +45,7 @@ keywords = [
 [[rules]]
 description = "Algolia API Key"
 id = "algolia-api-key"
-regex = '''\b((?i)[a-z0-9]{32})(?:['|\"|\n|\r|\s|\x60]|$)'''
+regex = '''(?i)(?:algolia)(?:[0-9a-z\-_\s.]{0,20})(?:[\s|']|[\s|"]){0,3}(?:=|>|:=|\|\|:|<=|=>|:)(?:'|\"|\s|=|\x60){0,5}([a-z0-9]{32})(?:['|\"|\n|\r|\s|\x60]|$)'''
 keywords = [
     "algolia",
 ]
@@ -741,11 +741,11 @@ keywords = [
 [[rules]]
 description = "Generic API Key"
 id = "generic-api-key"
-regex = '''(?i)(?:key|api[^Version]|token|pat|secret|client|password|auth)(?:[0-9a-z\-_\s.]{0,20})(?:[\s|']|[\s|"]){0,3}(?:=|>|:=|\|\|:|<=|=>|:)(?:'|\"|\s|=|\x60){0,5}([0-9a-z\-_.=]{10,150})(?:['|\"|\n|\r|\s|\x60]|$)'''
+regex = '''(?i)(?:key|api[^Version]|token|secret|client|passwd|password|auth)(?:[0-9a-z\-_\s.]{0,20})(?:[\s|']|[\s|"]){0,3}(?:=|>|:=|\|\|:|<=|=>|:)(?:'|\"|\s|=|\x60){0,5}([0-9a-z\-_.=]{10,150})(?:['|\"|\n|\r|\s|\x60]|$)'''
 secretGroup = 1
 entropy = 3.5
 keywords = [
-    "key","api","token","secret","client","pat","password","auth",
+    "key","api","token","secret","client","passwd","password","auth",
 ]
 [rules.allowlist]
 stopwords= [