diff --git a/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go b/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go index e2e12e5e2f50..7e364a43af36 100644 --- a/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go +++ b/pkg/detectors/cloudflareglobalapikey/cloudflareglobalapikey.go @@ -20,12 +20,13 @@ var _ detectors.Detector = (*Scanner)(nil) var ( client = common.SaneHttpClient() - apiKeyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"cloudflare"}) + `([A-Za-z0-9_-]{37})`) + apiKeyPat = regexp.MustCompile(detectors.PrefixRegex([]string{"cloudflare"}) + `\b([A-Za-z0-9_-]{37})\b`) // email pattern thanks https://golangcode.com/validate-an-email-address/ // emailPat = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$") + // the emailPat regex will also match emails ending in .co.uk and .engineering - emailPat = regexp.MustCompile(`\b([a-zA-Z0-9+._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9_-]+)\b`) + emailPat = regexp.MustCompile(`\b([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}(\.[A-Za-z]{2})?)\b`) ) // Keywords are used for efficiently pre-filtering chunks. diff --git a/pkg/engine/defaults.go b/pkg/engine/defaults.go index 0b3ba398024d..c7d40b9a32d9 100644 --- a/pkg/engine/defaults.go +++ b/pkg/engine/defaults.go @@ -139,6 +139,7 @@ import ( "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/cloudelements" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/cloudflareapitoken" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/cloudflarecakey" + "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/cloudflareglobalapikey" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/cloudimage" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/cloudmersive" "github.com/trufflesecurity/trufflehog/v3/pkg/detectors/cloudplan" @@ -825,7 +826,7 @@ func DefaultDetectors() []detectors.Detector { &clarifai.Scanner{}, &cloudflareapitoken.Scanner{}, &cloudflarecakey.Scanner{}, - // &cloudflareglobalapikey.Scanner{}, + &cloudflareglobalapikey.Scanner{}, &terraformcloudpersonaltoken.Scanner{}, &asanapersonalaccesstoken.Scanner{}, &trelloapikey.Scanner{},