diff --git a/cve-vulner-manager/models/modeldb.go b/cve-vulner-manager/models/modeldb.go index b92d8690711d08c52f52c5d0e97c162cdccadd6d..d92bc4d6487a17bc0dc65f0585b1a8ba3f36825c 100644 --- a/cve-vulner-manager/models/modeldb.go +++ b/cve-vulner-manager/models/modeldb.go @@ -16,6 +16,9 @@ const ( OrganizationIdOpenLooKeng = 4 IssueStatusRejected = 4 + + CveOriginUpstreamSourceVtopia = 0 + CveOriginUpstreamSource7cai = 2 ) type AuthTokenInfo struct { @@ -63,8 +66,9 @@ type VulnCenter struct { CveNum string `orm:"size(256);column(cve_num);index" description:"cve编号"` Description string `orm:"type(text);column(cve_desc)" description:"cve描述"` CveLevel string `orm:"size(32);column(cve_level)" description:"nvd 致命(Critical);严重(High);中等(Medium);一般(Low);其他"` - Status int8 `orm:"default(0);column(cve_status)" description:"0:cve新增;1:数据已变化;2:已创建issue; 3: 数据创建失败; 4:不符合创建issue条件数据(cve年份不符合要求); - 5:issue已经创建过,不符合要求,不处理;6:字段为空(评分,描述等);7:issue已被删除不再创建;8:分支和版本信息不想符合"` + Status int8 `orm:"default(0);column(cve_status)" description:"0:cve新增;1:数据已变化;2:已创建issue; 3: 数据创建失败; +4:不符合创建issue条件数据(cve年份不符合要求);5:issue已经创建过,不符合要求,不处理;6:字段为空(评分,描述等);7:issue已被删除不再创建; +8:分支和版本信息不符合"` CveVersion string `orm:"size(512);column(cve_version)" description:"cve归属版本,版本合并"` RepairTime string `orm:"size(32);column(repair_time)" description:"cve修复时间"` FirstPerTime string `orm:"size(32);column(first_per_time)" description:"cve首次披露时间"` diff --git a/cve-vulner-manager/models/uploadcve.go b/cve-vulner-manager/models/uploadcve.go index 8bd070b98f8b0433fccbb11bad0f45ed44a4d1e5..d7d216726b8e7636c1c24fddb56406d22f9fa80c 100644 --- a/cve-vulner-manager/models/uploadcve.go +++ b/cve-vulner-manager/models/uploadcve.go @@ -485,6 +485,10 @@ func CreateOriginCve(CveData common.CveOriginData, ou *OriginUpstream, od *Origi } o.Commit() } else { + if ouse.Source == CveOriginUpstreamSourceVtopia && ou.Source == CveOriginUpstreamSource7cai { + return 0, errors.New("source not match") + } + logs.Info("update datas: ", ou) ou.CveId = ouse.CveId ou.Ids = ouse.Ids