From 354a8c5affa2b60df0bbd99142b540972ed729d2 Mon Sep 17 00:00:00 2001 From: chenxinquan Date: Fri, 4 Aug 2023 14:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0System=E7=9A=84Word=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=8A=A5=E5=91=8A=E5=8A=9F=E8=83=BD,=20system?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0Package=E5=AD=97=E6=AE=B5&&BS=E6=9E=B6?= =?UTF-8?q?=E6=9E=84=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BF=AE=E6=94=B9&&?= =?UTF-8?q?=E6=8A=8Aarm=E5=8E=8B=E7=BC=A9=E5=8C=85=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/genmai/ExplorerSystem.go | 13 +++---------- src/genmai/ReportCommon.go | 11 +++++++++-- src/genmai/ReportSystem.go | 3 +++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/genmai/ExplorerSystem.go b/src/genmai/ExplorerSystem.go index d6df15c..ee08fcb 100644 --- a/src/genmai/ExplorerSystem.go +++ b/src/genmai/ExplorerSystem.go @@ -42,6 +42,7 @@ ExplorerConfigSystem struct { FormatVer int Id string Belong string + Package string PocHazardLevel string Source string SiteInfo SiteInfo @@ -56,15 +57,6 @@ ExplorerSystem struct { } -var errMap = map[string]string{ - "0":"signal: segmentation fault (core dumped)", - "1":"signal: aborted (core dumped)", - "2":"exit status 1", - - "101":"be killed", -} - - /////////////////////////////// // ExplorerSystem functions func @@ -116,7 +108,7 @@ func if (0 != config.SiteRequests.Implement.ExpireTime) { expiretime = config.SiteRequests.Implement.ExpireTime } else { - expiretime = 5 // 默认为五秒 + expiretime = 20 // 默认为五秒 } // if (0 != ... /* */ f := func() { @@ -245,6 +237,7 @@ func if rc.Error() =="Poc Check Successfully!"{ expvul.VICId = config.Id expvul.VICBelong = config.Belong + expvul.VICPackages = config.Package expvul.VICPocHazardLevel = config.PocHazardLevel expvul.VICSource = config.Source expvul.VICSiteInfo = config.SiteInfo diff --git a/src/genmai/ReportCommon.go b/src/genmai/ReportCommon.go index 86afada..c86ee10 100644 --- a/src/genmai/ReportCommon.go +++ b/src/genmai/ReportCommon.go @@ -86,9 +86,15 @@ ReportCommon struct { RCPackages string // TBD: type RCSrcPackages string // TBD: type RCOptional string // TBD: type + RCRisk_system_h_nums int + RCRisk_system_m_nums int + RCRisk_system_l_nums int + RCRisk_kernel_h_nums int + RCRisk_kernel_m_nums int + RCRisk_kernel_l_nums int RCExecPocNums int //执行poc总数 - RCRepairedNums int //未修复漏洞个数 - RCNotFixedNums int //已修复漏洞个数 + RCRepairedNums int //已修复漏洞个数 + RCNotFixedNums int //未修复漏洞个数 RCNotExecPocNums int //未执行poc个数 } @@ -131,6 +137,7 @@ type VulnInfoCommon struct { VICFormatVer int VICId string + VICPackages string VICBelong string VICPocHazardLevel string VICSource string diff --git a/src/genmai/ReportSystem.go b/src/genmai/ReportSystem.go index 524a3e8..670d10d 100644 --- a/src/genmai/ReportSystem.go +++ b/src/genmai/ReportSystem.go @@ -67,6 +67,9 @@ GetTemplateReportSystem() (*ReportSystem) { RCRepairedNums: 0, RCNotFixedNums: 0, RCNotExecPocNums: 0, + RCRisk_system_h_nums: 0, + RCRisk_system_m_nums: 0, + RCRisk_system_l_nums: 0, RCExploredMode: "RCExploredMode", RCExploredVersion: "RCExploredVersion", RCExploredRevision: "RCExploredRevision",