Skip to content

Commit e42153d

Browse files
authored
[Fix] Added Prefix In Dockerhub Detector Regex (#4084)
* added prefix in dockerhub regex * updated prefix in dockerhub regex * removed prefix from access token pattern * removed prefixed from v2 detector
1 parent 87a8034 commit e42153d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pkg/detectors/dockerhub/v1/dockerhub.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ var _ detectors.Versioner = (*Scanner)(nil)
2929

3030
var (
3131
// Can use email or username for login.
32-
usernamePat = regexp.MustCompile(`(?im)(?:user|usr|-u|id)\S{0,40}?[:=\s]{1,3}[ '"=]?([a-zA-Z0-9]{4,40})\b`)
33-
emailPat = regexp.MustCompile(common.EmailPattern)
32+
usernamePat = regexp.MustCompile(detectors.PrefixRegex([]string{"docker"}) + `(?im)(?:user|usr|-u|id)\S{0,40}?[:=\s]{1,3}[ '"=]?([a-zA-Z0-9]{4,40})\b`)
33+
emailPat = regexp.MustCompile(detectors.PrefixRegex([]string{"docker"}) + common.EmailPattern)
3434

3535
// Can use password or personal access token (PAT) for login, but this scanner will only check for PATs.
3636
accessTokenPat = regexp.MustCompile(detectors.PrefixRegex([]string{"docker"}) + `\b([a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12})\b`)

pkg/detectors/dockerhub/v2/dockerhub.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var (
3939
// Keywords are used for efficiently pre-filtering chunks.
4040
// Use identifiers in the secret preferably, or the provider name.
4141
func (s Scanner) Keywords() []string {
42-
return []string{"dckr_pat_", "dckr_oat_"}
42+
return []string{"docker", "dckr_pat_", "dckr_oat_"}
4343
}
4444

4545
// FromData will find and optionally verify Dockerhub secrets in a given set of bytes.

0 commit comments

Comments
 (0)