模块优化

modules/certificates/censys_api.py

@@ -39,10 +39,7 @@ class CensysAPI(Query):
         for page in range(2, pages + 1):
             data['page'] = page
             resp = self.post(self.addr, json=data, auth=(self.id, self.secret))
-            if not resp:
-                return
-            subdomains = self.match_subdomains(resp.text)
-            self.subdomains = self.subdomains.union(subdomains)
+            self.subdomains = self.collect_subdomains(resp)
 
     def run(self):
         """

modules/certificates/certspotter.py

@@ -19,11 +19,7 @@ class CertSpotter(Query):
                   'include_subdomains': 'true',
                   'expand': 'dns_names'}
         resp = self.get(self.addr, params)
-        if not resp:
-            return
-        subdomains = self.match_subdomains(resp.text)
-        # 合并搜索子域名搜索结果
-        self.subdomains = self.subdomains.union(subdomains)
+        self.subdomains = self.collect_subdomains(resp)
 
     def run(self):
         """

modules/certificates/google.py

@@ -20,11 +20,7 @@ class Google(Query):
                   'include_subdomains': 'true',
                   'domain': self.domain}
         resp = self.get(self.addr, params)
-        if not resp:
-            return
-        subdomains = self.match_subdomains(resp.text)
-        # 合并搜索子域名搜索结果
-        self.subdomains = self.subdomains.union(subdomains)
+        self.subdomains = self.collect_subdomains(resp)
 
     def run(self):
         """