优化代码结构 删除无用队列结果集参数

oneforall/modules/intelligence/riskiq_api.py

@@ -1,9 +1,7 @@
 # coding=utf-8
-import queue
 
 import config
 from common.query import Query
-from config import logger
 
 
 class RiskIQ(Query):
@@ -13,7 +11,7 @@ class RiskIQ(Query):
         self.module = 'Intelligence'
         self.source = 'RiskIQQuery'
         self.addr = 'https://api.passivetotal.org/v2/enrichment/subdomains'
-        self.username = config.riskiq_api_username
+        self.user = config.riskiq_api_username
         self.key = config.riskiq_api_key
 
     def query(self):
@@ -23,7 +21,7 @@ class RiskIQ(Query):
         self.header = self.get_header()
         self.proxy = self.get_proxy(self.source)
         params = {'query': self.domain}
-        resp = self.get(url=self.addr, params=params, auth=(self.username, self.key))
+        resp = self.get(url=self.addr, params=params, auth=(self.user, self.key))
         if not resp:
             return
         resp_json = resp.json()
@@ -31,34 +29,31 @@ class RiskIQ(Query):
         if subdomains_find:
             self.subdomains = set(map(lambda x: x + '.' + self.domain, subdomains_find))
 
-    def run(self, rx_queue):
+    def run(self):
         """
         类执行入口
         """
-        if not self.username or not self.key:
-            logger.log('ERROR', f'{self.source}模块API配置错误')
-            logger.log('ALERT', f'不执行{self.source}模块')
+        if not self.check(self.user, self.key):
             return
         self.begin()
         self.query()
         self.save_json()
         self.gen_result()
         self.save_db()
-        rx_queue.put(self.results)
         self.finish()
 
 
-def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
+def do(domain):  # 统一入口名字 方便多线程调用
     """
     类统一调用入口
 
     :param str domain: 域名
-    :param rx_queue: 结果集队列
+
     """
     query = RiskIQ(domain)
-    query.run(rx_queue)
+    query.run()
 
 
 if __name__ == '__main__':
-    result_queue = queue.Queue()
-    do('example.com', result_queue)
+
+    do('example.com')

oneforall/modules/intelligence/threatminer.py

@@ -1,5 +1,4 @@
 # coding=utf-8
-import queue
 import time
 
 from common.query import Query
@@ -27,7 +26,7 @@ class ThreatMiner(Query):
         subdomains_find = self.match(self.domain, resp.text)
         self.subdomains = self.subdomains.union(subdomains_find)  # 合并搜索子域名搜索结果
 
-    def run(self, rx_queue):
+    def run(self):
         """
         类执行入口
         """
@@ -36,21 +35,19 @@ class ThreatMiner(Query):
         self.save_json()
         self.gen_result()
         self.save_db()
-        rx_queue.put(self.results)
         self.finish()
 
 
-def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
+def do(domain):  # 统一入口名字 方便多线程调用
     """
     类统一调用入口
 
     :param str domain: 域名
-    :param rx_queue: 结果集队列
     """
     query = ThreatMiner(domain)
-    query.run(rx_queue)
+    query.run()
 
 
 if __name__ == '__main__':
-    result_queue = queue.Queue()
-    do('example.com', result_queue)
+
+    do('example.com')

oneforall/modules/intelligence/virustotal.py

@@ -1,5 +1,4 @@
 # coding=utf-8
-import queue
 import time
 
 from common.query import Query
@@ -50,7 +49,7 @@ class VirusTotal(Query):
             else:
                 break
 
-    def run(self, rx_queue):
+    def run(self):
         """
         类执行入口
         """
@@ -59,21 +58,20 @@ class VirusTotal(Query):
         self.save_json()
         self.gen_result()
         self.save_db()
-        rx_queue.put(self.results)
         self.finish()
 
 
-def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
+def do(domain):  # 统一入口名字 方便多线程调用
     """
     类统一调用入口
 
     :param str domain: 域名
-    :param rx_queue: 结果集队列
+
     """
     query = VirusTotal(domain)
-    query.run(rx_queue)
+    query.run()
 
 
 if __name__ == '__main__':
-    result_queue = queue.Queue()
-    do('example.com', result_queue)
+
+    do('example.com')

oneforall/modules/intelligence/virustotal_api.py

@@ -1,9 +1,7 @@
 # coding=utf-8
-import queue
 
 import config
 from common.query import Query
-from config import logger
 
 
 class VirusTotalAPI(Query):
@@ -29,34 +27,31 @@ class VirusTotalAPI(Query):
         subdomain_find = set(resp_json.get('subdomains'))
         self.subdomains = self.subdomains.union(subdomain_find)
 
-    def run(self, rx_queue):
+    def run(self):
         """
         类执行入口
         """
-        if not self.key:
-            logger.log('ERROR', f'{self.source}模块API配置错误')
-            logger.log('ALERT', f'不执行{self.source}模块')
+        if not self.check(self.key):
             return
         self.begin()
         self.query(self.domain)
         self.save_json()
         self.gen_result()
         self.save_db()
-        rx_queue.put(self.results)
         self.finish()
 
 
-def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
+def do(domain):  # 统一入口名字 方便多线程调用
     """
     类统一调用入口
 
     :param str domain: 域名
-    :param rx_queue: 结果集队列
+
     """
     query = VirusTotalAPI(domain)
-    query.run(rx_queue)
+    query.run()
 
 
 if __name__ == '__main__':
-    result_queue = queue.Queue()
-    do('example.com', result_queue)
+
+    do('example.com')