From c21698cdf7b7085c8a2da81ce7e779a963b6887d Mon Sep 17 00:00:00 2001 From: sb Date: Mon, 19 Jul 2021 11:08:33 +0800 Subject: [PATCH 1/3] After the cve-agent proxy service is running, the api interface call fails --- cve-agency-manager/controllers/track.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cve-agency-manager/controllers/track.go b/cve-agency-manager/controllers/track.go index d7a4a5c..ed41841 100644 --- a/cve-agency-manager/controllers/track.go +++ b/cve-agency-manager/controllers/track.go @@ -12,7 +12,6 @@ type TriggerTrackController struct { beego.Controller } - func (c *TriggerTrackController) RetData(resp map[string]interface{}) { c.Data["json"] = resp c.ServeJSON() @@ -46,7 +45,7 @@ func (c *TriggerTrackController) Post() { // Call python script pythonFile := beego.AppConfig.String("python_conf::python_file") args := []string{pythonFile, "-cve", cvePram.CveNum, "-name", cvePram.PackName, "-v", - cvePram.PackVersion, "-branch", cvePram.AffectBranch, "-issue", cvePram.IssueNumber} + cvePram.PackVersion, "-branch", cvePram.AffectBranch, "-cmd", "-issue", cvePram.IssueNumber} //args := []string{pythonFile} out, err := exec.Command("python", args...).Output() if err != nil { -- Gitee From 8d694972e89526e37a276ff2008f87a535b22faa Mon Sep 17 00:00:00 2001 From: sb Date: Mon, 19 Jul 2021 15:05:09 +0800 Subject: [PATCH 2/3] Added the processing of the monitoring business logic of the openEuler-20.03-LTS-SP2 branch openEuler added the release of openEuler-20.03-LTS-SP2 branch, cve-manager needs to increase the processing of the monitoring business logic of openEuler-20.03-LTS-SP2 branch --- cve-vulner-manager/conf/app.conf | 6 +++--- cve-vulner-manager/conf/product_app.conf | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cve-vulner-manager/conf/app.conf b/cve-vulner-manager/conf/app.conf index 831ae7f..2f15bbd 100644 --- a/cve-vulner-manager/conf/app.conf +++ b/cve-vulner-manager/conf/app.conf @@ -145,8 +145,8 @@ cve_number_m = 1990 cve_number_t = 1990 # Create an issue's repo whitelist;1: open; 2: close issue_whitelist = 2 -# List of affected branches： openEuler-20.03-LTS,openEuler-20.03-LTS-SP1 -affected_branchs = "openEuler-20.03-LTS-SP1" +# List of affected branches： openEuler-20.03-LTS,openEuler-20.03-LTS-SP1,openEuler-20.03-LTS-SP2 +affected_branchs = "openEuler-20.03-LTS-SP1,openEuler-20.03-LTS-SP2" # Close the highest privilege of issue close_issue_privilege = 2 # abnormal cve status ,Use "," to separate multiple states @@ -180,7 +180,7 @@ snsuffix = 1002 # example: openEuler-20.03-LTS@http://119.3.219.20:88/mkb/obs_update_info/openEuler-20.03-LTS.csv; # openEuler-20.03-LTS-SP1@http://119.3.219.20:88/mkb/obs_update_info/openEuler-20.03-LTS-SP1.csv # public sa format: openEuler-20.03-LTS@https;openEuler-20.03-LTS-SP1@https -v_pack_20_03_url = "openEuler-20.03-LTS-SP1@https" +v_pack_20_03_url = "openEuler-20.03-LTS-SP1@https;openEuler-20.03-LTS-SP2@https" # Time difference in different time zones sa_timestamp_zone = 28800 unaffect_year = 2018 diff --git a/cve-vulner-manager/conf/product_app.conf b/cve-vulner-manager/conf/product_app.conf index f0d6c6f..9f5be40 100644 --- a/cve-vulner-manager/conf/product_app.conf +++ b/cve-vulner-manager/conf/product_app.conf @@ -138,7 +138,7 @@ cve_number_t = 2018 # Create an issue's repo whitelist;1: open; 2: close issue_whitelist = 2 # List of affected branches: openEuler-20.03-LTS,openEuler-20.03-LTS-SP1 -affected_branchs = "openEuler-20.03-LTS-SP1" +affected_branchs = "openEuler-20.03-LTS-SP1,openEuler-20.03-LTS-SP2" # Close the highest privilege of issue:1:open;2:close close_issue_privilege = 2 # abnormal cve status ,Use "," to separate multiple states @@ -172,7 +172,7 @@ snsuffix = 1002 # example: openEuler-20.03-LTS@http://119.3.219.20:88/mkb/obs_update_info/openEuler-20.03-LTS.csv; # openEuler-20.03-LTS-SP1@http://119.3.219.20:88/mkb/obs_update_info/openEuler-20.03-LTS-SP1.csv # public sa format: openEuler-20.03-LTS@https;openEuler-20.03-LTS-SP1@https -v_pack_20_03_url = "openEuler-20.03-LTS-SP1@https" +v_pack_20_03_url = "openEuler-20.03-LTS-SP1@https;openEuler-20.03-LTS-SP2@https" # Time difference in different time zones sa_timestamp_zone = 28810 unaffect_year = 2018 -- Gitee From ec86ddeae09680e268fd53202afa7f6407b14bc4 Mon Sep 17 00:00:00 2001 From: sb Date: Mon, 19 Jul 2021 15:14:24 +0800 Subject: [PATCH 3/3] merage branch --- git | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 git diff --git a/git b/git new file mode 100644 index 0000000..e69de29 -- Gitee