Merge remote-tracking branch 'origin/master'

common/utils.py

@@ -606,14 +606,14 @@ def check_version(local):
     try:
         resp = requests.get(url=api, headers=header, proxies=proxy,
                             timeout=timeout, verify=verify)
-        json = resp.json()
+        resp_json = resp.json()
-        latest = json['tag_name']
+        latest = resp_json['tag_name']
     except Exception as e:
         logger.log('ERROR', 'An error occurred while checking the latest version')
         logger.log('ERROR', e.args)
         return
     if latest > local:
-        change = json.get("body")
+        change = resp_json.get("body")
         logger.log('ALERT', f'The current version is {local} '
                             f'but the latest version is {latest}')
         logger.log('ALERT', f'The {latest} version mainly has the following changes')

modules/datasets/qianxun.py

@@ -25,9 +25,10 @@ class QianXun(Query):
             url = f'https://www.dnsscan.cn/dns.html?' \
                   f'keywords={self.domain}&page={num}'
             resp = self.post(url, data)
-            self.subdomains = self.collect_subdomains(resp)
+            subdomains = self.match_subdomains(resp)
-            if resp is None:
+            if not subdomains:  # 没有发现子域名则停止查询
                 break
+            self.subdomains = self.subdomains.union(subdomains)
             if '<div id="page" class="pagelist">' not in resp.text:
                 break
             if '<li class="disabled"><span>&raquo;</span></li>' in resp.text:

modules/datasets/sitedossier.py

@@ -23,7 +23,7 @@ class SiteDossier(Query):
             url = f'{self.addr}{self.domain}/{self.page_num}'
             resp = self.get(url)
             subdomains = self.match_subdomains(resp)
-            if not subdomains:  # 搜索没有发现子域名则停止搜索
+            if not subdomains:  # 没有发现子域名则停止查询
                 break
             self.subdomains = self.subdomains.union(subdomains)
             # 搜索页面没有出现下一页时停止搜索

modules/datasets/spyse_api.py

@@ -27,7 +27,7 @@ class SpyseAPI(Query):
                 return
             json = resp.json()
             subdomains = self.match_subdomains(str(json))
-            if not subdomains:  # 搜索没有发现子域名则停止搜索
+            if not subdomains:  # 没有发现子域名则停止查询
                 break
             self.subdomains = self.subdomains.union(subdomains)
             offset += limit

modules/datasets/wzpc.py

@@ -32,6 +32,8 @@ class WZPCQuery(Query):
             if not resp:
                 break
             subdomains = self.match_subdomains(resp.text)
+            if not subdomains:  # 没有发现子域名则停止查询
+                break
             self.subdomains = self.subdomains.union(subdomains)
             if not subdomains:
                 break

modules/datasets/ximcx.py

@@ -17,11 +17,7 @@ class Ximcx(Query):
         self.proxy = self.get_proxy(self.source)
         data = {'domain': self.domain}
         resp = self.post(self.addr, data=data)
-        if not resp:
+        self.subdomains = self.collect_subdomains(resp)
-            return
-        json = resp.json()
-        subdomains = self.match_subdomains(str(json))
-        self.subdomains = self.subdomains.union(subdomains)
 
     def run(self):
         """