修改日志输出格式,降低代码重复率。

This commit is contained in:
shmilylty
2019-08-03 21:21:48 +08:00
parent 6241dd16db
commit 439fc9aa8e
55 changed files with 272 additions and 443 deletions
+3 -8
View File
@@ -38,16 +38,13 @@ class BinaryEdgeAPI(Query):
logger.log('ERROR', f'{self.source}模块API配置错误')
logger.log('ALERT', f'不执行{self.source}模块')
return
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -59,10 +56,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = BinaryEdgeAPI(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+3 -9
View File
@@ -2,7 +2,6 @@
import time
import queue
from common.query import Query
from config import logger
class BufferOver(Query):
@@ -31,16 +30,13 @@ class BufferOver(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -52,10 +48,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = BufferOver(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+5 -10
View File
@@ -1,8 +1,8 @@
# coding=utf-8
import time
import queue
import time
from common.query import Query
from config import logger
class Chinaz(Query):
@@ -31,16 +31,13 @@ class Chinaz(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -52,10 +49,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = Chinaz(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+3 -8
View File
@@ -37,16 +37,13 @@ class ChinazAPI(Query):
logger.log('ERROR', f'{self.source}模块API配置错误')
logger.log('ALERT', f'不执行{self.source}模块')
return
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -58,10 +55,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = ChinazAPI(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+3 -9
View File
@@ -3,7 +3,6 @@ import time
import queue
import config
from common.query import Query
from config import logger
class CirclAPI(Query):
@@ -33,17 +32,14 @@ class CirclAPI(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
self.begin()
if self.user and self.pwd:
start = time.time()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -55,10 +51,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = CirclAPI(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+6 -10
View File
@@ -1,10 +1,11 @@
# coding=utf-8
import queue
import random
import time
import queue
from bs4 import BeautifulSoup
from common.query import Query
from config import logger
class DNSdb(Query):
@@ -46,16 +47,13 @@ class DNSdb(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -67,10 +65,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = DNSdb(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+3 -8
View File
@@ -40,16 +40,13 @@ class DNSdbAPI(Query):
logger.log('ERROR', f'{self.source}模块API配置错误')
logger.log('ALERT', f'不执行{self.source}模块')
return
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -61,10 +58,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = DNSdbAPI(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+7 -11
View File
@@ -1,15 +1,16 @@
# coding=utf-8
import time
import queue
from common.query import Query
import time
from common import utils
from config import logger
from common.query import Query
class DNSdumpster(Query):
"""
"""
def __init__(self, domain):
Query.__init__(self)
self.domain = self.register(domain)
@@ -41,16 +42,13 @@ class DNSdumpster(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -62,10 +60,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = DNSdumpster(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+5 -11
View File
@@ -1,9 +1,8 @@
# coding=utf-8
import time
import queue
from common.query import Query
from common import utils
from config import logger
from common.query import Query
class HackerTarget(Query):
@@ -33,16 +32,13 @@ class HackerTarget(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -54,10 +50,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = HackerTarget(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+4 -10
View File
@@ -1,9 +1,8 @@
# coding=utf-8
import time
import queue
import config
from common.query import Query
from config import logger
class IPv4InfoAPI(Query):
@@ -45,16 +44,13 @@ class IPv4InfoAPI(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -66,10 +62,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = IPv4InfoAPI(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+6 -11
View File
@@ -1,11 +1,11 @@
# coding=utf-8
import hashlib
import queue
import re
import time
import queue
import hashlib
from urllib import parse
from common.query import Query
from config import logger
class NetCraft(Query):
@@ -56,16 +56,13 @@ class NetCraft(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -77,10 +74,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = NetCraft(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+5 -11
View File
@@ -1,10 +1,9 @@
# coding=utf-8
import time
import queue
import random
from common.query import Query
from common import utils
from config import logger
from common.query import Query
class PTRArchive(Query):
@@ -35,16 +34,13 @@ class PTRArchive(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -56,10 +52,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = PTRArchive(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+5 -10
View File
@@ -1,8 +1,8 @@
# coding=utf-8
import time
import queue
import time
from common.query import Query
from config import logger
class Riddler(Query):
@@ -31,16 +31,13 @@ class Riddler(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -52,10 +49,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = Riddler(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+6 -11
View File
@@ -1,9 +1,9 @@
# coding=utf-8
import time
import queue
import json
import queue
import time
from common.query import Query
from config import logger
class Robtex(Query):
@@ -42,16 +42,13 @@ class Robtex(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -63,10 +60,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = Robtex(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
@@ -41,16 +41,13 @@ class SecurityTrailsAPI(Query):
logger.log('ERROR', f'{self.source}模块API配置错误')
logger.log('ALERT', f'不执行{self.source}模块')
return
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -62,10 +59,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = SecurityTrailsAPI(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)
+5 -10
View File
@@ -1,8 +1,8 @@
# coding=utf-8
import time
import queue
import time
from common.query import Query
from config import logger
class SiteDossier(Query):
@@ -40,16 +40,13 @@ class SiteDossier(Query):
"""
类执行入口
"""
logger.log('DEBUG', f'开始执行{self.source}模块查询{self.domain}的子域')
start = time.time()
self.begin()
self.query()
end = time.time()
self.elapsed = round(end - start, 1)
self.save_json()
self.gen_result()
self.save_db()
rx_queue.put(self.results)
logger.log('DEBUG', f'结束执行{self.source}模块查询{self.domain}的子域')
self.finish()
def do(domain, rx_queue): # 统一入口名字 方便多线程调用
@@ -61,10 +58,8 @@ def do(domain, rx_queue): # 统一入口名字 方便多线程调用
"""
query = SiteDossier(domain)
query.run(rx_queue)
logger.log('INFOR', f'{query.source}模块耗时{query.elapsed}秒发现{query.domain}的子域{len(query.subdomains)}')
logger.log('DEBUG', f'{query.source}模块发现{query.domain}的子域 {query.subdomains}')
if __name__ == '__main__':
result_queue = queue.Queue()
do('owasp.org', result_queue)
do('example.com', result_queue)