调整执行finish函数位置

oneforall/modules/intelligence/riskiq_api.py

@@ -19,13 +19,16 @@ 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.user, self.key))
+        resp = self.get(url=self.addr,
+                        params=params,
+                        auth=(self.user, self.key))
         if not resp:
             return
         resp_json = resp.json()
-        subdomains_find = resp_json.get('subdomains')
-        if subdomains_find:
-            self.subdomains = set(map(lambda x: x + '.' + self.domain, subdomains_find))
+        subnames = resp_json.get('subdomains')
+        if subnames:
+            self.subdomains = set(map(lambda sub: f'{sub}.{self.domain}',
+                                      subnames))
 
     def run(self):
         """
@@ -35,10 +38,10 @@ class RiskIQ(Query):
             return
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/intelligence/threatbook_api.py

@@ -11,13 +11,15 @@ class ThreatBookAPI(Query):
         self.addr = 'https://x.threatbook.cn/api/v1/domain/query'
         self.key = config.threatbook_api_key
 
-    def query(self, domain):
+    def query(self):
         """
         向接口查询子域并做子域匹配
         """
         self.header = self.get_header()
         self.proxy = self.get_proxy(self.source)
-        params = {'apikey': self.key, 'domain': domain, 'field': 'sub_domains'}
+        params = {'apikey': self.key,
+                  'domain': self.domain,
+                  'field': 'sub_domains'}
         resp = self.post(self.addr, params)
         if not resp:
             return
@@ -31,11 +33,11 @@ class ThreatBookAPI(Query):
         if not self.check(self.key):
             return
         self.begin()
-        self.query(self.domain)
+        self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/intelligence/threatminer.py

@@ -33,10 +33,10 @@ class ThreatMiner(Query):
         """
         self.begin()
         self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/intelligence/virustotal.py

@@ -15,7 +15,7 @@ class VirusTotal(Query):
         self.addr = 'https://www.virustotal.com/ui/domains/{}/subdomains'
         self.domain = self.register(domain)
 
-    def query(self, domain):
+    def query(self):
         """
         向接口查询子域并做子域匹配
         """
@@ -27,7 +27,7 @@ class VirusTotal(Query):
                                 'TE': 'Trailers'})
             self.proxy = self.get_proxy(self.source)
             params = {'limit': '40', 'cursor': next_cursor}
-            resp = self.get(url=self.addr.format(domain), params=params)
+            resp = self.get(url=self.addr.format(self.domain), params=params)
             if not resp:
                 return
             resp_json = resp.json()
@@ -53,11 +53,11 @@ class VirusTotal(Query):
         类执行入口
         """
         self.begin()
-        self.query(self.domain)
+        self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用

oneforall/modules/intelligence/virustotal_api.py

@@ -11,13 +11,13 @@ class VirusTotalAPI(Query):
         self.addr = 'https://www.virustotal.com/vtapi/v2/domain/report'
         self.key = config.virustotal_api_key
 
-    def query(self, domain):
+    def query(self):
         """
         向接口查询子域并做子域匹配
         """
         self.header = self.get_header()
         self.proxy = self.get_proxy(self.source)
-        params = {'apikey': self.key, 'domain': domain}
+        params = {'apikey': self.key, 'domain': self.domain}
         resp = self.get(self.addr, params)
         if not resp:
             return
@@ -32,11 +32,11 @@ class VirusTotalAPI(Query):
         if not self.check(self.key):
             return
         self.begin()
-        self.query(self.domain)
+        self.query()
+        self.finish()
         self.save_json()
         self.gen_result()
         self.save_db()
-        self.finish()
 
 
 def do(domain):  # 统一入口名字 方便多线程调用