!279 增加System的Word格式报告功能, system添加Package字段&&BS架构返回值修改&&把arm压缩包格式更改

Merge pull request !279 from a-alpha/alpha-dev

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

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

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",