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:
shmilylty
2019-12-10 12:12:44 +08:00
parent 0cafe696a6
commit f5d02d74ef
11 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oneforall/common/database.py
+11 -11
View File
@@ -63,7 +63,7 @@ class Database(object):
f'elapsed float,'
f'count int)')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def save_db(self, table_name, results, module_name=None):
"""
@@ -88,7 +88,7 @@ class Database(object):
f':response, :module, :source,:elapsed, :count)',
results)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def exist_table(self, table_name):
"""
@@ -103,7 +103,7 @@ class Database(object):
f'where type = "table" and '
f'name = "{table_name}"')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
else:
if len(result) != 0:
return True
@@ -125,7 +125,7 @@ class Database(object):
self.conn.query(f'create table "{bak_table_name}" '
f'as select * from "{table_name}"')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def clear_table(self, table_name):
"""
@@ -138,7 +138,7 @@ class Database(object):
try:
self.conn.query(f'delete from "{table_name}"')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def drop_table(self, table_name):
"""
@@ -151,7 +151,7 @@ class Database(object):
try:
self.conn.query(f'drop table if exists "{table_name}"')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def rename_table(self, table_name, new_table_name):
"""
@@ -167,7 +167,7 @@ class Database(object):
self.conn.query(f'alter table "{table_name}" '
f'rename to "{new_table_name}"')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def deduplicate_subdomain(self, table_name):
"""
@@ -182,7 +182,7 @@ class Database(object):
f'delete from "{table_name}" where id not in (select min(id) '
f'from "{table_name}" group by subdomain)')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def remove_invalid(self, table_name):
"""
@@ -197,7 +197,7 @@ class Database(object):
f'delete from "{table_name}" where '
f'subdomain is null or valid == 0')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def get_data(self, table_name):
"""
@@ -210,7 +210,7 @@ class Database(object):
try:
rows = self.conn.query(f'select * from "{table_name}"')
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
else:
return rows
@@ -231,7 +231,7 @@ class Database(object):
try:
rows = self.conn.query(query)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
else:
return rows
oneforall/common/module.py
+3 -3
View File
@@ -85,7 +85,7 @@ class Module(object):
verify=self.verify,
**kwargs)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
return None
if not check:
return resp
@@ -113,7 +113,7 @@ class Module(object):
verify=self.verify,
**kwargs)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
return None
if not check:
return resp
@@ -141,7 +141,7 @@ class Module(object):
verify=self.verify,
**kwargs)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
return None
if not check:
return resp
oneforall/common/request.py
+3 -3
View File
@@ -96,8 +96,8 @@ async def fetch(session, url):
except UnicodeDecodeError:
text = await resp.text(errors='ignore')
return resp, text
except BaseException as exception:
return exception
except Exception as e:
return e
def get_title(markup):
@@ -146,7 +146,7 @@ def get_title(markup):
def request_callback(future, index, datas):
try:
result = future.result()
except BaseException as e:
except Exception as e:
logger.log('TRACE', e.args)
datas[index]['reason'] = str(e.args)
datas[index]['valid'] = 0
oneforall/common/resolve.py
+7 -7
View File
@@ -29,9 +29,9 @@ async def dns_query_a(hostname):
resolver = dns_resolver()
try:
answer = resolver.query(hostname, 'A')
except BaseException as exception:
logger.log('TRACE', exception.args)
answer = exception
except Exception as e:
logger.log('TRACE', e.args)
answer = e
return answer
@@ -45,9 +45,9 @@ async def aiodns_query_a(hostname):
try:
loop = asyncio.get_event_loop()
answer = await loop.getaddrinfo(hostname, 'http')
except BaseException as exception:
logger.log('TRACE', exception.args)
answer = exception
except Exception as e:
logger.log('TRACE', e.args)
answer = e
return answer
@@ -61,7 +61,7 @@ def resolve_callback(future, index, datas):
"""
try:
answer = future.result()
except BaseException as e:
except Exception as e:
datas[index]['ips'] = str(e.args)
datas[index]['valid'] = 0
else:
oneforall/common/utils.py
+1 -1
View File
@@ -190,7 +190,7 @@ def save_data(fpath, data):
file.write(data)
logger.log('ALERT', fpath)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
def check_response(method, resp):
oneforall/modules/check/axfr.py
+1 -1
View File
@@ -61,7 +61,7 @@ class CheckAXFR(Module):
try:
answers = resolver.query(self.domain, "NS")
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
return
nsservers = [str(answer) for answer in answers]
if not len(nsservers):
oneforall/modules/check/cert.py
+1 -1
View File
@@ -29,7 +29,7 @@ class CheckCert(Module):
sock.connect((self.domain, self.port))
cert_dict = sock.getpeercert()
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
return
subdomains = utils.match_subdomain(self.domain, str(cert_dict))
self.subdomains = self.subdomains.union(subdomains)
oneforall/modules/dnsquery/srv.py
+2 -2
View File
@@ -81,8 +81,8 @@ class BruteThread(threading.Thread):
logger.log('TRACE', f'尝试查询{name}的SRV记录')
try:
answer = self.resolver.query(name, 'SRV')
except Exception as exception:
logger.log('TRACE', exception.args)
except Exception as e:
logger.log('TRACE', e.args)
logger.log('TRACE', f'查询{name}的SRV记录失败')
return None
else:
oneforall/modules/search/duckduckgo.py
+1 -1
View File
@@ -87,4 +87,4 @@ def do(domain): # 统一入口名字 方便多线程调用
if __name__ == '__main__':
do('example.com')
do('huawei.com')
oneforall/modules/search/github.py
+3 -3
View File
@@ -41,7 +41,7 @@ class Github(Search):
try:
resp = self.session.post(self.post_url, data=post_data)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
return False
if resp.status_code != 200:
return False
@@ -58,7 +58,7 @@ class Github(Search):
try:
resp = self.session.get(self.login_url)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
return None
if resp.status_code != 200:
return None
@@ -85,7 +85,7 @@ class Github(Search):
try:
resp = self.session.get(self.addr, params=params)
except Exception as e:
logger.log('ERROR', e)
logger.log('ERROR', e.args)
break
if resp.status_code != 200:
logger.log('ERROR', f'{self.session}模块搜索出错')
oneforall/takeover.py
+2 -2
View File
@@ -34,8 +34,8 @@ def get_cname(subdomain):
resolver = resolve.dns_resolver()
try:
answers = resolver.query(subdomain, 'CNAME')
except Exception as exception:
logger.log('TRACE', exception.args)
except Exception as e:
logger.log('TRACE', e.args)
return None
for answer in answers:
return answer.to_text() # 一个子域只有一个CNAME记录