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

typos

Browse Source
This commit is contained in:
Jing Ling
2020-05-11 21:40:32 +08:00
parent 74d5354ead
commit fc7a5353d9
14 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/__init__.py
-1
View File
@@ -1 +0,0 @@
# coding=utf-8
common/crawl.py
+1 -1
View File
@@ -1,4 +1,4 @@
from .module import Module
from common.module import Module
class Crawl(Module):
common/database.py
+2 -2
View File
@@ -24,7 +24,7 @@ class Database(object):
:param db_path: Database path
:return: db_conn: SQLite database connection
"""
logger.log('TRACE', f'Establishing database connection...')
logger.log('TRACE', f'Establishing database connection')
if isinstance(db_path, Connection):
return db_path
protocol = 'sqlite:///'
@@ -94,7 +94,7 @@ class Database(object):
:param str module_name: mo
"""
logger.log('TRACE',
f'Saving the subdomain results of {table_name} found by module {module_name} into database...')
f'Saving the subdomain results of {table_name} found by module {module_name} into database')
table_name = table_name.replace('.', '_')
if results:
try:
common/lookup.py
+1 -1
View File
@@ -1,4 +1,4 @@
from .module import Module
from common.module import Module
from common import utils
common/module.py
+6 -6
View File
@@ -11,8 +11,8 @@ import time
import requests
from config.log import logger
from config import setting
from . import utils
from .domain import Domain
from common import utils
from common.domain import Domain
from common.database import Database
lock = threading.Lock()
@@ -45,7 +45,7 @@ class Module(object):
:return bool: check result
"""
if not all(apis):
logger.log('ALERT', f'{self.source} module is not configured, skip')
logger.log('DEBUG', f'{self.source} module is not configured')
return False
return True
@@ -62,10 +62,10 @@ 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('INFOR', f'The {self.source} module took {self.elapse} seconds, '
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'
f'{self.subdomains}')
f'{self.subdomains}')
def head(self, url, params=None, check=True, **kwargs):
"""
@@ -252,7 +252,7 @@ class Module(object):
"""
Generate results
"""
logger.log('DEBUG', f'Generating final results...')
logger.log('DEBUG', f'Generating final results')
if not len(self.subdomains): # 该模块一个子域都没有发现的情况
logger.log('DEBUG', f'{self.source} module result is empty')
result = {'id': None,
common/query.py
+1 -1
View File
@@ -1,4 +1,4 @@
from .module import Module
from common.module import Module
class Query(Module):
common/request.py
+4 -4
View File
@@ -22,7 +22,7 @@ def get_limit_conn():
def get_ports(port):
logger.log('DEBUG', f'Getting port range...')
logger.log('DEBUG', f'Getting port range')
ports = set()
if isinstance(port, (set, list, tuple)):
ports = port
@@ -40,7 +40,7 @@ def get_ports(port):
def gen_req_data(data, ports):
logger.log('INFOR', f'Generating request urls...')
logger.log('INFOR', f'Generating request urls')
new_data = []
for data in data:
resolve = data.get('resolve')
@@ -203,7 +203,7 @@ async def bulk_request(data, port):
to_req_data = gen_req_data(data, ports)
method = setting.request_method
logger.log('INFOR', f'Use {method} method to request')
logger.log('INFOR', f'Async subdomains request in progress...')
logger.log('INFOR', f'Async subdomains request in progress')
connector = get_connector()
header = get_header()
async with ClientSession(connector=connector, headers=header) as session:
@@ -255,7 +255,7 @@ def run_request(domain, data, port):
# 在关闭事件循环前加入一小段延迟让底层连接得到关闭的缓冲时间
loop.run_until_complete(asyncio.sleep(0.25))
count = utils.count_alive(data)
logger.log('INFOR', f'After verify, found {domain} have {count} alive subdomains')
logger.log('INFOR', f'Request module found {domain} have {count} alive subdomains')
return data
common/resolve.py
+6 -5
View File
@@ -14,7 +14,7 @@ def filter_subdomain(data):
:param list data: 待过滤的数据列表
:return: 符合条件的子域列表
"""
logger.log('DEBUG', f'Filtering subdomains to be resolved...')
logger.log('DEBUG', f'Filtering subdomains to be resolved')
subdomains = []
for data in data:
if not data.get('content'):
@@ -31,7 +31,7 @@ def update_data(data, records):
:param dict records: 解析结果字典
:return: 更新后的数据列表
"""
logger.log('DEBUG', f'Updating resolved results...')
logger.log('DEBUG', f'Updating resolved results')
if not records:
logger.log('ERROR', f'No valid resolved result')
return data
@@ -52,7 +52,7 @@ def save_data(name, data):
:param str name: 保存表名
:param list data: 待保存的数据
"""
logger.log('INFOR', f'Saving resolved results...')
logger.log('INFOR', f'Saving resolved results')
db = Database()
db.drop_table(name)
db.create_table(name)
@@ -61,7 +61,7 @@ def save_data(name, data):
def save_subdomains(save_path, subdomain_list):
logger.log('DEBUG', f'Saving resolved subdomain...')
logger.log('DEBUG', f'Saving resolved subdomain')
subdomain_data = '\n'.join(subdomain_list)
if not utils.save_data(save_path, subdomain_data):
logger.log('FATAL', 'Save resolved subdomain error')
@@ -69,7 +69,7 @@ def save_subdomains(save_path, subdomain_list):
def deal_output(output_path):
logger.log('INFOR', f'Processing resolved results...')
logger.log('INFOR', f'Processing resolved results')
records = dict() # 用来记录所有域名解析数据
with open(output_path) as fd:
for line in fd:
@@ -161,6 +161,7 @@ def run_resolve(domain, data):
ns_path = setting.brute_nameservers_path
logger.log('INFOR', f'Running massdns to brute subdomains')
utils.call_massdns(massdns_path, save_path, ns_path,
output_path, log_path, quiet_mode=True)
common/search.py
-1
View File
@@ -3,7 +3,6 @@ import re
from config import setting
from config.log import logger
from common.module import Module
from common import utils
class Search(Module):
common/utils.py
+10 -10
View File
@@ -99,7 +99,7 @@ def get_domains(target):
:return list: domain list
"""
domains = list()
logger.log('DEBUG', f'Getting domains...')
logger.log('DEBUG', f'Getting domains')
if isinstance(target, (set, tuple)):
domains = list(target)
elif isinstance(target, list):
@@ -171,7 +171,7 @@ def check_path(path, name, format):
logger.log('ALERT', f'{parent_dir} does not exist, directory will be created')
parent_dir.mkdir(parents=True, exist_ok=True)
if path.exists():
logger.log('ALERT', f'{path} exists, file will be overwritten')
logger.log('ALERT', f'The {path} exists and will be overwritten')
return path
@@ -487,7 +487,7 @@ def delete_file(*paths):
@tenacity.retry(stop=tenacity.stop_after_attempt(3))
def check_net():
logger.log('INFOR', 'Checking Internet environment...')
logger.log('INFOR', 'Checking Internet environment')
urls = ['http://www.example.com', 'http://www.baidu.com',
'http://www.bing.com', 'http://www.taobao.com',
'http://www.linkedin.com', 'http://www.msn.com',
@@ -498,18 +498,18 @@ def check_net():
rsp = requests.get(url)
except Exception as e:
logger.log('ERROR', e.args)
logger.log('ALERT', 'Can not access Internet, retrying...')
logger.log('ALERT', 'Can not access Internet, retrying')
raise tenacity.TryAgain
if rsp.status_code != 200:
logger.log('ALERT', f'{rsp.request.method} {rsp.request.url} '
f'{rsp.status_code} {rsp.reason}')
logger.log('ALERT', 'Can not access Internet normally, retrying...')
logger.log('ALERT', 'Can not access Internet normally, retrying')
raise tenacity.TryAgain
logger.log('INFOR', 'Access to Internet OK')
def check_pre():
logger.log('INFOR', 'Checking dependent environment...')
logger.log('INFOR', 'Checking dependent environment')
system = platform.system()
implementation = platform.python_implementation()
version = platform.python_version()
@@ -531,7 +531,7 @@ def check_pre():
def check_env():
logger.log('INFOR', 'Checking the environment...')
logger.log('INFOR', 'Checking the environment')
try:
check_net()
except Exception as e:
@@ -548,7 +548,7 @@ def get_maindomain(domain):
def call_massdns(massdns_path, dict_path, ns_path, output_path, log_path,
query_type='A', process_num=1, concurrent_num=10000,
quiet_mode=False):
logger.log('INFOR', f'Start running massdns')
logger.log('DEBUG', f'Start running massdns')
quiet = ''
if quiet_mode:
quiet = '--quiet'
@@ -561,9 +561,9 @@ def call_massdns(massdns_path, dict_path, ns_path, output_path, log_path,
f'--resolve-count {resolve_num} --type {query_type} ' \
f'--flush --output J --outfile {output_path} ' \
f'--root --error-log {log_path} {dict_path}'
logger.log('INFOR', f'Run command {cmd}')
logger.log('DEBUG', f'Run command {cmd}')
subprocess.run(args=cmd, shell=True)
logger.log('INFOR', f'Finished massdns')
logger.log('DEBUG', f'Finished massdns')
def get_massdns_path(massdns_dir):