From 90a3200f1f7ae6556ef51360eb345076c84eed3f Mon Sep 17 00:00:00 2001
From: bozhihouc <852782749@qq.com>
Date: Thu, 8 Nov 2018 10:38:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8join()=E4=BF=AE=E5=A4=8DCVE?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=BF=87=E5=A4=9A=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

使用join()修复CVE编号过多的情况
---
 README.md        |  3 +++
 nsfocus_excel.py | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9114b6d..de927a1 100644
--- a/README.md
+++ b/README.md
@@ -24,3 +24,6 @@ RSAS_html报表处理成excel
 ### 20180416
 > 感谢大佬指出 121行 修复建议
 > 在mac+windows系统 测试通过，脚本正常运行
+### 20181108
+> 使用join()修复CVE编号过多的情况
+> 感谢耀神
diff --git a/nsfocus_excel.py b/nsfocus_excel.py
index 4442e4a..e10802e 100644
--- a/nsfocus_excel.py
+++ b/nsfocus_excel.py
@@ -69,6 +69,7 @@ def bug_main(bug_bug):
         table.write(0, fist, data)
         fist += 1
     for i in range(len(bug_bug)):
+#    for i in range(1):
         #print u'当前进行第%s个' %(i+1)
         bug_n_r = r'trclass=".*?vuln_(.*?)"onclick.*?<spanstyle="color:.*?">(.*?)</span><!--<span'
         bug_n_re = re.compile(bug_n_r)
@@ -101,7 +102,21 @@ def bug_main(bug_bug):
             else:
                 bug_jie = u'无'
             if len(bug_c_list)!=0:
-                bug_cve = bug_c_list[0]
+                #print bug_c_list
+                if 'blank' in bug_c_list[0]:
+                    #print bug_c_list
+                    cvem = '>'+bug_c_list[0]+'</a>'
+                    #print cvem
+                    bug_cve_r = r'>(CVE.*?)</a>'
+                    bug_cve_re = re.compile(bug_cve_r)
+                    bug_cve_list = re.findall(bug_cve_re,cvem)
+                    #print bug_cve_list
+                    #print len(bug_cve_list)
+                    bug_cve = ','.join(bug_cve_list)
+                    #print bug_cve
+                else:
+                    #print bug_c_list
+                    bug_cve = bug_c_list[0]
             else:
                 bug_cve = u'无'
             #print vnln_hosts(bug_bug[i])[hs]+'Analogy'+bug_lv+bug_name+'Analogy'+bug_xin+'Analogy'+bug_jie+'Analogy'+bug_cve