Преглед изворни кода

Merge pull request #112 from zricethezav/wl-commit

look at prev commit too
Zachary Rice пре 7 година
родитељ
комит
28639d3a49
2 измењених фајлова са 10 додато и 6 уклоњено
  1. 2 6
      gitleaks_test.go
  2. 8 0
      main.go

+ 2 - 6
gitleaks_test.go

@@ -500,14 +500,12 @@ func TestAuditRepo(t *testing.T) {
 			numLeaks: 0,
 		},
 		{
-			// note this double counts the first commit since we are whitelisting
-			// a "bad" first commit
 			repo:        leaksRepo,
 			description: "two leaks present whitelist bad commit",
 			whiteListCommits: map[string]bool{
 				"eaeffdc65b4c73ccb67e75d96bd8743be2c85973": true,
 			},
-			numLeaks: 2,
+			numLeaks: 1,
 		},
 		{
 			repo:        leaksRepo,
@@ -539,12 +537,10 @@ func TestAuditRepo(t *testing.T) {
 			numLeaks:    0,
 		},
 		{
-			// note this double counts the first commit since we are whitelisting
-			// a "bad" first commit
 			repo:        leaksRepo,
 			description: "toml whitelist commit",
 			configPath:  path.Join(configsDir, "commit"),
-			numLeaks:    2,
+			numLeaks:    1,
 		},
 		{
 			repo:        leaksRepo,

+ 8 - 0
main.go

@@ -466,6 +466,14 @@ func auditGitReference(repo *RepoDescriptor, ref *plumbing.Reference) []Leak {
 			log.Infof("skipping commit: %s\n", c.Hash.String())
 			return nil
 		}
+		if prevCommit != nil {
+			if whiteListCommits[prevCommit.Hash.String()] {
+				prevCommit = c
+				log.Infof("skipping commit: %s\n", c.Hash.String())
+				return nil
+			}
+		}
+
 		commitWg.Add(1)
 		semaphore <- true
 		go func(c *object.Commit, prevCommit *object.Commit) {