From e8b5567843da2f0f9eecf95f554f48cddab5e4c2 Mon Sep 17 00:00:00 2001
From: zhangjianjun <wusen@126.com>
Date: Sat, 9 Oct 2021 17:24:42 +0800
Subject: [PATCH] Fix the bug with one more , in the version number string

---
 cve-vulner-manager/controllers/hook.go   |  5 ++++-
 cve-vulner-manager/models/gauss.go       | 27 +++++++++---------------
 cve-vulner-manager/taskhandler/common.go |  3 +++
 cve-vulner-manager/taskhandler/cve.go    |  3 +++
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/cve-vulner-manager/controllers/hook.go b/cve-vulner-manager/controllers/hook.go
index ce1f54a..716d3ba 100644
--- a/cve-vulner-manager/controllers/hook.go
+++ b/cve-vulner-manager/controllers/hook.go
@@ -1151,7 +1151,10 @@ func updateTempAndCenter(issueTmp models.IssueTemplate, cveCenter models.VulnCen
 		}
 	}
 	cveCenter.CveLevel = models.OpenEulerScoreProc(issueTmp.NVDScore)
-	update := models.UpdateVulnCenter(&cveCenter, "is_export", "cve_level")
+	if len(cveCenter.CveVersion) > 0 && cveCenter.CveVersion[0] == ',' {
+		cveCenter.CveVersion = cveCenter.CveVersion[1:]
+	}
+	update := models.UpdateVulnCenter(&cveCenter, "is_export", "cve_level", "CveVersion")
 	if !update {
 		logs.Error("update vulnCenter fail ")
 		appearErr += 1
diff --git a/cve-vulner-manager/models/gauss.go b/cve-vulner-manager/models/gauss.go
index 73f7d73..7310ed9 100644
--- a/cve-vulner-manager/models/gauss.go
+++ b/cve-vulner-manager/models/gauss.go
@@ -353,23 +353,16 @@ func UpdateOpenGaussPackByGid(gaussId, sGaussId int64) {
 // Upgrade pre-release data to official data
 func UpdateGaussPreTRelease() {
 	o := orm.NewOrm()
-	errs := o.Begin()
-	if errs == nil {
-		siteErr := o.Raw("update cve_open_gauss_site_list set status = 3,update_time = ? where status = 1",
-			common.GetCurTime()).QueryRow()
-		if siteErr != nil {
-			logs.Error("UpdateGaussPreTRelease, update cve_open_gauss_site_list failed ,err: ", siteErr)
-			o.Rollback()
-		}
-		cveErr := o.Raw("update cve_open_gauss_cve_list set status = 3,update_time = ? where status = 1",
-			common.GetCurTime()).QueryRow()
-		if cveErr != nil {
-			logs.Error("UpdateGaussPreTRelease, update cve_open_gauss_cve_list failed ,err: ", cveErr)
-			o.Rollback()
-		}
-		o.Commit()
-	} else {
-		logs.Error("UpdateGaussPreTRelease, Transaction creation failed, errs: ", errs)
+	siteErr := o.Raw("update cve_open_gauss_site_list set status = 3,update_time = ? where status = 1",
+		common.GetCurTime()).QueryRow()
+	if siteErr != nil {
+		logs.Error("UpdateGaussPreTRelease, update cve_open_gauss_site_list failed ,err: ", siteErr)
+	}
+	o = orm.NewOrm()
+	cveErr := o.Raw("update cve_open_gauss_cve_list set status = 3,update_time = ? where status = 1",
+		common.GetCurTime()).QueryRow()
+	if cveErr != nil {
+		logs.Error("UpdateGaussPreTRelease, update cve_open_gauss_cve_list failed ,err: ", cveErr)
 	}
 }
 
diff --git a/cve-vulner-manager/taskhandler/common.go b/cve-vulner-manager/taskhandler/common.go
index 66c2f61..3927072 100644
--- a/cve-vulner-manager/taskhandler/common.go
+++ b/cve-vulner-manager/taskhandler/common.go
@@ -805,6 +805,9 @@ func CreateIssueBody(accessToken, owner, path, assignee string,
 	cveNumber := "[" + cve.CveNum + "](https://nvd.nist.gov/vuln/detail/" + cve.CveNum + ")"
 	cve.CveDetailUrl = "https://nvd.nist.gov/vuln/detail/" + cve.CveNum
 	cve.CveLevel = models.OpenEulerScoreProc(nvdScore)
+	if len(cve.CveVersion) > 0 && cve.CveVersion[0] == ',' {
+		cve.CveVersion = cve.CveVersion[1:]
+	}
 	if flag == 1 {
 		if floatOpenEulerScore > 0.0 || (its.OpenEulerVector != "" && len(its.OpenEulerVector) > 1) {
 			nveScore := score + " " + cve.CveLevel
diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go
index 9714f7a..732c921 100644
--- a/cve-vulner-manager/taskhandler/cve.go
+++ b/cve-vulner-manager/taskhandler/cve.go
@@ -1114,6 +1114,9 @@ func AddCveVersion(organizationID int8, openGausVersion,
 			retVersion = strings.Join(eulerSlice, ",")
 		}
 	}
+	if len(retVersion) > 0 && retVersion[0] == ',' {
+		retVersion = retVersion[1:]
+	}
 	return retVersion
 }
 
-- 
Gitee