mirror of
https://github.com/shmilylty/OneForAll.git
synced 2026-08-26 04:47:48 +08:00
去掉type字段
This commit is contained in:
Jing Ling
+3
-4
@@ -54,7 +54,6 @@ class Database(object):
|
||||
logger.log('TRACE', f'Creating {table_name} table')
|
||||
self.query(f'create table "{table_name}" ('
|
||||
f'id integer primary key,'
|
||||
f'type text,'
|
||||
f'alive int,'
|
||||
f'request int,'
|
||||
f'resolve int,'
|
||||
@@ -102,12 +101,12 @@ class Database(object):
|
||||
if results:
|
||||
try:
|
||||
self.conn.bulk_query(
|
||||
f'insert into "{table_name}" (id, type, alive, resolve, request, new,'
|
||||
f'insert into "{table_name}" (id, alive, resolve, request, new,'
|
||||
f'url, subdomain, port, level, cname, content, public, cdn, status,'
|
||||
f'reason, title, banner, header, response, times, ttl, cidr, asn, org,'
|
||||
f' ip2region, ip2location, resolver, module, source, elapse, find,'
|
||||
f'brute, valid) '
|
||||
f'values (:id, :type, :alive, :resolve, :request, :new, :url, '
|
||||
f'values (:id, :alive, :resolve, :request, :new, :url, '
|
||||
f':subdomain, :port, :level, :cname, :content, :public, :cdn, :status,'
|
||||
f':reason, :title, :banner, :header, :response, :times, :ttl, :cidr,'
|
||||
f':asn, :org, :ip2region, :ip2location, :resolver, :module, :source,'
|
||||
@@ -231,7 +230,7 @@ class Database(object):
|
||||
:param str limit: limit value
|
||||
"""
|
||||
table_name = table_name.replace('.', '_')
|
||||
query = f'select id, type, new, alive, request, resolve, url, subdomain, level,' \
|
||||
query = f'select id, new, alive, request, resolve, url, subdomain, level,' \
|
||||
f'cname, content, public, cdn, port, status, reason, title, banner,' \
|
||||
f'times, ttl, cidr, asn, org, ip2region, ip2location, resolver, module,' \
|
||||
f'source, elapse, find, brute, valid from "{table_name}"'
|
||||
|
||||
+4
-2
@@ -1,5 +1,6 @@
|
||||
from common.module import Module
|
||||
from common import utils
|
||||
from config.log import logger
|
||||
|
||||
|
||||
class Lookup(Module):
|
||||
@@ -9,18 +10,19 @@ class Lookup(Module):
|
||||
|
||||
def __init__(self):
|
||||
Module.__init__(self)
|
||||
self.qtype = ''
|
||||
|
||||
def query(self):
|
||||
"""
|
||||
Query the TXT record of domain
|
||||
:return: query result
|
||||
"""
|
||||
answer = utils.dns_query(self.domain, self.type)
|
||||
answer = utils.dns_query(self.domain, self.qtype)
|
||||
if answer is None:
|
||||
return None
|
||||
for item in answer:
|
||||
record = item.to_text()
|
||||
subdomains = self.match_subdomains(record)
|
||||
self.subdomains = self.subdomains.union(subdomains)
|
||||
self.gen_record(subdomains, record)
|
||||
logger.log('DEBUG', record)
|
||||
return self.subdomains
|
||||
|
||||
+21
-48
@@ -26,9 +26,8 @@ class Module(object):
|
||||
self.timeout = settings.request_timeout # 请求超时时间
|
||||
self.verify = settings.request_verify # 请求SSL验证
|
||||
self.domain = str() # 当前进行子域名收集的主域
|
||||
self.type = 'A' # 对主域进行子域收集时利用的DNS记录查询类型(默认利用A记录)
|
||||
self.subdomains = set() # 存放发现的子域
|
||||
self.records = dict() # 存放子域解析记录
|
||||
self.infos = dict() # 存放子域有关信息
|
||||
self.results = list() # 存放模块结果
|
||||
self.start = time.time() # 模块开始执行时间
|
||||
self.end = None # 模块结束执行时间
|
||||
@@ -244,19 +243,10 @@ class Module(object):
|
||||
'elapse': self.elapse,
|
||||
'find': len(self.subdomains),
|
||||
'subdomains': list(self.subdomains),
|
||||
'records': self.records}
|
||||
'infos': self.infos}
|
||||
json.dump(result, file, ensure_ascii=False, indent=4)
|
||||
return True
|
||||
|
||||
def gen_record(self, subdomains, record):
|
||||
"""
|
||||
Generate record dictionary
|
||||
"""
|
||||
item = dict()
|
||||
item['content'] = record
|
||||
for subdomain in subdomains:
|
||||
self.records[subdomain] = item
|
||||
|
||||
def gen_result(self, find=0, brute=None, valid=0):
|
||||
"""
|
||||
Generate results
|
||||
@@ -265,7 +255,6 @@ class Module(object):
|
||||
if not len(self.subdomains): # 该模块一个子域都没有发现的情况
|
||||
logger.log('DEBUG', f'{self.source} module result is empty')
|
||||
result = {'id': None,
|
||||
'type': self.type,
|
||||
'alive': None,
|
||||
'request': None,
|
||||
'resolve': None,
|
||||
@@ -303,29 +292,14 @@ class Module(object):
|
||||
for subdomain in self.subdomains:
|
||||
url = 'http://' + subdomain
|
||||
level = subdomain.count('.') - self.domain.count('.')
|
||||
record = self.records.get(subdomain)
|
||||
if record is None:
|
||||
record = dict()
|
||||
resolve = record.get('resolve')
|
||||
request = record.get('request')
|
||||
alive = record.get('alive')
|
||||
if self.type != 'A': # 不是利用的DNS记录的A记录查询子域默认都有效
|
||||
resolve = 1
|
||||
request = 1
|
||||
alive = 1
|
||||
reason = record.get('reason')
|
||||
resolver = record.get('resolver')
|
||||
cname = record.get('cname')
|
||||
content = record.get('content')
|
||||
times = record.get('times')
|
||||
ttl = record.get('ttl')
|
||||
public = record.get('public')
|
||||
cdn = record.get('cdn')
|
||||
cidr = record.get('cidr')
|
||||
asn = record.get('asn')
|
||||
org = record.get('org')
|
||||
ip2region = record.get('ip2region')
|
||||
ip2location = record.get('ip2location')
|
||||
info = self.infos.get(subdomain)
|
||||
if info is None:
|
||||
info = dict()
|
||||
cname = info.get('cname')
|
||||
content = info.get('content')
|
||||
times = info.get('times')
|
||||
ttl = info.get('ttl')
|
||||
public = info.get('public')
|
||||
if isinstance(cname, list):
|
||||
cname = ','.join(cname)
|
||||
content = ','.join(content)
|
||||
@@ -333,10 +307,9 @@ class Module(object):
|
||||
ttl = ','.join([str(num) for num in ttl])
|
||||
public = ','.join([str(num) for num in public])
|
||||
result = {'id': None,
|
||||
'type': self.type,
|
||||
'alive': alive,
|
||||
'request': request,
|
||||
'resolve': resolve,
|
||||
'alive': info.get('alive'),
|
||||
'request': info.get('request'),
|
||||
'resolve': info.get('resolve'),
|
||||
'new': None,
|
||||
'url': url,
|
||||
'subdomain': subdomain,
|
||||
@@ -345,21 +318,21 @@ class Module(object):
|
||||
'cname': cname,
|
||||
'content': content,
|
||||
'public': public,
|
||||
'cdn': cdn,
|
||||
'cdn': info.get('cdn'),
|
||||
'status': None,
|
||||
'reason': reason,
|
||||
'reason': info.get('reason'),
|
||||
'title': None,
|
||||
'banner': None,
|
||||
'header': None,
|
||||
'response': None,
|
||||
'times': times,
|
||||
'ttl': ttl,
|
||||
'cidr': cidr,
|
||||
'asn': asn,
|
||||
'org': org,
|
||||
'ip2region': ip2region,
|
||||
'ip2location': ip2location,
|
||||
'resolver': resolver,
|
||||
'cidr': info.get('cidr'),
|
||||
'asn': info.get('asn'),
|
||||
'org': info.get('org'),
|
||||
'ip2region': info.get('ip2region'),
|
||||
'ip2location': info.get('ip2location'),
|
||||
'resolver': info.get('resolver'),
|
||||
'module': self.module,
|
||||
'source': self.source,
|
||||
'elapse': self.elapse,
|
||||
|
||||
Reference in New Issue
Block a user