Skip to content

fix(vulnfeeds): use canonical URLs for repository comparison in GitVersionsToCommits #5791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jess-lowe wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −2
Open

fix(vulnfeeds): use canonical URLs for repository comparison in GitVersionsToCommits #5791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b802c63
fix canonical link issue
jess-lowe Aug 5, 2026
b075f13
no local
jess-lowe Aug 6, 2026
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
25 changes: 23 additions & 2 deletions vulnfeeds/conversion/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,16 @@ func GitVersionsToCommits(versionRanges []models.RangeWithMetadata, repos []stri
claimedRepos := make(map[string]bool)
for _, vr := range versionRanges {
if vr.Range.GetRepo() != "" {
claimedRepos[vr.Range.GetRepo()] = true
canonicalRepo, err := git.FindCanonicalLink(vr.Range.GetRepo(), http.DefaultClient, cache)
if err != nil {
if git.IsRateLimit(err) {
metrics.Outcome = models.Error
return nil, nil, nil
}
claimedRepos[vr.Range.GetRepo()] = true

@another-rex another-rex Aug 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a detailed comment on claimedRepo explaining what it does?

Also, we want to claim the raw range repo (vr.Range.GetRepo()) no matter if we canonicalized it or not right?

} else {
claimedRepos[canonicalRepo] = true
}
}
}

Expand Down Expand Up @@ -184,7 +193,19 @@ func GitVersionsToCommits(versionRanges []models.RangeWithMetadata, repos []stri

var stillUnresolvedRanges []models.RangeWithMetadata
for _, vr := range unresolvedRanges {
if (vr.Range.GetRepo() != "" && vr.Range.GetRepo() != repo) || (vr.Range.GetRepo() == "" && claimedRepos[repo]) {
vRepo := vr.Range.GetRepo()
if vRepo != "" {
canonicalVRepo, err := git.FindCanonicalLink(vRepo, http.DefaultClient, cache)
if err != nil {
if git.IsRateLimit(err) {
metrics.Outcome = models.Error
return nil, nil, nil
}
} else {
vRepo = canonicalVRepo
}
}
if (vRepo != "" && vRepo != repo) || (vRepo == "" && claimedRepos[repo]) {
stillUnresolvedRanges = append(stillUnresolvedRanges, vr)
continue
}
Expand Down
Loading