优化

common/module.py

@@ -53,7 +53,8 @@ class Module(object):
         """
         begin log
         """
-        logger.log('DEBUG', f'Start {self.source} module to collect subdomains of {self.domain}')
+        logger.log('DEBUG', f'Start {self.source} module to '
+                            f'collect subdomains of {self.domain}')
 
     def finish(self):
         """
@@ -61,7 +62,8 @@ class Module(object):
         """
         self.end = time.time()
         self.elapse = round(self.end - self.start, 1)
-        logger.log('DEBUG', f'Finished {self.source} module to collect {self.domain}\'s subdomains')
+        logger.log('DEBUG', f'Finished {self.source} module to '
+                            f'collect {self.domain}\'s subdomains')
         logger.log('INFOR', f'The {self.source} module took {self.elapse} seconds '
                             f'found {len(self.subdomains)} subdomains')
         logger.log('DEBUG', f'{self.source} module found subdomains of {self.domain}\n'
@@ -209,35 +211,48 @@ class Module(object):
             logger.log('TRACE', f'{module} module does not use proxy')
             return self.proxy
 
-    @staticmethod
-    def match_subdomains(domain, text, distinct=True):
+    def match_subdomains(self, html, distinct=True, fuzzy=True):
         """
         Use regexp to match subdomains
 
-        :param  str domain: domain
-        :param  str text: text
+        :param  str html: response html text
         :param  bool distinct: deduplicate results or not (default True)
+        :param  bool fuzzy: fuzzy match subdomain 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'(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\.){0,}' \
-                 + domain.replace('.', r'\.')
-        result = re.findall(regexp, text, re.I)
+        if fuzzy:
+            regexp = r'(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\.){0,}' \
+                     + self.domain.replace('.', r'\.')
+            result = re.findall(regexp, html, re.I)
+            if not result:
+                return set()
+            deal = map(lambda s: s.lower(), result)
+            if distinct:
+                return set(deal)
+            else:
+                return list(deal)
+        else:
+            regexp = r'(?:\>|\"|\'|\=|\,)(?:http\:\/\/|https\:\/\/)?' \
+                     r'(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9])?\.){0,}' \
+                     + self.domain.replace('.', r'\.')
+            result = re.findall(regexp, html, re.I)
         if not result:
             return set()
-        deal = map(lambda s: s.lower(), result)
+        regexp = r'(?:http://|https://)'
+        deal = map(lambda s: re.sub(regexp, '', s[1:].lower()), result)
         if distinct:
             return set(deal)
         else:
             return list(deal)
 
     @staticmethod
-    def register(domain):
+    def get_maindomain(domain):
         """
-        Get registered domain
+        Get main domain
 
         :param str domain: domain
-        :return: registered domain
+        :return: main domain
         """
         return Domain(domain).registered()
 
@@ -249,7 +264,8 @@ class Module(object):
         """
         if not setting.save_module_result:
             return False
-        logger.log('TRACE', f'Save the subdomain results found by {self.source} module as a json file')
+        logger.log('TRACE', f'Save the subdomain results found by '
+                            f'{self.source} module as a json file')
         path = setting.result_save_dir.joinpath(self.domain, self.module)
         path.mkdir(parents=True, exist_ok=True)
         name = self.source + '.json'