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

Update generate (#892)

* maintain parity with recent changes... need to create rule contributing guidelines

* missed on, ensure uniqueness in rule-id
Zachary Rice 3 лет назад
Родитель
Сommit
70028079b4
3 измененных файлов с 17 добавлено и 8 удалено
  1. 10 1
      cmd/generate/config/main.go
  2. 3 3
      cmd/generate/config/rules/flutterwave.go
  3. 4 4
      config/gitleaks.toml

+ 10 - 1
cmd/generate/config/main.go

@@ -49,7 +49,7 @@ func main() {
 	configRules = append(configRules, rules.FinicityAPIToken())
 	configRules = append(configRules, rules.FlutterwavePublicKey())
 	configRules = append(configRules, rules.FlutterwaveSecretKey())
-	configRules = append(configRules, rules.FlutterwaveSecretKey())
+	configRules = append(configRules, rules.FlutterwaveEncKey())
 	configRules = append(configRules, rules.FrameIO())
 	configRules = append(configRules, rules.GoCardless())
 	// TODO figure out what makes sense for GCP
@@ -104,6 +104,15 @@ func main() {
 	configRules = append(configRules, rules.Typeform())
 	configRules = append(configRules, rules.GenericCredential())
 
+	// ensure rules have unique ids
+	ruleLookUp := make(map[string]bool)
+	for _, rule := range configRules {
+		// check if rule is in ruleLookUp
+		if _, ok := ruleLookUp[rule.RuleID]; ok {
+			log.Fatal().Msgf("rule id %s is not unique", rule.RuleID)
+		}
+		ruleLookUp[rule.RuleID] = true
+	}
 	config := config.Config{
 		Rules: configRules,
 	}

+ 3 - 3
cmd/generate/config/rules/flutterwave.go

@@ -26,7 +26,7 @@ func FlutterwavePublicKey() *config.Rule {
 func FlutterwaveSecretKey() *config.Rule {
 	// define rule
 	r := config.Rule{
-		Description: "Finicity Secret Key",
+		Description: "Flutterwave Secret Key",
 		RuleID:      "flutterwave-secret-key",
 		Regex:       regexp.MustCompile(`FLWSECK_TEST-(?i)[a-h0-9]{32}-X`),
 		Keywords:    []string{"FLWSECK_TEST"},
@@ -42,8 +42,8 @@ func FlutterwaveSecretKey() *config.Rule {
 func FlutterwaveEncKey() *config.Rule {
 	// define rule
 	r := config.Rule{
-		Description: "Finicity Secret Key",
-		RuleID:      "flutterwave-public-key",
+		Description: "Flutterwave Encryption Key",
+		RuleID:      "flutterwave-encryption-key",
 		Regex:       regexp.MustCompile(`FLWSECK_TEST-(?i)[a-h0-9]{12}`),
 		Keywords:    []string{"FLWSECK_TEST"},
 	}

+ 4 - 4
config/gitleaks.toml

@@ -291,7 +291,7 @@ keywords = [
 ]
 
 [[rules]]
-description = "Finicity Secret Key"
+description = "Flutterwave Secret Key"
 id = "flutterwave-secret-key"
 regex = '''FLWSECK_TEST-(?i)[a-h0-9]{32}-X'''
 keywords = [
@@ -299,9 +299,9 @@ keywords = [
 ]
 
 [[rules]]
-description = "Finicity Secret Key"
-id = "flutterwave-secret-key"
-regex = '''FLWSECK_TEST-(?i)[a-h0-9]{32}-X'''
+description = "Flutterwave Encryption Key"
+id = "flutterwave-encryption-key"
+regex = '''FLWSECK_TEST-(?i)[a-h0-9]{12}'''
 keywords = [
     "flwseck_test",
 ]