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

content改ip

Browse Source
This commit is contained in:
Jing Ling
2020-08-29 17:44:22 +08:00
parent a2dcc6dde5
commit 4bf37ca5d5
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database.py
+4 -4
View File
@@ -63,7 +63,7 @@ class Database(object):
f'port int,'
f'level int,'
f'cname text,'
f'content text,'
f'ip text,'
f'public int,'
f'cdn int,'
f'status int,'
@@ -102,11 +102,11 @@ class Database(object):
self.conn.bulk_query(
f'insert into "{table_name}" '
f'(id, alive, resolve, request, new, url, subdomain, port, level,'
f'cname, content, public, cdn, status, reason, title, banner, header,'
f'cname, ip, public, cdn, status, reason, title, banner, header,'
f'history, response, times, ttl, cidr, asn, org, addr, isp, resolver,'
f'module, source, elapse, find) '
f'values (:id, :alive, :resolve, :request, :new, :url,'
f':subdomain, :port, :level, :cname, :content, :public, :cdn,'
f':subdomain, :port, :level, :cname, :ip, :public, :cdn,'
f':status, :reason, :title, :banner, :header, :history, :response,'
f':times, :ttl, :cidr, :asn, :org, :addr, :isp, :resolver, :module,'
f':source, :elapse, :find)', results)
@@ -230,7 +230,7 @@ class Database(object):
"""
table_name = table_name.replace('.', '_')
query = f'select id, new, alive, request, resolve, url, subdomain, level,' \
f'cname, content, public, cdn, port, status, reason, title, banner,' \
f'cname, ip, public, cdn, port, status, reason, title, banner,' \
f'cidr, asn, org, addr, isp, source from "{table_name}"'
if alive and limit:
if limit in ['resolve', 'request']:
common/module.py
+4 -4
View File
@@ -269,7 +269,7 @@ class Module(object):
'port': None,
'level': None,
'cname': None,
'content': None,
'ip': None,
'public': None,
'cdn': None,
'status': None,
@@ -300,13 +300,13 @@ class Module(object):
if info is None:
info = dict()
cname = info.get('cname')
content = info.get('content')
ip = info.get('ip')
times = info.get('times')
ttl = info.get('ttl')
public = info.get('public')
if isinstance(cname, list):
cname = ','.join(cname)
content = ','.join(content)
ip = ','.join(ip)
times = ','.join([str(num) for num in times])
ttl = ','.join([str(num) for num in ttl])
public = ','.join([str(num) for num in public])
@@ -320,7 +320,7 @@ class Module(object):
'port': 80,
'level': level,
'cname': cname,
'content': content,
'ip': ip,
'public': public,
'cdn': info.get('cdn'),
'status': None,
common/resolve.py
+3 -3
View File
@@ -22,7 +22,7 @@ def filter_subdomain(data):
logger.log('DEBUG', f'Filtering subdomains to be resolved')
subdomains = []
for data in data:
if not data.get('content'):
if not data.get('ip'):
subdomain = data.get('subdomain')
subdomains.append(subdomain)
return subdomains
@@ -41,7 +41,7 @@ def update_data(data, infos):
logger.log('ERROR', f'No valid resolved result')
return data
for index, items in enumerate(data):
if items.get('content'):
if items.get('ip'):
continue
subdomain = items.get('subdomain')
record = infos.get(subdomain)
@@ -104,7 +104,7 @@ def gen_infos(data, qname, info, infos):
info['resolve'] = 1
info['reason'] = 'OK'
info['cname'] = ','.join(cname)
info['content'] = ','.join(ips)
info['ip'] = ','.join(ips)
info['public'] = ','.join(public)
info['ttl'] = ','.join(ttl)
info['cidr'] = ','.join(cidr)