From 193b0ac97968c5d11f0b7019e5962d462680c3e7 Mon Sep 17 00:00:00 2001 From: yangwei999 <348134071@qq.com> Date: Tue, 8 Aug 2023 18:41:50 +0800 Subject: [PATCH] change domain and fix bug --- cve-vulner-manager/conf/product_app.conf | 2 +- cve-vulner-manager/taskhandler/cve.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cve-vulner-manager/conf/product_app.conf b/cve-vulner-manager/conf/product_app.conf index 1df6a6a..2711e78 100644 --- a/cve-vulner-manager/conf/product_app.conf +++ b/cve-vulner-manager/conf/product_app.conf @@ -162,7 +162,7 @@ delete_hook = 2 [yaml] apiurl = https://api.openeuler.org/pkgmanage -eulerurl = http://omapi.osinfra.cn/v1/versions +eulerurl = http://dsapi.osinfra.cn/v1/versions [cve] cveref = https://nvd.nist.gov/vuln/detail/ diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go index 3e58143..d219b22 100644 --- a/cve-vulner-manager/taskhandler/cve.go +++ b/cve-vulner-manager/taskhandler/cve.go @@ -2568,13 +2568,14 @@ func GetCveProduct(cveNumber, packageName string, branch ...string) (bool, model return false, detail } affectedBranchs := beego.AppConfig.String("cve::affected_branchs") - if len(detail.Result) >= 3 { + splitAffectedBranches := strings.Split(strings.ToLower(affectedBranchs), ",") + if len(detail.Result) >= len(splitAffectedBranches)-1 { var p string var f = true for _, product := range detail.Result { p += strings.ToLower(product.ProductName) + "," } - for _, s := range strings.Split(strings.ToLower(affectedBranchs), ",") { + for _, s := range splitAffectedBranches { if !strings.Contains(p, s) { f = false break @@ -2592,7 +2593,7 @@ func GetCveProduct(cveNumber, packageName string, branch ...string) (bool, model } return false, detail } - return len(detail.Result) >= 4, detail + return len(detail.Result) >= len(splitAffectedBranches), detail } //FilterCveExported Filter exportable data -- Gitee