8000 Remove depending on package types for version constraint enforcement by wagoodman · Pull Request #67 · anchore/grype-db · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Remove depending on package types for version constraint enforcement #67

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

Merged
merged 2 commits into from
Mar 9, 2023
Merged

Remove depending on package types for version constraint enforcement #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe16b8d
remove depending on package types for version constraint enforcement
wagoodman Mar 9, 2023
02ac4af
Merge remote-tracking branch 'origin/main' into fix-pkg-deps
wagoodman Mar 9, 2023
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
20 changes: 7 additions & 13 deletions pkg/process/v1/transformers/os/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,11 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
// separate vulnerability entries (one for each name|namespace combo) while merging
// constraint ranges as they are found.
for _, advisory := range vulnerability.Vulnerability.FixedIn {
constraint, err := enforceConstraint(advisory.Version, advisory.VersionFormat)
if err != nil {
return nil, err
}

// create vulnerability entry
vuln := grypeDB.Vulnerability{
ID: vulnerability.Vulnerability.Name,
RecordSource: recordSource,
VersionConstraint: constraint,
VersionConstraint: enforceConstraint(advisory.Version, advisory.VersionFormat),
VersionFormat: advisory.VersionFormat,
PackageName: advisory.Name,
Namespace: advisory.NamespaceName,
Expand Down Expand Up @@ -87,17 +82,16 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
return transformers.NewEntries(allVulns, metadata), nil
}

func enforceConstraint(constraint, format string) (string, error) {
func enforceConstraint(constraint, format string) string {
constraint = common.CleanConstraint(constraint)
if len(constraint) == 0 {
return "", nil
return ""
}
switch strings.ToLower(format) {
case "dpkg", "rpm", "apk":
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint), nil
case "semver":
return common.EnforceSemVerConstraint(constraint), nil
return common.EnforceSemVerConstraint(constraint)
default:
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint)
}
return "", fmt.Errorf("unable to enforce constraint='%s' format='%s'", constraint, format)
}
20 changes: 7 additions & 13 deletions pkg/process/v2/transformers/os/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,11 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
// separate vulnerability entries (one for each name|namespace combo) while merging
// constraint ranges as they are found.
for _, advisory := range vulnerability.Vulnerability.FixedIn {
constraint, err := enforceConstraint(advisory.Version, advisory.VersionFormat)
if err != nil {
return nil, err
}

// create vulnerability entry
vuln := grypeDB.Vulnerability{
ID: vulnerability.Vulnerability.Name,
RecordSource: recordSource,
VersionConstraint: constraint,
VersionConstraint: enforceConstraint(advisory.Version, advisory.VersionFormat),
VersionFormat: advisory.VersionFormat,
PackageName: advisory.Name,
Namespace: advisory.NamespaceName,
Expand Down Expand Up @@ -87,17 +82,16 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
return transformers.NewEntries(allVulns, metadata), nil
}

func enforceConstraint(constraint, format string) (string, error) {
func enforceConstraint(constraint, format string) string {
constraint = common.CleanConstraint(constraint)
if len(constraint) == 0 {
return "", nil
return ""
}
switch strings.ToLower(format) {
case "dpkg", "rpm", "apk":
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint), nil
case "semver":
return common.EnforceSemVerConstraint(constraint), nil
return common.EnforceSemVerConstraint(constraint)
default:
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint)
}
return "", fmt.Errorf("unable to enforce constraint='%s' format='%s'", constraint, format)
}
20 changes: 7 additions & 13 deletions pkg/process/v3/transformers/os/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,10 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
// separate vulnerability entries (one for each name|namespace combo) while merging
// constraint ranges as they are found.
for idx, fixedInEntry := range vulnerability.Vulnerability.FixedIn {
constraint, err := enforceConstraint(fixedInEntry.Version, fixedInEntry.VersionFormat)
if err != nil {
return nil, err
}

// create vulnerability entry
allVulns = append(allVulns, grypeDB.Vulnerability{
ID: vulnerability.Vulnerability.Name,
VersionConstraint: constraint,
VersionConstraint: enforceConstraint(fixedInEntry.Version, fixedInEntry.VersionFormat),
VersionFormat: fixedInEntry.VersionFormat,
PackageName: fixedInEntry.Name,
Namespace: entryNamespace,
Expand Down Expand Up @@ -151,17 +146,16 @@ func getRelatedVulnerabilities(entry unmarshal.OSVulnerability) (vulns []grypeDB
return vulns
}

func enforceConstraint(constraint, format string) (string, error) {
func enforceConstraint(constraint, format string) string {
constraint = common.CleanConstraint(constraint)
if len(constraint) == 0 {
return "", nil
return ""
}
switch strings.ToLower(format) {
case "dpkg", "rpm", "apk":
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint), nil
case "semver":
return common.EnforceSemVerConstraint(constraint), nil
return common.EnforceSemVerConstraint(constraint)
default:
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint)
}
return "", fmt.Errorf("unable to enforce constraint='%s' format='%s'", constraint, format)
}
20 changes: 7 additions & 13 deletions pkg/process/v4/transformers/os/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,10 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
vulnerability.Vulnerability.FixedIn = vulnerability.Vulnerability.FixedIn.FilterToHighestModularity()

for idx, fixedInEntry := range vulnerability.Vulnerability.FixedIn {
constraint, err := enforceConstraint(fixedInEntry.Version, fixedInEntry.VersionFormat)
if err != nil {
return nil, err
}

// create vulnerability entry
allVulns = append(allVulns, grypeDB.Vulnerability{
ID: vulnerability.Vulnerability.Name,
VersionConstraint: constraint,
VersionConstraint: enforceConstraint(fixedInEntry.Version, fixedInEntry.VersionFormat),
VersionFormat: fixedInEntry.VersionFormat,
PackageName: grypeNamespace.Resolver().Normalize(fixedInEntry.Name),
Namespace: entryNamespace,
Expand Down Expand Up @@ -187,17 +182,16 @@ func getRelatedVulnerabilities(entry unmarshal.OSVulnerability) (vulns []gryp 8000 eDB
return vulns
}

func enforceConstraint(constraint, format string) (string, error) {
func enforceConstraint(constraint, format string) string {
constraint = common.CleanConstraint(constraint)
if len(constraint) == 0 {
return "", nil
return ""
}
switch strings.ToLower(format) {
case "dpkg", "rpm", "apk":
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint), nil
case "semver":
return common.EnforceSemVerConstraint(constraint), nil
return common.EnforceSemVerConstraint(constraint)
default:
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint)
}
return "", fmt.Errorf("unable to enforce constraint='%s' format='%s'", constraint, format)
}
20 changes: 7 additions & 13 deletions pkg/process/v5/transformers/os/transform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
// separate vulnerability entries (one for each name|namespace combo) while merging
// constraint ranges as they are found.
for idx, fixedInEntry := range vulnerability.Vulnerability.FixedIn {
constraint, err := enforceConstraint(fixedInEntry.Version, fixedInEntry.VersionFormat)
if err != nil {
return nil, err
}

var qualifiers []qualifier.Qualifier

if fixedInEntry.Module != nil {
Expand All @@ -82,7 +77,7 @@ func Transform(vulnerability unmarshal.OSVulnerability) ([]data.Entry, error) {
allVulns = append(allVulns, grypeDB.Vulnerability{
ID: vulnerability.Vulnerability.Name,
PackageQualifiers: qualifiers,
VersionConstraint: constraint,
VersionConstraint: enforceConstraint(fixedInEntry.Version, fixedInEntry.VersionFormat),
VersionFormat: fixedInEntry.VersionFormat,
PackageName: grypeNamespace.Resolver().Normalize(fixedInEntry.Name),
Namespace: entryNamespace,
Expand Down Expand Up @@ -192,17 +187,16 @@ func getRelatedVulnerabilities(entry unmarshal.OSVulnerability) (vulns []grypeDB
return vulns
}

func enforceConstraint(constraint, format string) (string, error) {
func enforceConstraint(constraint, format string) string {
constraint = common.CleanConstraint(constraint)
if len(constraint) == 0 {
return "", nil
return ""
}
switch strings.ToLower(format) {
case "dpkg", "rpm", "apk":
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint), nil
case "semver":
return common.EnforceSemVerConstraint(constraint), nil
return common.EnforceSemVerConstraint(constraint)
default:
// the passed constraint is a fixed version
return fmt.Sprintf("< %s", constraint)
}
return "", fmt.Errorf("unable to enforce constraint='%s' format='%s'", constraint, format)
}
0