diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go index 0a5694b81e3539133a97c795bfe51293377fbc7f..acc0a9ddb380e06a0166943dc35322a9ba403fa5 100644 --- a/cve-vulner-manager/taskhandler/cve.go +++ b/cve-vulner-manager/taskhandler/cve.go @@ -1072,8 +1072,16 @@ func AddOrDataToCenter(repoNme, packageName, cveRef, scopeType, value string, cv CveRes, err := models.QueryCveByNum(cveData.CveNum, repoNme, organizationID) if err { CveRes.RepoName = packageName - retVersion := AddCveVersion(organizationID, versionList, CveRes.CveVersion) - pkList = append(pkList, retVersion) + if CveRes.DataSource == 1 { + retVersion := " " + if len(versionList) > 0 { + retVersion = strings.Join(versionList, ",") + } + pkList = append(pkList, retVersion) + } else { + retVersion := AddCveVersion(organizationID, versionList, CveRes.CveVersion) + pkList = append(pkList, retVersion) + } lockx.Lock() ok, err := UpdateCveGroups(cveData, cveRef, openeulerNum, CveRes, cveDesc, cveScV3, goe, scopeType, cveScV2, pkList, organizationID) @@ -1085,7 +1093,11 @@ func AddOrDataToCenter(repoNme, packageName, cveRef, scopeType, value string, cv } } else { retVersion := AddCveVersion(organizationID, versionList, "") - pkList = append(pkList, retVersion) + if len(retVersion) > 0 { + pkList = append(pkList, retVersion) + } else { + pkList = append(pkList, " ") + } lockx.Lock() ok, err := InsertCveGroups(cveData, cveRef, repoNme, openeulerNum, cveDesc, cveScV3, goe, scopeType, cveScV2, pkList, organizationID) @@ -1162,6 +1174,20 @@ func AddCveVersion(organizationID int8, versionList []string, cveVersion string) retVersion = strings.Join(eulerSlice, ",") } } + if len(retVersion) > 0 { + verList := make([]string, 0) + tmpVer := strings.Split(retVersion, ",") + for _, ver := range tmpVer { + if len(ver) > 0 && ver != " " { + verList = append(verList, ver) + } + } + if len(verList) > 0 { + retVersion = strings.Join(verList, ",") + } else { + retVersion = " " + } + } if len(retVersion) > 0 && retVersion[0] == ',' { retVersion = retVersion[1:] }