river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-08-26 12:57:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复路径问题

Browse Source
This commit is contained in:
Jing Ling
2020-02-12 10:44:15 +08:00
parent d527536192
commit a7b0def3c2
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oneforall/common/utils.py
+6 -6
View File
@@ -147,16 +147,16 @@ def get_semaphore():
return 800 return 800
def check_path(path, table, format): def check_path(path, name, format):
""" """
检查结果输出目录路径 检查结果输出目录路径
:param path: 保存路径 :param path: 保存路径
:param table: 导出表名 :param name: 导出名字
:param format: 保存格式 :param format: 保存格式
:return: 目录路径 :return: 目录路径
""" """
default_path = config.result_save_path.joinpath(f'{table}.{format}') default_path = config.result_save_path.joinpath(f'{name}.{format}')
if path is None: if path is None:
path = default_path path = default_path
try: try:
@@ -296,9 +296,9 @@ def export_all(format, datas):
:param datas: 待导出的结果数据 :param datas: 待导出的结果数据
""" """
format = check_format(format, len(datas)) format = check_format(format, len(datas))
dpath = check_dpath()
timestamp = get_timestamp() timestamp = get_timestamp()
fpath = dpath.joinpath(f'all_subdomain_{timestamp}.{format}') name = f'all_subdomain_{timestamp}'
path = check_path(None, name, format)
row_list = list() row_list = list()
for row in datas: for row in datas:
row.pop('header') row.pop('header')
@@ -314,7 +314,7 @@ def export_all(format, datas):
row_list.append(Record(keys, values)) row_list.append(Record(keys, values))
rows = RecordCollection(iter(row_list)) rows = RecordCollection(iter(row_list))
content = rows.export(format) content = rows.export(format)
save_data(fpath, content) save_data(path, content)
def get_timestamp(): def get_timestamp():
oneforall/takeover.py
+6 -6
View File
@@ -56,12 +56,12 @@ class Takeover(Module):
Note: Note:
参数format可选格式有'txt', 'rst', 'csv', 'tsv', 'json', 'yaml', 'html', 参数format可选格式有'txt', 'rst', 'csv', 'tsv', 'json', 'yaml', 'html',
'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods' 'jira', 'xls', 'xlsx', 'dbf', 'latex', 'ods'
参数path为None默认使用OneForAll结果目录 参数path默认None使用OneForAll结果目录生成路径
:param any target: 单个子域或者每行一个子域的文件路径(必需参数) :param any target: 单个子域或者每行一个子域的文件路径(必需参数)
:param int thread: 线程数(默认100) :param int thread: 线程数(默认100)
:param str format: 导出格式(默认csv) :param str format: 导出格式(默认csv)
:param str path: 导出目录(默认None) :param str path: 导出路径(默认None)
""" """
def __init__(self, target, thread=100, path=None, format='csv'): def __init__(self, target, thread=100, path=None, format='csv'):
Module.__init__(self) Module.__init__(self)
@@ -83,9 +83,7 @@ class Takeover(Module):
data = str(self.results) data = str(self.results)
else: else:
data = self.results.export(self.format) data = self.results.export(self.format)
timestamp = utils.get_timestamp() utils.save_data(self.path, data)
path = self.path.joinpath(f'takeover_{timestamp}.{self.format}')
utils.save_data(path, data)
def compare(self, subdomain, cname, responses): def compare(self, subdomain, cname, responses):
domain_resp = self.get('http://' + subdomain, check=False) domain_resp = self.get('http://' + subdomain, check=False)
@@ -136,7 +134,9 @@ class Takeover(Module):
logger.log('INFOR', f'开始执行{self.source}模块') logger.log('INFOR', f'开始执行{self.source}模块')
self.subdomains = utils.get_domains(self.target) self.subdomains = utils.get_domains(self.target)
self.format = utils.check_format(self.format, len(self.subdomains)) self.format = utils.check_format(self.format, len(self.subdomains))
self.path = utils.check_dpath(self.path) timestamp = utils.get_timestamp()
name = f'all_subdomain_{timestamp}'
self.path = utils.check_path(self.path, name, self.format)
if self.subdomains: if self.subdomains:
logger.log('INFOR', f'正在检查子域接管风险') logger.log('INFOR', f'正在检查子域接管风险')
self.fingerprints = get_fingerprint() self.fingerprints = get_fingerprint()