统一调整子域匹配函数

common/lookup.py

@@ -20,7 +20,7 @@ class Lookup(Module):
             return None
         for item in answer:
             record = item.to_text()
-            subdomains = utils.match_subdomain(self.domain, record)
+            subdomains = self.match_subdomains(self.domain, record)
             self.subdomains = self.subdomains.union(subdomains)
             self.gen_record(subdomains, record)
         return self.subdomains

common/module.py

@@ -128,7 +128,7 @@ class Module(object):
         Custom post request
 
         :param str  url: request url
-        :param dict params: request parameters
+        :param dict data: request parameters
         :param bool check: check response
         :param kwargs: other params
         :return: requests's response object
@@ -184,24 +184,22 @@ class Module(object):
             return self.proxy
 
     @staticmethod
-    def match(domain, html, distinct=True):
+    def match_subdomains(domain, text, distinct=True):
         """
         Use regexp to match subdomains
 
         :param  str domain: domain
-        :param  str html: response html text
+        :param  str text: text
         :param  bool distinct: deduplicate results or not (default True)
         :return set/list: result set or list
         """
         logger.log('TRACE', f'Use regexp to match subdomains in the response body')
-        regexp = r'(?:\>|\"|\'|\=|\,)(?:http\:\/\/|https\:\/\/)?' \
+        regexp = r'(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\.){0,}' \
-                 r'(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\.){0,}' \
                  + domain.replace('.', r'\.')
-        result = re.findall(regexp, html, re.I)
+        result = re.findall(regexp, text, re.I)
         if not result:
             return set()
-        regexp = r'(?:http://|https://)'
+        deal = map(lambda s: s.lower(), result)
-        deal = map(lambda s: re.sub(regexp, '', s[1:].lower()), result)
         if distinct:
             return set(deal)
         else:
@@ -340,14 +338,12 @@ class Module(object):
                           'elapse': self.elapse,
                           'find': find,
                           'brute': brute,
-                          'valid': valid,
+                          'valid': valid}
-                          }
                 self.results.append(result)
 
     def save_db(self):
         """
         Save module results into the database
-
         """
         logger.log('DEBUG', f'Saving results to database')
         lock.acquire()

common/search.py

@@ -1,6 +1,9 @@
+import re
+
 from config import setting
-from .module import Module
+from config.log import logger
-from . import utils
+from common.module import Module
+from common import utils
 
 
 class Search(Module):
@@ -51,4 +54,28 @@ class Search(Module):
         location = resp.headers.get('location')
         if not location:
             return set()
-        return set(utils.match_subdomain(domain, location))
+        return set(self.match_subdomains(domain, location))
+
+    @staticmethod
+    def match_subdomains(domain, html, distinct=True):
+        """
+        Use regexp to match subdomains
+
+        :param  str domain: domain
+        :param  str html: response html text
+        :param  bool distinct: deduplicate results or not (default True)
+        :return set/list: result set or list
+        """
+        logger.log('TRACE', f'Use regexp to match subdomains in the response body')
+        regexp = r'(?:\>|\"|\'|\=|\,)(?:http\:\/\/|https\:\/\/)?' \
+                 r'(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\.){0,}' \
+                 + domain.replace('.', r'\.')
+        result = re.findall(regexp, html, re.I)
+        if not result:
+            return set()
+        regexp = r'(?:http://|https://)'
+        deal = map(lambda s: re.sub(regexp, '', s[1:].lower()), result)
+        if distinct:
+            return set(deal)
+        else:
+            return list(deal)

common/utils.py

@@ -32,27 +32,6 @@ user_agents = [
     'Mozilla/5.0 (X11; Linux i586; rv:31.0) Gecko/20100101 Firefox/68.0']
 
 
