Find, verify, and analyze leaked credentials
Go credentialsdevsecopsdynamic-analysisprecommitscanningsecretsecret-managementsecretssecuritysecurity-toolstrufflehogverification
fixed uri regex issue (#3815)
Kashif Khand01060718c07
diff --git a/pkg/detectors/privacy/privacy.go b/pkg/detectors/privacy/privacy.goindex 30a73016a..fb62f6c47 100644--- a/pkg/detectors/privacy/privacy.go+++ b/pkg/detectors/privacy/privacy.go@@ -3,10 +3,11 @@ package privacyimport ("context""fmt"- regexp "github.com/wasilibs/go-re2""net/http""strings"+ regexp "github.com/wasilibs/go-re2"+"github.com/trufflesecurity/trufflehog/v3/pkg/common""github.com/trufflesecurity/trufflehog/v3/pkg/detectors""github.com/trufflesecurity/trufflehog/v3/pkg/pb/detectorspb"diff --git a/pkg/detectors/uri/uri.go b/pkg/detectors/uri/uri.goindex 111869ea9..a140c58a0 100644--- a/pkg/detectors/uri/uri.go+++ b/pkg/detectors/uri/uri.go@@ -30,7 +30,7 @@ var _ interface {} = (*Scanner)(nil)var (- keyPat = regexp.MustCompile(`\b(?:https?:)?\/\/[\S]{3,50}:([\S]{3,50})@[-.%\w\/:]+\b`)+ keyPat = regexp.MustCompile(`\bhttps?:\/\/[\w!#$%&()*+,\-./;<=>?@[\\\]^_{|}~]{0,50}:([\w!#$%&()*+,\-./:;<=>?[\\\]^_{|}~]{3,50})@[a-zA-Z0-9.-]+(?:\.[a-zA-Z]{2,})?(?::\d{1,5})?[\w/]+\b`)// TODO: make local addr opt-outdefaultClient = detectors.DetectorHttpClientWithNoLocalAddresses@@ -131,6 +131,7 @@ func (s Scanner) FromData(ctx context.Context, verify bool, data []byte) (resultcontinue}}+results = append(results, r)}diff --git a/pkg/detectors/uri/uri_test.go b/pkg/detectors/uri/uri_test.goindex 7c0762bb0..bdde2b9e8 100644--- a/pkg/detectors/uri/uri_test.go+++ b/pkg/detectors/uri/uri_test.go@@ -13,6 +13,7 @@ import (var (validPattern = "https://kaNydBSAodo87dsm9asuiSAFtsd7.com:1234@qYY3SylY7fHP"+ validPattern2 = `<p><a href="http://username:[email protected]">http://username:[email protected]</a></p>`invalidPattern = "https://kaNydBSAodo87dsm9asuiSAFtsd7.com.1234@qYY3SylY7fHP"keyword = "uri")@@ -30,6 +31,11 @@ func TestURI_Pattern(t *testing.T) {input: fmt.Sprintf("%s token = '%s'", keyword, validPattern),want: []string{validPattern},},+ {+ name: "valid pattern - do not process duplicate",+ input: fmt.Sprintf("%s token = '%s'", keyword, validPattern2),+ want: []string{"http://username:[email protected]"},+ },{name: "invalid pattern",input: fmt.Sprintf("%s = '%s'", keyword, invalidPattern),