From d944cf1da17239a2855fdadeb3a34532727f8ea5 Mon Sep 17 00:00:00 2001 From: zhangjianjun Date: Wed, 30 Mar 2022 15:43:01 +0800 Subject: [PATCH] Set the issue processing date and report an error: 405 Not Allowed modification --- cve-vulner-manager/common/common.go | 17 +++-- cve-vulner-manager/conf/app.conf | 4 +- cve-vulner-manager/controllers/cve.go | 4 +- .../tabletask/import_excel_task.go | 68 +++++++++---------- .../cve-timed-task/tabletask/mapping_task.go | 2 +- cve-vulner-manager/task/issue.go | 4 +- cve-vulner-manager/taskhandler/cve.go | 10 +-- 7 files changed, 59 insertions(+), 50 deletions(-) diff --git a/cve-vulner-manager/common/common.go b/cve-vulner-manager/common/common.go index 6d85eee..318c934 100644 --- a/cve-vulner-manager/common/common.go +++ b/cve-vulner-manager/common/common.go @@ -13,6 +13,7 @@ import ( ) const DATE_FORMAT = "2006-01-02 15:04:05" +const DATE_T_FORMAT = "2006-01-02T15:04:05" func DesString(dbpwd string) (strs string) { defer Catchs() @@ -72,16 +73,24 @@ func GetBeforeTime(days int) string { return resTime } -func GetSpecifiedTime(startTime time.Time, days int, localFlag bool) string { +func GetSpecifiedTime(startTime time.Time, days int, localFlag, isTparam bool) string { getTime := startTime.AddDate(0, 0, days) resTime := "" if !localFlag { h, _ := time.ParseDuration("1h") - resTime = getTime.Add(8 * h).Format(DATE_FORMAT) + if isTparam { + resTime = getTime.Add(8 * h).Format(DATE_T_FORMAT) + } else { + resTime = getTime.Add(8 * h).Format(DATE_FORMAT) + } } else { - resTime = getTime.Format(DATE_FORMAT) // The format of the obtained time + if isTparam { + resTime = getTime.Format(DATE_T_FORMAT) // The format of the obtained time + } else { + resTime = getTime.Format(DATE_FORMAT) // The format of the obtained time + } } - logs.Info("Get the number of days：", days, ",Time：", resTime) + logs.Info("Get the number of days: ", days, ",Time: ", resTime) return resTime } diff --git a/cve-vulner-manager/conf/app.conf b/cve-vulner-manager/conf/app.conf index 32891c9..89c448f 100644 --- a/cve-vulner-manager/conf/app.conf +++ b/cve-vulner-manager/conf/app.conf @@ -124,8 +124,8 @@ issuelabelcheck = 0 */30 * * * * getv8tokenflag = 2 getv8token = 0/10 * * * * * # Set issue processing date -setissueprocdateflag = 2 -setissueprocdate = 0 0 */1 * * * +setissueprocdateflag = 1 +setissueprocdate = */10 * * * * * [gitee] #owner = cve-test diff --git a/cve-vulner-manager/controllers/cve.go b/cve-vulner-manager/controllers/cve.go index e373cf9..6da093b 100644 --- a/cve-vulner-manager/controllers/cve.go +++ b/cve-vulner-manager/controllers/cve.go @@ -169,7 +169,7 @@ func (u *CveAllIssueController) Get() { irda.CveLevel = issues.CveLevel irda.CveVtopicPublicTime = issues.FirstPerTime irda.CveVtopicRecTime = issues.FirstGetTime - irda.PlanClosedTime = taskhandler.CvePlanCloseTime(issues.CreateTime, issues.CveLevel) + irda.PlanClosedTime = taskhandler.CvePlanCloseTime(issues.CreateTime, issues.CveLevel, false) if len(issues.CpublicTime) > 10 { irda.CvePublicTime = issues.CpublicTime[:10] } else { @@ -281,7 +281,7 @@ func (u *KanbanCveAllIssueController) Get() { } irda.CveVtopicPublicTime = issues.FirstPerTime irda.CveVtopicRecTime = issues.FirstGetTime - irda.PlanClosedTime = taskhandler.CvePlanCloseTime(issues.CreateTime, issues.CveLevel) + irda.PlanClosedTime = taskhandler.CvePlanCloseTime(issues.CreateTime, issues.CveLevel, false) if len(issues.CpublicTime) > 10 { irda.CvePublicTime = issues.CpublicTime[:10] } else { diff --git a/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go b/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go index e92c300..d9af2f7 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/import_excel_task.go @@ -21,14 +21,14 @@ import ( func ImportDataTypeTwo() { ormModel := orm.NewOrm() - filePath, err := downloadfiletask.HandleThree() - if err != nil { - logs.Error("downloadfiletask.HandleThree error:", err) + filePath, dErr := downloadfiletask.HandleThree() + if dErr != nil { + logs.Error("downloadfiletask.HandleThree error:", dErr) return } - files, err := ioutil.ReadDir(filePath) - if err != nil { - logs.Error(" ioutil.ReadDir error: ", err, filePath) + files, rErr := ioutil.ReadDir(filePath) + if rErr != nil { + logs.Error(" ioutil.ReadDir error: ", rErr, filePath) return } @@ -39,14 +39,14 @@ func ImportDataTypeTwo() { _ = os.RemoveAll(filePath + fileName) continue } - f, err := os.Open(filePath + fileName) - if err != nil { + f, oErr := os.Open(filePath + fileName) + if oErr != nil { continue } hash := sha1.New() - _, err = io.Copy(hash, f) - if err != nil { - logs.Error("io.Copy :", err) + _, cErr := io.Copy(hash, f) + if cErr != nil { + logs.Error("io.Copy :", cErr) _ = f.Close() continue } @@ -60,9 +60,9 @@ func ImportDataTypeTwo() { logs.Error(" Open transaction error:", tranErr.Error()) continue } - list, rowsAffected, err := db_models.SelectCveFileHashByFileName(fileName, ormModel) - if err != nil { - logs.Error("db_models.SelectCveFileHashByFileName :", err) + list, rowsAffected, sErr := db_models.SelectCveFileHashByFileName(fileName, ormModel) + if sErr != nil { + logs.Error("db_models.SelectCveFileHashByFileName :", sErr) tranErr = ormModel.Rollback() if tranErr != nil { logs.Error(" Rollback transaction error:", tranErr.Error()) @@ -78,9 +78,9 @@ func ImportDataTypeTwo() { _ = os.Remove(filePath + fileName) continue } - err = db_models.InsertCveFileHash(fileName, hashValue, ormModel) - if err != nil { - logs.Error("db_models.InsertCveFileHash :", err) + sErr = db_models.InsertCveFileHash(fileName, hashValue, ormModel) + if sErr != nil { + logs.Error("db_models.InsertCveFileHash :", sErr) tranErr = ormModel.Rollback() if tranErr != nil { logs.Error(" Rollback transaction error:", tranErr.Error()) @@ -93,15 +93,15 @@ func ImportDataTypeTwo() { continue } - excel, err := excelize.OpenFile(filePath + fileName) - if err != nil { - logs.Error("excelize.OpenReader:", err) + excel, xErr := excelize.OpenFile(filePath + fileName) + if xErr != nil { + logs.Error("excelize.OpenReader:", xErr) continue } - rows, err := excel.GetRows("Sheet1") - if err != nil { - logs.Error("excel.GetRows Sheet1 error", err) + rows, gErr := excel.GetRows("Sheet1") + if gErr != nil { + logs.Error("excel.GetRows Sheet1 error: ", gErr) continue } now := time.Now().Format("2006-01-02 15:04:05") @@ -134,24 +134,24 @@ func ImportDataTypeTwo() { } else { version = "" } - tranErr := ormModel.Begin() + tranErr = ormModel.Begin() if tranErr != nil { logs.Error(" Open transaction error:", tranErr.Error()) continue } - _, err = db_models.SelectIssueRepoWhiteListByPackageName(row[0], ormModel) - if err != nil { - if errors.Is(orm.ErrNoRows, err) { - err = db_models.InsertIssueRepoWhiteList(&models.IssueRepoWhitelist{ + _, wErr := db_models.SelectIssueRepoWhiteListByPackageName(row[0], ormModel) + if wErr != nil { + if errors.Is(orm.ErrNoRows, wErr) { + wErr = db_models.InsertIssueRepoWhiteList(&models.IssueRepoWhitelist{ PackageName: packName, Version: version, Status: status, Branchs: branchs, CreateTime: now, }, ormModel) - if err != nil { - logs.Error("db_models.InsertIssueRepoWhiteList:", err) + if wErr != nil { + logs.Error("db_models.InsertIssueRepoWhiteList:", wErr) tranErr = ormModel.Rollback() if tranErr != nil { logs.Error(" Rollback transaction error:", tranErr.Error()) @@ -159,7 +159,7 @@ func ImportDataTypeTwo() { continue } } else { - logs.Error("db_models.SelectIssueRepoWhiteListByPackageName error", err) + logs.Error("db_models.SelectIssueRepoWhiteListByPackageName error: ", wErr) tranErr = ormModel.Rollback() if tranErr != nil { logs.Error(" Rollback transaction error:", tranErr.Error()) @@ -167,15 +167,15 @@ func ImportDataTypeTwo() { continue } } else { - err = db_models.UpdateIssueRepoWhiteList(models.IssueRepoWhitelist{ + wErr = db_models.UpdateIssueRepoWhiteList(models.IssueRepoWhitelist{ Status: status, Branchs: branchs, UpdateTime: now, PackageName: packName, Version: version, }, ormModel) - if err != nil { - logs.Error("db_models.UpdateIssueRepoWhiteList error:", err) + if wErr != nil { + logs.Error("db_models.UpdateIssueRepoWhiteList error:", wErr) tranErr = ormModel.Rollback() if tranErr != nil { logs.Error(" Rollback transaction error:", tranErr.Error()) diff --git a/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go b/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go index 873e7d1..5160c1b 100644 --- a/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go +++ b/cve-vulner-manager/cve-timed-task/tabletask/mapping_task.go @@ -170,7 +170,7 @@ func ToMysql() { } } else { if packageCpe.CpePackName != cpePackName { - err := db_models.UpdateCvePackAgeCpe(models.PackageCpe{ + err = db_models.UpdateCvePackAgeCpe(models.PackageCpe{ CpePackName: cpePackName, CreateTime: now, PackName: packageCpe.PackName, diff --git a/cve-vulner-manager/task/issue.go b/cve-vulner-manager/task/issue.go index b2335b7..050eccc 100644 --- a/cve-vulner-manager/task/issue.go +++ b/cve-vulner-manager/task/issue.go @@ -260,8 +260,8 @@ func SetIssueProcParams() error { } if its.NVDScore > 0 { cveLevel := models.OpenEulerScoreProc(its.NVDScore) - deadLine := taskhandler.CvePlanCloseTime(its.CreateTime, cveLevel) - planAt := common.GetSpecifiedTime(its.CreateTime, 0, false) + deadLine := taskhandler.CvePlanCloseTime(its.CreateTime, cveLevel, true) + planAt := common.GetSpecifiedTime(its.CreateTime, 0, false, true) priority := taskhandler.GetIssuePriority(cveLevel) taskhandler.UpdateEntIssueDetail(authToken.EnId, its.IssueId, authToken.AccessToken, planAt, deadLine, priority) diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go index ebeaa22..fd65e00 100644 --- a/cve-vulner-manager/taskhandler/cve.go +++ b/cve-vulner-manager/taskhandler/cve.go @@ -2625,17 +2625,17 @@ func GiteeDownCsv(localPath, branch string) (error) { return nil } -func CvePlanCloseTime(startTime time.Time, cveLevel string) string { +func CvePlanCloseTime(startTime time.Time, cveLevel string, isTparam bool) string { endLocal := "" switch cveLevel { case "Critical": - endLocal = common.GetSpecifiedTime(startTime, 7, false) + endLocal = common.GetSpecifiedTime(startTime, 7, false, isTparam) case "High": - endLocal = common.GetSpecifiedTime(startTime, 14, false) + endLocal = common.GetSpecifiedTime(startTime, 14, false, isTparam) case "Medium", "Low": - endLocal = common.GetSpecifiedTime(startTime, 30, false) + endLocal = common.GetSpecifiedTime(startTime, 30, false, isTparam) default: - endLocal = common.GetSpecifiedTime(startTime, 60, false) + endLocal = common.GetSpecifiedTime(startTime, 60, false, isTparam) } return endLocal } -- Gitee