Commitf036dce

authored

* fix allowlist bug* Adding new repo for testing allowlisting* adding additional constraints on the dotgit regex

1 parent2d58f1f commitf036dceCopy full SHA for f036dce

File tree

+41

-3

lines changed

+41

-3

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,10 @@ import (`
`4`	`4`	`"regexp"`
`5`	`5`	`)`
`6`	`6`
	`7`	`+// used for ignoring .git directories when the --no-git flag is set`
	`8`	`+// related issue: https://github.com/zricethezav/gitleaks/issues/486`
	`9`	+constdotGit=`\.git/`
	`10`	`+`
`7`	`11`	`// AllowList is struct containing items that if encountered will allowlist`
`8`	`12`	`// a commit/line of code that would be considered a leak.`
`9`	`13`	`typeAllowListstruct {`
`@@ -45,9 +49,9 @@ func (a *AllowList) RepoAllowed(repo string) bool {`
`45`	`49`	`returnanyRegexMatch(repo,a.Repos)`
`46`	`50`	`}`
`47`	`51`
`48`		-// IgnoreDotGit appends a `.git$` rule to ignore all .git paths. This is used for --no-git scans
	`52`	+// IgnoreDotGit appends a `\.git` rule to ignore all .git paths. This is used for --no-git scans
`49`	`53`	`func (a*AllowList)IgnoreDotGit()error {`
`50`		`-re,err:=regexp.Compile(".git")`
	`54`	`+re,err:=regexp.Compile(dotGit)`
`51`	`55`	`iferr!=nil {`
`52`	`56`	`returnerr`
`53`	`57`	`}`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,20 @@`
`1`	`1`	`[`
	`2`	`+ {`
	`3`	`+"line":"",`
	`4`	`+"lineNumber":1,`
	`5`	`+"offender":"Filename or path offender: ../test_data/test_repos/test_repo_10/.gitignore",`
	`6`	`+"commit":"",`
	`7`	`+"repo":"",`
	`8`	`+"repoURL":"",`
	`9`	`+"leakURL":"",`
	`10`	`+"rule":"Block dangerous filetypes",`
	`11`	`+"commitMessage":"",`
	`12`	`+"author":"",`
	`13`	`+"email":"",`
	`14`	`+"file":"../test_data/test_repos/test_repo_10/.gitignore",`
	`15`	`+"date":"0001-01-01T00:00:00Z",`
	`16`	`+"tags":"key, extensions"`
	`17`	`+ },`
`2`	`18`	`{`
`3`	`19`	`"line":"",`
`4`	`20`	`"lineNumber":1,`
`@@ -14,5 +30,21 @@`
`14`	`30`	`"file":"../test_data/test_repos/test_repo_10/bad.zip",`
`15`	`31`	`"date":"0001-01-01T00:00:00Z",`
`16`	`32`	`"tags":"key, extensions"`
	`33`	`+ },`
	`34`	`+ {`
	`35`	`+"line":"",`
	`36`	`+"lineNumber":1,`
	`37`	`+"offender":"Filename or path offender: ../test_data/test_repos/test_repo_10/gitfile.txt",`
	`38`	`+"commit":"",`
	`39`	`+"repo":"",`
	`40`	`+"repoURL":"",`
	`41`	`+"leakURL":"",`
	`42`	`+"rule":"Block dangerous filetypes",`
	`43`	`+"commitMessage":"",`
	`44`	`+"author":"",`
	`45`	`+"email":"",`
	`46`	`+"file":"../test_data/test_repos/test_repo_10/gitfile.txt",`
	`47`	`+"date":"0001-01-01T00:00:00Z",`
	`48`	`+"tags":"key, extensions"`
`17`	`49`	`}`
`18`	`50`	`]`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`[[rules]]`
`2`	`2`	`description ="Block dangerous filetypes"`
`3`		`-file ='''(.*?)(pdf\|doc\|docx\|zip\|xls\|tfplan\|tfstate\|tfvars\|vault_pass\|vagrant\|pyc\|key\|cache)$'''`
	`3`	`+file ='''(.*?)(gitfile.txt\|gitignore\|pdf\|doc\|docx\|zip\|xls\|tfplan\|tfstate\|tfvars\|vault_pass\|vagrant\|pyc\|key\|cache)$'''`
`4`	`4`	`tags = ["key","extensions"]`
`5`	`5`	`[rules.allowlist]`
`6`	`6`	`paths = ['''.docx''']`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+adotgitignorefile`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+a git file`

Comments

(0)