diff --git a/cve-vulner-manager/conf/app.conf b/cve-vulner-manager/conf/app.conf index 420267e7626cf656f15152365f551f2aa18bbaf9..770de909c456f8a8eca1217bd5c2eead44fdaa85 100644 --- a/cve-vulner-manager/conf/app.conf +++ b/cve-vulner-manager/conf/app.conf @@ -172,6 +172,7 @@ de_duplication_date = -300 comment_cmd = https://gitee.com/openeuler/cve-manager/blob/master/doc/md/manual.md gauss_comment_cmd = https://gitee.com/opengauss/security/blob/master/cve/manual.md spore_comment_cmd = https://gitee.com/mindspore/community/blob/master/security/cve_issue_template.md +openeuler_web = https://www.openeuler.org [excel] forcerewrite = false diff --git a/cve-vulner-manager/conf/product_app.conf b/cve-vulner-manager/conf/product_app.conf index e5c8417cc33e3b0eed814071bfddf1c647e7e9b0..602311eef536997f41717effe4ba63e1adae9b10 100644 --- a/cve-vulner-manager/conf/product_app.conf +++ b/cve-vulner-manager/conf/product_app.conf @@ -164,6 +164,7 @@ de_duplication_date = -100 comment_cmd = https://gitee.com/openeuler/cve-manager/blob/master/doc/md/manual.md gauss_comment_cmd = https://gitee.com/opengauss/security/blob/master/cve/manual.md spore_comment_cmd = https://gitee.com/mindspore/community/blob/master/security/cve_issue_template.md +openeuler_web = https://www.openeuler.org [excel] forcerewrite = false diff --git a/cve-vulner-manager/taskhandler/cve.go b/cve-vulner-manager/taskhandler/cve.go index 59c245a5d965a6c3537ab6ae00370d400a82e30f..4a0e94eff929ff46cb7b9af3f09af117ff1b4364 100644 --- a/cve-vulner-manager/taskhandler/cve.go +++ b/cve-vulner-manager/taskhandler/cve.go @@ -2297,7 +2297,8 @@ func GetCveSecurityNotice(cveNumber string) (bool, models.RespCveDetail) { q := urlS.Query() q.Add("cveId", cveNumber) params := q.Encode() - req, _ := http.NewRequest("GET", "https://openeuler.org", nil) + secLinkConfig := beego.AppConfig.String("reflink::openeuler_web") + req, _ := http.NewRequest("GET", secLinkConfig, nil) req.URL = &url.URL{ Scheme: req.URL.Scheme, Host: req.URL.Host, diff --git a/cve-vulner-manager/taskhandler/cvrf.go b/cve-vulner-manager/taskhandler/cvrf.go index 0fd18a2e807cc7c284643463ff77b8cac19be5f6..09ae643ebadd90ed9a8378f7609902a28a93dbe4 100644 --- a/cve-vulner-manager/taskhandler/cvrf.go +++ b/cve-vulner-manager/taskhandler/cvrf.go @@ -8,6 +8,7 @@ import ( "encoding/xml" "errors" "fmt" + "github.com/astaxie/beego" "github.com/astaxie/beego/logs" "io" "io/ioutil" @@ -748,6 +749,7 @@ func BuildDocumentRef(cvrfsa *CvrfSa, v models.ExcelExport, componentMap map[string]ComponentInfo, branchFlag int, affectBranch string) { componentInfo, comOk := componentMap[v.InfluenceComponent] localOpenEulerSANum := "" + secLinkConfig := beego.AppConfig.String("reflink::openeuler_web") localCveNum := []string{} if branchFlag == 1 { localOpenEulerSANum = componentInfo.OpenEulerSANum @@ -770,7 +772,7 @@ func BuildDocumentRef(cvrfsa *CvrfSa, v models.ExcelExport, } if !isExist { var cveUrl1 CveUrl - cveUrl1.Url = "https://openeuler.org/en/security/cve/detail.html?id=" + v.CveNum + cveUrl1.Url = secLinkConfig + "/en/security/cve/detail.html?id=" + v.CveNum cveRef.CveUrl = append(cveRef.CveUrl, cveUrl1) } } @@ -796,7 +798,7 @@ func BuildDocumentRef(cvrfsa *CvrfSa, v models.ExcelExport, var cveReference0 CveReference cveUrlSlice0 := make([]CveUrl, 0) var cveUrl0 CveUrl - cveUrl0.Url = "https://openeuler.org/en/security/safety-bulletin/detail.html?id=" + localOpenEulerSANum + cveUrl0.Url = secLinkConfig + "/en/security/safety-bulletin/detail.html?id=" + localOpenEulerSANum cveUrlSlice0 = append(cveUrlSlice0, cveUrl0) cveReference0.Type = "Self" cveReference0.CveUrl = cveUrlSlice0 @@ -805,7 +807,7 @@ func BuildDocumentRef(cvrfsa *CvrfSa, v models.ExcelExport, cveUrlSlice1 := make([]CveUrl, 0) for _, cveNum := range localCveNum { var cveUrl1 CveUrl - cveUrl1.Url = "https://openeuler.org/en/security/cve/detail.html?id=" + cveNum + cveUrl1.Url = secLinkConfig + "/en/security/cve/detail.html?id=" + cveNum cveUrlSlice1 = append(cveUrlSlice1, cveUrl1) } cveReference1.Type = "openEuler CVE" @@ -1100,7 +1102,8 @@ func BuildVulnerability(vlLenth int, v models.ExcelExport, } else { localOpenEulerSANum = componentInfo.CveNumMap[cpe].OpenEulerSANum } - remediation.Url = "https://openeuler.org/en/security/safety-bulletin/detail.html?id=" + localOpenEulerSANum + secLinkConfig := beego.AppConfig.String("reflink::openeuler_web") + remediation.Url = secLinkConfig + "/en/security/safety-bulletin/detail.html?id=" + localOpenEulerSANum remediations.Remediation = &remediation vulnerability.Remediations = &remediations vulnerabilitySlice = append(vulnerabilitySlice, vulnerability) diff --git a/cve-vulner-manager/taskhandler/issuestatistics.go b/cve-vulner-manager/taskhandler/issuestatistics.go index dd28fe4555837b82084d9d3324351cd7f93f48c9..2013d7cf1901925b791555be641c9700b0a40279 100644 --- a/cve-vulner-manager/taskhandler/issuestatistics.go +++ b/cve-vulner-manager/taskhandler/issuestatistics.go @@ -298,6 +298,7 @@ func CveCredibilityStatistics(beforeDate, prcnum int) error { } func ProcSecLinkTemplate(beforeDate, prcnum int, owner, accessToken string) error { + secLinkConfig := beego.AppConfig.String("reflink::openeuler_web") templateId := int64(0) for { it, err := GetNoLinkIssueData(beforeDate, prcnum, templateId) @@ -321,7 +322,7 @@ func ProcSecLinkTemplate(beforeDate, prcnum int, owner, accessToken string) erro if issueExist && len(saData.Result.AffectedProduct) > 2 { // Update sa release time UpdateSAReleaseTime(saData.Result.AffectedProduct, saData.Result.CreateTime, temp.TemplateId) - secLink := "https://openeuler.org/zh/security/safety-bulletin/detail.html?id=" + saData.Result.AffectedProduct + secLink := secLinkConfig + "/zh/security/safety-bulletin/detail.html?id=" + saData.Result.AffectedProduct if temp.SecLink != secLink { temp.SecLink = secLink } else {