Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/rules/ruledefine/gitlab_pat_routable.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
20 changes: 20 additions & 0 deletions engine/rules/ruledefine/gitlab_pat_routable_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
"<gitlabToken>\n glpat-0thvkg8tnsqpnek96k0pa3latn9.01.0t0thvkg8\n</gitlabToken>",
},
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 {
Expand Down
1 change: 1 addition & 0 deletions engine/validation/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down
Loading