From ed5f7287c6ee14bb8ff88359088227af310d2ad1 Mon Sep 17 00:00:00 2001
From: EXP <289065406@qq.com>
Date: Tue, 5 May 2020 23:03:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85CVE=E6=9D=A5=E6=BA=90?=
=?UTF-8?q?=E7=9A=84=E5=AE=98=E7=BD=91URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/bean/cve_info.py | 2 +-
src/crawler/_base_crawler.py | 5 +++++
src/crawler/anquanke.py | 5 +++++
src/crawler/cert360.py | 5 +++++
src/crawler/nsfocus.py | 4 ++++
src/crawler/qianxin.py | 5 +++++
src/crawler/redqueen.py | 5 +++++
src/crawler/vas.py | 5 +++++
src/notice/mail.py | 3 ++-
9 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/bean/cve_info.py b/src/bean/cve_info.py
index b1b4c588675..3dd9ad4d1f5 100644
--- a/src/bean/cve_info.py
+++ b/src/bean/cve_info.py
@@ -39,7 +39,7 @@ def to_html(self):
"[漏洞编号] %s" % self.id,
"[披露时间] %s" % self.time,
"[漏洞描述] %s" % self.title,
- "[相关链接] %s" % self.url
+ "[相关链接] %s" % (self.url, self.url)
])
diff --git a/src/crawler/_base_crawler.py b/src/crawler/_base_crawler.py
index 4807405f871..d7ad81d62c1 100644
--- a/src/crawler/_base_crawler.py
+++ b/src/crawler/_base_crawler.py
@@ -34,6 +34,11 @@ def NAME_EN(self):
return 'unknow'
+ @abstractmethod
+ def HOME_PAGE(self):
+ return 'https://exp-blog.com'
+
+
def CACHE_PATH(self):
return '%s/cache/%s.dat' % (env.PRJ_DIR, self.NAME_EN())
diff --git a/src/crawler/anquanke.py b/src/crawler/anquanke.py
index ceb7dbca128..8e222cb7052 100644
--- a/src/crawler/anquanke.py
+++ b/src/crawler/anquanke.py
@@ -21,6 +21,7 @@ def __init__(self):
BaseCrawler.__init__(self)
self.name_ch = '安全客'
self.name_en = 'AnQuanKe'
+ self.home_page = 'https://www.anquanke.com/vul'
self.url = 'https://www.anquanke.com/vul/'
@@ -32,6 +33,10 @@ def NAME_EN(self):
return self.name_en
+ def HOME_PAGE(self):
+ return self.home_page
+
+
def get_cves(self):
response = requests.get(
self.url,
diff --git a/src/crawler/cert360.py b/src/crawler/cert360.py
index 694107dfb30..97542af5cc8 100644
--- a/src/crawler/cert360.py
+++ b/src/crawler/cert360.py
@@ -22,6 +22,7 @@ def __init__(self):
BaseCrawler.__init__(self)
self.name_ch = '360'
self.name_en = '360'
+ self.home_page = 'https://cert.360.cn/warning'
self.url_list = 'https://cert.360.cn/warning/searchbypage'
self.url_cve = 'https://cert.360.cn/warning/detail?id='
@@ -34,6 +35,10 @@ def NAME_EN(self):
return self.name_en
+ def HOME_PAGE(self):
+ return self.home_page
+
+
def get_cves(self, limit = 6):
params = {
'length': limit,
diff --git a/src/crawler/nsfocus.py b/src/crawler/nsfocus.py
index 59a319c5d30..7423d64a37c 100644
--- a/src/crawler/nsfocus.py
+++ b/src/crawler/nsfocus.py
@@ -21,6 +21,7 @@ def __init__(self):
BaseCrawler.__init__(self)
self.name_ch = '绿盟'
self.name_en = 'Nsfocus'
+ self.home_page = 'http://www.nsfocus.net/index.php'
self.url_list = 'http://www.nsfocus.net/index.php'
self.url_cve = 'http://www.nsfocus.net/vulndb/'
@@ -33,6 +34,9 @@ def NAME_EN(self):
return self.name_en
+ def HOME_PAGE(self):
+ return self.home_page
+
def get_cves(self):
params = {
diff --git a/src/crawler/qianxin.py b/src/crawler/qianxin.py
index cf038dfb7f4..8fe61723ae5 100644
--- a/src/crawler/qianxin.py
+++ b/src/crawler/qianxin.py
@@ -21,6 +21,7 @@ def __init__(self):
BaseCrawler.__init__(self)
self.name_ch = '奇安信'
self.name_en = 'QiAnXin'
+ self.home_page = 'https://ti.qianxin.com/advisory/'
self.url = 'https://ti.qianxin.com/advisory/'
@@ -32,6 +33,10 @@ def NAME_EN(self):
return self.name_en
+ def HOME_PAGE(self):
+ return self.home_page
+
+
def get_cves(self):
response = requests.get(
self.url,
diff --git a/src/crawler/redqueen.py b/src/crawler/redqueen.py
index dd47b5fd51c..32bdcd4c17e 100644
--- a/src/crawler/redqueen.py
+++ b/src/crawler/redqueen.py
@@ -21,6 +21,7 @@ def __init__(self):
BaseCrawler.__init__(self)
self.name_ch = '红后'
self.name_en = 'RedQueen'
+ self.home_page = 'https://redqueen.tj-un.com/IntelHome.html'
self.url_list = 'https://redqueen.tj-un.com/Json/intelHomeVulnIntelList.json'
self.url_cve = 'https://redqueen.tj-un.com/IntelDetails.html?id='
@@ -33,6 +34,10 @@ def NAME_EN(self):
return self.name_en
+ def HOME_PAGE(self):
+ return self.home_page
+
+
def to_headers(self):
headers = self.headers()
headers['Host'] = 'redqueen.tj-un.com'
diff --git a/src/crawler/vas.py b/src/crawler/vas.py
index ffec7e21c56..c5de120c328 100644
--- a/src/crawler/vas.py
+++ b/src/crawler/vas.py
@@ -22,6 +22,7 @@ def __init__(self):
BaseCrawler.__init__(self)
self.name_ch = '斗象'
self.name_en = 'vas'
+ self.home_page = 'https://vas.riskivy.com/vuln'
self.url_list = 'https://console.riskivy.com/vas'
self.url_details = 'https://console.riskivy.com/vas/'
self.url_cve = 'https://vas.riskivy.com/vuln-detail?id='
@@ -35,6 +36,10 @@ def NAME_EN(self):
return self.name_en
+ def HOME_PAGE(self):
+ return self.home_page
+
+
def get_cves(self, limit = 5):
params = {
'title': '',
diff --git a/src/notice/mail.py b/src/notice/mail.py
index 550a6d9ae36..7c3c7cc92e2 100644
--- a/src/notice/mail.py
+++ b/src/notice/mail.py
@@ -42,7 +42,7 @@ def to_mail(cves, smtp, sender, password):
def format_content(cves):
- src_tpl = ' %(cnt)d条由 [%(src)s] 提供'
+ src_tpl = ' %(cnt)d条由 [%(src)s] 提供'
mail_tpl = '''
发现最新威胁情报%(total)d条：
@@ -65,6 +65,7 @@ def format_content(cves):
total += cnt
src_infos.append(src_tpl % {
'cnt': cnt,
+ 'url': src.NAME_CH(),
'src': src.NAME_CH()
})
map(lambda cve: cve_infos.append(cve.to_html()), _cves)