-def match_subdomain(domain, text, distinct=True):
-    """
-    Use regexp to match subdomains in text
-
-    :param  str domain: domain
-    :param  str text: response text
-    :param  bool distinct: deduplicate results
-    :return set/list: match result
-    """
-    regexp = r'(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\.){0,}' \
-             + domain.replace('.', r'\.')
-    result = re.findall(regexp, text, re.I)
-    if not result:
-        return set()
-    deal = map(lambda s: s.lower(), result)
-    if distinct:
-        return set(deal)
-    else:
-        return list(deal)
-
-
 def gen_random_ip():
     """
     Generate random decimal IP string

modules/certificates/censys_api.py

@@ -33,7 +33,7 @@ class CensysAPI(Query):
         if status != 'ok':
             logger.log('ALERT', status)
             return
-        subdomains = self.match(self.domain, str(json))
+        subdomains = self.match_subdomains(self.domain, str(json))
         self.subdomains = self.subdomains.union(subdomains)
         pages = json.get('metadata').get('pages')
         for page in range(2, pages + 1):
@@ -41,7 +41,7 @@ class CensysAPI(Query):
             resp = self.post(self.addr, json=data, auth=(self.id, self.secret))
             if not resp:
                 return
-            subdomains = self.match(self.domain, str(resp.json()))
+            subdomains = self.match_subdomains(self.domain, str(resp.json()))
             self.subdomains = self.subdomains.union(subdomains)
 
     def run(self):

modules/certificates/certspotter.py

@@ -22,7 +22,7 @@ class CertSpotter(Query):
         resp = self.get(self.addr, params)
         if not resp:
             return
-        subdomains = utils.match_subdomain(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/certificates/crtsh.py

@@ -20,7 +20,7 @@ class Crtsh(Query):
         resp = self.get(self.addr, params)
         if not resp:
             return
-        subdomains = utils.match_subdomain(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         self.subdomains = self.subdomains.union(subdomains)
 
     def run(self):

modules/certificates/google.py

@@ -23,7 +23,7 @@ class Google(Query):
         resp = self.get(self.addr, params)
         if not resp:
             return
-        subdomains = utils.match_subdomain(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/check/axfr.py

@@ -44,7 +44,7 @@ class CheckAXFR(Module):
         names = zone.nodes.keys()
         for name in names:
             full_domain = str(name) + '.' + self.domain
-            subdomain = utils.match_subdomain(self.domain, full_domain)
+            subdomain = self.match_subdomains(self.domain, full_domain)
             self.subdomains = self.subdomains.union(subdomain)
             record = zone[name].to_text(name)
             self.results.append(record)

modules/check/cdx.py

@@ -31,7 +31,7 @@ class CheckCDX(Module):
             if not response:
                 return
             if response and len(response.content):
-                self.subdomains = utils.match_subdomain(self.domain,
+                self.subdomains = self.match_subdomains(self.domain,
                                                         response.text)
 
     def run(self):

modules/check/cert.py

@@ -32,7 +32,7 @@ class CheckCert(Module):
         except Exception as e:
             logger.log('DEBUG', e.args)
             return
-        subdomains = utils.match_subdomain(self.domain, str(cert_dict))
+        subdomains = self.match_subdomains(self.domain, str(cert_dict))
         self.subdomains = self.subdomains.union(subdomains)
 
     def run(self):

modules/check/csp.py

@@ -52,7 +52,7 @@ class CheckCSP(Module):
         if not csp:
             logger.log('DEBUG', f'{self.domain}域的响应头不存在内容安全策略字段')
             return
-        self.subdomains = utils.match_subdomain(self.domain, csp)
+        self.subdomains = self.match_subdomains(self.domain, csp)
 
     def run(self):
         """

modules/check/robots.py

@@ -30,7 +30,7 @@ class CheckRobots(Module):
             if not response:
                 return
             if response and len(response.content):
