This commit is contained in:
JrD
2020-08-31 19:11:57 +08:00
parent fabfd9ec37
commit acac99d13c
4 changed files with 6 additions and 12 deletions
+1 -2
View File
@@ -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
+2 -2
View File
@@ -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出现次数
+1 -6
View File
@@ -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:
+1 -1
View File
@@ -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