diff --git a/engine/rules/ruledefine/gitlab_pat_routable.go b/engine/rules/ruledefine/gitlab_pat_routable.go index 7274d988..c31cd266 100644 --- a/engine/rules/ruledefine/gitlab_pat_routable.go +++ b/engine/rules/ruledefine/gitlab_pat_routable.go @@ -4,7 +4,7 @@ import ( "regexp" ) -var gitlabPatRoutableRegex = regexp.MustCompile(`\bglpat-[0-9a-zA-Z_-]{27,300}\.[0-9a-z]{2}[0-9a-z]{7}\b`).String() +var gitlabPatRoutableRegex = regexp.MustCompile(`\bglpat-[0-9a-zA-Z_-]{27,300}\.(?:[0-9a-z]{2}\.)?[0-9a-z]{2}[0-9a-z]{7}\b`).String() func GitlabPatRoutable() *Rule { return &Rule{ diff --git a/engine/rules/ruledefine/gitlab_pat_routable_test.go b/engine/rules/ruledefine/gitlab_pat_routable_test.go index a6fbd427..ef95b3ec 100644 --- a/engine/rules/ruledefine/gitlab_pat_routable_test.go +++ b/engine/rules/ruledefine/gitlab_pat_routable_test.go @@ -47,6 +47,26 @@ func TestGitlabPatRoutable(t *testing.T) { "glpat-xxxxxxxx-xxxxxxxxxxxxxxxxxx.xxxxxxxxx", }, }, + { + name: "GitlabPatRoutable with version segment", + truePositives: []string{ + "gitlabToken = glpat-0thvkg8tnsqpnek96k0pa3latn9.01.0t0thvkg8", + "gitlabToken = \"glpat-0thvkg8tnsqpnek96k0pa3latn9.01.0t0thvkg8\"", + "GITLAB_TOKEN=glpat-Ab3dE_fG-hIjK1mN2oPqR4sTuV5wXyZ.0a.1b2c3d4e5", + "{\n \"gitlab_token\": \"glpat-0thvkg8tnsqpnek96k0pa3latn9.01.0t0thvkg8\"\n}", + "\n glpat-0thvkg8tnsqpnek96k0pa3latn9.01.0t0thvkg8\n", + }, + falsePositives: []string{ + "glpat-xxxxxxxx-xxxxxxxxxxxxxxxxxx.xx.xxxxxxxxx", + // version segment must be exactly 2 chars + "glpat-0thvkg8tnsqpnek96k0pa3latn9.011.0t0thvkg8", + "glpat-0thvkg8tnsqpnek96k0pa3latn9.1.0t0thvkg8", + // version segment must be lowercase alphanumeric + "glpat-0thvkg8tnsqpnek96k0pa3latn9.0A.0t0thvkg8", + // trailing segment too short + "glpat-0thvkg8tnsqpnek96k0pa3latn9.01.0t0thvk", + }, + }, } for _, tt := range tests { diff --git a/engine/validation/validator.go b/engine/validation/validator.go index ffa2212a..a31a50ed 100644 --- a/engine/validation/validator.go +++ b/engine/validation/validator.go @@ -12,6 +12,7 @@ var ruleIDToFunction = map[string]validationFunc{ ruledefine.GitHubFineGrainedPat().RuleID: validateGithub, ruledefine.GitHubPat().RuleID: validateGithub, ruledefine.GitlabPat().RuleID: validateGitlab, + ruledefine.GitlabPatRoutable().RuleID: validateGitlab, ruledefine.GCPAPIKey().RuleID: validateGCP, }