修改日志输出格式，降低代码重复率。

oneforall/modules/certificates/censys_api.py

@@ -24,11 +24,10 @@ class CensysAPI(Query):
         self.header = self.get_header()
         self.proxy = self.get_proxy(self.source)
         data = {
-            'query': 'parsed.names: owasp.org',
+            'query': 'parsed.names: example.com',
             'page': 1,
             'fields': ['parsed.subject_dn'],
             'flatten': True}
-
         resp = self.post(self.addr, json=data, auth=(self.id, self.secret))
         if not resp:
             return
@@ -40,7 +39,7 @@ class CensysAPI(Query):
         subdomains_find = self.match(self.domain, str(resp_json))
         self.subdomains = self.subdomains.union(subdomains_find)
         pages = resp_json.get('metadata').get('pages')
-        for page in range(2, pages+1):
+        for page in range(2, pages + 1):
             time.sleep(self.delay)
             data['page'] = page
             resp = self.post(self.addr, json=data, auth=(self.id, self.secret))
@@ -57,16 +56,13 @@ class CensysAPI(Query):
             logger.log('ERROR', f'{self.source}模块API配置错误')
             logger.log('ALERT', f'不执行{self.source}模块')
             return
-        logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
-        start = time.time()
+        self.begin()
         self.query()
-        end = time.time()
-        self.elapsed = round(end - start, 1)
         self.save_json()
         self.gen_result()
         self.save_db()
         rx_queue.put(self.results)
-        logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
+        self.finish()
 
 
 def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
@@ -78,10 +74,8 @@ def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
     """
     query = CensysAPI(domain)
     query.run(rx_queue)
-    logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}个')
-    logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
 
 
 if __name__ == '__main__':
     result_queue = queue.Queue()
-    do('owasp.org', result_queue)
+    do('example.com', result_queue)

oneforall/modules/certificates/certdb_api.py

@@ -44,19 +44,16 @@ class CertDBAPI(Query):
             logger.log('ERROR', f'{self.source}模块API配置错误')
             logger.log('ALERT', f'不执行{self.source}模块')
             return
-        logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
-        start = time.time()
+        self.begin()
         self.query()
-        end = time.time()
-        self.elapsed = round(end - start, 1)
         self.save_json()
         self.gen_result()
         self.save_db()
         rx_queue.put(self.results)
-        logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
+        self.finish()
 
 
-def do(domain, rx_queue):   # 统一入口名字 方便多线程调用
+def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
     """
     类统一调用入口
 
@@ -65,10 +62,8 @@ def do(domain, rx_queue):   # 统一入口名字 方便多线程调用
     """
     query = CertDBAPI(domain)
     query.run(rx_queue)
-    logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}个')
-    logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
 
 
 if __name__ == '__main__':
     result_queue = queue.Queue()
-    do('owasp.org', result_queue)
+    do('example.com', result_queue)

oneforall/modules/certificates/certspotter.py

@@ -1,9 +1,9 @@
 # coding=utf-8
-import time
 import queue
-from common.query import Query
+import time
+
 from common import utils
-from config import logger
+from common.query import Query
 
 
 class CertSpotter(Query):
@@ -32,16 +32,13 @@ class CertSpotter(Query):
         """
         类执行入口
         """
-        logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
-        start = time.time()
+        self.begin()
         self.query()
-        end = time.time()
-        self.elapsed = round(end - start, 1)
         self.save_json()
         self.gen_result()
         self.save_db()
         rx_queue.put(self.results)
-        logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
+        self.finish()
 
 
 def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
@@ -53,10 +50,8 @@ def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
     """
     query = CertSpotter(domain)
     query.run(rx_queue)
-    logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}个')
-    logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
 
 
 if __name__ == '__main__':
     result_queue = queue.Queue()
-    do('owasp.org', result_queue)
+    do('example.com', result_queue)

oneforall/modules/certificates/crtsh.py

@@ -1,9 +1,9 @@
 # coding=utf-8
-import time
 import queue
-from common.query import Query
+import time
+
 from common import utils
-from config import logger
+from common.query import Query
 
 
 class Crtsh(Query):
@@ -32,16 +32,13 @@ class Crtsh(Query):
         """
         类执行入口
         """
-        logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
-        start = time.time()
+        self.begin()
         self.query()
-        end = time.time()
-        self.elapsed = round(end - start, 1)
         self.save_json()
         self.gen_result()
         self.save_db()
         rx_queue.put(self.results)
-        logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
+        self.finish()
 
 
 def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
@@ -53,10 +50,8 @@ def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
     """
     query = Crtsh(domain)
     query.run(rx_queue)
-    logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}个')
-    logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
 
 
 if __name__ == '__main__':
     result_queue = queue.Queue()
-    do('owasp.org', result_queue)
+    do('example.com', result_queue)

oneforall/modules/certificates/entrust.py

@@ -1,9 +1,9 @@
 # coding=utf-8
-import time
 import queue
-from common.query import Query
+import time
+
 from common import utils
-from config import logger
+from common.query import Query
 
 
 class Entrust(Query):
@@ -32,16 +32,13 @@ class Entrust(Query):
         """
         类执行入口
         """
-        logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
-        start = time.time()
+        self.begin()
         self.query()
-        end = time.time()
-        self.elapsed = round(end - start, 1)
         self.save_json()
         self.gen_result()
         self.save_db()
         rx_queue.put(self.results)
-        logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
+        self.finish()
 
 
 def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
@@ -53,10 +50,8 @@ def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
     """
     query = Entrust(domain)
     query.run(rx_queue)
-    logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}个')
-    logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
 
 
 if __name__ == '__main__':
     result_queue = queue.Queue()
-    do('owasp.org', result_queue)
+    do('example.com', result_queue)

oneforall/modules/certificates/google.py

@@ -1,9 +1,9 @@
 # coding=utf-8
-import time
 import queue
-from common.query import Query
+import time
+
 from common import utils
-from config import logger
+from common.query import Query
 
 
 class Google(Query):
@@ -32,16 +32,13 @@ class Google(Query):
         """
         类执行入口
         """
-        logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
-        start = time.time()
+        self.begin()
         self.query()
-        end = time.time()
-        self.elapsed = round(end - start, 1)
         self.save_json()
         self.gen_result()
         self.save_db()
         rx_queue.put(self.results)
-        logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
+        self.finish()
 
 
 def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
@@ -53,10 +50,8 @@ def do(domain, rx_queue):  # 统一入口名字 方便多线程调用
     """
     query = Google(domain)
     query.run(rx_queue)
-    logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}个')
-    logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
 
 
 if __name__ == '__main__':
     result_queue = queue.Queue()
-    do('owasp.org', result_queue)
+    do('example.com', result_queue)