Skip to content

Commit 805bb01

Browse files
committed
fix
1 parent 01aa996 commit 805bb01

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

detector/vuls2/vendor.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@ func preConvertBinaryVersion(family, version string) string {
4545
}
4646
}
4747

48+
func toVuls2Family(vuls0Family string) string {
49+
switch vuls0Family {
50+
case "suse.linux.enterprise.server", "suse.linux.enterprise.desktop":
51+
return "suse.linux.enterprise"
52+
case "suse.linux.enterprise.server.micro":
53+
return "suse.linux.micro"
54+
default:
55+
return vuls0Family
56+
}
57+
}
4858
func ignoreVulnerability(e ecosystemTypes.Ecosystem, v vulnerabilityTypes.Vulnerability, as models.DistroAdvisories) bool {
4959
et, _, _ := strings.Cut(string(e), ":")
5060

@@ -462,8 +472,7 @@ func advisoryReference(e ecosystemTypes.Ecosystem, s sourceTypes.SourceID, da mo
462472
Source: "UBUNTU",
463473
RefID: da.AdvisoryID,
464474
}, nil
465-
case ecosystemTypes.EcosystemTypeOpenSUSE, ecosystemTypes.EcosystemTypeOpenSUSELeap, ecosystemTypes.EcosystemTypeOpenSUSELeapMicro, ecosystemTypes.EcosystemTypeOpenSUSETumbleweed,
466-
ecosystemTypes.EcosystemTypeSUSEEnterpriseServer, ecosystemTypes.EcosystemTypeSUSEEnterpriseDesktop, ecosystemTypes.EcosystemTypeSUSEEnterpriseMicro:
475+
case ecosystemTypes.EcosystemTypeSUSELinuxEnterprise, ecosystemTypes.EcosystemTypeOpenSUSE, ecosystemTypes.EcosystemTypeOpenSUSELeap, ecosystemTypes.EcosystemTypeOpenSUSELeapMicro, ecosystemTypes.EcosystemTypeOpenSUSETumbleweed, ecosystemTypes.EcosystemTypeSUSELinuxMicro:
467476
return models.Reference{
468477
Link: fmt.Sprintf("https://www.suse.com/security/cve/%s.html", da.AdvisoryID),
469478
Source: "SUSE",
@@ -691,6 +700,8 @@ func toCveContentType(e ecosystemTypes.Ecosystem, s sourceTypes.SourceID) models
691700
default:
692701
return models.Ubuntu
693702
}
703+
case ecosystemTypes.EcosystemTypeSUSELinuxEnterprise:
704+
return models.SUSE
694705
default:
695706
return models.NewCveContentType(et)
696707
}
@@ -774,7 +785,8 @@ func toVuls0Confidence(e ecosystemTypes.Ecosystem, s sourceTypes.SourceID) model
774785
DetectionMethod: models.DetectionMethod("EPELMatch"),
775786
SortOrder: 1,
776787
}
777-
case ecosystemTypes.EcosystemTypeRedHat, ecosystemTypes.EcosystemTypeFedora, ecosystemTypes.EcosystemTypeAlma, ecosystemTypes.EcosystemTypeRocky, ecosystemTypes.EcosystemTypeOracle, ecosystemTypes.EcosystemTypeAlpine, ecosystemTypes.EcosystemTypeSUSEEnterpriseServer, ecosystemTypes.EcosystemTypeSUSEEnterpriseDesktop, ecosystemTypes.EcosystemTypeSUSEEnterpriseMicro, ecosystemTypes.EcosystemTypeOpenSUSE, ecosystemTypes.EcosystemTypeOpenSUSELeap, ecosystemTypes.EcosystemTypeOpenSUSELeapMicro, ecosystemTypes.EcosystemTypeOpenSUSETumbleweed:
788+
case ecosystemTypes.EcosystemTypeRedHat, ecosystemTypes.EcosystemTypeFedora, ecosystemTypes.EcosystemTypeAlma, ecosystemTypes.EcosystemTypeRocky, ecosystemTypes.EcosystemTypeOracle, ecosystemTypes.EcosystemTypeAlpine,
789+
ecosystemTypes.EcosystemTypeSUSELinuxEnterprise, ecosystemTypes.EcosystemTypeSUSELinuxMicro, ecosystemTypes.EcosystemTypeOpenSUSE, ecosystemTypes.EcosystemTypeOpenSUSELeap, ecosystemTypes.EcosystemTypeOpenSUSELeapMicro, ecosystemTypes.EcosystemTypeOpenSUSETumbleweed:
778790
return models.OvalMatch
779791
case ecosystemTypes.EcosystemTypeUbuntu:
780792
switch s {

detector/vuls2/vuls2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func preConvert(sr *models.ScanResult) scanTypes.ScanResult {
141141
return scanTypes.ScanResult{
142142
JSONVersion: 0,
143143
ServerName: sr.ServerName,
144-
Family: ecosystemTypes.Ecosystem(sr.Family),
144+
Family: ecosystemTypes.Ecosystem(toVuls2Family(sr.Family)),
145145
Release: sr.Release,
146146

147147
Kernel: scanTypes.Kernel{

0 commit comments

Comments
 (0)