diff --git a/common/common.go b/common/common.go index d0d446d707c4a108c7864d7f5c565edd3290d5d8..6693f3a9d85465caef54fef725354ddeb52a6508 100644 --- a/common/common.go +++ b/common/common.go @@ -147,13 +147,13 @@ func GetBeforeTime(days int) string { nowTime := time.Now() getTime := nowTime.AddDate(0, 0, days) resTime := getTime.Format(DATE_FORMAT) // The format of the obtained time - logs.Info("获取：", days, "前的时间：", resTime) + logs.Info("Get the number of days：", days, ",Time ago：", resTime) return resTime } func Catchs() { if err := recover(); err != nil { - logs.Error("程序发生异常, err: ", err) + logs.Error("The program is abnormal, err: ", err) } } diff --git a/conf/app.conf b/conf/app.conf index e5c9ff7006e122d73a80ee4a54d8b244c60489ef..fc9d4a682cc8c9fb4f4f67d15ee4c160323ac589 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -76,6 +76,8 @@ issuestatisticflag = 2 issuestatistic = 0 43 14 * * * cvecredflag = 2 cvecredit = 0 53 14 * * * +urgenttaskflag = 1 +urgenttask = 0 0 9-20 * * * [gitee] #owner = cve-test @@ -119,7 +121,7 @@ cve_number = 1990 cve_number_m = 1990 # Tool import data restriction cve_number_t = 1990 -# Create an issue's warehouse whitelist;1: open; 2: close +# Create an issue's repo whitelist;1: open; 2: close issue_whitelist = 2 # List of affected branches affected_branchs = openEuler-20.03-LTS diff --git a/conf/product_app.conf b/conf/product_app.conf index 85e09b22670ed0f95ef07acaecf01391c783d8d6..571f40badef2133f051fdeb55586b9e8f37a29c1 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -77,6 +77,8 @@ issuestatisticflag = 1 issuestatistic = 0 30 8 * * 1,3 cvecredflag = 1 cvecredit = 0 0 5 * * * +urgenttaskflag = 1 +urgenttask = 0 0 9-20 * * * [gitee] owner = src-openeuler @@ -115,7 +117,7 @@ cve_number = 2018 cve_number_m = 1990 # Tool import data restriction cve_number_t = 2018 -# Create an issue's warehouse whitelist;1: open; 2: close +# Create an issue's repo whitelist;1: open; 2: close issue_whitelist = 1 # List of affected branches affected_branchs = openEuler-20.03-LTS diff --git a/controllers/cvedetail.go b/controllers/cvedetail.go index afa83d002d933ce0835627fdf92af6e3f922b248..41d0594d4d7552511478e714672b41f8bc3c01be 100644 --- a/controllers/cvedetail.go +++ b/controllers/cvedetail.go @@ -28,7 +28,8 @@ func (c *CveDetailController) RetData(resp map[string]interface{}) { func (u *CveDetailController) Get() { req := u.Ctx.Request addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "客户端请求的：addr: ", addr, "Header: ", req.Header, "body: ", req.Body) + logs.Info("Method: ", req.Method, "The ip address requested by the client: ", addr, + ",Header: ", req.Header, ",body: ", req.Body) resp := make(map[string]interface{}) var cod common.CveOriginDetailData resp["errno"] = errcode.RecodeUnknowErr @@ -41,7 +42,7 @@ func (u *CveDetailController) Get() { resp["errno"] = errcode.RecodeSessionErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeSessionErr) resp["body"] = []ResultData{} - logs.Error("token 校验失败") + logs.Error("token acquisition failed") return } else { // Check token @@ -50,20 +51,20 @@ func (u *CveDetailController) Get() { resp["errno"] = errcode.RecodeSessionErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeSessionErr) resp["body"] = []ResultData{} - logs.Error("token 校验失败") + logs.Error("token verification failed") return } } cveNum := u.GetString("cveNum") if cveNum == "" { - logs.Error("cveNum, 参数错误") + logs.Error("cveNum, Parameter error") resp["errno"] = errcode.RecodeParamErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeParamErr) return } cveType, typeError := u.GetInt64("cveType") if typeError != nil || cveType == 0 { - logs.Error("cveType, 参数错误") + logs.Error("cveType, Parameter error") resp["errno"] = errcode.RecodeParamErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeParamErr) return diff --git a/controllers/hook.go b/controllers/hook.go index c426b5ee756c00c3f9f4f85c4432a93272876998..f36fde0fabd8e2f8d683bfbd52e008a941c10f98 100644 --- a/controllers/hook.go +++ b/controllers/hook.go @@ -433,7 +433,7 @@ func handleIssueStateChange(issueHook *models.IssuePayload) error { path = "security" } issueTmp.StatusName = issueHook.Issue.StateName - logs.Info("发起issue状态修改, 发起人: @", issueHook.Sender.UserName, ", 修改状态: ", + logs.Info("Initiating issue status modification, sponsor: @", issueHook.Sender.UserName, ", Modify status: ", issueHook.Issue.StateName, ", data: ", issueHook) switch issueHook.State { case IssueOpenState: @@ -749,7 +749,7 @@ func isLegallyIssue(i models.HookIssue) (pri models.PullRequestIssue, ok bool) { return } -// Get the pr associated with a single warehouse +// Get the pr associated with a single repo func getRepoIssueAllPR(affectBranch, token, owner, repo string, isTemp models.IssueTemplate) (prList []models.PullRequestIssue) { url := fmt.Sprintf("https://gitee.com/api/v5/repos/%v/issues/%v/pull_requests", owner, isTemp.IssueNum) req, err := http.NewRequest(http.MethodGet, url, nil) @@ -949,9 +949,9 @@ func gaussMaintainerApprove(issueTmp *models.IssueTemplate, cuAccount, owner, to _, issueErr := taskhandler.UpdateIssueToGit(token, owner, issueTmp.Repo, cveCenter, *issueTmp) if issueErr == nil { - logs.Info("发起issue关闭,issuetmp: ", issueTmp) + logs.Info("Initiate an issue to close,issuetmp: ", issueTmp) } else { - logs.Error("issue关闭操作失败, issuetmp: ", issueTmp, ",issueErr: ", issueErr) + logs.Error("Issue closing operation failed, issuetmp: ", issueTmp, ",issueErr: ", issueErr) return } //issueTmp.SaAuditFlag = 1 @@ -1002,9 +1002,9 @@ func maintainerApprove(issueTmp *models.IssueTemplate, cuAccount, owner, token, _, issueErr := taskhandler.UpdateIssueToGit(token, owner, issueTmp.Repo, cveCenter, *issueTmp) if issueErr == nil { - logs.Info("发起issue关闭,issuetmp: ", issueTmp) + logs.Info("Initiate an issue to close, issuetmp: ", issueTmp) } else { - logs.Error("issue关闭操作失败, issuetmp: ", issueTmp, ",issueErr: ", issueErr) + logs.Error("Issue closing operation failed, issuetmp: ", issueTmp, ",issueErr: ", issueErr) return } //issueTmp.SaAuditFlag = 1 @@ -1055,9 +1055,9 @@ func securityApprove(issueTmp *models.IssueTemplate, cuAccount, owner, token, fi _, issueErr := taskhandler.UpdateIssueToGit(token, owner, issueTmp.Repo, cveCenter, *issueTmp) if issueErr == nil { - logs.Info("发起issue关闭,issuetmp: ", issueTmp) + logs.Info("Initiate an issue to close, issuetmp: ", issueTmp) } else { - logs.Error("issue关闭操作失败, issuetmp: ", issueTmp, ",issueErr: ", issueErr) + logs.Error("issue close operation failed, issuetmp: ", issueTmp, ",issueErr: ", issueErr) return } issueTmp.SaAuditFlag = 1 @@ -1423,7 +1423,6 @@ func notifyAuditorReview(payload *models.CommentPayload, issueTmp models.IssueTe } msg := fmt.Sprintf(CommentReviewTpl, strings.Join(ns, ",")) taskhandler.AddCommentToIssue(msg, issueTmp.IssueNum, owner, path, accessToken) - } func changeOpenEulerScoreStatus(cveID int64, status int8) error { @@ -1528,7 +1527,6 @@ func checkGaussIssueAnalysisComplete(i *models.IssueTemplate) (msg, tbStr string |%v|%v|%v| |%v|%v|%v| ` - if i == nil { logs.Error("issue template is nil") return msg, "", false @@ -1611,7 +1609,6 @@ func checkIssueClosedAnalysisComplete(i *models.IssueTemplate) (msg, tbStr strin |%v|%v|%v| |%v|%v|%v| ` - if i == nil { logs.Error("issue template is nil") return msg, "", false @@ -1699,7 +1696,6 @@ func checkGaussIssueClosedAnalysisComplete(i *models.IssueTemplate) (msg, tbStr |%v|%v|%v| |%v|%v|%v| ` - if i == nil { logs.Error("issue template is nil") return msg, "", false diff --git a/controllers/issue.go b/controllers/issue.go index 2f50b0c23dec7cadd8df629593fd112e2d1706e1..79ff7fdfb050520c232c1aa68cb3793f0989e151 100644 --- a/controllers/issue.go +++ b/controllers/issue.go @@ -42,7 +42,7 @@ func (c *IssueOathCallbackController) Post() { resp["body"] = Result{} defer c.RetData(resp) json.Unmarshal(c.Ctx.Input.RequestBody, &req) - logs.Info("登录请求参数：", &req) + logs.Info("Login request parameters: ", &req) return } @@ -66,7 +66,8 @@ func (c *CveIssueWhiteListController) RetData(resp map[string]interface{}) { func (u *CveIssueWhiteListController) Get() { req := u.Ctx.Request addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "客户端请求的：addr: ", addr, "Header: ", req.Header, "body: ", req.Body) + logs.Info("Method: ", req.Method, "Client request ip address: ", addr, + ", Header: ", req.Header, ", body: ", req.Body) resp := make(map[string]interface{}) var ird []IssueRepoWhiteData resp["errno"] = errcode.RecodeUnknowErr diff --git a/controllers/login.go b/controllers/login.go index 848129916929a642da0b65b794328a2bdbd51661..4231230606dcabbbb7e5876c4e098677fd2f4556 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -43,13 +43,12 @@ func (u *UserLoginController) Post() { logs.Error(err) return } - //logs.Info("登录请求参数：", req) //Judge whether it is legal if req["userName"] == nil || req["passWord"] == nil { resp["errno"] = errcode.RecodeDataErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeDataErr) resp["body"] = Result{} - logs.Error("数据错误") + logs.Error("Data error: username or password") return } password := fmt.Sprintf("%s", req["passWord"]) @@ -58,7 +57,7 @@ func (u *UserLoginController) Post() { if password == "" || len(password) == 0 { resp["errno"] = errcode.RecodePwdErr resp["errmsg"] = errcode.RecodeText(errcode.RecodePwdErr) - logs.Error("密码解析错误", password) + logs.Error("Password parsing error.") resp["body"] = Result{} return } diff --git a/controllers/packages.go b/controllers/packages.go index 692091fb8cbb58b565371a9f16de3cebdf19152e..87e9c4a91a3f71112fa2fe57dfd93248f71e4cbf 100644 --- a/controllers/packages.go +++ b/controllers/packages.go @@ -76,7 +76,8 @@ type PackageInfoData struct { func (u *PackagesController) Get() { req := u.Ctx.Request addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "客户端请求的：addr: ", addr, "Header: ", req.Header, "body: ", req.Body) + logs.Info("Method: ", req.Method, "Client request ip address: ", addr, + ", Header: ", req.Header, ", body: ", req.Body) resp := make(map[string]interface{}) var pd []PackageData resp["errno"] = errcode.RecodeUnknowErr @@ -128,7 +129,7 @@ func (u *PackagesController) Get() { } QueryPkgName := u.GetString("queryPkgName") if QueryPkgName != "" { - logs.Info("查询： ", QueryPkgName, " 包的相关信息") + logs.Info("Query data: ", QueryPkgName, ", Information about the package") } totalNum := models.GetPackageNum(QueryPkgName) @@ -180,7 +181,8 @@ func (u *PackagesController) Get() { func (u *PackagesInfoController) Get() { req := u.Ctx.Request addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "客户端请求的：addr: ", addr, "Header: ", req.Header, "body: ", req.Body) + logs.Info("Method: ", req.Method, "Client request ip address: ", addr, + ", Header: ", req.Header, ", body: ", req.Body) resp := make(map[string]interface{}) var pd PackageInfoData resp["errno"] = errcode.RecodeUnknowErr @@ -216,7 +218,7 @@ func (u *PackagesInfoController) Get() { } pkgName := u.GetString("pkgName") if pkgName == "" { - logs.Error("pkgName, 参数错误") + logs.Error("pkgName, Parameter error") resp["errno"] = errcode.RecodeParamErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeParamErr) return diff --git a/controllers/upload.go b/controllers/upload.go index dd97b93bb9128bcb5df5dc60bbbb27e50ef5eabb..a37242174f2f1c4acb66688658a41d4895959323 100644 --- a/controllers/upload.go +++ b/controllers/upload.go @@ -48,7 +48,8 @@ type CveErrorData struct { func (u *CveErrorFeedBackController) Get() { req := u.Ctx.Request addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "客户端请求的：addr: ", addr, "Header: ", req.Header, "body: ", req.Body) + logs.Info("Method: ", req.Method, "Client request ip address: ", addr, + ",Header: ", req.Header, ",body: ", req.Body) resp := make(map[string]interface{}) var ced []CveErrorData resp["errno"] = errcode.RecodeUnknowErr @@ -85,12 +86,12 @@ func (u *CveErrorFeedBackController) Get() { startDate := u.GetString("startDate") if startDate != "" { - logs.Info("查询： ", startDate, " 开始日期") + logs.Info("Query start date: ", startDate) } endDate := u.GetString("endDate") if endDate != "" { - logs.Info("查询： ", endDate, " 结束日期") + logs.Info("Query end date: ", endDate) } else { endDate = common.GetCurTime() } @@ -125,14 +126,14 @@ func (u *UserUploadController) Post() { var ResDataList []ResultData req := u.Ctx.Request addr := req.RemoteAddr - logs.Info("Method: ", req.Method, "客户端请求的：addr: ", addr, "Header: ", req.Header) + logs.Info("Method: ", req.Method, "Client request ip address: ", addr, ",Header: ", req.Header) resp := make(map[string]interface{}) resp["errno"] = errcode.RecodeUnknowErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeUnknowErr) resp["body"] = []ResultData{} defer u.RetData(resp) json.Unmarshal(u.Ctx.Input.RequestBody, &uploaddata) - logs.Info("Cve上传请求参数：", &uploaddata) + logs.Info("Cve upload request parameters: ", &uploaddata) var iw models.IpWhite if addr != "" { addrIp := strings.Split(addr, ":") @@ -152,7 +153,7 @@ func (u *UserUploadController) Post() { resp["errno"] = errcode.RecodeSessionErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeSessionErr) resp["body"] = []ResultData{} - logs.Error("token 校验失败") + logs.Error("token request parameter is empty!") return } else { // Check token @@ -161,7 +162,7 @@ func (u *UserUploadController) Post() { resp["errno"] = errcode.RecodeSessionErr resp["errmsg"] = errcode.RecodeText(errcode.RecodeSessionErr) resp["body"] = []ResultData{} - logs.Error("token 校验失败") + logs.Error("token verification failed!") return } } @@ -169,12 +170,12 @@ func (u *UserUploadController) Post() { resp["errno"] = errcode.RecodeNodata resp["errmsg"] = errcode.RecodeText(errcode.RecodeNodata) resp["body"] = []ResultData{} - logs.Error("数据为空") + logs.Error("cve data is empty") return } for _, CveDataDict := range uploaddata.CveData { defer common.Catchs() - logs.Info("每一条请求参数： ", CveDataDict) + logs.Info("Each request parameter: ", CveDataDict) var ResData ResultData ids := CveDataDict.Ids if ids == "" { @@ -186,7 +187,7 @@ func (u *UserUploadController) Post() { } cveNum := CveDataDict.CveNum if cveNum == "" { - logs.Error("cveNum 为空, ids: ", ids) + logs.Error("cveNum is empty, ids: ", ids) } updateType := CveDataDict.UpdateType cvePackName := "" @@ -208,9 +209,6 @@ func (u *UserUploadController) Post() { cnvdID := CveDataDict.CnvdID publishedDate := CveDataDict.PublishedDate vulStatus := CveDataDict.VulStatus - //if CveDataDict.Version == "" { - // logs.Error("Version 为空, ids: ", ids) - //} version := CveDataDict.Version if version == "" { version = packName @@ -251,7 +249,7 @@ func (u *UserUploadController) Post() { gits, ok := models.QueryCveOpeneulerdata(pkList[0], pkList[1]) if ok { orCve.IsExit = 1 - logs.Info("对应src-openEuler的数据为: ", gits) + logs.Info("The data corresponding to src-openEuler is: ", gits) break } else { opy := models.OpenGussYaml{PackageName: pkList[0], Version: pkList[1]} @@ -308,16 +306,16 @@ func (u *UserUploadController) Post() { if orCve.Status == 3 { orCve.DeleteTime = common.GetCurTime() } - logs.Info("当前插入的数据已经存在： ", dbCve) + logs.Info("The currently inserted data already exists: ", dbCve) } _, err := models.CreateOriginCve(CveDataDict, &orCve, &od, &ous, &osi, &osp, &ose, &osv, &osf) if err == nil { - logs.Info("cve 原始数据创建成功 CveNum:", CveDataDict.Ids) + logs.Info("Cve original data is successfully created CveNum: ", CveDataDict.Ids) ResData.CveNum = CveDataDict.Ids ResData.Status = 0 ResDataList = append(ResDataList, ResData) } else { - logs.Info("cve 创建失败 CveNum:", CveDataDict.Ids) + logs.Info("cve creation failed CveNum: ", CveDataDict.Ids) ResData.CveNum = CveDataDict.Ids ResData.Status = 1 ResDataList = append(ResDataList, ResData) diff --git a/cve-py/controller/timertaskcontroller.py b/cve-py/controller/timertaskcontroller.py index 76e44bcb8a1b61087de7d85244eee5fbbff3fed0..3577f9b8409cf22f69e1cc80ad0b7e42dd446772 100644 --- a/cve-py/controller/timertaskcontroller.py +++ b/cve-py/controller/timertaskcontroller.py @@ -28,7 +28,7 @@ def timertask(): # Warehouse, organization, and owner correspondence timing task scheduler.add_job(taskcontroller.gwcontroller, 'cron', day_of_week='0-6', hour=0, minute=2) # Manual CVE data entry timing task - scheduler.add_job(taskcontroller.runtabletask, 'interval', hours=2) + scheduler.add_job(taskcontroller.runtabletask, 'cron', hour='*', minute='*/20') # Error data export and email sending timing task scheduler.add_job(taskcontroller.toexcelcontroller, 'cron', day_of_week='0-6', hour=7, minute=30) # Package name correspondence relationship timing task diff --git a/cve-py/newexcels/CVE-2021-01-27.xlsx b/cve-py/newexcels/CVE-2021-01-27.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..87421527f2765d00e7d006a52328030c02fd85aa Binary files /dev/null and b/cve-py/newexcels/CVE-2021-01-27.xlsx differ diff --git a/cve-py/newexcels/CVE-2021-1-20.xlsx b/cve-py/newexcels/CVE-2021-1-20.xlsx deleted file mode 100644 index d4890b5a5961c7e9f247bb54767bebb0503a09a9..0000000000000000000000000000000000000000 Binary files a/cve-py/newexcels/CVE-2021-1-20.xlsx and /dev/null differ diff --git a/cve-py/newexcels/CVE-20210120.xlsx b/cve-py/newexcels/CVE-20210120.xlsx deleted file mode 100644 index fe7d99220993fec4482855c01eaffff522fdf492..0000000000000000000000000000000000000000 Binary files a/cve-py/newexcels/CVE-20210120.xlsx and /dev/null differ diff --git a/errcode/errcode.go b/errcode/errcode.go index f24d0d596147609c18c35924c951a872f77676c9..5f2fb02f03a82439cb7cfc361bf218e4a14a4e5f 100644 --- a/errcode/errcode.go +++ b/errcode/errcode.go @@ -1,6 +1,5 @@ package errcode - const ( RecodeOk = "200" RecodeDbErr = "4001" @@ -8,17 +7,17 @@ const ( RecodeDataExist = "4003" RecodeDataErr = "4004" RecodeSessionErr = "4101" - RecodeLoginErr = "4102" - RecodeParamErr = "4103" - RecodeUserErr = "4104" - RecodeRoleErr = "4105" - RecodePwdErr = "4106" - RecodeReqErr = "4201" - RecodeIpErr = "4202" - RecodeThirdErr = "4301" - RecodeIoErr = "4302" - RecodeServerErr = "4500" - RecodeUnknowErr = "4501" + RecodeLoginErr = "4102" + RecodeParamErr = "4103" + RecodeUserErr = "4104" + RecodeRoleErr = "4105" + RecodePwdErr = "4106" + RecodeReqErr = "4201" + RecodeIpErr = "4202" + RecodeThirdErr = "4301" + RecodeIoErr = "4302" + RecodeServerErr = "4500" + RecodeUnknowErr = "4501" ) var recodeText = map[string]string{ @@ -28,25 +27,24 @@ var recodeText = map[string]string{ RecodeDataExist: "数据已存在", RecodeDataErr: "数据错误", RecodeSessionErr: "用户未登录", - RecodeLoginErr: "用户登录失败", - RecodeParamErr: "请求参数错误", - RecodeUserErr: "用户不存在或未激活", - RecodeRoleErr: "登录身份错误", - RecodePwdErr: "密码错误", - RecodeReqErr: "非法请求或请求次数受限", - RecodeIpErr: "IP受限", - RecodeThirdErr: "第三方系统错误", - RecodeIoErr: "文件读写错误", - RecodeServerErr: "内部错误", - RecodeUnknowErr: "未知错误", - + RecodeLoginErr: "用户登录失败", + RecodeParamErr: "请求参数错误", + RecodeUserErr: "用户不存在或未激活", + RecodeRoleErr: "登录身份错误", + RecodePwdErr: "密码错误", + RecodeReqErr: "非法请求或请求次数受限", + RecodeIpErr: "IP受限", + RecodeThirdErr: "第三方系统错误", + RecodeIoErr: "文件读写错误", + RecodeServerErr: "内部错误", + RecodeUnknowErr: "未知错误", } //RecodeText get resp string by code -func RecodeText(code string)string { - str,ok := recodeText[code] +func RecodeText(code string) string { + str, ok := recodeText[code] if ok { return str } return RecodeText(RecodeUnknowErr) -} \ No newline at end of file +} diff --git a/models/common.go b/models/common.go index 7554f72c3524d6c85b400ebe69479a1e5f1cb2db..b407564f57699da4f1de927a3474ed46be5baa3c 100644 --- a/models/common.go +++ b/models/common.go @@ -18,7 +18,7 @@ func CheckToken(token string) bool { var ou OtherUser err := GetUserByToken(token, &ou) if err != nil { - logs.Error("token: ", token, ", 错误") + logs.Error("token value: ", token, ", token, is forged data, does not exist") return false } now := Time2Str() @@ -29,7 +29,7 @@ func CheckToken(token string) bool { return true } -func openEulerScoreProc(openEulerScore float64) (CveLevel string){ +func openEulerScoreProc(openEulerScore float64) (CveLevel string) { if openEulerScore >= 9.0 { CveLevel = "Critical" } else if openEulerScore >= 7.0 && openEulerScore <= 8.9 { diff --git a/models/cve.go b/models/cve.go index dc68f38fda4d4bf27ed2faa6582c753cdc7b95ff..0fc67d1c7290d521091499142452f169040ba912 100644 --- a/models/cve.go +++ b/models/cve.go @@ -22,9 +22,10 @@ func QueryOriginCveExcel(days string, prcnum int) ([]OriginExcel, int64, error) "cve_status,create_time from cve_origin_excel where update_time >= ? and cve_status in (?, ?)"+ "order by cve_id asc limit ?", days, 0, 1, prcnum).QueryRows(&coe) if err == nil && num > 0 { - logs.Info("cve_origin_excel 查询结果： ", num) + logs.Info("QueryOriginCveExcel, cve_origin_excel, search result: ", num) } else { - logs.Info("当前无新增或者更新的cve, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryOriginCveExcel, There is currently no manually added or updated cve, cur_time:", + common.GetCurTime(), ",err: ", err) } return coe, num, err } @@ -38,17 +39,20 @@ func UpdateCveIssueStatusById(status int, issueId int64) (id int64) { func LockUpdateCveIssueStatus(status int, issueId int64) (bool) { o := orm.NewOrm() - res, err := o.Raw("UPDATE cve_gite_origin_issue SET proc_status = ?, issue_update_at = ? where id = ? and proc_status = 0", + res, err := o.Raw("UPDATE cve_gite_origin_issue SET proc_status = ?, "+ + "issue_update_at = ? where id = ? and proc_status = 0", status, common.GetCurTime(), issueId).Exec() if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("LockUpdateCveIssueStatus, update cve_gite_origin_issue row affected nums: ", num, ",issueId: ", issueId) + logs.Info("LockUpdateCveIssueStatus, update cve_gite_origin_issue row affected nums: ", num, + ",issueId: ", issueId) return true } return false } else { - logs.Error("LockUpdateCveIssueStatus, update failed, cve_gite_origin_issue, ", ",issueId: ", issueId, ", err: ", err) + logs.Error("LockUpdateCveIssueStatus, update failed, cve_gite_origin_issue, issueId: ", + issueId, ", err: ", err) return false } } @@ -77,9 +81,10 @@ func QueryOriginCveIssue(prcnum int) ([]GiteOriginIssue, int64, error) { " from cve_gite_origin_issue where proc_status = ? "+ "order by id asc limit ?", 0, prcnum).QueryRows(&gs) if err == nil && num > 0 { - logs.Info("cve_gite_origin_issue 查询结果： ", num) + logs.Info("QueryOriginCveIssue, cve_gite_origin_issue, search result: ", num) } else { - logs.Info("当前无新增或者更新的cveissue, cve_gite_origin_issue, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryOriginCveIssue, There are currently no new or updated issues, cve_gite_origin_issue, cur_time:", + common.GetCurTime(), ",err: ", err) } return gs, num, err } @@ -88,15 +93,16 @@ func QueryOriginCve(days string, prcnum, credibilityLevel int) ([]OriginUpstream o := orm.NewOrm() var gs []OriginUpstream num, err := o.Raw("select cve_id,cve_un_ids,cve_num, update_type,cve_packname,"+ - "git_packname,cve_title,affect_porduct,cnnvd_id,cnvd_id,published_date," + + "git_packname,cve_title,affect_porduct,cnnvd_id,cnvd_id,published_date,"+ "vul_status,cve_status,version,credibility_level"+ - " from cve_origin_upstream where update_time >= ? and cve_status in (?, ?) " + + " from cve_origin_upstream where update_time >= ? and cve_status in (?, ?) "+ "and is_exit = ? and credibility_level <= ? "+ "order by cve_id asc limit ?", days, 0, 1, 1, credibilityLevel, prcnum).QueryRows(&gs) if err == nil && num > 0 { - logs.Info("cve_origin_upstream 查询结果： ", num) + logs.Info("QueryOriginCveIssue, cve_origin_upstream, search result: ", num) } else { - logs.Info("当前无新增或者更新的cve, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryOriginCveIssue, There are currently no new or updated automated submission cve, cur_time:", + common.GetCurTime(), ", err: ", err) } return gs, num, err } @@ -106,7 +112,8 @@ func QueryCveDesc(cveId int64) (OriginUpstreamDesc, bool) { var cveDesc OriginUpstreamDesc err := o.Raw("select * from cve_origin_upstream_desc where cve_id = ?", cveId).QueryRow(&cveDesc) if err != nil { - logs.Error(cveId, "cve_origin_upstream_desc cve描述查询不到") + logs.Error(cveId, "QueryCveDesc, "+ + "The original cve description cannot be queried, cveId: ", cveId, ", err: ", err) return cveDesc, false } else { return cveDesc, true @@ -118,7 +125,7 @@ func QueryCveImpact(cveId int64) (OriginUpstreamImpact, bool) { var cveImpact OriginUpstreamImpact err := o.Raw("select * from cve_origin_upstream_impact where cve_id = ?", cveId).QueryRow(&cveImpact) if err != nil { - logs.Error(cveId, "cve_origin_upstream_impact cve impact 查询不到") + logs.Error(cveId, "QueryCveImpact, cve_origin_upstream_impact, cveId: ", cveId, ",err: ", err) return cveImpact, false } else { return cveImpact, true @@ -132,7 +139,7 @@ func QueryCveScore(impactId int64, typex string) (OriginUpstreamImpactScore, boo err := o.Raw("select * from cve_origin_upstream_impact_score where "+ "impact_id = ? and base_met_v3=? and cvss_v3=?", impactId, 1, 1).QueryRow(&cveScore) if err != nil { - logs.Error(impactId, "cve_origin_upstream_impact_score cve score 查询不到") + logs.Error(impactId, "QueryCveScore, cve_origin_upstream_impact_score, impactId: ", impactId, ",err: ", err) return cveScore, false } else { return cveScore, true @@ -141,7 +148,7 @@ func QueryCveScore(impactId int64, typex string) (OriginUpstreamImpactScore, boo err := o.Raw("select * from cve_origin_upstream_impact_score where "+ "impact_id = ? and base_met_v2=? and cvss_v2=?", impactId, 1, 1).QueryRow(&cveScore) if err != nil { - logs.Error(impactId, "cve_origin_upstream_impact_score cve score 查询不到") + logs.Error(impactId, "QueryCveScore, cve_origin_upstream_impact_score, impactId: ", impactId, ", err: ", err) return cveScore, false } else { return cveScore, true @@ -155,7 +162,7 @@ func QueryCveCvssV3(scoreId int64) (OriginUpstreamImpactScoreV3, bool) { var cveScoreV3 OriginUpstreamImpactScoreV3 err := o.Raw("select * from cve_origin_upstream_impact_score_v3 where score_id = ?", scoreId).QueryRow(&cveScoreV3) if err != nil { - logs.Error(scoreId, "cve_origin_upstream_impact_score_v3 cve cvssv3 查询不到") + logs.Error("QueryCveCvssV3, cve_origin_upstream_impact_score_v3, scoreId: ", scoreId, ", err: ", err) return cveScoreV3, false } else { return cveScoreV3, true @@ -167,7 +174,7 @@ func QueryCveCvssV2(scoreId int64) (OriginUpstreamImpactScoreV2, bool) { var cveScoreV2 OriginUpstreamImpactScoreV2 err := o.Raw("select * from cve_origin_upstream_impact_score_v2 where score_id = ?", scoreId).QueryRow(&cveScoreV2) if err != nil { - logs.Error(scoreId, "cve_origin_upstream_impact_score_v2 cve cvssv2 查询不到") + logs.Error("QueryCveCvssV2, cve_origin_upstream_impact_score_v2, scoreId: ", scoreId, ", err: ", err) return cveScoreV2, false } else { return cveScoreV2, true @@ -179,10 +186,12 @@ func QueryCveByNum(cveNum, packName, version string) (VulnCenter, bool) { var cve VulnCenter //err := o.Raw("select * from cve_vuln_center where cve_num = ? and pack_name = ? and cve_version = ?", // cveNum, packName, version).QueryRow(&cve) - err := o.Raw("select * from cve_vuln_center where cve_num = ? and " + + err := o.Raw("select * from cve_vuln_center where cve_num = ? and "+ "pack_name = ? order by cve_id desc limit 1", cveNum, packName).QueryRow(&cve) if err != nil || cve.CveId == 0 { + logs.Error("QueryCveByNum, cve_vuln_center, cveNum: ", + cveNum, ",packName: ", packName, ", err: ", err) return cve, false } else { return cve, true @@ -197,12 +206,14 @@ func UpdateCveStatusExportByNum(updatetime, cveNum string, isExport int, repoPat if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("cve_vuln_center row affected nums: ", num, ",cveNum: ", cveNum, ",", updatetime) + logs.Info("cve_vuln_center row affected nums: ", num, + ",cveNum: ", cveNum, ",updatetime: ", updatetime) return true } return false } else { - logs.Error("更新失败, cve_vuln_center, ", ",cveNum: ", cveNum, ",", updatetime, ", err: ", err) + logs.Error("UpdateCveStatusExportByNum, cve_vuln_center, Update failed, cveNum: ", cveNum, + ", updatetime: ", updatetime, ", err: ", err) return false } } @@ -212,7 +223,7 @@ func QueryScoreByCveId(CveId int64) (Score, bool) { var score Score err := o.Raw("select * from cve_score where cve_id = ?", CveId).QueryRow(&score) if err != nil { - logs.Error(CveId, "cve_score 查询不到") + logs.Error(CveId, "QueryScoreByCveId, cve_id: ", CveId, ",err: ", err) return score, false } else { return score, true @@ -224,10 +235,10 @@ func QueryOpenEulerSAByCveId(CveId int64) (OpenEulerSA, bool) { op := OpenEulerSA{CveId: CveId} err := o.Read(&op, "CveId") if err == orm.ErrNoRows { - logs.Error(CveId, "cve_open_euler_s_a 查询不到") + logs.Error("QueryOpenEulerSAByCveId, cveId: ", CveId, ", err: ", err) return op, false } else if err == orm.ErrMissPK { - logs.Error(CveId, "cve_open_euler_s_a pk 查询不到") + logs.Error("QueryOpenEulerSAByCveId, cveId: ", CveId, ", err: ", err) return op, false } else { return op, true @@ -239,7 +250,7 @@ func QuerySecNoticeByCveId(CveId int64) (SecurityNotice, bool) { var secNotice SecurityNotice err := o.Raw("select * from cve_security_notice where cve_id = ?", CveId).QueryRow(&secNotice) if err != nil { - logs.Error(CveId, "cve_security_notice 查询不到") + logs.Error("QuerySecNoticeByCveId, cveId: ", CveId, ", err: ", err) return secNotice, false } else { return secNotice, true @@ -252,16 +263,16 @@ func CreateSecurityNotice(sec *SecurityNotice) (SecId int64, err error) { if errs == nil { var num int64 if num, err = o.Insert(sec); err == nil { - logs.Info("insert cve_security_notice success, num:, cveNum", num, sec.CveNum) + logs.Info("CreateSecurityNotice, insert cve_security_notice success, num: ", num, ",cveNum: ", sec.CveNum) } else { - logs.Error("insert cve_security_notice failed, cveNum:", sec.CveNum) + logs.Error("CreateSecurityNotice, insert cve_security_notice failed, cveNum:", sec.CveNum, ", err: ", err) err = o.Rollback() return 0, err } SecId = sec.SecId _ = o.Commit() } else { - logs.Error("事务创建失败，cveNum:", sec.CveNum) + logs.Error("CreateSecurityNotice, Transaction creation failed, cveNum: ", sec.CveNum, ", errs: ", errs) return 0, errs } return SecId, nil @@ -273,16 +284,16 @@ func CreateScore(score *Score) (Id int64, err error) { if errs == nil { var num int64 if num, err = o.Insert(score); err == nil { - logs.Info("insert cve_score success, num:, cveNum:", num, score.CveNum) + logs.Info("CreateScore, insert cve_score success, num: ", num, ",cveNum: ", score.CveNum) } else { - logs.Error("insert cve_score failed, score:", score, "err:", err) + logs.Error("CreateScore, insert cve_score failed, score: ", score, ", err: ", err) o.Rollback() return 0, err } Id = score.Id o.Commit() } else { - logs.Error("事务创建失败，cveNum:", score.CveNum) + logs.Error("CreateScore, Transaction creation failed, cveNum:", score.CveNum, ",errs: ", errs) return 0, errs } return Id, nil @@ -294,16 +305,16 @@ func CreateOpenEulerSA(op *OpenEulerSA) (OpenId int64, err error) { if errs == nil { var num int64 if num, err = o.Insert(op); err == nil { - logs.Info("insert cve_open_euler_s_a success, num:, ", num, "CveId:", op.CveId) + logs.Info("CreateOpenEulerSA, insert cve_open_euler_s_a success, num: ", num, "CveId:", op.CveId) } else { - logs.Error("insert cve_open_euler_s_a failed, CveId:", op.CveId, "err:", err) + logs.Error("CreateOpenEulerSA, insert cve_open_euler_s_a failed, CveId: ", op.CveId, ", err:", err) o.Rollback() return 0, err } OpenId = op.OpenId o.Commit() } else { - logs.Error("事务创建失败，cveId:", op.CveId) + logs.Error("CreateOpenEulerSA, Transaction creation failed,cveId:", op.CveId, ", errs: ", errs) return 0, errs } return OpenId, nil @@ -315,16 +326,16 @@ func CreateScoreRecord(sc *ScoreRecord) (scoreId int64, err error) { if errs == nil { var num int64 if num, err = o.Insert(sc); err == nil { - logs.Info("insert cve_score_record success, num:, ", num, "CveId:", sc.CveId) + logs.Info("CreateScoreRecord, insert cve_score_record success, num: ", num, ", CveId: ", sc.CveId) } else { - logs.Error("insert cve_score_record failed, CveId:", sc.CveId, "err:", err) + logs.Error("CreateScoreRecord, insert cve_score_record failed, CveId:", sc.CveId, ", err:", err) o.Rollback() return 0, err } scoreId = sc.Id o.Commit() } else { - logs.Error("事务创建失败，cveId:", sc.CveId) + logs.Error("CreateScoreRecord, Transaction creation failed, cveId: ", sc.CveId, ",errs: ", errs) return 0, errs } return scoreId, nil @@ -335,13 +346,16 @@ func InsertScoreRecord(sc *ScoreRecord) (int64, error) { errs := o.Begin() if errs == nil { if num, err := o.Insert(sc); err == nil { - logs.Info("insert cve_score_record, num:, CveId:", num, sc.CveId) + logs.Info("InsertScoreRecord, insert cve_score_record, num:", num, ", CveId:", sc.CveId) } else { - logs.Error("insert cve_score_record failed, CveId:", sc.CveId, ",err: ", err) + logs.Error("InsertScoreRecord, insert cve_score_record failed, CveId:", sc.CveId, ",err: ", err) o.Rollback() return 0, err } o.Commit() + } else { + logs.Error("InsertScoreRecord, Transaction creation failed, cveId:", sc.CveId, ",errs: ", errs) + return 0, errs } return 0, nil } @@ -354,9 +368,9 @@ func CreateCveRelat(cve *VulnCenter, sec *SecurityNotice, score *Score, var num int64 var err error if num, err = o.Insert(cve); err == nil { - logs.Info("insert cve_vuln_center success, num:, cveNum:", num, cve.CveNum) + logs.Info("CreateCveRelat, insert cve_vuln_center success, num: ", num, ", cveNum: ", cve.CveNum) } else { - logs.Error("insert cve_vuln_center failed, CveNum:", cve.CveNum, ",err: ", err) + logs.Error("CreateCveRelat, insert cve_vuln_center failed, CveNum: ", cve.CveNum, ",err: ", err) o.Rollback() return 0, err } @@ -364,40 +378,40 @@ func CreateCveRelat(cve *VulnCenter, sec *SecurityNotice, score *Score, cveid = num op.CveId = cveid if num, err = o.Insert(op); err == nil { - logs.Info("insert cve_open_euler_s_a success, num:, cveNum:", num, cve.CveNum) + logs.Info("CreateCveRelat, insert cve_open_euler_s_a success, num: ", num, ",cveNum: ", cve.CveNum) } else { - logs.Error("insert cve_open_euler_s_a failed, CveNum:", cve.CveNum, ",err: ", err) + logs.Error("CreateCveRelat, insert cve_open_euler_s_a failed, CveNum:", cve.CveNum, ",err: ", err) o.Rollback() return 0, err } sec.OpenId = num score.OpenId = num if num, err = o.Insert(sec); err == nil { - logs.Info("insert cve_security_notice success, num:, cveNum", num, cve.CveNum) + logs.Info("CreateCveRelat, insert cve_security_notice success, num: ", num, ", cveNum: ", cve.CveNum) } else { - logs.Error("insert cve_security_notice failed, cveNum:", cve.CveNum, ",err: ", err) + logs.Error("CreateCveRelat, insert cve_security_notice failed, cveNum:", cve.CveNum, ",err: ", err) o.Rollback() return 0, err } score.CveId = cveid if num, err = o.Insert(score); err == nil { - logs.Info("insert cve_score success, num:, cveNum:", num, cve.CveNum) + logs.Info("CreateCveRelat, insert cve_score success, num: ", num, ", cveNum: ", cve.CveNum) } else { - logs.Error("insert cve_score failed, CveNum:", cve.CveNum, ",err: ", err) + logs.Error("CreateCveRelat, insert cve_score failed, CveNum:", cve.CveNum, ",err: ", err) o.Rollback() return 0, err } sc.CveId = cveid if num, err = o.Insert(sc); err == nil { - logs.Info("insert cve_score_record, num:, CveId:", num, cve.CveId) + logs.Info("CreateCveRelat, insert cve_score_record, num: ", num, ", CveId:", cve.CveId) } else { - logs.Error("insert cve_score_record failed, CveId:", cve.CveId, ",err: ", err) + logs.Error("CreateCveRelat, insert cve_score_record failed, CveId:", cve.CveId, ",err: ", err) o.Rollback() return 0, err } o.Commit() } else { - logs.Error("事务创建失败，CveId:", cve.CveId, ",err: ", errs) + logs.Error("CreateCveRelat, Transaction creation failed, CveId:", cve.CveId, ",err: ", errs) return 0, errs } return cveid, nil @@ -414,20 +428,19 @@ func UpdateCveRelat(cve *VulnCenter, sec *SecurityNotice, score *Score) error { var err error cve.CveId = cv.CveId if num, err = o.Update(cve); err == nil { - logs.Info("update cve_vuln_center success, num:, cveNum", num, cve.CveNum) + logs.Info("UpdateCveRelat, update cve_vuln_center success, num: ", num, ", cveNum", cve.CveNum) } else { - logs.Error("update cve_vuln_center failed, CveId:", cve.CveId, ",err: ", err) + logs.Error("UpdateCveRelat, update cve_vuln_center failed, CveId:", cve.CveId, ",err: ", err) o.Rollback() return err } } else { - logs.Info("insert cve_vuln_center failed, CveId:", cve.CveId) var num int64 var err error if num, err = o.Insert(cve); err == nil { - logs.Info("insert cve_vuln_center success, num:, cveNum:", num, cve.CveNum) + logs.Info("UpdateCveRelat, insert cve_vuln_center success, num: ", num, ", cveNum:", cve.CveNum) } else { - logs.Error("insert cve_vuln_center failed, CveNum:", cve.CveNum, ",err:", err) + logs.Error("UpdateCveRelat, insert cve_vuln_center failed, CveNum:", cve.CveNum, ",err:", err) o.Rollback() return err } @@ -440,9 +453,9 @@ func UpdateCveRelat(cve *VulnCenter, sec *SecurityNotice, score *Score) error { sec.SecId = se.SecId var err error if num, err = o.Update(sec); err == nil { - logs.Info("update cve_security_notice success, num:, cve.CveId", num, cve.CveId) + logs.Info("UpdateCveRelat, update cve_security_notice success, num: ", num, ", cve.CveId", cve.CveId) } else { - logs.Error("update cve_security_notice failed, CveId:", cve.CveId, ",err: ", err) + logs.Error("UpdateCveRelat, update cve_security_notice failed, CveId:", cve.CveId, ",err: ", err) o.Rollback() return err } @@ -451,9 +464,9 @@ func UpdateCveRelat(cve *VulnCenter, sec *SecurityNotice, score *Score) error { var err error var num int64 if num, err = o.Insert(sec); err == nil { - logs.Info("insert cve_security_notice success, num:, cveNum:", num, cve.CveNum) + logs.Info("UpdateCveRelat, insert cve_security_notice success, num: ", num, ", cveNum: ", cve.CveNum) } else { - logs.Error("insert cve_security_notice failed, CveNum:", cve.CveNum, ",err:", err) + logs.Error("UpdateCveRelat, insert cve_security_notice failed, CveNum:", cve.CveNum, ",err:", err) o.Rollback() return err } @@ -465,24 +478,24 @@ func UpdateCveRelat(cve *VulnCenter, sec *SecurityNotice, score *Score) error { score.Id = sc.Id var err error if num, err = o.Update(score); err == nil { - logs.Info("update cve_score success, num:, cve.CveId:", num, cve.CveId) + logs.Info("UpdateCveRelat, update cve_score success, num: ", num, ", cve.CveId: ", cve.CveId) } else { - logs.Error("update cve_score failed, CveId:", cve.CveId, ",err: ", err) + logs.Error("UpdateCveRelat, update cve_score failed, CveId:", cve.CveId, ",err: ", err) o.Rollback() return err } } else { score.CveId = cve.CveId if num, err := o.Insert(score); err == nil { - logs.Info("insert cve_score success, num:, cveNum:", num, cve.CveNum) + logs.Info("UpdateCveRelat, insert cve_score success, num: ", num, ", cveNum:", cve.CveNum) } else { - logs.Error("insert cve_score failed, CveNum:", cve.CveNum, ",err: ", err) + logs.Error("UpdateCveRelat, insert cve_score failed, CveNum: ", cve.CveNum, ",err: ", err) o.Rollback() return err } } } else { - logs.Error("事务创建失败，CveId:", cve.CveId) + logs.Error("UpdateCveRelat, Transaction creation failed, CveId:", cve.CveId, ",errs: ", errs) return errs } o.Commit() @@ -497,18 +510,18 @@ func UpdateCveRelat1(cve *VulnCenter, sec *SecurityNotice) (err error) { if err = o.Read(&v, "CveId"); err == nil { var num int64 if num, err = o.Update(cve); err == nil { - logs.Info("update cve_vuln_center success, num:, cveNum", num, cve.CveNum) + logs.Info("UpdateCveRelat1, update cve_vuln_center success, num: ", num, ", cveNum", cve.CveNum) } else { - logs.Error("update cve_vuln_center failed, CveId:", cve.CveId, ",err: ", err) + logs.Error("UpdateCveRelat1, update cve_vuln_center failed, CveId:", cve.CveId, ",err: ", err) o.Rollback() return err } } else { var num int64 if num, err = o.Insert(cve); err == nil { - logs.Info("insert cve_vuln_center success, num:, cveNum:", num, cve.CveNum) + logs.Info("UpdateCveRelat1, insert cve_vuln_center success, num: ", num, ", cveNum:", cve.CveNum) } else { - logs.Error("insert cve_vuln_center failed, CveNum:", cve.CveNum, ",err:", err) + logs.Error("UpdateCveRelat1, insert cve_vuln_center failed, CveNum:", cve.CveNum, ",err:", err) o.Rollback() return err } @@ -517,24 +530,24 @@ func UpdateCveRelat1(cve *VulnCenter, sec *SecurityNotice) (err error) { if err = o.Read(&se, "CveId"); err == nil { var num int64 if num, err = o.Update(sec); err == nil { - logs.Info("update cve_security_notice success, num:, cve.CveId:", num, cve.CveId) + logs.Info("UpdateCveRelat1, update cve_security_notice success, num: ", num, ", cve.CveId:", cve.CveId) } else { - logs.Error("update cve_security_notice failed, CveId:", cve.CveId, ",err: ", err) + logs.Error("UpdateCveRelat1, update cve_security_notice failed, CveId:", cve.CveId, ",err: ", err) o.Rollback() return err } } else { sec.CveId = cve.CveId if num, err := o.Insert(sec); err == nil { - logs.Info("insert cve_security_notice success, num:, cveNum:", num, cve.CveNum) + logs.Info("UpdateCveRelat1, insert cve_security_notice success, num: ", num, ", cveNum:", cve.CveNum) } else { - logs.Error("insert cve_security_notice failed, CveNum:", cve.CveNum, ",err:", err) + logs.Error("UpdateCveRelat1, insert cve_security_notice failed, CveNum:", cve.CveNum, ",err:", err) o.Rollback() return err } } } else { - logs.Error("事务创建失败，CveId:", cve.CveId, ",err: ", errs) + logs.Error("UpdateCveRelat1, Transaction creation failed, CveId:", cve.CveId, ",err: ", errs) return errs } o.Commit() @@ -549,18 +562,18 @@ func UpdateCveRelat2(cve *VulnCenter, score *Score) (err error) { if err = o.Read(&v, "CveId"); err == nil { var num int64 if num, err = o.Update(cve); err == nil { - logs.Info("update cve_vuln_center success, num:, cveNum", num, cve.CveNum) + logs.Info("UpdateCveRelat2, update cve_vuln_center success, num: ", num, ", cveNum: ", cve.CveNum) } else { - logs.Error("update cve_vuln_center failed, CveId:", cve.CveId, ", err: ", err) + logs.Error("UpdateCveRelat2, update cve_vuln_center failed, CveId:", cve.CveId, ", err: ", err) o.Rollback() return err } } else { var num int64 if num, err = o.Insert(cve); err == nil { - logs.Info("insert cve_vuln_center success, num:, cveNum:", num, cve.CveNum) + logs.Info("UpdateCveRelat2, insert cve_vuln_center success, num: ", num, ", cveNum:", cve.CveNum) } else { - logs.Error("insert cve_vuln_center failed, CveNum:", cve.CveNum, ",err:", err) + logs.Error("UpdateCveRelat2, insert cve_vuln_center failed, CveNum:", cve.CveNum, ",err:", err) o.Rollback() return err } @@ -569,24 +582,24 @@ func UpdateCveRelat2(cve *VulnCenter, score *Score) (err error) { if err = o.Read(&sc, "CveId"); err == nil { var num int64 if num, err = o.Update(score); err == nil { - logs.Info("update cve_score success, num:, cve.CveId", num, cve.CveId) + logs.Info("UpdateCveRelat2, update cve_score success, num: ", num, ", cve.CveId", cve.CveId) } else { - logs.Error("update cve_score failed, CveId:", cve.CveId, ",err: ", err) + logs.Error("UpdateCveRelat2, update cve_score failed, CveId:", cve.CveId, ",err: ", err) o.Rollback() return err } } else { score.CveId = cve.CveId if num, err := o.Insert(score); err == nil { - logs.Info("insert cve_score success, num:, cveNum:", num, cve.CveNum) + logs.Info("UpdateCveRelat2, insert cve_score success, num: ", num, ", cveNum:", cve.CveNum) } else { - logs.Error("insert cve_score failed, CveNum:", cve.CveNum, ",err: ", err) + logs.Error("UpdateCveRelat2, insert cve_score failed, CveNum:", cve.CveNum, ",err: ", err) o.Rollback() return err } } } else { - logs.Error("事务创建失败，CveId:", cve.CveId, ",err: ", errs) + logs.Error("UpdateCveRelat2, Transaction creation failed, CveId:", cve.CveId, ",errs: ", errs) return errs } o.Commit() @@ -597,9 +610,6 @@ func QueryOpenSaLastId() (OpenEulerSA, error) { o := orm.NewOrm() var os OpenEulerSA err := o.Raw("select openeuler_id, openeuler_sa_num from cve_open_euler_s_a order by openeuler_id desc limit 1").QueryRow(&os) - if err == nil { - logs.Info("OpenEulerSA 查询结果：", os) - } return os, err } @@ -607,9 +617,6 @@ func QueryOpenSaById(cveId int64) (OpenEulerSA, error) { o := orm.NewOrm() var os OpenEulerSA err := o.Raw("select openeuler_id, openeuler_sa_num from cve_open_euler_s_a where cve_id = ?", cveId).QueryRow(&os) - if err == nil { - logs.Info("OpenEulerSA 查询结果：", os) - } return os, err } @@ -621,13 +628,13 @@ func UpdateOriginStatus(updateTime, pakName, version string, cveId int64, status if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("cve_origin_upstream row affected nums: ", + logs.Info("UpdateOriginStatus, cve_origin_upstream row affected nums: ", num, ",cveId: ", cveId, ",", updateTime, pakName, version) return true } return false } else { - logs.Error("更新失败, cve_origin_upstream, ", ",cveId: ", + logs.Error("UpdateOriginStatus, cve_origin_upstream, Update failed, cveId: ", cveId, ",", updateTime, pakName, version, ", err: ", err) return false } @@ -636,18 +643,19 @@ func UpdateOriginStatus(updateTime, pakName, version string, cveId int64, status func LockUpdateOriginStatus(updateTime, pakName, version string, cveId int64, status int) bool { o := orm.NewOrm() res, err := o.Raw("UPDATE cve_origin_upstream SET "+ - "cve_status = ?, update_time = ? where cve_id = ? and git_packname = ? and version = ? and cve_status in (0,1)", + "cve_status = ?, update_time = ? where cve_id = ? and "+ + "git_packname = ? and version = ? and cve_status in (0,1)", status, updateTime, cveId, pakName, version).Exec() if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("cve_origin_upstream row affected nums: ", + logs.Info("LockUpdateOriginStatus, cve_origin_upstream row affected nums: ", num, ",cveId: ", cveId, ",", updateTime, pakName, version) return true } return false } else { - logs.Error("更新失败, cve_origin_upstream, ", ",cveId: ", + logs.Error("LockUpdateOriginStatus, cve_origin_upstream, Update failed, cveId: ", cveId, ",", updateTime, pakName, version, ", err: ", err) return false } @@ -679,12 +687,14 @@ func UpdateOriginExcelStatus(updateTime string, cveId int64, status int) bool { if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("cve_origin_excel row affected nums: ", num, ",cveId: ", cveId, ",", updateTime) + logs.Info("UpdateOriginExcelStatus, cve_origin_excel row affected nums: ", num, + ",cveId: ", cveId, ",updateTime: ", updateTime) return true } return false } else { - logs.Error("更新失败, cve_origin_excel, ", ",cveId: ", cveId, ",", updateTime, ", err: ", err) + logs.Error("UpdateOriginExcelStatus, cve_origin_excel, cveId: ", cveId, + ",updateTime: ", updateTime, ", err: ", err) return false } } @@ -692,16 +702,19 @@ func UpdateOriginExcelStatus(updateTime string, cveId int64, status int) bool { func LockUpdateOriginExcelStatus(updateTime string, cveId int64, status int) bool { o := orm.NewOrm() res, err := o.Raw("UPDATE cve_origin_excel SET "+ - "cve_status = ?, update_time = ? where cve_id = ? and cve_status in (0,1)", status, updateTime, cveId).Exec() + "cve_status = ?, update_time = ? where cve_id = ? and cve_status in (0,1)", + status, updateTime, cveId).Exec() if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("cve_origin_excel row affected nums: ", num, ",cveId: ", cveId, ",", updateTime) + logs.Info("LockUpdateOriginExcelStatus, cve_origin_excel row affected nums: ", + num, ",cveId: ", cveId, ",", updateTime) return true } return false } else { - logs.Error("更新失败, cve_origin_excel, ", ",cveId: ", cveId, ",", updateTime, ", err: ", err) + logs.Error("LockUpdateOriginExcelStatus, cve_origin_excel, cveId: ", cveId, + ",updateTime: ", updateTime, ", err: ", err) return false } } @@ -729,20 +742,18 @@ func GetSaNumCountByYears(years string, status int) int64 { o := orm.NewOrm() if status == 0 { cnt, err := o.QueryTable("cve_sa_number").Filter("sa_years", years).Count() - //result, err := o.Raw("select count(sa_id) from cve_sa_number where sa_years = ?", years).Exec() if err == nil { - logs.Info("cve_sa_number search result：", cnt) + logs.Info("GetSaNumCountByYears, cve_sa_number search result：", cnt) } else { - logs.Error("cve_sa_number search result： failed") + logs.Error("GetSaNumCountByYears, cve_sa_number, Query result failed, err: ", err) } return cnt } else { - //err := o.Raw("select count(sa_id) from cve_sa_number where sa_years = ? and status = ?", years, status).QueryRow(&count) cnt, err := o.QueryTable("cve_sa_number").Filter("sa_years", years).Filter("status", status).Count() if err == nil { - logs.Info("cve_sa_number search result：", cnt) + logs.Info("GetSaNumCountByYears, cve_sa_number search result：", cnt) } else { - logs.Error("cve_sa_number search result： failed") + logs.Error("GetSaNumCountByYears, cve_sa_number, Query result failed, err: ", err, years, status) } return cnt } @@ -753,19 +764,23 @@ func GetSaNumberByYears(sa *SaNumber, years string, status, orderSort int) error err := error(nil) if status == 0 { if orderSort == 1 { - err = o.Raw("select * from cve_sa_number where sa_years = ? order by sa_id asc limit 1", years).QueryRow(&sa) + err = o.Raw("select * from cve_sa_number where sa_years = ? " + + "order by sa_id asc limit 1", years).QueryRow(&sa) logs.Info("GetSaNumberByYears", err) } else { - err = o.Raw("select * from cve_sa_number where sa_years = ? order by sa_id desc limit 1", years).QueryRow(&sa) - logs.Info("GetSaNumberByYears", err) + err = o.Raw("select * from cve_sa_number where sa_years = ? " + + "order by sa_id desc limit 1", years).QueryRow(&sa) + logs.Info("GetSaNumberByYears, err: ", err) } } else { if orderSort == 1 { - err = o.Raw("select * from cve_sa_number where sa_years = ? and status = ? order by sa_id asc limit 1", years, status).QueryRow(&sa) + err = o.Raw("select * from cve_sa_number where sa_years = ? and status = ? " + + "order by sa_id asc limit 1", years, status).QueryRow(&sa) logs.Info("GetSaNumberByYears", err) } else { - err = o.Raw("select * from cve_sa_number where sa_years = ? and status = ? order by sa_id desc limit 1", years, status).QueryRow(&sa) - logs.Info("GetSaNumberByYears", err) + err = o.Raw("select * from cve_sa_number where sa_years = ? and status = ? " + + "order by sa_id desc limit 1", years, status).QueryRow(&sa) + logs.Info("GetSaNumberByYears, err: ", err) } } return err @@ -773,7 +788,8 @@ func GetSaNumberByYears(sa *SaNumber, years string, status, orderSort int) error func DeleteSaNumberByYears(years string, status int) { o := orm.NewOrm() - err := o.Raw("delete from cve_sa_number where sa_years != ? and status = ? ", years, status).QueryRow() + err := o.Raw("delete from cve_sa_number " + + "where sa_years != ? and status = ? ", years, status).QueryRow() logs.Info("DeleteSaNumberByYears", err) } @@ -794,7 +810,7 @@ func UpdateSaNumber(sa *SaNumber, field ...string) bool { o := orm.NewOrm() _, err := o.Update(sa, field...) if err != nil { - logs.Error(err) + logs.Error("UpdateSaNumber, err: ", err) return false } return true @@ -804,7 +820,7 @@ func UpdateVulnCenter(cve *VulnCenter, field ...string) bool { o := orm.NewOrm() _, err := o.Update(cve, field...) if err != nil { - logs.Error(err) + logs.Error("UpdateVulnCenter, err: ", err) return false } return true @@ -840,7 +856,7 @@ func GetCanExportVulnCenterCount() (count int64) { o := orm.NewOrm() err := o.Raw(sql).QueryRow(&res) if err != nil { - logs.Error(err) + logs.Error("GetCanExportVulnCenterCount, err: ", err) return 0 } return res.Total diff --git a/models/cvedetail.go b/models/cvedetail.go index 930fcd419c940d19c53854352ae6171bc871f55f..741dc5d3904abfb37186c24153508502f1f96fa2 100644 --- a/models/cvedetail.go +++ b/models/cvedetail.go @@ -7,144 +7,178 @@ import ( func GetOriginUpstream(cveNum string, ou *OriginUpstream) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_origin_upstream WHERE cve_num=? order by cve_id desc limit 1", cveNum).QueryRow(ou) + err = o.Raw("select * FROM cve_origin_upstream "+ + "WHERE cve_num=? order by cve_id desc limit 1", cveNum).QueryRow(ou) if err == nil { - logs.Info("cve_origin_upstream cveNum: ", cveNum, " 查询成功") + logs.Info("GetOriginUpstream, cve_origin_upstream, "+ + "cveNum: ", cveNum, ", search successful") return nil } else { - logs.Error("cve_origin_upstream cveNum: ", cveNum, " 不存在") + logs.Error("GetOriginUpstream, cve_origin_upstream, "+ + "cveNum: ", cveNum, ", Query failed") } return err } func GetOriginDesc(cveId int64, oud *OriginUpstreamDesc) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_origin_upstream_desc WHERE cve_id=?", cveId).QueryRow(oud) + err = o.Raw("select * FROM cve_origin_upstream_desc "+ + "WHERE cve_id=?", cveId).QueryRow(oud) if err == nil { - logs.Info("cve_origin_upstream_desc cve_id: ", cveId, " 查询成功") + logs.Info("GetOriginDesc, cve_origin_upstream_desc, "+ + "cve_id: ", cveId, ", search successful") return nil } else { - logs.Error("cve_origin_upstream_desc cve_id: ", cveId, " 不存在") + logs.Error("GetOriginDesc, cve_origin_upstream_desc, "+ + "cve_id: ", cveId, ", Query failed") } return err } func GetOriginConfig(cveId int64, ouc *OriginUpstreamConfig) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_origin_upstream_config WHERE cve_id=?", cveId).QueryRow(ouc) + err = o.Raw("select * FROM cve_origin_upstream_config "+ + "WHERE cve_id=?", cveId).QueryRow(ouc) if err == nil { - logs.Info("cve_origin_upstream_config cve_id: ", cveId, " 查询成功") + logs.Info("GetOriginConfig, cve_origin_upstream_config, "+ + "cve_id: ", cveId, ", search successful") return nil } else { - logs.Error("cve_origin_upstream_config cve_id: ", cveId, " 不存在") + logs.Error("GetOriginConfig, cve_origin_upstream_config, "+ + "cve_id: ", cveId, ", Query failed") } return err } func GetOriginConfigNode(configId int64, oucn *[]OriginUpstreamConfigNode) (num int64, err error) { o := orm.NewOrm() - num, err = o.Raw("select * FROM cve_origin_upstream_config_node WHERE conf_id=?", configId).QueryRows(oucn) + num, err = o.Raw("select * FROM cve_origin_upstream_config_node "+ + "WHERE conf_id=?", configId).QueryRows(oucn) if num > 0 && err == nil { - logs.Info("cve_origin_upstream_config_node configId: ", configId, " 查询成功") + logs.Info("GetOriginConfigNode, cve_origin_upstream_config_node, "+ + "configId: ", configId, ", search successful") return num, nil } else { - logs.Error("cve_origin_upstream_config_node configId: ", configId, " 不存在") + logs.Error("GetOriginConfigNode, cve_origin_upstream_config_node,"+ + " configId: ", configId, ", Query failed") } return 0, err } func GetOriginConfigNodeCpe(nodeId int64, oucnc *[]OriginUpstreamConfigNodeCpe) (num int64, err error) { o := orm.NewOrm() - num, err = o.Raw("select * FROM cve_origin_upstream_config_node_cpe WHERE node_id=?", nodeId).QueryRows(oucnc) + num, err = o.Raw("select * FROM cve_origin_upstream_config_node_cpe "+ + "WHERE node_id=?", nodeId).QueryRows(oucnc) if num > 0 && err == nil { - logs.Info("cve_origin_upstream_config_node_cpe configId: ", nodeId, " 查询成功") + logs.Info("GetOriginConfigNodeCpe, cve_origin_upstream_config_node_cpe,"+ + " configId: ", nodeId, ", search successful") return num, nil } else { - logs.Error("cve_origin_upstream_config_node_cpe configId: ", nodeId, " 不存在") + logs.Error("GetOriginConfigNodeCpe, cve_origin_upstream_config_node_cpe, "+ + "configId: ", nodeId, ", Query failed") } return 0, err } func GetOriginPoc(cveId int64, oup *OriginUpstreamPoc) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_origin_upstream_poc WHERE cve_id=?", cveId).QueryRow(oup) + err = o.Raw("select * FROM cve_origin_upstream_poc "+ + "WHERE cve_id=?", cveId).QueryRow(oup) if err == nil { - logs.Info("cve_origin_upstream_poc cve_id: ", cveId, " 查询成功") + logs.Info("GetOriginPoc, cve_origin_upstream_poc, "+ + "cve_id: ", cveId, ", search successful") return nil } else { - logs.Error("cve_origin_upstream_poc cve_id: ", cveId, " 不存在") + logs.Error("GetOriginPoc, cve_origin_upstream_poc, "+ + "cve_id: ", cveId, ", Query failed") } return err } func GetOriginEvent(cveId int64, oue *OriginUpstreamEvent) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_origin_upstream_event WHERE cve_id=?", cveId).QueryRow(oue) + err = o.Raw("select * FROM cve_origin_upstream_event "+ + "WHERE cve_id=?", cveId).QueryRow(oue) if err == nil { - logs.Info("cve_origin_upstream_event cve_id: ", cveId, " 查询成功") + logs.Info("GetOriginEvent, cve_origin_upstream_event, cve_id: ", cveId, ", search successful") return nil } else { - logs.Error("cve_origin_upstream_event cve_id: ", cveId, " 不存在") + logs.Error("GetOriginEvent, cve_origin_upstream_event, cve_id: ", cveId, ", Query failed") } return err } func GetOriginReference(cveId int64, our *[]OriginUpstreamReference) (num int64, err error) { o := orm.NewOrm() - num, err = o.Raw("select * FROM cve_origin_upstream_reference WHERE cve_id=?", cveId).QueryRows(our) + num, err = o.Raw("select * FROM cve_origin_upstream_reference "+ + "WHERE cve_id=?", cveId).QueryRows(our) if num > 0 && err == nil { - logs.Info("cve_origin_upstream_reference cve_id: ", cveId, " 查询成功") + logs.Info("GetOriginReference, cve_origin_upstream_reference, "+ + "cve_id: ", cveId, ", search successful") return num, nil } else { - logs.Error("cve_origin_upstream_reference cve_id: ", cveId, " 不存在") + logs.Error("GetOriginReference, cve_origin_upstream_reference, "+ + "cve_id: ", cveId, ", Query failed") } return 0, err } func GetOriginVulType(cveId int64, ouv *OriginUpstreamVulType) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_origin_upstream_vul_type WHERE cve_id=?", cveId).QueryRow(ouv) + err = o.Raw("select * FROM cve_origin_upstream_vul_type "+ + "WHERE cve_id=?", cveId).QueryRow(ouv) if err == nil { - logs.Info("cve_origin_upstream_vul_type cve_id: ", cveId, " 查询成功") + logs.Info("GetOriginVulType, cve_origin_upstream_vul_type, "+ + "cve_id: ", cveId, ", search successful") return nil } else { - logs.Error("cve_origin_upstream_vul_type cve_id: ", cveId, " 不存在") + logs.Error("GetOriginVulType, cve_origin_upstream_vul_type, "+ + "cve_id: ", cveId, ", Query failed") } return err } func GetOriginFixSuggest(cveId int64, ouf *OriginUpstreamFixSuggest) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_origin_upstream_fix_suggest WHERE cve_id=?", cveId).QueryRow(ouf) + err = o.Raw("select * FROM cve_origin_upstream_fix_suggest "+ + "WHERE cve_id=?", cveId).QueryRow(ouf) if err == nil { - logs.Info("cve_origin_upstream_fix_suggest cve_id: ", cveId, " 查询成功") + logs.Info("GetOriginFixSuggest, cve_origin_upstream_fix_suggest, "+ + "cve_id: ", cveId, ", search successful") return nil } else { - logs.Error("cve_origin_upstream_fix_suggest cve_id: ", cveId, " 不存在") + logs.Error("GetOriginFixSuggest, cve_origin_upstream_fix_suggest, "+ + "cve_id: ", cveId, ", Query failed") } return err } func GetOriginFixSuggestRef(fixId int64, oufr *[]OriginUpstreamFixSuggestRef) (num int64, err error) { o := orm.NewOrm() - num, err = o.Raw("select * FROM cve_origin_upstream_fix_suggest_ref WHERE fix_id=?", fixId).QueryRows(oufr) + num, err = o.Raw("select * FROM cve_origin_upstream_fix_suggest_ref "+ + "WHERE fix_id=?", fixId).QueryRows(oufr) if num > 0 && err == nil { - logs.Info("cve_origin_upstream_fix_suggest_ref fix_id: ", fixId, " 查询成功") + logs.Info("GetOriginFixSuggestRef, cve_origin_upstream_fix_suggest_ref, "+ + "fix_id: ", fixId, ", search successful") return num, nil } else { - logs.Error("cve_origin_upstream_fix_suggest_ref fix_id: ", fixId, " 不存在") + logs.Error("GetOriginFixSuggestRef, cve_origin_upstream_fix_suggest_ref, "+ + "fix_id: ", fixId, ", Query failed") } return 0, err } func GetOriginFixSuggestRefTag(fixRefId int64, oufrt *[]OriginUpstreamFixSuggestRefTag) (num int64, err error) { o := orm.NewOrm() - num, err = o.Raw("select * FROM cve_origin_upstream_fix_suggest_ref_tag WHERE fix_ref_id=?", fixRefId).QueryRows(oufrt) + num, err = o.Raw("select * FROM cve_origin_upstream_fix_suggest_ref_tag "+ + "WHERE fix_ref_id=?", fixRefId).QueryRows(oufrt) if num > 0 && err == nil { - logs.Info("cve_origin_upstream_fix_suggest_ref_tag fix_ref_id: ", fixRefId, " 查询成功") + logs.Info("GetOriginFixSuggestRefTag, cve_origin_upstream_fix_suggest_ref_tag, "+ + "fix_ref_id: ", fixRefId, ", search successful") return num, nil } else { - logs.Error("cve_origin_upstream_fix_suggest_ref_tag fix_ref_id: ", fixRefId, " 不存在") + logs.Error("GetOriginFixSuggestRefTag, cve_origin_upstream_fix_suggest_ref_tag, "+ + "fix_ref_id: ", fixRefId, ", Query failed") } return 0, err } diff --git a/models/excel.go b/models/excel.go index f9f6f91a3c9f10e755d9c2e98d75ebf1338b9785..9d144be0bf6368a1dccbaff6faac8398d6d09252 100644 --- a/models/excel.go +++ b/models/excel.go @@ -69,7 +69,7 @@ func (elt *EmailList) Read(field ...string) ([]EmailList, error) { if err == nil && num > 0 { return el, nil } - logs.Error("查询 cve_email_list ,err: ", err) + logs.Error("cve_email_list ,err: ", err) return el, err } @@ -103,6 +103,8 @@ func GetCvrfAllFile() []SaFileList { num, err := o.Raw("SELECT file_name FROM cve_sa_file_list order by file_id asc").QueryRows(&afl) if err == nil { logs.Info("cve_sa_file_list nums: ", num) + } else { + logs.Error("GetCvrfAllFile, err: ", err) } return afl } diff --git a/models/giteeissue.go b/models/giteeissue.go index 395ee3f4583e7b188bc9f852b9435f2c939cc7c3..9130ec66b4d99be403979eca889b9d6e4343f362 100644 --- a/models/giteeissue.go +++ b/models/giteeissue.go @@ -274,7 +274,6 @@ func parseNewTplToLoopHole(lp *Loophole, body string) { } } } - sm = util.RegexpCveVersion.FindAllStringSubmatch(body, 1) if len(sm) > 0 && len(sm[0]) > 1 { for _, v := range sm[0][1:] { @@ -283,7 +282,6 @@ func parseNewTplToLoopHole(lp *Loophole, body string) { break } } - } sm = util.RegexpCveScore.FindAllStringSubmatch(body, -1) if len(sm) > 0 && len(sm[0]) > 0 { diff --git a/models/initdb.go b/models/initdb.go index 460d4f36b08e37b50994f60037dfffff172bb5a7..05e4c9a1ff5717233241eb3c2a08f6fac7123c28 100644 --- a/models/initdb.go +++ b/models/initdb.go @@ -10,12 +10,8 @@ import ( _ "github.com/go-sql-driver/mysql" ) -//func init() { -// Initdb() -//} - //InitDb init database -func Initdb() bool{ +func Initdb() bool { BConfig, err := config.NewConfig("ini", "conf/app.conf") if err != nil { logs.Error("config init error:", err) @@ -50,10 +46,10 @@ func Initdb() bool{ logs.Error("RegisterDataBase failed", "errorm: ", errorm) return false } - logs.Info("mysql 连接成功") + logs.Info("Initdb, mysql connection is successful") res := CreateDb() if res { - logs.Info("mysql table init success !") + logs.Info("mysql table init success!") } else { logs.Error("mysql table init failed!") return false @@ -64,7 +60,7 @@ func Initdb() bool{ func ConnDb() (*sql.DB, error) { BConfig, err := config.NewConfig("ini", "conf/app.conf") if err != nil { - logs.Error("config init error:", err) + logs.Error("ConnDb, config init error:", err) return nil, err } dbhost := BConfig.String("mysql::dbhost") @@ -78,9 +74,9 @@ func ConnDb() (*sql.DB, error) { dns := dbuser + ":" + string(bytes) + "@tcp(" + dbhost + ":" + dbport + ")/" + dbname + "?charset=utf8" db, err := sql.Open("mysql", dns) if err != nil { - logs.Error("连接数据库出错", err, "@tcp("+dbhost+":"+dbport+")/"+dbname) + logs.Error("Error connecting to the database: ", err, "@tcp("+dbhost+":"+dbport+")/"+dbname) return nil, err } - logs.Info("数据库连接成功, db: ", db) + logs.Info("ConnDb, mysql connection is successful!") return db, nil } diff --git a/models/issue.go b/models/issue.go index bad9bfa982f3f60729a5b1e9da67241335a92aa7..d2e4da5040734c23ee8eea3c6071d7d1eebc9a1f 100644 --- a/models/issue.go +++ b/models/issue.go @@ -17,9 +17,11 @@ var mutex sync.Mutex func QueryIssueCveByNum(cvenum, repoPath string) (GiteOriginIssue, bool) { o := orm.NewOrm() var cve GiteOriginIssue - err := o.Raw("select * from cve_gite_origin_issue where cve_number = ? and repo_path = ?", cvenum, repoPath).QueryRow(&cve) + err := o.Raw("select * from cve_gite_origin_issue where cve_number = ? and repo_path = ?", + cvenum, repoPath).QueryRow(&cve) if err != nil { - logs.Info(cvenum, ", cve_gite_origin_issue 查询不到, 不是错误,需要新增数据") + logs.Info("QueryIssueCveByNum, cve_gite_origin_issue, Can't find,"+ + " it's not an error, you need to add data, ", cvenum, repoPath) return cve, false } else { return cve, true @@ -35,9 +37,10 @@ func QueryIssueWhitelist(status int8) ([]IssueRepoWhitelist, error) { "update_time,delete_time" + " from cve_issue_repo_whitelist order by repo_id desc").QueryRows(&irw) if err == nil && num > 0 { - logs.Info("cve_issue_repo_whitelist 查询结果：", irw) + logs.Info("QueryIssueWhitelist, search result: ", irw) } else { - logs.Info("当前创建issue白名单为空, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryIssueWhitelist, The current issue whitelist is empty, cur_time:", + common.GetCurTime(), ",err: ", err) } return irw, err } else { @@ -45,9 +48,10 @@ func QueryIssueWhitelist(status int8) ([]IssueRepoWhitelist, error) { "update_time,delete_time"+ " from cve_issue_repo_whitelist where status = ? ", status).QueryRows(&irw) if err == nil && num > 0 { - logs.Info("cve_issue_repo_whitelist 查询结果：", irw) + logs.Info("QueryIssueWhitelist, search result: ", irw) } else { - logs.Info("当前创建issue白名单为空, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryIssueWhitelist, The current issue whitelist is empty, cur_time:", + common.GetCurTime(), ", err: ", err) } return irw, err } @@ -64,9 +68,10 @@ func QueryIssueByPackName(packName, days string, prcnum int) ([]VulnCenter, erro "update_time >= ? and cve_status in (?, ?) "+ "order by cve_id asc limit ?", packName, days, 0, 1, prcnum).QueryRows(&vc) if err == nil && num > 0 { - logs.Info("cve_vuln_center 查询结果：", vc, "查询条件： packName: ", packName) + logs.Info("QueryIssueByPackName, cve_vuln_center , search result：", vc, "Query conditions： packName: ", packName) } else { - logs.Info("当前无cve,需要提交issue, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryIssueByPackName, cve_vuln_center, There is currently no cve, need to submit an issue, cur_time:", + common.GetCurTime(), ", err: ", err) } return vc, err } @@ -80,9 +85,10 @@ func QueryIssue(days string, prcnum int) ([]VulnCenter, error) { " from cve_vuln_center where update_time >= ? and cve_status in (?, ?) "+ "order by cve_id asc limit ?", days, 0, 1, prcnum).QueryRows(&vc) if err == nil && num > 0 { - logs.Info("cve_vuln_center 查询结果：", vc) + logs.Info("QueryIssue, cve_vuln_center, search result: ", vc) } else { - logs.Info("当前无cve,需要提交issue, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryIssue, cve_vuln_center, There is currently no cve, need to submit an issue, cur_time:", + common.GetCurTime(), ", err: ", err) } return vc, err } @@ -108,9 +114,9 @@ func QueryIssueSecurity(cveId int64, cveNum string) (SecurityNotice, error) { "description,influence_component,affect_product,reference_link"+ " from cve_security_notice where cve_id = ? and cve_num = ?", cveId, cveNum).QueryRow(&sn) if err == nil { - logs.Info("cve_security_notice 查询结果：", sn) + logs.Info("QueryIssueSecurity, cve_security_notice, search result:", sn) } else { - logs.Info("查询 cve_security_notic err, cveId: ", cveId, "err: ", err) + logs.Info("QueryIssueSecurity, cve_security_notice, cveId: ", cveId, ", err: ", err) } return sn, err } @@ -121,37 +127,23 @@ func QueryIssueScore(cveId int64) (Score, error) { err := o.Raw("select *"+ " from cve_score where cve_id = ?", cveId).QueryRow(&sc) if err == nil { - logs.Info("cve_score 查询结果：", sc) + logs.Info("QueryIssueScore, cve_score, search result: ", sc) } else { - logs.Info("查询 cve_score err, cveId: ", cveId, "err: ", err) + logs.Info("QueryIssueScore, cve_score, cveId: ", cveId, ", err: ", err) } return sc, err } -func QueryCveBrands(gitId int64) ([]GitOpenEulerTableRelate, error) { - o := orm.NewOrm() - var gt []GitOpenEulerTableRelate - var num int64 - num, err := o.Raw("select *"+ - " from cve_git_open_euler_table_relate where git_id = ?", gitId).QueryRows(>) - if err == nil && num > 0 { - logs.Info("cve_git_open_euler_table_relate 查询结果：", gt) - return gt, nil - } else { - logs.Info("查询 cve_git_open_euler_table_relate err, gitId: ", gitId, "err: ", err) - } - return gt, err -} - func QueryIssueScoreRecord(cveId int64, status int8) (ScoreRecord, error) { o := orm.NewOrm() var sr ScoreRecord err := o.Raw("select id, cve_id, nvd_score, n_vector_value"+ - " from cve_score_record where cve_id = ? and status = ? order by id desc limit 1", cveId, status).QueryRow(&sr) + " from cve_score_record where cve_id = ? and status = ? order by id desc limit 1", + cveId, status).QueryRow(&sr) if err == nil { - logs.Info("cve_score_record 查询结果：", sr) + logs.Info("QueryIssueScoreRecord, cve_score_record, search result: ", sr) } else { - logs.Info("查询 cve_score_record err, cveId: ", cveId, "err: ", err) + logs.Info("QueryIssueScoreRecord, cve_score_record, cveId: ", cveId, ", err: ", err) } return sr, err } @@ -216,7 +208,6 @@ func UpdatePackageByCveId(pkgStr string, cveId int64) error { } func ReplacePackageByCveId(pkgList []string, cveId int64) error { - //===== 先删除 再修改 ===== sec := struct { SecId int64 }{} @@ -229,7 +220,7 @@ func ReplacePackageByCveId(pkgList []string, cveId int64) error { delPkgSql := `DELETE FROM cve_package WHERE sec_id = ?` _, err = o.Raw(delPkgSql, sec.SecId).Exec() if err != nil { - logs.Error("delete cve_package error:", err) + logs.Error("ReplacePackageByCveId, delete cve_package error:", err) } pkgData := make([]Package, 0) for _, v := range pkgList { @@ -261,9 +252,11 @@ func QueryPackageByCveId(cveId int64) ([]Package, error) { func InsertIssueTemplate(it *IssueTemplate) (issTempId int64, err error) { o := orm.NewOrm() if issTempId, err = o.Insert(it); err == nil && issTempId > 0 { - logs.Info("insert cve_issue_template success, issTempId: ", issTempId, "cveNum: ", it.CveNum) + logs.Info("InsertIssueTemplate, insert cve_issue_template success, issTempId: ", + issTempId, "cveNum: ", it.CveNum) } else { - logs.Error("insert cve_issue_template failed, cveNum:", it.CveNum, "err: ", err) + logs.Error("InsertIssueTemplate, insert cve_issue_template failed, cveNum:", + it.CveNum, ", err: ", err) return 0, err } return issTempId, nil @@ -272,9 +265,10 @@ func InsertIssueTemplate(it *IssueTemplate) (issTempId int64, err error) { func UpdateIssueTemplateAll(it *IssueTemplate) (issTempId int64, err error) { o := orm.NewOrm() if num, err := o.Update(it); err == nil { - logs.Info("update cve_issue_template success, num: ", num, "cveNum: ", it.CveNum) + logs.Info("UpdateIssueTemplateAll, update cve_issue_template success, num: ", num, "cveNum: ", it.CveNum) } else { - logs.Error("update cve_issue_template failed, cveNum:", it.CveNum, "err: ", err) + logs.Error("UpdateIssueTemplateAll, update cve_issue_template failed, cveNum:", + it.CveNum, ", err: ", err) return 0, err } return it.TemplateId, nil @@ -285,9 +279,10 @@ func DeleteIssueTemplate(issTempId int64) error { var it = IssueTemplate{TemplateId: issTempId} id, dErr := o.Delete(&it) if dErr == nil && id > 0 { - logs.Info("delete cve_issue_template success, issTempId: ", issTempId) + logs.Info("DeleteIssueTemplate, delete cve_issue_template success, issTempId: ", issTempId) } else { - logs.Error("delete cve_issue_template failed, issTempId: ", issTempId) + logs.Error("DeleteIssueTemplate, delete cve_issue_template failed, issTempId: ", + issTempId, ", err: ", dErr) } return dErr } @@ -297,17 +292,21 @@ func CreateIssueTemplate(it *IssueTemplate) (issTempId int64, err error) { if it.TemplateId == 0 { var issTempId int64 if issTempId, err = o.Insert(it); err == nil { - logs.Info("insert cve_issue_template success, issTempId: ", issTempId, "cveNum: ", it.CveNum) + logs.Info("CreateIssueTemplate, insert cve_issue_template success, "+ + "issTempId: ", issTempId, ", cveNum: ", it.CveNum) } else { - logs.Error("insert cve_issue_template failed, cveNum:", it.CveNum, "err: ", err) + logs.Error("CreateIssueTemplate, insert cve_issue_template failed, cveNum:", + it.CveNum, ", err: ", err) return 0, err } return issTempId, nil } else { if num, err := o.Update(it); err == nil { - logs.Info("update cve_issue_template success, num: ", num, "cveNum: ", it.CveNum) + logs.Info("CreateIssueTemplate, update cve_issue_template success, "+ + "num: ", num, ", cveNum: ", it.CveNum) } else { - logs.Error("update cve_issue_template failed, cveNum:", it.CveNum, "err: ", err) + logs.Error("CreateIssueTemplate, update cve_issue_template failed, "+ + "cveNum:", it.CveNum, ", err: ", err) return 0, err } return it.TemplateId, nil @@ -319,11 +318,12 @@ func GetAllIssueHook(hookId int64, count, status int) (localh []IssueHooks, valu var localIh []IssueHooks var num int64 num, err := o.Raw("select *"+ - " from cve_issue_hooks where status = ? and id > ? order by id limit ?", status, hookId, count).QueryRows(&localIh) + " from cve_issue_hooks where status = ? and id > ? order by id limit ?", + status, hookId, count).QueryRows(&localIh) if err == nil && num > 0 { return localIh, true } else { - logs.Info("查询 cve_issue_hooks err, err: ", err) + logs.Info("GetAllIssueHook, cve_issue_hooks, err: ", err) return localIh, false } } @@ -333,12 +333,13 @@ func GetIssueHook(ih *IssueHooks) (localh []IssueHooks, value bool) { var localIh []IssueHooks var num int64 num, err := o.Raw("select *"+ - " from cve_issue_hooks where owner = ? and repo = ? and status = ?", ih.Owner, ih.Repo, ih.Status).QueryRows(&localIh) + " from cve_issue_hooks where owner = ? and repo = ? and status = ?", + ih.Owner, ih.Repo, ih.Status).QueryRows(&localIh) if err == nil && num > 0 { - logs.Info("cve_issue_hooks 查询结果：", localIh) return localIh, true } else { - logs.Info("查询 cve_issue_hooks err, cveId: ", ih.CveId, "err: ", err) + logs.Info("GetIssueHook, cve_issue_hooks, "+ + "cveId: ", ih.CveId, ", err: ", err) return localIh, false } } @@ -349,24 +350,27 @@ func CreateDepositHooks(ih *IssueHooks) (issHookId int64, err error) { localIh.CveId = ih.CveId localIh.IssueNum = ih.IssueNum errx := o.Raw("select *"+ - " from cve_issue_hooks where owner = ? and repo = ? and status = ?", ih.Owner, ih.Repo, ih.Status).QueryRow(&localIh) + " from cve_issue_hooks where owner = ? and repo = ? and status = ?", + ih.Owner, ih.Repo, ih.Status).QueryRow(&localIh) if errx == nil { - logs.Info("cve_issue_hooks 查询结果：", localIh) ih.Id = localIh.Id if num, err := o.Update(ih); err == nil { - logs.Info("update cve_issue_hook success, issHookId: ", num, "IssueNum: ", ih.IssueNum) + logs.Info("CreateDepositHooks, update cve_issue_hook success, "+ + "issHookId: ", num, "IssueNum: ", ih.IssueNum) } else { - logs.Error("update cve_issue_hook failed, IssueNum:", ih.IssueNum, "err: ", err) + logs.Error("CreateDepositHooks, update cve_issue_hook failed, "+ + "IssueNum:", ih.IssueNum, ", err: ", err) return 0, err } return ih.Id, nil } else { - logs.Info("查询 cve_issue_hooks err, cveId: ", ih.CveId, "err: ", err) var issHookId int64 if issHookId, err = o.Insert(ih); err == nil { - logs.Info("insert cve_issue_hook success, issHookId: ", issHookId, "IssueNum: ", ih.IssueNum) + logs.Info("CreateDepositHooks, insert cve_issue_hook success, "+ + "issHookId: ", issHookId, ", IssueNum: ", ih.IssueNum) } else { - logs.Error("insert cve_issue_hook failed, IssueNum:", ih.IssueNum, "err: ", err) + logs.Error("CreateDepositHooks, insert cve_issue_hook failed, "+ + "IssueNum:", ih.IssueNum, ", err: ", err) return 0, err } return issHookId, nil @@ -379,9 +383,9 @@ func UpdateSecNotice(sec *SecurityNotice) (secId int64, err error) { localSec.CveId = sec.CveId localSec.CveNum = sec.CveNum errx := o.Raw("select *"+ - " from cve_security_notice where cve_id = ? and cve_num = ?", sec.CveId, sec.CveNum).QueryRow(&localSec) + " from cve_security_notice where cve_id = ? and cve_num = ?", + sec.CveId, sec.CveNum).QueryRow(&localSec) if errx == nil { - logs.Info("cve_security_notice 查询结果：", localSec) sec.SecId = localSec.SecId sec.OpenId = localSec.OpenId sec.InfluenceComponent = localSec.InfluenceComponent @@ -391,19 +395,22 @@ func UpdateSecNotice(sec *SecurityNotice) (secId int64, err error) { sec.Status = localSec.Status sec.ReferenceLink = localSec.ReferenceLink if num, err := o.Update(sec); err == nil { - logs.Info("update cve_security_notice success, SecID: ", num, "CveNum: ", sec.CveNum) + logs.Info("UpdateSecNotice, update cve_security_notice success, "+ + "SecID: ", num, ",CveNum: ", sec.CveNum) } else { - logs.Error("update cve_security_notice failed, SecID:", sec.SecId, "err: ", err) + logs.Error("UpdateSecNotice, update cve_security_notice failed, "+ + "SecID:", sec.SecId, ", err: ", err) return 0, err } return sec.SecId, nil } else { - logs.Info("查询 cve_security_notic err, cveId: ", sec.CveId, "err: ", err) var SecId int64 if SecId, err = o.Insert(sec); err == nil { - logs.Info("insert cve_security_notice success, SecID: ", SecId, "CveNum: ", sec.CveNum) + logs.Info("UpdateSecNotice, insert cve_security_notice success, "+ + "SecID: ", SecId, ", CveNum: ", sec.CveNum) } else { - logs.Error("insert cve_security_notice failed, CveNum:", sec.CveNum, "err: ", err) + logs.Error("UpdateSecNotice, insert cve_security_notice failed, "+ + "CveNum:", sec.CveNum, ", err: ", err) return 0, err } return SecId, nil @@ -412,7 +419,8 @@ func UpdateSecNotice(sec *SecurityNotice) (secId int64, err error) { func UpdateIssueStatus(iss VulnCenter, status int8) { o := orm.NewOrm() - _ = o.Raw("UPDATE cve_vuln_center SET cve_status = ? WHERE cve_id = ? and cve_num = ?", status, iss.CveId, iss.CveNum).QueryRow() + _ = o.Raw("UPDATE cve_vuln_center SET cve_status = ? WHERE cve_id = ? and cve_num = ?", + status, iss.CveId, iss.CveNum).QueryRow() return } @@ -430,17 +438,20 @@ func GetOrgCveDesc(ord *OriginUpstreamDesc, colName ...string) error { func LockUpdateIssueStatus(cveId int64, cveNum string, status int8) (bool) { o := orm.NewOrm() - res, err := o.Raw("UPDATE cve_vuln_center SET cve_status = ? WHERE cve_id = ? and cve_num = ? and cve_status in (0,1)", + res, err := o.Raw("UPDATE cve_vuln_center SET cve_status = ? "+ + "WHERE cve_id = ? and cve_num = ? and cve_status in (0,1)", status, cveId, cveNum).Exec() if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("update cve_vuln_center row affected nums: ", num, ",cveId: ", cveId) + logs.Info("LockUpdateIssueStatus, update cve_vuln_center row affected "+ + "nums: ", num, ",cveId: ", cveId) return true } return false } else { - logs.Error("update failed, cve_vuln_center, ", ",cveId: ", cveId, ", err: ", err) + logs.Error("LockUpdateIssueStatus, update cve_vuln_center failed, "+ + "cveId: ", cveId, ", err: ", err) return false } } @@ -457,26 +468,29 @@ func UnLockUpdateIssueStatus(beforeStatus, afterStatus int8, updateTime string) } return false } else { - logs.Error("UnLockUpdateIssueStatus, update failed, cve_vuln_center, err: ", err) + logs.Error("UnLockUpdateIssueStatus, update cve_vuln_center failed, cve_vuln_center, err: ", err) return false } } func UpdateIssueScore(iss VulnCenter, status int8) (id int64) { o := orm.NewOrm() - _ = o.Raw("UPDATE cve_score SET n_score_status = ? WHERE cve_id = ? and cve_num = ?", status, iss.CveId, iss.CveNum).QueryRow() + _ = o.Raw("UPDATE cve_score SET n_score_status = ? WHERE cve_id = ? and cve_num = ?", + status, iss.CveId, iss.CveNum).QueryRow() return } func UpdateIssueScoreRe(iss VulnCenter, status int8) (id int64) { o := orm.NewOrm() - _ = o.Raw("UPDATE cve_score_record SET status = ? WHERE cve_id = ? and status = ?", status, iss.CveId, 0).QueryRow() + _ = o.Raw("UPDATE cve_score_record SET status = ? WHERE cve_id = ? and status = ?", + status, iss.CveId, 0).QueryRow() return } func UpdateIssueCommentId(issueNum, cveNum string, commentId int64) (id int64) { o := orm.NewOrm() - _ = o.Raw("UPDATE cve_issue_template SET comment_id = ? WHERE issue_num = ? and cve_num = ?", commentId, issueNum, cveNum).QueryRow() + _ = o.Raw("UPDATE cve_issue_template SET comment_id = ? WHERE issue_num = ? and cve_num = ?", + commentId, issueNum, cveNum).QueryRow() return } @@ -496,12 +510,6 @@ func GetIssueTplByCveNum(num string) (list []IssueTemplate, err error) { return } -func GetIssueTplGroupByRepo() (list []IssueTemplate, err error) { - o := orm.NewOrm() - _, err = o.QueryTable("cve_issue_template").GroupBy("repo").All(&list) - return -} - func CreateIssueRecord(icr *IssueCreateRecord) (issueRecordId int64, err error) { o := orm.NewOrm() var localIcr IssueCreateRecord @@ -511,18 +519,22 @@ func CreateIssueRecord(icr *IssueCreateRecord) (issueRecordId int64, err error) if errx != nil || localIcr.IssueRecordId == 0 { var issueRecordId int64 if issueRecordId, err = o.Insert(icr); err == nil { - logs.Info("insert cve_issue_create_record success, issueRecordId: ", issueRecordId, ", cveNum: ", icr.CveNum) + logs.Info("CreateIssueRecord, insert cve_issue_create_record success, "+ + "issueRecordId: ", issueRecordId, ", cveNum: ", icr.CveNum) } else { - logs.Error("insert cve_issue_create_record failed, cveData:", icr, ", err: ", err) + logs.Error("CreateIssueRecord, insert cve_issue_create_record failed, "+ + "cveData:", icr, ", err: ", err) return 0, err } return issueRecordId, nil } else { icr.IssueRecordId = localIcr.IssueRecordId if num, err := o.Update(icr); err == nil { - logs.Info("update cve_issue_create_record success, num: ", num, ", cveNum: ", icr.CveNum) + logs.Info("CreateIssueRecord, update cve_issue_create_record success,"+ + " num: ", num, ", cveNum: ", icr.CveNum) } else { - logs.Error("update cve_issue_create_record failed, cveData:", icr, ", err: ", err) + logs.Error("CreateIssueRecord, update cve_issue_create_record failed,"+ + " cveData:", icr, ", err: ", err) return 0, err } return icr.IssueRecordId, nil @@ -530,7 +542,8 @@ func CreateIssueRecord(icr *IssueCreateRecord) (issueRecordId int64, err error) } //QueryIssue query center -func QueryIssueTemplateByTime(beforeTime string, prcnum int, templateId int64, status int8) ([]IssueTemplate, error) { +func QueryIssueTemplateByTime(beforeTime string, prcnum int, + templateId int64, status int8) ([]IssueTemplate, error) { o := orm.NewOrm() var it []IssueTemplate num, err := o.Raw("select *"+ @@ -550,19 +563,21 @@ func QueryIssueStatisticEmail() ([]IssueStatisticsMailList, error) { return ism, err } -func QueryLowCredibilityCve(days string, prcnum, credibilityLevel int, cveId int64) ([]OriginUpstream, int64, error) { +func QueryLowCredibilityCve(days string, prcnum, + credibilityLevel int, cveId int64) ([]OriginUpstream, int64, error) { o := orm.NewOrm() var gs []OriginUpstream num, err := o.Raw("select cve_id,cve_un_ids,cve_num, update_type,cve_packname,"+ - "git_packname,cve_title,affect_porduct,cnnvd_id,cnvd_id,published_date," + + "git_packname,cve_title,affect_porduct,cnnvd_id,cnvd_id,published_date,"+ "vul_status,cve_status,version,credibility_level"+ - " from cve_origin_upstream where update_time >= ? and cve_status in (?, ?) " + + " from cve_origin_upstream where update_time >= ? and cve_status in (?, ?) "+ " and credibility_level > ? and cve_id > ? "+ "order by cve_id asc limit ?", days, 0, 1, credibilityLevel, cveId, prcnum).QueryRows(&gs) if err == nil && num > 0 { - logs.Info("cve_origin_upstream 查询结果： ", num) + logs.Info("QueryLowCredibilityCve, cve_origin_upstream, serach result: ", num) } else { - logs.Info("当前无新增或者更新的cve, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryLowCredibilityCve, There is currently no new or updated cve, cur_time:", + common.GetCurTime(), "err: ", err) } return gs, num, err -} \ No newline at end of file +} diff --git a/models/login.go b/models/login.go index b179c674fe6648c163ff5170416e07057b9bc47d..62dcd79360008093912dba596c0bf9372527a85d 100644 --- a/models/login.go +++ b/models/login.go @@ -8,7 +8,8 @@ import ( func GetCveUserByUser(username, pwd string) (maps []orm.Params, err error) { o := orm.NewOrm() var num int64 - num, err = o.Raw("select user_id FROM cve_other_user WHERE user_name=? and pass_word=?", username, pwd).Values(&maps) + num, err = o.Raw("select user_id FROM cve_other_user WHERE user_name=? and pass_word=?", + username, pwd).Values(&maps) if err == nil && num > 0 { return maps, nil } @@ -17,7 +18,8 @@ func GetCveUserByUser(username, pwd string) (maps []orm.Params, err error) { func UpdateToken(Userid interface{}, token string, newTime time.Time) bool { o := orm.NewOrm() - _ = o.Raw("update cve_other_user set aes_key=?,expiration_time=? where user_id=?", token, newTime, Userid).QueryRow() + _ = o.Raw("update cve_other_user set aes_key=?,expiration_time=? where user_id=?", + token, newTime, Userid).QueryRow() return true } diff --git a/models/oricvecheck.go b/models/oricvecheck.go index a23594d21139e23c40cb5a06aadba2ec22091dfa..24eb4c63c61dd4149caf033fbf0c740c040989ce 100644 --- a/models/oricvecheck.go +++ b/models/oricvecheck.go @@ -15,9 +15,10 @@ func QueryOriginCveE(prcnum int) ([]OriginUpstream, int64, error) { " from cve_origin_upstream where cve_status in (?, ?) and is_exit = ? "+ "order by cve_id asc limit ?", 0, 1, 2, prcnum).QueryRows(&os) if err == nil && num > 0 { - logs.Info("cve_origin_upstream 查询结果： ", num) + logs.Info("cve_origin_upstream, Number of items found: ", num) } else { - logs.Info("当前无新增或者更新的cve, cur_time:", common.GetCurTime(), "err: ", err) + logs.Info("QueryOriginCveE, There is currently no new or updated cve, cur_time:", + common.GetCurTime(), ", err: ", err) } return os, num, err } @@ -25,16 +26,19 @@ func QueryOriginCveE(prcnum int) ([]OriginUpstream, int64, error) { func UpdateOriginExist(updatetime, pakName, version string, cveId int64, isExit int) (bool) { o := orm.NewOrm() res, err := o.Raw("UPDATE cve_origin_upstream SET "+ - "is_exit = ?, update_time = ? where cve_id = ? and git_packname = ? and version = ?", isExit, updatetime, cveId, pakName, version).Exec() + "is_exit = ?, update_time = ? where cve_id = ? and git_packname = ? and version = ?", + isExit, updatetime, cveId, pakName, version).Exec() if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("cve_origin_upstream row affected nums: ", num, ",cveId: ", cveId, ",", updatetime, pakName, version) + logs.Info("cve_origin_upstream row affected nums: ", num, + ",cveId: ", cveId, ",", updatetime, pakName, version) return true } return false } else { - logs.Error("更新失败, cve_origin_upstream, ", ",cveId: ", cveId, ",", updatetime, pakName, version, ", err: ", err) + logs.Error("UpdateOriginExist, Status update failed, cveId: ", + cveId, ",", updatetime, pakName, version, ", err: ", err) return false } } @@ -46,12 +50,12 @@ func UpdateOriginExistTemp() (bool) { if err == nil { num, _ := res.RowsAffected() if num > 0 { - logs.Info("cve_origin_upstream row affected nums: ", num, ", 数据被更新") + logs.Info("cve_origin_upstream row affected nums: ", num) return true } return false } else { - logs.Error("更新失败, cve_origin_upstream, err: ", err) + logs.Error("UpdateOriginExistTemp, Update failed, err: ", err) return false } } diff --git a/models/packages.go b/models/packages.go index 5b1a95e21aabed22021c6cb412932132ad2aa5f1..3251b05c938f39195df442c38f85ef5942c5b3cb 100644 --- a/models/packages.go +++ b/models/packages.go @@ -9,24 +9,25 @@ func GetIpWhite(ip string, iw *IpWhite) (err error) { o := orm.NewOrm() err = o.Raw("select * FROM cve_ip_white WHERE machine_ip=?", ip).QueryRow(iw) if err == nil { - logs.Info("ip:", ip, " 在白名单中") - return nil + logs.Info("GetIpWhite, ip:", ip, " ,In the whitelist") } else { - //logs.Error("ip:", ip, " 访问受限") - // 不处理黑名单 - return nil + // Do not process blacklist + //logs.Error("ip:", ip, " Restricted access") } - //return err + return nil } func GetPackageInfo(packageName string, gi *GitPackageInfo) (err error) { o := orm.NewOrm() - err = o.Raw("select * FROM cve_git_package_info WHERE package_name=?", packageName).QueryRow(gi) + err = o.Raw("select * FROM cve_git_package_info WHERE package_name=?", + packageName).QueryRow(gi) if err == nil { - logs.Info("packageName: ", packageName, " 查询成功") + logs.Info("GetPackageInfo, cve_git_package_info, "+ + "packageName: ", packageName, ", search successful") return nil } else { - logs.Error("packageName: ", packageName, " 不存在") + logs.Error("GetPackageInfo, cve_git_package_info, "+ + "packageName: ", packageName, ", Data does not exist, err: ", err) } return err } @@ -34,12 +35,16 @@ func GetPackageInfo(packageName string, gi *GitPackageInfo) (err error) { func GetSubPackage(packageInfoId int64) (gg []GitSubPack, num int64, err error) { o := orm.NewOrm() var gs []GitSubPack - num, err = o.Raw("select sub_id,ids,sub_pack_name FROM cve_git_sub_pack WHERE detail_id=?", packageInfoId).QueryRows(&gs) + num, err = o.Raw("select sub_id,ids,sub_pack_name "+ + "FROM cve_git_sub_pack WHERE detail_id=?", + packageInfoId).QueryRows(&gs) if num > 0 && err == nil { - logs.Info("cve_git_sub_pack packageInfoId: ", packageInfoId, " 查询成功") + logs.Info("GetSubPackage, cve_git_sub_pack, "+ + "packageInfoId: ", packageInfoId, " , search successful") return gs, num, nil } else { - logs.Error("cve_git_sub_pack packageInfoId: ", packageInfoId, " 不存在") + logs.Error("GetSubPackage, cve_git_sub_pack, "+ + "packageInfoId: ", packageInfoId, " , Data does not exist, err: ", err) } return gs, 0, err } @@ -47,12 +52,16 @@ func GetSubPackage(packageInfoId int64) (gg []GitSubPack, num int64, err error) func GetSubPackProvide(subId int64) (gg []GitSubPackProvides, num int64, err error) { o := orm.NewOrm() var gs []GitSubPackProvides - num, err = o.Raw("select provide_id,ids,provide_name, requiredb FROM cve_git_sub_pack_provides WHERE sub_id=?", subId).QueryRows(&gs) + num, err = o.Raw("select provide_id,ids,provide_name, requiredb "+ + "FROM cve_git_sub_pack_provides WHERE sub_id=?", + subId).QueryRows(&gs) if num > 0 && err == nil { - logs.Info("cve_git_sub_pack_provides subId: ", subId, " 查询成功") + logs.Info("GetSubPackProvide, cve_git_sub_pack_provides, "+ + "subId: ", subId, " , search successful") return gs, num, nil } else { - logs.Error("cve_git_sub_pack_provides subId: ", subId, " 不存在") + logs.Error("GetSubPackProvide, cve_git_sub_pack_provides, "+ + "subId: ", subId, " , Data does not exist, err: ", err) } return gs, 0, err } @@ -60,12 +69,15 @@ func GetSubPackProvide(subId int64) (gg []GitSubPackProvides, num int64, err err func GetSubPackrequiredby(provideId int64) (gg []GitSubPackRequiredby, num int64, err error) { o := orm.NewOrm() var gs []GitSubPackRequiredby - num, err = o.Raw("select id,requiredb FROM cve_git_sub_pack_requiredby WHERE provide_id=?", provideId).QueryRows(&gs) + num, err = o.Raw("select id,requiredb FROM cve_git_sub_pack_requiredby WHERE provide_id=?", + provideId).QueryRows(&gs) if num > 0 && err == nil { - logs.Info("cve_git_sub_pack_requiredby provideId: ", provideId, " 查询成功") + logs.Info("GetSubPackrequiredby, cve_git_sub_pack_requiredby, "+ + "provideId: ", provideId, " , search successful") return gs, num, nil } else { - logs.Error("cve_git_sub_pack_requiredby provideId: ", provideId, " 不存在") + logs.Error("GetSubPackrequiredby, cve_git_sub_pack_requiredby, "+ + "provideId: ", provideId, " , Data does not exist, err: ", err) } return gs, 0, err } @@ -73,12 +85,16 @@ func GetSubPackrequiredby(provideId int64) (gg []GitSubPackRequiredby, num int64 func GetSubPackRequire(subId int64) (gg []GitSubPackRequire, num int64, err error) { o := orm.NewOrm() var gs []GitSubPackRequire - num, err = o.Raw("select require_id,ids,require_name, providedb FROM cve_git_sub_pack_require WHERE sub_id=?", subId).QueryRows(&gs) + num, err = o.Raw("select require_id,ids,require_name, providedb "+ + "FROM cve_git_sub_pack_require WHERE sub_id=?", + subId).QueryRows(&gs) if num > 0 && err == nil { - logs.Info("cve_git_sub_pack_require subId: ", subId, " 查询成功") + logs.Info("GetSubPackRequire, cve_git_sub_pack_require, "+ + "subId: ", subId, " , search successful") return gs, num, nil } else { - logs.Error("cve_git_sub_pack_require subId: ", subId, " 不存在") + logs.Error("GetSubPackRequire, cve_git_sub_pack_require, "+ + "subId: ", subId, " , Data does not exist, err: ", err) } return gs, 0, err } @@ -90,17 +106,21 @@ func GetPackageList(pagesize int64, pagenum int64, QueryPkgName string) (ge []Gi if QueryPkgName != "" { cnt, err := qs.Filter("package_name__icontains", QueryPkgName).Limit(pagesize, (pagenum-1)*pagesize).All(&us) if err == nil { - logs.Info("cve_git_open_euler, count: ", cnt, "pagesize ", pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) + logs.Info("GetPackageList, cve_git_open_euler, count: ", cnt, ",pagesize ", + pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) } else { - logs.Error("cve_git_open_euler, err: ", err, "pagesize ", pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) + logs.Error("GetPackageList, cve_git_open_euler, err: ", err, ",pagesize ", + pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) } return us, cnt, err } else { cnt, err := qs.Limit(pagesize, (pagenum-1)*pagesize).All(&us) if err == nil { - logs.Info("cve_git_open_euler, count: ", cnt, "pagesize ", pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) + logs.Info("GetPackageList, cve_git_open_euler, count: ", cnt, ",pagesize ", + pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) } else { - logs.Error("cve_git_open_euler, err: ", err, "pagesize ", pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) + logs.Error("GetPackageList, cve_git_open_euler, err: ", err, ",pagesize ", + pagesize, ",pagenum ", pagenum, ", QueryPkgName ", QueryPkgName) } return us, cnt, err } @@ -125,5 +145,4 @@ func GetPackageNum(QueryPkgName string) int64 { return 0 } } - } diff --git a/models/uploadcve.go b/models/uploadcve.go index 8e40e63bef5114770abdc5633793cd5004a318a3..801e41e90a5b52dcfe2134df25da17a1062dddbd 100644 --- a/models/uploadcve.go +++ b/models/uploadcve.go @@ -13,12 +13,15 @@ type OpenSaId struct { func QueryYamlData(pkgName string, version string) (GitOpenEuler, bool) { o := orm.NewOrm() var goe GitOpenEuler - err := o.Raw("select * from cve_git_open_euler where package_name = ? and version = ?", pkgName, version).QueryRow(&goe) + err := o.Raw("select * from cve_git_open_euler where package_name = ? and version = ?", + pkgName, version).QueryRow(&goe) if err != nil { - logs.Info("pkgName", pkgName, "version", version, ", cve_git_open_euler 无对应数据") + logs.Info("QueryYamlData, cve_git_open_euler, "+ + "pkgName: ", pkgName, ", version: ", version, ", No corresponding data") return goe, false } else { - logs.Info("pkgName", pkgName, "version", version, ", cve_git_open_euler 查询成功") + logs.Info("QueryYamlData, cve_git_open_euler, "+ + "pkgName", pkgName, ", version: ", version, ", search successful") return goe, true } } @@ -28,15 +31,19 @@ func QueryOriginRepo(pkgName string) (GiteRepo, bool) { var gr GiteRepo repoOrg, errx := common.GetRepoOrg() if errx != nil { - logs.Error("pkgName: ", pkgName, ",无法 获取组织, err: ", errx) + logs.Error("QueryOriginRepo, GetRepoOrg, pkgName: ", pkgName, + ",Unable to get the organization corresponding to the repo, err: ", errx) return gr, false } - err := o.Raw("select * from cve_gite_repo where path = ? and org_path = ? and status = ?", pkgName, repoOrg, 0).QueryRow(&gr) + err := o.Raw("select * from cve_gite_repo where path = ? and org_path = ? and status = ?", + pkgName, repoOrg, 0).QueryRow(&gr) if err != nil { - logs.Info("pkgName", pkgName, "repoOrg", repoOrg, ", cve_gite_repo 无对应数据") + logs.Info("QueryOriginRepo, cve_gite_repo, "+ + "pkgName:", pkgName, ", repoOrg: ", repoOrg, ", No corresponding data") return gr, false } else { - logs.Info("pkgName", pkgName, "repoOrg", repoOrg, ", cve_gite_repo 查询成功") + logs.Info("QueryOriginRepo, cve_gite_repo, "+ + "pkgName: ", pkgName, ", repoOrg: ", repoOrg, ", search successful") return gr, true } } @@ -44,32 +51,25 @@ func QueryOriginRepo(pkgName string) (GiteRepo, bool) { func QueryRepoMember(groupId int64, memberType string) ([]GiteRepoMember, bool) { o := orm.NewOrm() var grm []GiteRepoMember - num, err := o.Raw("select * from cve_gite_repo_member where group_id = ?", groupId).QueryRows(&grm) + num, err := o.Raw("select * from cve_gite_repo_member where group_id = ?", + groupId).QueryRows(&grm) if err != nil || num == 0 { - logs.Info("groupId", groupId, ",memberType", memberType, ", cve_gite_repo_member 无对应数据") + logs.Info("QueryRepoMember, cve_gite_repo_member, "+ + "groupId: ", groupId, ",memberType: ", memberType, ", No corresponding data") return grm, false } else { - logs.Info("groupId", groupId, ",memberType", memberType, ", cve_gite_repo_member 查询成功") + logs.Info("QueryRepoMember, cve_gite_repo_member, "+ + "groupId: ", groupId, ",memberType: ", memberType, ", search successful") return grm, true } } -func QueryAssignee() ([]IssueAssignee, bool) { - o := orm.NewOrm() - var iae []IssueAssignee - num, err := o.Raw("select * from cve_issue_assignee").QueryRows(&iae) - if err != nil || num == 0 { - return iae, false - } else { - return iae, true - } -} - func QueryRepoAllMaintainer(pkgName string) ([]GiteRepoMember, bool) { sia := SpecIssueAssigness{PackageName: pkgName, Status: 1} gr, okrg := QueryOriginRepo(pkgName) if !okrg || gr.RepoId == 0 { - logs.Error("maintainer query failed, pkgName: ", pkgName, ",okrg: ", okrg) + logs.Error("QueryRepoAllMaintainer, maintainer query failed, "+ + "pkgName: ", pkgName, ",okrg: ", okrg) specError := GetSpecIssueAssignee(&sia, "package_name", "status") if specError == nil && sia.Id > 0 { var grm []GiteRepoMember @@ -82,7 +82,8 @@ func QueryRepoAllMaintainer(pkgName string) ([]GiteRepoMember, bool) { } grm, okgrm := QueryRepoMember(gr.GroupId, "Maintainer") if !okgrm { - logs.Error("maintainer query failed, pkgName: ", pkgName, ",gr.GroupId: ", gr.GroupId, ",okgrm: ", okgrm) + logs.Error("QueryRepoMember, maintainer query failed, "+ + "pkgName: ", pkgName, ",gr.GroupId: ", gr.GroupId, ",okgrm: ", okgrm) specError := GetSpecIssueAssignee(&sia, "package_name", "status") if specError == nil && sia.Id > 0 { var grmr GiteRepoMember @@ -113,12 +114,12 @@ func QueryRepoAllMaintainer(pkgName string) ([]GiteRepoMember, bool) { func QueryRepoMaintainer(pkgName string) (string, bool) { gr, okrg := QueryOriginRepo(pkgName) if !okrg || gr.RepoId == 0 { - logs.Error("repo does not exist, err: ", okrg) + logs.Error("QueryRepoMaintainer, repo does not exist, err: ", okrg) return "", okrg } grm, okgrm := QueryRepoMember(gr.GroupId, "Maintainer") if !okgrm { - logs.Error("Maintainer does not exist, err: ", okrg) + logs.Error("QueryRepoMember, Maintainer does not exist, err: ", okrg) return "", okgrm } for _, g := range grm { @@ -132,7 +133,7 @@ func QueryRepoMaintainer(pkgName string) (string, bool) { func QueryCveOpeneulerdata(pkgName string, version string) (GitOpenEuler, bool) { goe, ok := QueryYamlData(pkgName, version) if !ok || goe.GitId == 0 { - logs.Error("查询版本信息失败, ", pkgName, version) + logs.Error("QueryCveOpeneulerdata, There is no corresponding repo or version, ", pkgName, version) return goe, false } return goe, true @@ -141,13 +142,15 @@ func QueryCveOpeneulerdata(pkgName string, version string) (GitOpenEuler, bool) func QueryCveOpeneulerDetaildataByName(pkgName, versions string) (GitPackageInfo, bool) { o := orm.NewOrm() var goe GitPackageInfo - err := o.Raw("select * from cve_git_package_info where package_name = ? and version = ? " + + err := o.Raw("select * from cve_git_package_info where package_name = ? and version = ? "+ "order by detail_id limit 1", pkgName, versions).QueryRow(&goe) if err != nil { - logs.Info("pkgName: ", pkgName, ", cve_git_package_info 无对应数据") + logs.Info("QueryCveOpeneulerDetaildataByName, cve_git_package_info, pkgName: ", pkgName, ", versions: ", versions, + ", No corresponding data") return goe, false } else { - logs.Info("pkgName: ", pkgName, ", cve_git_package_info 查询成功") + logs.Info("QueryCveOpeneulerDetaildataByName, cve_git_package_info, pkgName: ", pkgName, ", versions: ", versions, + ", search successful") return goe, true } } @@ -157,7 +160,6 @@ func QueryCveOriginByIds(ids string) (OriginUpstream, bool) { var orcve OriginUpstream err := o.Raw("select * from cve_origin_upstream where cve_un_ids = ?", ids).QueryRow(&orcve) if err != nil { - logs.Info("ids", ids, ", cve_origin_upstream 新增数据") return orcve, false } else { return orcve, true @@ -173,12 +175,12 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi ouse := OriginUpstream{Ids: ou.Ids} err := o.Read(&ouse, "Ids") if err == orm.ErrNoRows || err == orm.ErrMissPK { - logs.Info("新增数据： ", ou) + logs.Info("CreateOriginCve, Add data: ", ou) var num int64 if num, err = o.Insert(ou); err == nil { - logs.Info("insert cve_origin_upstream success, num:, cveNum", num, ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream success, num:, cveNum", num, ou.Ids) } else { - logs.Error("insert cve_origin_upstream failed, ou:", ou, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream failed, ou:", ou, ", err: ", err) o.Rollback() return 0, err } @@ -186,9 +188,9 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lod := OriginUpstreamDesc{CveId: num} o.Delete(&lod, "CveId") if odnum, err := o.Insert(od); err == nil { - logs.Info("insert cve_origin_upstream_desc success, num:", odnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_desc success, num:", odnum, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_desc failed, ou:", ou, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_desc failed, ou:", ou, ", err: ", err) o.Rollback() return 0, err } @@ -196,12 +198,15 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lous := OriginUpstreamConfig{CveId: num} err := o.Read(&lous, "CveId") if err == orm.ErrNoRows || err == orm.ErrMissPK { - logs.Info("cve_origin_upstream_config 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_config, "+ + "Data does not exist, cveId: ", num) } else { var lousc []OriginUpstreamConfigNode - louscNum, err := o.Raw("select * from cve_origin_upstream_config_node where conf_id = ?", lous.ConfId).QueryRows(&lousc) + louscNum, err := o.Raw("select * from cve_origin_upstream_config_node where conf_id = ?", + lous.ConfId).QueryRows(&lousc) if err != nil { - logs.Info("cve_origin_upstream_config_node 不存在, louscNum: ", louscNum) + logs.Info("CreateOriginCve, cve_origin_upstream_config_node, "+ + "Data does not exist, louscNum: ", louscNum) } else { for _, lsc := range lousc { ousnc := OriginUpstreamConfigNodeCpe{NodeId: lsc.NodeId} @@ -214,9 +219,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi o.Delete(&lousn, "CveId") } if ousnum, err := o.Insert(ous); err == nil { - logs.Info("insert cve_origin_upstream_config success, ousnum:", ousnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_config success, "+ + "ousnum:", ousnum, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_config failed, ou:", ous, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_config failed,"+ + " ou:", ous, ", err: ", err) o.Rollback() return 0, err } @@ -226,9 +233,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi Lnode.Operator = nodes.Operator Lnode.ConfId = ous.ConfId if lousnum, err := o.Insert(&Lnode); err == nil { - logs.Info("insert cve_origin_upstream_config_node success, lousnum:", lousnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_config_node success, "+ + "lousnum:", lousnum, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_config_node failed, Lnode:", Lnode, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_config_node failed, "+ + "Lnode:", Lnode, ", err: ", err) o.Rollback() return 0, err } @@ -240,9 +249,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi ouscnc.CpeMatchString = nodCpe.CpeMatchString ouscnc.Vulnerable = nodCpe.Vulnerable if lousnumc, err := o.Insert(&ouscnc); err == nil { - logs.Info("insert cve_origin_upstream_config_node_cpe success, lousnumc:", lousnumc, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_config_node_cpe success, "+ + "lousnumc:", lousnumc, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_config_node_cpe failed, ouscnc:", ouscnc, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_config_node_cpe failed, "+ + "ouscnc:", ouscnc, ", err: ", err) o.Rollback() return 0, err } @@ -254,12 +265,15 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi losi := OriginUpstreamImpact{CveId: num} errxx := o.Read(&losi, "CveId") if errxx == orm.ErrNoRows || errxx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_impact 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_impact, "+ + "Data does not exist, cveId: ", num) } else { var losis []OriginUpstreamImpactScore - losisNum, err := o.Raw("select * from cve_origin_upstream_impact_score where impact_id = ?", losi.ImpactId).QueryRows(&losis) + losisNum, err := o.Raw("select * from cve_origin_upstream_impact_score where impact_id = ?", + losi.ImpactId).QueryRows(&losis) if err != nil { - logs.Info("cve_origin_upstream_impact_score 不存在, losi.ImpactId: ", losi.ImpactId, "err: ", err, ",losisNum: ", losisNum) + logs.Info("CreateOriginCve, cve_origin_upstream_impact_score, Data does not exist,"+ + " losi.ImpactId: ", losi.ImpactId, ", err: ", err, ",losisNum: ", losisNum) } else { for _, sis := range losis { if sis.CvssV3 == 1 && sis.BaseMetricV3 == 1 { @@ -277,11 +291,12 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi losix := OriginUpstreamImpact{CveId: num} o.Delete(&losix, "CveId") } - if losinum, err := o.Insert(osi); err == nil { - logs.Info("insert cve_origin_upstream_impact success, lousnum:", losinum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact success, lousnum:", + losinum, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact failed, Lnode:", osi, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact failed,"+ + " Lnode:", osi, ", err: ", err) o.Rollback() return 0, err } @@ -293,9 +308,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousist.CvssV2 = 0 lousist.Status = 1 if lousistnum, err := o.Insert(&lousist); err == nil { - logs.Info("insert cve_origin_upstream_impact_score success, lousistnum:", lousistnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score success, "+ + "lousistnum:", lousistnum, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score failed, lousist:", lousist, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score failed, "+ + "lousist:", lousist, ", err: ", err) o.Rollback() return 0, err } @@ -317,9 +334,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousisv3.ExploitabilityScore = CveData.Impact.BaseMetricV3.ExploitabilityScore lousisv3.CveLevel = openEulerScoreProc(CveData.Impact.BaseMetricV3.CvssV3.BaseScore) if lousistnumv3, err := o.Insert(&lousisv3); err == nil { - logs.Info("insert cve_origin_upstream_impact_score_v3 success, lousistnumv3:", lousistnumv3, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score_v3 success, "+ + "lousistnumv3:", lousistnumv3, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score_v3 failed, lousisv3:", lousisv3, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score_v3 failed, "+ + "lousisv3:", lousisv3, ", err: ", err) o.Rollback() return 0, err } @@ -331,9 +350,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousistv2.CvssV2 = 1 lousistv2.Status = 1 if lousistnum, err := o.Insert(&lousistv2); err == nil { - logs.Info("insert cve_origin_upstream_impact_score success, lousistnum:", lousistnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score success, "+ + "lousistnum:", lousistnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score failed, lousistv2:", lousistv2, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score failed, "+ + "lousistv2:", lousistv2, ", err: ", err) o.Rollback() return 0, err } @@ -359,9 +380,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousisv2.ExploitabilityScore = CveData.Impact.BaseMetricV2.ExploitabilityScore lousisv2.CveLevel = openEulerScoreProc(CveData.Impact.BaseMetricV2.CvssV2.BaseScore) if lousistnumv2, err := o.Insert(&lousisv2); err == nil { - logs.Info("insert cve_origin_upstream_impact_score_v2 success, lousistnumv2:", lousistnumv2, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score_v2 success, "+ + "lousistnumv2:", lousistnumv2, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score_v2 failed, lousisv2:", lousisv2, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score_v2 failed,"+ + " lousisv2:", lousisv2, ", err: ", err) o.Rollback() return 0, err } @@ -370,15 +393,17 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi losp := OriginUpstreamPoc{CveId: num} errxxx := o.Read(&losp, "CveId") if errxxx == orm.ErrNoRows || errxxx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_impact 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_impact, Data does not exist, cveId: ", num) } else { lospd := OriginUpstreamPoc{CveId: num} o.Delete(&lospd, "CveId") } if ospnum, err := o.Insert(osp); err == nil { - logs.Info("insert Table: cve_origin_upstream_poc success, ospnum:", ospnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_poc success, "+ + "ospnum:", ospnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_poc failed, osp:", osp, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_poc failed, "+ + "osp:", osp, ", err: ", err) o.Rollback() return 0, err } @@ -387,15 +412,17 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lose := OriginUpstreamEvent{CveId: num} errx := o.Read(&lose, "CveId") if errx == orm.ErrNoRows || errx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_event 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_event, Data does not exist, cveId: ", num) } else { losed := OriginUpstreamEvent{CveId: num} o.Delete(&losed, "CveId") } if osenum, err := o.Insert(ose); err == nil { - logs.Info("insert Table: cve_origin_upstream_event success, osenum:", osenum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_event success, "+ + "osenum:", osenum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_event failed, ose:", ose, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_event failed, "+ + "ose:", ose, ", err: ", err) o.Rollback() return 0, err } @@ -418,9 +445,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi } lousrd.Tags = tags if lousrdnum, err := o.Insert(&lousrd); err == nil { - logs.Info("insert Table: cve_origin_upstream_reference success, lousrdnum:", lousrdnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_reference success, "+ + "lousrdnum:", lousrdnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_reference failed, lousrd:", lousrd, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_reference failed, "+ + "lousrd:", lousrd, ", err: ", err) o.Rollback() return 0, err } @@ -430,9 +459,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi o.Delete(&lousv, "CveId") osv.CveId = num if osvnum, err := o.Insert(osv); err == nil { - logs.Info("insert Table: cve_origin_upstream_vul_type success, osvnum:", osvnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_vul_type success,"+ + " osvnum:", osvnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_vul_type failed, osv:", osv, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_vul_type failed, "+ + "osv:", osv, ", err: ", err) o.Rollback() return 0, err } @@ -440,12 +471,14 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousfs := OriginUpstreamFixSuggest{CveId: num} errxxsx := o.Read(&lousfs, "CveId") if errxxsx == orm.ErrNoRows || errxxsx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_fix_suggest 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_fix_suggest, Data does not exist, cveId: ", num) } else { var lousfst []OriginUpstreamFixSuggestRef - louscNum, err := o.Raw("select * from cve_origin_upstream_fix_suggest_ref where fix_id = ?", lousfs.FixId).QueryRows(&lousfst) + louscNum, err := o.Raw("select * from cve_origin_upstream_fix_suggest_ref where fix_id = ?", + lousfs.FixId).QueryRows(&lousfst) if err != nil { - logs.Info("cve_origin_upstream_fix_suggest_ref 不存在, louscNum: ", louscNum, "err: ", err) + logs.Info("CreateOriginCve, cve_origin_upstream_fix_suggest_ref, Data does not exist, "+ + "louscNum: ", louscNum, "err: ", err) } else { for _, sc := range lousfst { lorfrt := OriginUpstreamFixSuggestRefTag{FixRefId: sc.FixRefId} @@ -459,9 +492,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi } osf.CveId = num if osfnum, err := o.Insert(osf); err == nil { - logs.Info("insert Table: cve_origin_upstream_fix_suggest success, osfnum:", osfnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_fix_suggest success, "+ + "osfnum:", osfnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_fix_suggest failed, osf:", osf, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_fix_suggest failed, "+ + "osf:", osf, ", err: ", err) o.Rollback() return 0, err } @@ -473,9 +508,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousfstr.Refsource = refer.Refsource lousfstr.Url = refer.Url if osfstrnum, err := o.Insert(&lousfstr); err == nil { - logs.Info("insert Table: cve_origin_upstream_fix_suggest_ref success, osfstrnum:", osfstrnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref success, "+ + "osfstrnum:", osfstrnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_fix_suggest_ref failed, lousfstr:", lousfstr, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref failed, "+ + "lousfstr:", lousfstr, ", err: ", err) o.Rollback() return 0, err } @@ -485,9 +522,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi loufsrtg.FixRefId = lousfstr.FixRefId loufsrtg.Name = refertag if osfstgrnum, err := o.Insert(&loufsrtg); err == nil { - logs.Info("insert Table: cve_origin_upstream_fix_suggest_ref_tag success, osfstgrnum:", osfstgrnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref_tag success, "+ + "osfstgrnum:", osfstgrnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_fix_suggest_ref_tag failed, loufsrtg:", loufsrtg, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref_tag failed, "+ + "loufsrtg:", loufsrtg, ", err: ", err) o.Rollback() return 0, err } @@ -497,13 +536,13 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi } o.Commit() } else { - logs.Info("更新数据： ", ou) + logs.Info("update datas: ", ou) ou.CveId = ouse.CveId ou.Ids = ouse.Ids if num, err := o.Update(ou); err == nil { - logs.Info("Update cve_origin_upstream success, num:, cveNum", num, ou.Ids) + logs.Info("CreateOriginCve, Update cve_origin_upstream success, num: ", num, ", cveNum: ", ou.Ids) } else { - logs.Error("Update cve_origin_upstream failed, ou:", ou, ", err: ", err) + logs.Error("CreateOriginCve, Update cve_origin_upstream failed, ou:", ou, ", err: ", err) o.Rollback() return 0, err } @@ -512,9 +551,9 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lod := OriginUpstreamDesc{CveId: num} o.Delete(&lod, "CveId") if odnum, err := o.Insert(od); err == nil { - logs.Info("insert cve_origin_upstream_desc success, num:", odnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_desc success, num:", odnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_desc failed, ou:", ou, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_desc failed, ou:", ou, ", err: ", err) o.Rollback() return 0, err } @@ -522,12 +561,14 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lous := OriginUpstreamConfig{CveId: num} err := o.Read(&lous, "CveId") if err == orm.ErrNoRows || err == orm.ErrMissPK { - logs.Info("cve_origin_upstream_config 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_config, Data does not exist, cveId: ", num) } else { var lousc []OriginUpstreamConfigNode - louscNum, err := o.Raw("select * from cve_origin_upstream_config_node where conf_id = ?", lous.ConfId).QueryRows(&lousc) + louscNum, err := o.Raw("select * from cve_origin_upstream_config_node where conf_id = ?", + lous.ConfId).QueryRows(&lousc) if err != nil { - logs.Info("cve_origin_upstream_config_node 不存在, louscNum: ", louscNum) + logs.Info("CreateOriginCve, cve_origin_upstream_config_node, Data does not exist,"+ + " louscNum: ", louscNum) } else { for _, lsc := range lousc { ousnc := OriginUpstreamConfigNodeCpe{NodeId: lsc.NodeId} @@ -540,9 +581,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi o.Delete(&lousn, "CveId") } if ousnum, err := o.Insert(ous); err == nil { - logs.Info("insert cve_origin_upstream_config success, ousnum:", ousnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_config success, "+ + "ousnum:", ousnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_config failed, ou:", ous, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_config failed, "+ + "ou:", ous, ", err: ", err) o.Rollback() return 0, err } @@ -552,9 +595,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi Lnode.Operator = nodes.Operator Lnode.ConfId = ous.ConfId if lousnum, err := o.Insert(&Lnode); err == nil { - logs.Info("insert cve_origin_upstream_config_node success, lousnum:", lousnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_config_node success, "+ + "lousnum:", lousnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_config_node failed, Lnode:", Lnode, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_config_node failed, "+ + "Lnode:", Lnode, ", err: ", err) o.Rollback() return 0, err } @@ -566,9 +611,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi ouscnc.CpeMatchString = nodCpe.CpeMatchString ouscnc.Vulnerable = nodCpe.Vulnerable if lousnumc, err := o.Insert(&ouscnc); err == nil { - logs.Info("insert cve_origin_upstream_config_node_cpe success, lousnumc:", lousnumc, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_config_node_cpe success, "+ + "lousnumc:", lousnumc, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_config_node_cpe failed, ouscnc:", ouscnc, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_config_node_cpe failed, "+ + "ouscnc:", ouscnc, ", err: ", err) o.Rollback() return 0, err } @@ -576,17 +623,18 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi } } } - osi.CveId = num losi := OriginUpstreamImpact{CveId: num} errxx := o.Read(&losi, "CveId") if errxx == orm.ErrNoRows || errxx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_impact 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_impact, Data does not exist, cveId: ", num) } else { var losis []OriginUpstreamImpactScore - losisNum, err := o.Raw("select * from cve_origin_upstream_impact_score where impact_id = ?", losi.ImpactId).QueryRows(&losis) + losisNum, err := o.Raw("select * from cve_origin_upstream_impact_score where impact_id = ?", + losi.ImpactId).QueryRows(&losis) if err != nil { - logs.Info("cve_origin_upstream_impact_score 不存在, losi.ImpactId: ", losi.ImpactId, "err: ", err, ",losisNum: ", losisNum) + logs.Info("CreateOriginCve, cve_origin_upstream_impact_score, Data does not exist,"+ + " losi.ImpactId: ", losi.ImpactId, ", err: ", err, ",losisNum: ", losisNum) } else { for _, sis := range losis { if sis.CvssV3 == 1 && sis.BaseMetricV3 == 1 { @@ -604,11 +652,12 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi losix := OriginUpstreamImpact{CveId: num} o.Delete(&losix, "CveId") } - if losinum, err := o.Insert(osi); err == nil { - logs.Info("insert cve_origin_upstream_impact success, lousnum:", losinum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact success, "+ + "lousnum:", losinum, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact failed, Lnode:", osi, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact failed, "+ + "Lnode:", osi, ", err: ", err) o.Rollback() return 0, err } @@ -620,9 +669,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousist.CvssV2 = 0 lousist.Status = 1 if lousistnum, err := o.Insert(&lousist); err == nil { - logs.Info("insert cve_origin_upstream_impact_score success, lousistnum:", lousistnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score success, "+ + "lousistnum:", lousistnum, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score failed, lousist:", lousist, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score failed, "+ + "lousist:", lousist, ", err: ", err) o.Rollback() return 0, err } @@ -644,9 +695,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousisv3.ExploitabilityScore = CveData.Impact.BaseMetricV3.ExploitabilityScore lousisv3.CveLevel = openEulerScoreProc(CveData.Impact.BaseMetricV3.CvssV3.BaseScore) if lousistnumv3, err := o.Insert(&lousisv3); err == nil { - logs.Info("insert cve_origin_upstream_impact_score_v3 success, lousistnumv3:", lousistnumv3, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score_v3 success, "+ + "lousistnumv3:", lousistnumv3, ", cveNum", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score_v3 failed, lousisv3:", lousisv3, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score_v3 failed, "+ + "lousisv3:", lousisv3, ", err: ", err) o.Rollback() return 0, err } @@ -658,9 +711,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousistv2.CvssV2 = 1 lousistv2.Status = 1 if lousistnum, err := o.Insert(&lousistv2); err == nil { - logs.Info("insert cve_origin_upstream_impact_score success, lousistnum:", lousistnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score success, "+ + "lousistnum:", lousistnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score failed, lousistv2:", lousistv2, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score failed, "+ + "lousistv2:", lousistv2, ", err: ", err) o.Rollback() return 0, err } @@ -686,9 +741,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousisv2.ExploitabilityScore = CveData.Impact.BaseMetricV2.ExploitabilityScore lousisv2.CveLevel = openEulerScoreProc(CveData.Impact.BaseMetricV2.CvssV2.BaseScore) if lousistnumv2, err := o.Insert(&lousisv2); err == nil { - logs.Info("insert cve_origin_upstream_impact_score_v2 success, lousistnumv2:", lousistnumv2, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_impact_score_v2 success, "+ + "lousistnumv2:", lousistnumv2, ", cveNum: ", ou.Ids) } else { - logs.Error("insert cve_origin_upstream_impact_score_v2 failed, lousisv2:", lousisv2, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_impact_score_v2 failed, "+ + "lousisv2:", lousisv2, ", err: ", err) o.Rollback() return 0, err } @@ -697,36 +754,38 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi losp := OriginUpstreamPoc{CveId: num} errxxx := o.Read(&losp, "CveId") if errxxx == orm.ErrNoRows || errxxx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_impact 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_impact, Data does not exist, cveId: ", num) } else { lospd := OriginUpstreamPoc{CveId: num} o.Delete(&lospd, "CveId") } if ospnum, err := o.Insert(osp); err == nil { - logs.Info("insert Table: cve_origin_upstream_poc success, ospnum:", ospnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_poc success,"+ + " ospnum:", ospnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_poc failed, osp:", osp, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_poc failed, "+ + "osp:", osp, ", err: ", err) o.Rollback() return 0, err } - ose.CveId = num lose := OriginUpstreamEvent{CveId: num} errx := o.Read(&lose, "CveId") if errx == orm.ErrNoRows || errx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_event 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_event, Data does not exist, cveId: ", num) } else { losed := OriginUpstreamEvent{CveId: num} o.Delete(&losed, "CveId") } if osenum, err := o.Insert(ose); err == nil { - logs.Info("insert Table: cve_origin_upstream_event success, osenum:", osenum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_event success, "+ + "osenum:", osenum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_event failed, ose:", ose, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_event failed, "+ + "ose:", ose, ", err: ", err) o.Rollback() return 0, err } - lousr := OriginUpstreamReference{CveId: num} o.Delete(&lousr, "CveId") if CveData.ReferenceData != nil && len(CveData.ReferenceData) > 0 { @@ -745,9 +804,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi } lousrd.Tags = tags if lousrdnum, err := o.Insert(&lousrd); err == nil { - logs.Info("insert Table: cve_origin_upstream_reference success, lousrdnum:", lousrdnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_reference success, "+ + "lousrdnum:", lousrdnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_reference failed, lousrd:", lousrd, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_reference failed, "+ + "lousrd:", lousrd, ", err: ", err) o.Rollback() return 0, err } @@ -757,9 +818,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi o.Delete(&lousv, "CveId") osv.CveId = num if osvnum, err := o.Insert(osv); err == nil { - logs.Info("insert Table: cve_origin_upstream_vul_type success, osvnum:", osvnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_vul_type success, "+ + "osvnum:", osvnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_vul_type failed, osv:", osv, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_vul_type failed, "+ + "osv:", osv, ", err: ", err) o.Rollback() return 0, err } @@ -767,12 +830,14 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousfs := OriginUpstreamFixSuggest{CveId: num} errxxsx := o.Read(&lousfs, "CveId") if errxxsx == orm.ErrNoRows || errxxsx == orm.ErrMissPK { - logs.Info("cve_origin_upstream_fix_suggest 不存在, cveId: ", num) + logs.Info("CreateOriginCve, cve_origin_upstream_fix_suggest, Data does not exist, cveId: ", num) } else { var lousfst []OriginUpstreamFixSuggestRef - louscNum, err := o.Raw("select * from cve_origin_upstream_fix_suggest_ref where fix_id = ?", lousfs.FixId).QueryRows(&lousfst) + louscNum, err := o.Raw("select * from cve_origin_upstream_fix_suggest_ref where fix_id = ?", + lousfs.FixId).QueryRows(&lousfst) if err != nil { - logs.Info("cve_origin_upstream_fix_suggest_ref 不存在, louscNum: ", louscNum, "err: ", err) + logs.Info("CreateOriginCve, cve_origin_upstream_fix_suggest_ref, Data does not exist,"+ + " louscNum: ", louscNum, "err: ", err) } else { for _, sc := range lousfst { lorfrt := OriginUpstreamFixSuggestRefTag{FixRefId: sc.FixRefId} @@ -786,9 +851,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi } osf.CveId = num if osfnum, err := o.Insert(osf); err == nil { - logs.Info("insert Table: cve_origin_upstream_fix_suggest success, osfnum:", osfnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_fix_suggest success, "+ + "osfnum:", osfnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_fix_suggest failed, osf:", osf, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_fix_suggest failed, "+ + "osf:", osf, ", err: ", err) o.Rollback() return 0, err } @@ -800,9 +867,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi lousfstr.Refsource = refer.Refsource lousfstr.Url = refer.Url if osfstrnum, err := o.Insert(&lousfstr); err == nil { - logs.Info("insert Table: cve_origin_upstream_fix_suggest_ref success, osfstrnum:", osfstrnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref success, "+ + "osfstrnum:", osfstrnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_fix_suggest_ref failed, lousfstr:", lousfstr, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref failed, "+ + "lousfstr:", lousfstr, ", err: ", err) o.Rollback() return 0, err } @@ -812,9 +881,11 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi loufsrtg.FixRefId = lousfstr.FixRefId loufsrtg.Name = refertag if osfstgrnum, err := o.Insert(&loufsrtg); err == nil { - logs.Info("insert Table: cve_origin_upstream_fix_suggest_ref_tag success, osfstgrnum:", osfstgrnum, ", cveNum", ou.Ids) + logs.Info("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref_tag success, "+ + "osfstgrnum:", osfstgrnum, ", cveNum: ", ou.Ids) } else { - logs.Error("insert Table: cve_origin_upstream_fix_suggest_ref_tag failed, loufsrtg:", loufsrtg, ", err: ", err) + logs.Error("CreateOriginCve, insert cve_origin_upstream_fix_suggest_ref_tag failed, "+ + "loufsrtg:", loufsrtg, ", err: ", err) o.Rollback() return 0, err } @@ -825,7 +896,7 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi o.Commit() } } else { - logs.Error("事务创建失败，cveNum:", ou.CveNum) + logs.Error("CreateOriginCve, Transaction creation failed, cveNum:", ou.CveNum) return 0, errs } return 0, nil @@ -838,24 +909,25 @@ func QueryCveErrorInfo(issueStatus int8, startDate, endDate string) ([]IssueTemp var err error if startDate != "" { num, err = o.Raw("select cve_num,error_description,create_time from cve_issue_template "+ - "where issue_status = ? and create_time >= ? and create_time <= ?", issueStatus, startDate, endDate).QueryRows(&it) + "where issue_status = ? and create_time >= ? and create_time <= ?", + issueStatus, startDate, endDate).QueryRows(&it) } else { num, err = o.Raw("select cve_num,error_description,create_time from cve_issue_template "+ "where issue_status = ? and create_time <= ?", issueStatus, endDate).QueryRows(&it) } - if err != nil || num == 0 { - logs.Info(issueStatus, startDate, endDate, ", cve_issue_template 无对应数据") + logs.Info("QueryCveErrorInfo, ", issueStatus, startDate, endDate, + ", cve_issue_template, No corresponding data") return it, false } else { - logs.Info(issueStatus, startDate, endDate, ", cve_issue_template 查询成功") + logs.Info("QueryCveErrorInfo, ", issueStatus, startDate, endDate, + ", cve_issue_template, search successful") return it, true } } - func GetOpengaussYaml(opy *OpenGussYaml, colName ...string) error { o := orm.NewOrm() err := o.Read(opy, colName...) return err -} \ No newline at end of file +} diff --git a/models/ymal.go b/models/ymal.go index b086b975ab81ee477c7577c2bfc9aaab3b932dce..1e9b463b7915d72bb77342b1d88b130ba93c85dd 100644 --- a/models/ymal.go +++ b/models/ymal.go @@ -10,7 +10,7 @@ func GetYamlTable(gt *[]GitPackageTable) (int64, error) { num, errx := o.Raw("select *" + " from cve_git_package_table").QueryRows(gt) if errx != nil { - logs.Error("获取数据失败或者不存在, err: ", errx) + logs.Error("GetYamlTable, Get data does not exist, err: ", errx) } return num, errx } @@ -19,7 +19,6 @@ func GetCpePackName(pc *PackageCpe, packName string) (error) { o := orm.NewOrm() errx := o.Raw("select id, cpe_packname"+ " from cve_package_cpe where packname = ?", packName).QueryRow(pc) - return errx } @@ -36,9 +35,11 @@ func CreateYamlTable(gt *GitPackageTable) (TableId int64, err error) { if errx != nil { var TableId int64 if TableId, err = o.Insert(gt); err == nil { - logs.Info("insert cve_git_package_table success, TableId: ", TableId, "tableName: ", gt.TableName) + logs.Info("CreateYamlTable, insert cve_git_package_table success, "+ + "TableId: ", TableId, ", tableName: ", gt.TableName) } else { - logs.Error("insert cve_git_package_table failed, tableName:", gt.TableName, "err: ", err) + logs.Error("CreateYamlTable, insert cve_git_package_table failed,"+ + " tableName:", gt.TableName, ", err: ", err) return 0, err } return TableId, nil @@ -46,9 +47,11 @@ func CreateYamlTable(gt *GitPackageTable) (TableId int64, err error) { gt.TableId = localgt.TableId gt.Brands = localgt.Brands if num, err := o.Update(gt); err == nil { - logs.Info("update cve_git_package_table success, num: ", num, "TableName: ", gt.TableName) + logs.Info("CreateYamlTable, update cve_git_package_table success, "+ + "num: ", num, ", TableName: ", gt.TableName) } else { - logs.Error("update cve_git_package_table failed, TableName:", gt.TableName, "err: ", err) + logs.Error("CreateYamlTable, update cve_git_package_table failed, "+ + "TableName:", gt.TableName, ", err: ", err) return 0, err } return gt.TableId, nil @@ -60,7 +63,8 @@ func GetSingleYaml(ge *GitOpenEuler) (bool, error) { if ge.Version != "" && ge.Release != "" { localge := GitOpenEuler{PackageName: ge.PackageName, Version: ge.Version} err := o.Read(&localge, "PackageName", "Version", "Release") - logs.Info("查询yaml数据是否存在：", ge, ", localge: ", localge, ", err: ", err) + logs.Info("GetSingleYaml1, Query yaml data results: ", ge, + ", localge: ", localge, ", err: ", err) if err == orm.ErrNoRows { return false, err } else if err == orm.ErrMissPK { @@ -71,7 +75,8 @@ func GetSingleYaml(ge *GitOpenEuler) (bool, error) { } else { localge := GitOpenEuler{PackageName: ge.PackageName} err := o.Read(&localge, "PackageName") - logs.Info("查询yaml数据是否存在：", ge, ", localge: ", localge, ", err: ", err) + logs.Info("GetSingleYaml2, Query yaml data results: ", ge, + ", localge: ", localge, ", err: ", err) if err == orm.ErrNoRows { return false, err } else if err == orm.ErrMissPK { @@ -91,18 +96,22 @@ func InsertOpenEulerRelate(getr *GitOpenEulerTableRelate) (id int64, typex strin if errx != nil { var relateId int64 if relateId, err = o.Insert(getr); err == nil { - logs.Info("insert cve_git_open_euler_table_relate success, RelateId: ", relateId, "tableName: ", getr.TableName) + logs.Info("InsertOpenEulerRelate, insert cve_git_open_euler_table_relate success, "+ + "RelateId: ", relateId, "tableName: ", getr.TableName) } else { - logs.Error("insert cve_git_open_euler_table_relate failed, ", "tableName: ", getr.TableName, "err: ", err) + logs.Error("InsertOpenEulerRelate, insert cve_git_open_euler_table_relate failed, "+ + "tableName: ", getr.TableName, ", err: ", err) return 0, "insert", err } return relateId, "insert", nil } else { getr.RelateId = localge.RelateId if _, err := o.Update(getr); err == nil { - logs.Info("update cve_git_open_euler_table_relate success, RelateId: ", getr.RelateId, "tableName: ", getr.TableName) + logs.Info("InsertOpenEulerRelate, update cve_git_open_euler_table_relate success, "+ + "RelateId: ", getr.RelateId, "tableName: ", getr.TableName) } else { - logs.Error("update cve_git_open_euler_table_relate failed, ", "tableName: ", getr.TableName, "err: ", err) + logs.Error("InsertOpenEulerRelate, update cve_git_open_euler_table_relate failed, "+ + "tableName: ", getr.TableName, ", err: ", err) return getr.RelateId, "update", err } return getr.RelateId, "update", nil @@ -119,13 +128,15 @@ func CreateYaml(ge *GitOpenEuler, tableValue GitPackageTable) (id int64, typex s " from cve_git_open_euler where package_name = ? and version = ?", ge.PackageName, ge.Version).QueryRow(&localge) if errx != nil { - logs.Info("createYaml: ", localge) + logs.Info("createYaml: ", localge, ",errx: ", errx) ge.Status = 0 var GitId int64 if GitId, err = o.Insert(ge); err == nil { - logs.Info("insert cve_git_open_euler success, GitId: ", GitId, "packName: ", ge.PackageName) + logs.Info("CreateYaml, insert cve_git_open_euler success, GitId: ", + GitId, ", packName: ", ge.PackageName) } else { - logs.Error("insert cve_git_open_euler failed, ", "packName: ", ge.PackageName, "err: ", err) + logs.Error("CreateYaml, insert cve_git_open_euler failed, "+ + "packName: ", ge.PackageName, ", err: ", err) return 0, "insert", err } getr.GitId = GitId @@ -136,9 +147,11 @@ func CreateYaml(ge *GitOpenEuler, tableValue GitPackageTable) (id int64, typex s ge.Status = 1 ge.GitId = localge.GitId if _, err := o.Update(ge); err == nil { - logs.Info("update cve_git_open_euler success, GitId: ", ge.GitId, "packName: ", ge.PackageName) + logs.Info("CreateYaml, update cve_git_open_euler success, "+ + "GitId: ", ge.GitId, ", packName: ", ge.PackageName) } else { - logs.Error("update cve_git_open_euler failed, ", "packName: ", ge.PackageName, "err: ", err) + logs.Error("CreateYaml, update cve_git_open_euler failed, "+ + "packName: ", ge.PackageName, ", err: ", err) return ge.GitId, "update", err } getr.GitId = ge.GitId @@ -157,18 +170,22 @@ func CreateYamlDetail(gp *GitPackageInfo, ge GitOpenEuler) (id int64, typex stri gp.Status = 0 var DetailId int64 if DetailId, err = o.Insert(gp); err == nil { - logs.Info("insert cve_git_package_info success, DetailId: ", DetailId, ",PackageName: ", gp.PackageName) + logs.Info("CreateYamlDetail, insert cve_git_package_info success, "+ + "DetailId: ", DetailId, ",PackageName: ", gp.PackageName) } else { - logs.Error("insert cve_git_package_info failed, ", "PackageName: ", gp.PackageName, ",err: ", err) + logs.Error("CreateYamlDetail, insert cve_git_package_info failed, "+ + "PackageName: ", gp.PackageName, ",err: ", err) return 0, "insert", err } return DetailId, "insert", nil } else { gp.DetailId = localgp.DetailId if _, err := o.Update(gp); err == nil { - logs.Info("update cve_git_package_info success, DetailId: ", gp.DetailId, ",packName: ", gp.PackageName) + logs.Info("CreateYamlDetail, update cve_git_package_info success, "+ + "DetailId: ", gp.DetailId, ",packName: ", gp.PackageName) } else { - logs.Error("update cve_git_package_info failed, ", "packName: ", gp.PackageName, ",err: ", err) + logs.Error("CreateYamlDetail, update cve_git_package_info failed, "+ + "packName: ", gp.PackageName, ",err: ", err) return gp.DetailId, "update", err } return gp.DetailId, "update", nil @@ -184,9 +201,11 @@ func CreateYamlSubPack(gb *GitSubPack) (SubId int64, typex string, err error) { if errx != nil { var SubId int64 if SubId, err = o.Insert(gb); err == nil { - logs.Info("insert cve_git_sub_pack success, SubId: ", SubId, ",SubPackName: ", gb.SubPackName) + logs.Info("CreateYamlSubPack, insert cve_git_sub_pack success,"+ + " SubId: ", SubId, ",SubPackName: ", gb.SubPackName) } else { - logs.Error("insert cve_git_sub_pack failed, ", "SubPackName: ", gb.SubPackName, ",err: ", err) + logs.Error("CreateYamlSubPack, insert cve_git_sub_pack failed, "+ + "SubPackName: ", gb.SubPackName, ",err: ", err) return 0, "insert", err } return SubId, "insert", nil @@ -203,9 +222,11 @@ func CreateYamlSubPackProvides(gs *GitSubPackProvides) (ProvideId int64, typex s if errx != nil { var ProvideId int64 if ProvideId, err = o.Insert(gs); err == nil { - logs.Info("insert cve_git_sub_pack_provides success, ProvideId: ", ProvideId, "ProvideName: ", gs.ProvideName) + logs.Info("CreateYamlSubPack, insert cve_git_sub_pack_provides success, "+ + "ProvideId: ", ProvideId, ", ProvideName: ", gs.ProvideName) } else { - logs.Error("insert cve_git_sub_pack_provides failed, ", "ProvideName: ", gs.ProvideName, "err: ", err) + logs.Error("CreateYamlSubPack, insert cve_git_sub_pack_provides failed, "+ + "ProvideName: ", gs.ProvideName, ",err: ", err) return 0, "insert", err } return ProvideId, "insert", nil @@ -222,9 +243,11 @@ func CreateYamlSubPackRequiredb(gs *GitSubPackRequiredby) (Id int64, typex strin if errx != nil { var Id int64 if Id, err = o.Insert(gs); err == nil { - logs.Info("insert cve_git_sub_pack_requiredby success, ID: ", Id, "requiredb: ", gs.Requiredby) + logs.Info("CreateYamlSubPackRequiredb, insert cve_git_sub_pack_requiredby success, "+ + "ID: ", Id, ", requiredb: ", gs.Requiredby) } else { - logs.Error("insert cve_git_sub_pack_requiredby failed, ", "requiredb: ", gs.Requiredby, "err: ", err) + logs.Error("CreateYamlSubPackRequiredb, insert cve_git_sub_pack_requiredby failed, "+ + "requiredb: ", gs.Requiredby, ", err: ", err) return 0, "insert", err } return Id, "insert", nil @@ -241,9 +264,11 @@ func CreateYamlSubPackRequires(gs *GitSubPackRequire) (RequireId int64, typex st if errx != nil { var RequireId int64 if RequireId, err = o.Insert(gs); err == nil { - logs.Info("insert cve_git_sub_pack_require success, RequireId: ", RequireId, "RequireName: ", gs.RequireName) + logs.Info("CreateYamlSubPackRequires, insert cve_git_sub_pack_require success,"+ + " RequireId: ", RequireId, ",RequireName: ", gs.RequireName) } else { - logs.Error("insert cve_git_sub_pack_require failed, ", "RequireName: ", gs.RequireName, "err: ", err) + logs.Error("CreateYamlSubPackRequires, insert cve_git_sub_pack_require failed, "+ + "RequireName: ", gs.RequireName, ", err: ", err) return 0, "insert", err } return RequireId, "insert", nil diff --git a/task/cve.go b/task/cve.go index 011eb44a8b12de4e1df60dd9424a900816ed2364..c239fcb5752ee7590083041305d5e9f7f4f2410f 100644 --- a/task/cve.go +++ b/task/cve.go @@ -13,17 +13,17 @@ func ProcCveOriginData(prcNum, days, credibilityLevel, openeulerNum int, cveRef, // Process raw data obtained by api ok, err := taskhandler.GetCveOriginData(prcNum, days, openeulerNum, credibilityLevel, cveRef) if !ok { - logs.Error("接口上的原始数据处理失败(GetCveOriginData), err: ", err) + logs.Error("ProcCveOriginData, GetCveOriginData, err: ", err) } // Processing excel raw data okx, err := taskhandler.GetCveOriginExcelData(prcNum, days, openeulerNum, cveRef) if !okx { - logs.Error("excel数据处理失败(GetCveOriginExcelData), errx: ", err) + logs.Error("ProcCveOriginData, GetCveOriginExcelData, err: ", err) } // Compatible with created issue data oki, err := taskhandler.GetCveIssueData(prcNum, days, openeulerNum, cveRef, owner) if !oki { - logs.Error("issue数据处理失败(GetCveIssueData), erri: ", err) + logs.Error("ProcCveOriginData, GetCveIssueData, err: ", err) } return true, nil } @@ -31,41 +31,41 @@ func ProcCveOriginData(prcNum, days, credibilityLevel, openeulerNum int, cveRef, //ParamsCveOriginData Processing cve raw data func ParamsCveOriginData() error { defer common.Catchs() - logs.Info("将cve原始数据生成cve库 task start") + logs.Info("Start the task of generating cve raw data into cve library.") // Query the cve to be processed, 1: add; 2: modify BConfig, err := config.NewConfig("ini", "conf/app.conf") if err != nil { - logs.Error("config init error:", err) + logs.Error("config init, error: ", err) return err } // The amount of data processed at a time prcnum, err := BConfig.Int("crontab::prcnum") if err != nil { - logs.Error("config crontab::prcnum error: invalid value is ", prcnum) + logs.Error("crontab::prcnum, error: ", err) return errors.New("value is nil") } // How many days have been processed to date data days, ok := BConfig.Int("crontab::days") if ok != nil { - logs.Error("config crontab::days error:", err) + logs.Error("crontab::days, err:", err) return ok } // openeuler Number start value cveRef := BConfig.String("cve::cveref") openeulernum, ok := BConfig.Int("cve::openeulernum") if ok != nil { - logs.Error("config cve::openeulernum error:", err) + logs.Error("cve::openeulernum, err:", err) return ok } owner := BConfig.String("gitee::owner") // cve credibility level credibilityLevel, ok := BConfig.Int("cve::credibility_level") if ok != nil { - logs.Error("config cve::credibility_level error:", err) + logs.Error("cve::credibility_level, err:", err) return ok } // Get the data source of the table _, errx := ProcCveOriginData(prcnum, days, credibilityLevel, openeulernum, cveRef, owner) - logs.Info("将cve原始数据生成cve库 task end") + logs.Info("The task of generating cve original data into cve library is over.") return errx } diff --git a/task/inittask.go b/task/inittask.go index 9a49d68bcad89e94268411dc28213aa1354a6ad2..f707b8d1d3d50690495626feba5ef1e1707e023e 100644 --- a/task/inittask.go +++ b/task/inittask.go @@ -8,114 +8,122 @@ import ( //CheckOriCveTask Verify the original cve data func CheckOriCveTask(oriCveCheck string) { - logs.Info("校验原始cve数据 task start") + logs.Info("The task of verifying the original cve data starts...") CheckTask := toolbox.NewTask("CheckOriCve", oriCveCheck, CheckOriCve) toolbox.AddTask("CheckOriCve", CheckTask) - logs.Info("校验原始cve数据 task end") + logs.Info("End of verifying original cve data task...") } //InitYamlTask Get yaml data source func InitYamlTask(getYaml string) { - logs.Info("获取yaml数据源 task start") + logs.Info("Get the yaml data source task started...") YamlTask := toolbox.NewTask("GetYamlData", getYaml, GetYamlData) toolbox.AddTask("GetYamlData", YamlTask) - logs.Info("获取yaml数据源 task end") + logs.Info("End of the task of obtaining yaml data source...") } //InitCveTask Generate cve original data into cve library func InitCveTask(getCve string) { - logs.Info("将cve原始数据生成cve库 task start") + logs.Info("The task of generating cve vulnerability library from cve raw data begins...") CveTask := toolbox.NewTask("ParamsCveOriginData", getCve, ParamsCveOriginData) toolbox.AddTask("ParamsCveOriginData", CveTask) - logs.Info("将cve原始数据生成cve库 task end") + logs.Info("The task of generating cve vulnerability library from cve raw data ends...") } // InitIssueTask Get the created issue data source func InitIssueTask(getIssue string) { - logs.Info("获取已经创建的issue数据源 task start") + logs.Info("Get the created issue data source task starts...") issueTask := toolbox.NewTask("GetIssueData", getIssue, GetIssueData) toolbox.AddTask("GetIssueData", issueTask) - logs.Info("获取已经创建的issue数据源 task end") + logs.Info("End of the task of obtaining the created issue data source...") } // InitIssueToken Execute the token acquisition task to start func InitIssueToken(issueOath string) { - logs.Info("执行获取token task start") + logs.Info("Execute the token acquisition task to start...") TokenTask := toolbox.NewTask("GetGiteeToken", issueOath, GetGiteeToken) toolbox.AddTask("GetGiteeToken", TokenTask) - logs.Info("执行获取token task end") + logs.Info("End of execution of the token acquisition task...") } // CreatTask Execute the create issue task to start func CreatTask(createIssue string) { - logs.Info("执行创建issue task start") + logs.Info("Execute the create issue task to start...") cIssueTask := toolbox.NewTask("CreateIssue", createIssue, CreateIssue) toolbox.AddTask("CreateIssue", cIssueTask) - logs.Info("执行创建issue task end") + logs.Info("End of execution of the task of creating an issue...") } // unlock table func UnlockTask(unLockTable string) { - logs.Info("执行解锁表 task start") + logs.Info("Execute unlock table task start...") cUnLockTable := toolbox.NewTask("UnLockTable", unLockTable, UnLockTable) toolbox.AddTask("UnLockTable", cUnLockTable) - logs.Info("执行解锁表 task end") + logs.Info("End of execution of unlock table task...") } // Handling hook events func ProcHookTask(prochook string) { - logs.Info("执行处理Hook事件 task start") + logs.Info("Execute the Hook event task start...") cProchook := toolbox.NewTask("ProcHookEvent", prochook, ProcHookEvent) toolbox.AddTask("ProcHookEvent", cProchook) - logs.Info("执行处理Hook事件 task end") + logs.Info("The execution of the Hook event task ends...") } //GenSAExcelTask Execute issue to generate excel task start func GenSAExcelTask(genExcel string) { - logs.Info("执行issue生成excel task start") + logs.Info("Execute issue to generate excel task start...") genExcelTask := toolbox.NewTask("GenExcelData", genExcel, GenExcelData) toolbox.AddTask("GenExcelData", genExcelTask) - logs.Info("执行issue生成excel task end") + logs.Info("Execute issue to generate excel task ends...") } // Handling abnormal cve data func AbnormalCveTask(exceptcve string) { - logs.Info("创建处理异常cve任务 task start") + logs.Info("Execute abnormal cve task task start...") procabnTask := toolbox.NewTask("AbnormalCve", exceptcve, ProcAbnCve) toolbox.AddTask("AbnormalCve", procabnTask) - logs.Info("创建处理异常cve任务 task end") + logs.Info("Execute processing exception cve task task end...") } // Generate SA number func GenerateSaNumberTask(genSa string) { - logs.Info("生成SA编号 task start") + logs.Info("Start the task of generating SA number...") proSaTask := toolbox.NewTask("GenerateSaNumber", genSa, ProcSaNumber) toolbox.AddTask("GenerateSaNumber", proSaTask) - logs.Info("生成SA编号 task end") + logs.Info("The task of generating SA number is over...") } // issue statistics mailing list func IssueStstisticsTask(issueStatistic string) { - logs.Info("issue统计 task start") + logs.Info("Execute issue statistics task start...") iStTask := toolbox.NewTask("IssueStatistics", issueStatistic, IssueStatistics) toolbox.AddTask("IssueStatistics", iStTask) - logs.Info("issue统计 task end") + logs.Info("The end of the issue statistics task...") } // Cve data email task with low credibility func cveLowCredTask(cvecredit string) { - logs.Info("cve 可信度 task start") + logs.Info("Execute the CVE credibility data feedback task started...") iStTask := toolbox.NewTask("ProcCveLowCred", cvecredit, ProcCveLowCred) toolbox.AddTask("ProcCveLowCred", iStTask) - logs.Info("cve 可信度 task end") + logs.Info("The end of the CVE credibility data feedback task...") +} + +// Handling urgent tasks +func UrgentTask(urgenttask string) { + logs.Info("Handling urgent task started...") + iStTask := toolbox.NewTask("HandUrgentData", urgenttask, HandUrgentData) + toolbox.AddTask("HandUrgentData", iStTask) + logs.Info("The end of the Handling urgent task...") } // Print logs to the console and delete redundant logs func PrintLogTask(printLog string) { - logs.Info("创建日志任务 task start") + logs.Info("Execute log task task start...") printLogTask := toolbox.NewTask("ProcLogData", printLog, ProcLogData) toolbox.AddTask("ProcLogData", printLogTask) - logs.Info("创建日志任务 task end") + logs.Info("Execute log task task end...") } // start task @@ -179,24 +187,18 @@ func InitTask() bool { if taskFlag == 1 && errx == nil { createIssue := BConfig.String("crontab::createissue") CreatTask(createIssue) - } else { - logs.Info("createissue no task") } // Generate excel data from issue genexcelflag, errx := BConfig.Int("crontab::genexcelflag") if genexcelflag == 1 && errx == nil { genExcel := BConfig.String("crontab::genexcel") GenSAExcelTask(genExcel) - } else { - logs.Info("genexcel no task") } // unlock mysql unlockflag, errx := BConfig.Int("crontab::unlockflag") if unlockflag == 1 && errx == nil { unlock := BConfig.String("crontab::unlock") UnlockTask(unlock) - } else { - logs.Info("unlock no task") } // Handling hook events hookflag, errx := BConfig.Int("crontab::hookflag") @@ -211,32 +213,30 @@ func InitTask() bool { if exceptflag == 1 && errx == nil { exceptcve := BConfig.String("crontab::exceptcve") AbnormalCveTask(exceptcve) - } else { - logs.Info("exceptcve no task") } // Generate SA number gensaflag, errx := BConfig.Int("crontab::gensaflag") if gensaflag == 1 && errx == nil { gensa := BConfig.String("crontab::gensa") GenerateSaNumberTask(gensa) - } else { - logs.Info("Generate SA task") } // issue statistics mailing list issuestatisticflag, errx := BConfig.Int("crontab::issuestatisticflag") if issuestatisticflag == 1 && errx == nil { issueStatistic := BConfig.String("crontab::issuestatistic") IssueStstisticsTask(issueStatistic) - } else { - logs.Info("issue statistics task") } // Cve data email task with low credibility cvecredflag, errx := BConfig.Int("crontab::cvecredflag") if cvecredflag == 1 && errx == nil { cvecredit := BConfig.String("crontab::cvecredit") cveLowCredTask(cvecredit) - } else { - logs.Info("cve credibility task") + } + // Handling urgent tasks + urgenttaskflag, errx := BConfig.Int("crontab::urgenttaskflag") + if urgenttaskflag == 1 && errx == nil { + urgenttask := BConfig.String("crontab::urgenttask") + UrgentTask(urgenttask) } return true } diff --git a/task/urgent.go b/task/urgent.go new file mode 100644 index 0000000000000000000000000000000000000000..c50e634b2d3bb7a757b8a6a81a7051c06f197bc8 --- /dev/null +++ b/task/urgent.go @@ -0,0 +1,56 @@ +package task + +import ( + "cvevulner/common" + "cvevulner/taskhandler" + "errors" + "github.com/astaxie/beego/config" + "github.com/astaxie/beego/logs" +) + +// Synchronize excel data +func SynchronizeExcelData() error { + defer common.Catchs() + logs.Info("Start the task of generating cve raw data into cve library.") + // Query the cve to be processed, 1: add; 2: modify + BConfig, err := config.NewConfig("ini", "conf/app.conf") + if err != nil { + logs.Error("config init, error: ", err) + return err + } + // The amount of data processed at a time + prcNum, err := BConfig.Int("crontab::prcnum") + if err != nil { + logs.Error("crontab::prcnum, error: ", err) + return errors.New("value is nil") + } + // How many days have been processed to date data + days, ok := BConfig.Int("crontab::days") + if ok != nil { + logs.Error("crontab::days, err:", err) + return ok + } + // openeuler Number start value + cveRef := BConfig.String("cve::cveref") + openeulerNum, ok := BConfig.Int("cve::openeulernum") + if ok != nil { + logs.Error("cve::openeulernum, err:", err) + return ok + } + // Processing excel raw data + okx, err := taskhandler.GetCveOriginExcelData(prcNum, days, openeulerNum, cveRef) + if !okx { + logs.Error("ProcCveOriginData, GetCveOriginExcelData, err: ", err) + return err + } + return nil +} + +func HandUrgentData() error{ + // Synchronize excel data + syErr := SynchronizeExcelData() + // Create cve data + cErr := CreateIssue() + logs.Info(syErr, cErr) + return nil +} diff --git a/taskhandler/sendemail.go b/taskhandler/sendemail.go index a6a29fd4188ae9150d9a93b406c1517d7a6c7c98..5c6623e4d29544389038e1826529454f26f85de7 100644 --- a/taskhandler/sendemail.go +++ b/taskhandler/sendemail.go @@ -112,7 +112,8 @@ func SendEmail(attchStr string, flag int, cBody, subject string) error { cc: []string{}, bcc: []string{}, subject: "The file name of the cvrf format currently to be manually reviewed is as follows.date: " + common.GetCurTime(), - body: fmt.Sprintf("hi all: \r\n The list of cvrf format files that have been uploaded to the file server is as follows: \r\n" + attchStr), + body: fmt.Sprintf("hi all: \r\n The list of cvrf format files that have been " + + "uploaded to the file server is as follows: \r\n" + strings.ReplaceAll(attchStr,"download/", "")), contentType: "text/plain;charset=utf-8", attachment: Attachment{ name: attchStr,