From acac99d13cc2ae85d4d775e5d0f784d859156d99 Mon Sep 17 00:00:00 2001
From: JrD <421273918@qq.com>
Date: Mon, 31 Aug 2020 19:11:57 +0800
Subject: [PATCH] typo

---
 README.md            | 3 +--
 brute.py             | 6 +++---
 common/utils.py      | 7 +------
 docs/en-us/README.md | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 59e5ba5..8b0aee3 100644
--- a/README.md
+++ b/README.md
@@ -171,8 +171,7 @@ DESCRIPTION
     Note:
         参数alive可选值True，False分别表示导出存活，全部子域结果
         参数port可选值有'default', 'small', 'large', 详见config.py配置
-        参数format可选格式有'rst', 'csv', 'tsv', 'json', 'yaml', 'html',
-                          'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods'
+        参数format可选格式有 'csv','json'
         参数path默认None使用OneForAll结果目录生成路径
 
 ARGUMENTS
diff --git a/brute.py b/brute.py
index 24089db..a9450e4 100644
--- a/brute.py
+++ b/brute.py
@@ -274,7 +274,7 @@ def get_wildcard_record(domain, resolver):
         raise tenacity.TryAgain
     except (NXDOMAIN, YXDOMAIN, NoAnswer, NoNameservers) as e:
         logger.log('DEBUG', e.args)
-        logger.log('INFOR', f'{domain} dont have A record on authoritative name server')
+        logger.log('DEBUG', f'{domain} dont have A record on authoritative name server')
         return None, None
     except Exception as e:
         logger.log('ERROR', e.args)
@@ -314,7 +314,7 @@ def collect_wildcard_record(domain, authoritative_ns):
             logger.log('ALERT', f'Multiple query errors,'
                                 f'try to query a new random subdomain')
             continue
-        if ip is None:
+        if ip is None:  # TODO 当权威服务器查询出的结果只有cname没有ip结果时会死循环
             continue
         ips.update(ip)
         # 统计每个泛解析IP出现次数
@@ -727,7 +727,7 @@ class Brute(Module):
             if self.recursive_brute:
                 for layer_num in range(1, self.recursive_depth):
                     # 之前已经做过1层子域爆破 当前实际递归层数是layer+1
-                    logger.log('INFOR', f'Start recursively brute the {layer_num+1} layer'
+                    logger.log('INFOR', f'Start recursively brute the {layer_num + 1} layer'
                                         f' subdomain of {self.domain}')
                     for subdomain in all_subdomains:
                         self.place = '*.' + subdomain
diff --git a/common/utils.py b/common/utils.py
index fd70b8b..bdb5019 100644
--- a/common/utils.py
+++ b/common/utils.py
@@ -201,12 +201,7 @@ def check_format(format, count):
     :param count: 数量
     :return: 导出格式
     """
-    formats = ['rst', 'csv', 'tsv', 'json', 'yaml', 'html',
-               'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods']
-    if format == 'xls' and count > 65000:
-        logger.log('ALERT', '\'xls\' file is limited to 65000 lines')
-        logger.log('ALERT', 'So use xlsx format replace')
-        return 'xlsx'
+    formats = ['csv', 'json', ]
     if format in formats:
         return format
     else:
diff --git a/docs/en-us/README.md b/docs/en-us/README.md
index 82c46d0..21c6aa3 100644
--- a/docs/en-us/README.md
+++ b/docs/en-us/README.md
@@ -160,7 +160,7 @@ DESCRIPTION
     Note:
         --alive  True/False           Only export alive subdomains or not (default False)
         --port   default/small/large  See details in ./config/setting.py(default port 80)
-        --format rst/csv/tsv/json/yaml/html/jira/xls/xlsx/dbf/latex/ods (result format)
+        --format csv/json (result format)
         --path   Result directory (default directory is ./results)
 
 ARGUMENTS