优化

common/search.py

@@ -36,13 +36,12 @@ class Search(Module):
                                                    subdomains_temp[i:i + 2]))))
         return statements_list
 
-    def match_location(self, domain, url):
+    def match_location(self, url):
         """
         匹配跳转之后的url
         针对部分搜索引擎(如百度搜索)搜索展示url时有显示不全的情况
         此函数会向每条结果的链接发送head请求获取响应头的location值并做子域匹配
 
-        :param str domain: 域名
         :param str url: 展示结果的url链接
         :return: 匹配的子域
         :rtype set
@@ -53,28 +52,4 @@ class Search(Module):
         location = resp.headers.get('location')
         if not location:
             return set()
-        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)
+        return set(self.match_subdomains(location))