-                self.subdomains = utils.match_subdomain(self.domain,
+                self.subdomains = self.match_subdomains(self.domain,
                                                         response.text)
 
     def run(self):

modules/check/sitemap.py

@@ -43,7 +43,7 @@ class CheckRobots(Module):
             if not response:
                 return
             if response and len(response.content):
-                self.subdomains = utils.match_subdomain(self.domain,
+                self.subdomains = self.match_subdomains(self.domain,
                                                         response.text)
 
 

modules/crawl/archivecrawl.py

@@ -26,7 +26,7 @@ class ArchiveCrawl(Crawl):
         for resp in cdx.iter(url, limit=limit):
             if resp.data.get('status') not in ['301', '302']:
                 url = resp.data.get('url')
-                subdomains = self.match(self.register(domain),
+                subdomains = self.match_subdomains(self.register(domain),
                                                    url + resp.text)
                 # 合并搜索子域名搜索结果
                 self.subdomains = self.subdomains.union(subdomains)

modules/crawl/commoncrawl.py

@@ -26,7 +26,7 @@ class CommonCrawl(Crawl):
 
         for resp in tqdm(cdx.iter(url, limit=limit), total=limit):
             if resp.data.get('status') not in ['301', '302']:
-                subdomains = self.match(self.register(domain), resp.text)
+                subdomains = self.match_subdomains(self.register(domain), resp.text)
                 # 合并搜索子域名搜索结果
                 self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/binaryedge_api.py

@@ -22,7 +22,7 @@ class BinaryEdgeAPI(Query):
         resp = self.get(url)
         if not resp:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         self.subdomains = self.subdomains.union(subdomains)
 
     def run(self):

modules/datasets/bufferover.py

@@ -26,7 +26,7 @@ class BufferOver(Query):
             return
         if resp.status_code != 200:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/cebaidu.py

@@ -19,7 +19,7 @@ class CeBaidu(Query):
         resp = self.get(self.addr, params)
         if not resp:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/chinaz.py

@@ -19,7 +19,7 @@ class Chinaz(Query):
         resp = self.get(self.addr)
         if not resp:
             return
-        subdomains = self.match(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/chinaz_api.py

@@ -21,7 +21,7 @@ class ChinazAPI(Query):
         resp = self.get(self.addr, params)
         if not resp:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/circl_api.py

@@ -21,7 +21,7 @@ class CirclAPI(Query):
         resp = self.get(self.addr + self.domain, auth=(self.user, self.pwd))
         if not resp:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/dnsdb_api.py

@@ -23,7 +23,7 @@ class DNSdbAPI(Query):
         resp = self.get(url)
         if not resp:
             return
-        subdomains = utils.match_subdomain(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/dnsdumpster.py

@@ -26,7 +26,7 @@ class DNSdumpster(Query):
         resp = self.post(self.addr, data)
         if not resp:
             return
-        subdomains = utils.match_subdomain(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         if subdomains:
             # 合并搜索子域名搜索结果
             self.subdomains = self.subdomains.union(subdomains)

modules/datasets/hackertarget.py

@@ -21,7 +21,7 @@ class HackerTarget(Query):
         if not resp:
             return
         if resp.status_code == 200:
-            subdomains = utils.match_subdomain(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             if subdomains:
                 # 合并搜索子域名搜索结果
                 self.subdomains = self.subdomains.union(subdomains)

modules/datasets/ip138.py

@@ -19,7 +19,7 @@ class IP138(Query):
         resp = self.get(self.addr)
         if not resp:
             return
-        subdomains = self.match(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/ipv4info_api.py

@@ -32,7 +32,7 @@ class IPv4InfoAPI(Query):
             except Exception as e:
                 logger.log('DEBUG', e.args)
                 break
-            subdomains = self.match(self.domain, str(json))
+            subdomains = self.match_subdomains(self.domain, str(json))
             if not subdomains:
                 break
             # 合并搜索子域名搜索结果

modules/datasets/netcraft.py

@@ -49,7 +49,7 @@ class NetCraft(Query):
             resp = self.get(self.addr + last, params)
             if not resp:
                 return
-            subdomains = self.match(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             # 合并搜索子域名搜索结果

modules/datasets/passivedns_api.py

@@ -22,7 +22,7 @@ class PassiveDnsAPI(Query):
         resp = self.get(url)
         if not resp:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/qianxun.py

@@ -27,7 +27,7 @@ class QianXun(Query):
             resp = self.post(url, data)
             if not resp:
                 break
-            subdomains = self.match(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             self.subdomains = self.subdomains.union(subdomains)
             if '<div id="page" class="pagelist">' not in resp.text:
                 break

modules/datasets/rapiddns.py

@@ -20,7 +20,7 @@ class RapidDNS(Query):
         resp = self.get(url, params)
         if not resp:
             return
-        subdomains = utils.match_subdomain(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/riddler.py

@@ -19,7 +19,7 @@ class Riddler(Query):
         resp = self.get(self.addr, params)
         if not resp:
             return
-        subdomains = self.match(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/robtex.py

@@ -32,7 +32,7 @@ class Robtex(Query):
                 resp = self.get(url)
                 if not resp:
                     return
-                subdomains = self.match(self.domain, resp.text)
+                subdomains = self.match_subdomains(self.domain, resp.text)
                 if subdomains:
                     # 合并搜索子域名搜索结果
                     self.subdomains = self.subdomains.union(subdomains)

modules/datasets/sitedossier.py

@@ -24,7 +24,7 @@ class SiteDossier(Query):
             resp = self.get(url)
             if not resp:
                 return
-            subdomains = self.match(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             # 合并搜索子域名搜索结果

modules/datasets/spyse_api.py

@@ -27,7 +27,7 @@ class SpyseAPI(Query):
             if not resp:
                 return
             json = resp.json()
-            subdomains = utils.match_subdomain(self.domain, str(json))
+            subdomains = self.match_subdomains(self.domain, str(json))
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             # 合并搜索子域名搜索结果

modules/datasets/threatcrowd.py

@@ -25,7 +25,7 @@ class ThreatCrowd(Query):
             return
         if resp.status_code != 200:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/datasets/wzpc.py

@@ -31,7 +31,7 @@ class WZPCQuery(Query):
                 break
             if not resp:
                 break
-            subdomains = self.match(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             self.subdomains = self.subdomains.union(subdomains)
             if not subdomains:
                 break

modules/datasets/ximcx.py

@@ -20,7 +20,7 @@ class Ximcx(Query):
         if not resp:
             return
         json = resp.json()
-        subdomains = self.match(self.domain, str(json))
+        subdomains = self.match_subdomains(self.domain, str(json))
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/dnsquery/srv.py

@@ -50,7 +50,7 @@ class BruteSRV(Module):
                 continue
             for item in answer:
                 record = str(item)
-                subdomains = utils.match_subdomain(self.domain, record)
+                subdomains = self.match_subdomains(self.domain, record)
                 self.subdomains = self.subdomains.union(subdomains)
                 self.gen_record(subdomains, record)
 

modules/intelligence/alienvault.py

@@ -21,7 +21,7 @@ class AlienVault(Query):
         if not resp:
             return
         json = resp.json()
-        subdomains = self.match(self.domain, str(json))
+        subdomains = self.match_subdomains(self.domain, str(json))
         self.subdomains = self.subdomains.union(subdomains)
 
         url = f'{base}/{self.domain}/url_list'
@@ -29,7 +29,7 @@ class AlienVault(Query):
         if not resp:
             return
         json = resp.json()
-        subdomains = self.match(self.domain, str(json))
+        subdomains = self.match_subdomains(self.domain, str(json))
         self.subdomains = self.subdomains.union(subdomains)
 
     def run(self):

modules/intelligence/threatbook_api.py

@@ -23,7 +23,7 @@ class ThreatBookAPI(Query):
         resp = self.post(self.addr, params)
         if not resp:
             return
-        subdomains = self.match(self.domain, str(resp.json()))
+        subdomains = self.match_subdomains(self.domain, str(resp.json()))
         self.subdomains = self.subdomains.union(subdomains)
 
     def run(self):

modules/intelligence/threatminer.py

@@ -20,7 +20,7 @@ class ThreatMiner(Query):
         resp = self.get(self.addr, params)
         if not resp:
             return
-        subdomains = self.match(self.domain, resp.text)
+        subdomains = self.match_subdomains(self.domain, resp.text)
         # 合并搜索子域名搜索结果
         self.subdomains = self.subdomains.union(subdomains)
 

modules/search/ask.py

@@ -30,7 +30,7 @@ class Ask(Search):
             resp = self.get(self.addr, params)
             if not resp:
                 return
-            subdomains = self.match(domain, resp.text)
+            subdomains = self.match_subdomains(domain, resp.text)
             if not subdomains:
                 break
             if not full_search:

modules/search/baidu.py

@@ -54,7 +54,7 @@ class Baidu(Search):
                 # 获取百度跳转URL响应头的Location字段获取直链
                 subdomains = self.redirect_match(domain, resp.text)
             else:
-                subdomains = self.match(domain, resp.text)
+                subdomains = self.match_subdomains(domain, resp.text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             if not full_search:

modules/search/bing.py

@@ -36,7 +36,7 @@ class Bing(Search):
             resp = self.get(self.addr, params)
             if not resp:
                 return
-            subdomains = self.match(domain, resp.text)
+            subdomains = self.match_subdomains(domain, resp.text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             if not full_search:

modules/search/bing_api.py

@@ -37,7 +37,7 @@ class BingAPI(Search):
             resp = self.get(self.addr, params)
             if not resp:
                 return
-            subdomains = self.match(domain, str(resp.json()))
+            subdomains = self.match_subdomains(domain, str(resp.json()))
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             if not full_search:

modules/search/fofa_api.py

@@ -36,7 +36,7 @@ class FoFa(Search):
             if not resp:
                 return
             resp_json = resp.json()
-            subdomains = self.match(self.domain, str(resp_json))
+            subdomains = self.match_subdomains(self.domain, str(resp_json))
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             self.subdomains = self.subdomains.union(subdomains)

modules/search/gitee.py

@@ -34,7 +34,7 @@ class Gitee(Search):
             if 'class="empty-box"' in resp.text:
                 break
             soup = BeautifulSoup(resp.text, 'html.parser')
-            subdomains = self.match(self.domain, soup.text)
+            subdomains = self.match_subdomains(self.domain, soup.text)
             if not subdomains:
                 break
             if not full_search:

modules/search/github_api.py

@@ -1,6 +1,5 @@
 import requests
 from config import api
-from common.utils import match_subdomain
 from common.search import Search
 from config.log import logger
 
@@ -61,7 +60,7 @@ class GithubAPI(Search):
             if resp.status_code != 200:
                 logger.log('ERROR', f'{self.source}模块搜索出错')
                 break
-            subdomains = match_subdomain(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             if not subdomains:
                 break
             self.subdomains = self.subdomains.union(subdomains)

modules/search/google.py

@@ -40,7 +40,7 @@ class Google(Search):
             resp = self.get(url=self.addr, params=payload)
             if not resp:
                 return
-            subdomains = self.match(domain, resp.text)
+            subdomains = self.match_subdomains(domain, resp.text)
             if not subdomains:
                 break
             if not full_search:

modules/search/google_api.py

@@ -35,7 +35,7 @@ class GoogleAPI(Search):
             resp = self.get(self.addr, params)
             if not resp:
                 return
-            subdomains = self.match(domain, str(resp.json()))
+            subdomains = self.match_subdomains(domain, str(resp.json()))
             if not subdomains:
                 break
             if not full_search:

modules/search/shodan_api.py

@@ -25,7 +25,7 @@ class ShodanAPI(Search):
             resp = self.get(self.addr, params)
             if not resp:
                 return
-            subdomains = self.match(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             if subdomains:

modules/search/so.py

@@ -31,7 +31,7 @@ class So(Search):
             resp = self.get(url=self.addr, params=payload)
             if not resp:
                 return
-            subdomains = self.match(domain, resp.text)
+            subdomains = self.match_subdomains(domain, resp.text)
             if not subdomains:
                 break
             if not full_search:

modules/search/sogou.py

@@ -28,7 +28,7 @@ class Sogou(Search):
             resp = self.get(self.addr, payload)
             if not resp:
                 return
-            subdomains = self.match(domain, resp.text)
+            subdomains = self.match_subdomains(domain, resp.text)
             if not subdomains:
                 break
             if not full_search:

modules/search/yahoo.py

@@ -36,7 +36,7 @@ class Yahoo(Search):
             if not resp:
                 return
             text = resp.text.replace('<b>', '').replace('</b>', '')
-            subdomains = self.match(domain, text)
+            subdomains = self.match_subdomains(domain, text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             if not full_search:

modules/search/yandex.py

@@ -36,7 +36,7 @@ class Yandex(Search):
             resp = self.get(self.addr, params)
             if not resp:
                 return
-            subdomains = self.match(domain, resp.text)
+            subdomains = self.match_subdomains(domain, resp.text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             if not full_search:

modules/search/zoomeye_api.py

@@ -48,7 +48,7 @@ class ZoomEyeAPI(Search):
             resp = self.get(self.addr, params)
             if not resp:
                 return
-            subdomains = self.match(self.domain, resp.text)
+            subdomains = self.match_subdomains(self.domain, resp.text)
             if not subdomains:  # 搜索没有发现子域名则停止搜索
                 break
             self.subdomains = self.subdomains.union(subdomains)