gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-12 15:50:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix: using SrcVersion instead of Version for echo detector (#9552)

Browse Source
This commit is contained in:
Ori
2025-10-09 10:12:43 +03:00
committed by GitHub
parent cff91acdef
commit 66479f050d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/detector/ospkg/echo/echo.go
View File

@@ -36,7 +36,7 @@ func (s *Scanner) Detect(ctx context.Context, _ string, _ *ftypes.Repository, pk
if err != nil {
return nil, xerrors.Errorf("failed to get echo advisories: %w", err)
}
formattedInstalledVersion := utils.FormatVersion(pkg)
formattedInstalledVersion := utils.FormatSrcVersion(pkg)
installedVersion, err := version.NewVersion(formattedInstalledVersion)
if err != nil {
return nil, xerrors.Errorf("failed to parse installed version: %w", err)

6
pkg/detector/ospkg/echo/echo_test.go
View File

@@ -152,6 +152,7 @@ func TestScanner_Detect(t *testing.T) {
SrcName: "nginx",
SrcVersion: "1.14.2",
Release: "1ubuntu1",
SrcRelease: "1ubuntu1",
Layer: ftypes.Layer{
DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
},
@@ -163,6 +164,7 @@ func TestScanner_Detect(t *testing.T) {
Version: "2.4.24",
SrcVersion: "2.4.24",
Release: "2",
SrcRelease: "2",
Layer: ftypes.Layer{
DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
},
@@ -226,7 +228,7 @@ func TestScanner_Detect(t *testing.T) {
name: "happy path - no matching packages",
args: args{
pkgs: []ftypes.Package{
{ID: "echo", Version: "1.0.0"},
{ID: "echo", Version: "1.0.0", SrcVersion: "1.0.0", SrcName: "echo"},
},
},
want: nil,
@@ -239,7 +241,7 @@ func TestScanner_Detect(t *testing.T) {
},
args: args{
pkgs: []ftypes.Package{
{SrcName: "apache2", Version: "1.0.0"},
{SrcName: "apache2", Version: "1.0.0", SrcVersion: "1.0.0"},
},
},
wantErr: "failed to get echo advisories",