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

统一调整子域匹配函数

Browse Source
This commit is contained in:
Jing Ling
2020-05-11 21:17:25 +08:00
parent ebd55faa9e
commit 74d5354ead
57 changed files with 94 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/certificates/censys_api.py
+2 -2
View File
@@ -33,7 +33,7 @@ class CensysAPI(Query):
if status != 'ok':
logger.log('ALERT', status)
return
subdomains = self.match(self.domain, str(json))
subdomains = self.match_subdomains(self.domain, str(json))
self.subdomains = self.subdomains.union(subdomains)
pages = json.get('metadata').get('pages')
for page in range(2, pages + 1):
@@ -41,7 +41,7 @@ class CensysAPI(Query):
resp = self.post(self.addr, json=data, auth=(self.id, self.secret))
if not resp:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
self.subdomains = self.subdomains.union(subdomains)
def run(self):
modules/certificates/certspotter.py
+1 -1
View File
@@ -22,7 +22,7 @@ class CertSpotter(Query):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = utils.match_subdomain(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/certificates/crtsh.py
+1 -1
View File
@@ -20,7 +20,7 @@ class Crtsh(Query):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = utils.match_subdomain(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
self.subdomains = self.subdomains.union(subdomains)
def run(self):
modules/certificates/google.py
+1 -1
View File
@@ -23,7 +23,7 @@ class Google(Query):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = utils.match_subdomain(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/check/axfr.py
+1 -1
View File
@@ -44,7 +44,7 @@ class CheckAXFR(Module):
names = zone.nodes.keys()
for name in names:
full_domain = str(name) + '.' + self.domain
subdomain = utils.match_subdomain(self.domain, full_domain)
subdomain = self.match_subdomains(self.domain, full_domain)
self.subdomains = self.subdomains.union(subdomain)
record = zone[name].to_text(name)
self.results.append(record)
modules/check/cdx.py
+1 -1
View File
@@ -31,7 +31,7 @@ class CheckCDX(Module):
if not response:
return
if response and len(response.content):
self.subdomains = utils.match_subdomain(self.domain,
self.subdomains = self.match_subdomains(self.domain,
response.text)
def run(self):
modules/check/cert.py
+1 -1
View File
@@ -32,7 +32,7 @@ class CheckCert(Module):
except Exception as e:
logger.log('DEBUG', e.args)
return
subdomains = utils.match_subdomain(self.domain, str(cert_dict))
subdomains = self.match_subdomains(self.domain, str(cert_dict))
self.subdomains = self.subdomains.union(subdomains)
def run(self):
modules/check/csp.py
+1 -1
View File
@@ -52,7 +52,7 @@ class CheckCSP(Module):
if not csp:
logger.log('DEBUG', f'{self.domain}域的响应头不存在内容安全策略字段')
return
self.subdomains = utils.match_subdomain(self.domain, csp)
self.subdomains = self.match_subdomains(self.domain, csp)
def run(self):
"""
modules/check/robots.py
+1 -1
View File
@@ -30,7 +30,7 @@ class CheckRobots(Module):
if not response:
return
if response and len(response.content):
self.subdomains = utils.match_subdomain(self.domain,
self.subdomains = self.match_subdomains(self.domain,
response.text)
def run(self):
modules/check/sitemap.py
+1 -1
View File
@@ -43,7 +43,7 @@ class CheckRobots(Module):
if not response:
return
if response and len(response.content):
self.subdomains = utils.match_subdomain(self.domain,
self.subdomains = self.match_subdomains(self.domain,
response.text)
modules/crawl/archivecrawl.py
+2 -2
View File
@@ -26,8 +26,8 @@ class ArchiveCrawl(Crawl):
for resp in cdx.iter(url, limit=limit):
if resp.data.get('status') not in ['301', '302']:
url = resp.data.get('url')
subdomains = self.match(self.register(domain),
url + resp.text)
subdomains = self.match_subdomains(self.register(domain),
url + resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/crawl/commoncrawl.py
+1 -1
View File
@@ -26,7 +26,7 @@ class CommonCrawl(Crawl):
for resp in tqdm(cdx.iter(url, limit=limit), total=limit):
if resp.data.get('status') not in ['301', '302']:
subdomains = self.match(self.register(domain), resp.text)
subdomains = self.match_subdomains(self.register(domain), resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/binaryedge_api.py
+1 -1
View File
@@ -22,7 +22,7 @@ class BinaryEdgeAPI(Query):
resp = self.get(url)
if not resp:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
self.subdomains = self.subdomains.union(subdomains)
def run(self):
modules/datasets/bufferover.py
+1 -1
View File
@@ -26,7 +26,7 @@ class BufferOver(Query):
return
if resp.status_code != 200:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/cebaidu.py
+1 -1
View File
@@ -19,7 +19,7 @@ class CeBaidu(Query):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/chinaz.py
+1 -1
View File
@@ -19,7 +19,7 @@ class Chinaz(Query):
resp = self.get(self.addr)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/chinaz_api.py
+1 -1
View File
@@ -21,7 +21,7 @@ class ChinazAPI(Query):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/circl_api.py
+1 -1
View File
@@ -21,7 +21,7 @@ class CirclAPI(Query):
resp = self.get(self.addr + self.domain, auth=(self.user, self.pwd))
if not resp:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/dnsdb_api.py
+1 -1
View File
@@ -23,7 +23,7 @@ class DNSdbAPI(Query):
resp = self.get(url)
if not resp:
return
subdomains = utils.match_subdomain(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/dnsdumpster.py
+1 -1
View File
@@ -26,7 +26,7 @@ class DNSdumpster(Query):
resp = self.post(self.addr, data)
if not resp:
return
subdomains = utils.match_subdomain(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if subdomains:
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/hackertarget.py
+1 -1
View File
@@ -21,7 +21,7 @@ class HackerTarget(Query):
if not resp:
return
if resp.status_code == 200:
subdomains = utils.match_subdomain(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if subdomains:
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/ip138.py
+1 -1
View File
@@ -19,7 +19,7 @@ class IP138(Query):
resp = self.get(self.addr)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/ipv4info_api.py
+1 -1
View File
@@ -32,7 +32,7 @@ class IPv4InfoAPI(Query):
except Exception as e:
logger.log('DEBUG', e.args)
break
subdomains = self.match(self.domain, str(json))
subdomains = self.match_subdomains(self.domain, str(json))
if not subdomains:
break
# 合并搜索子域名搜索结果
modules/datasets/netcraft.py
+1 -1
View File
@@ -49,7 +49,7 @@ class NetCraft(Query):
resp = self.get(self.addr + last, params)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
# 合并搜索子域名搜索结果
modules/datasets/passivedns_api.py
+1 -1
View File
@@ -22,7 +22,7 @@ class PassiveDnsAPI(Query):
resp = self.get(url)
if not resp:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/qianxun.py
+1 -1
View File
@@ -27,7 +27,7 @@ class QianXun(Query):
resp = self.post(url, data)
if not resp:
break
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
self.subdomains = self.subdomains.union(subdomains)
if '<div id="page" class="pagelist">' not in resp.text:
break
modules/datasets/rapiddns.py
+1 -1
View File
@@ -20,7 +20,7 @@ class RapidDNS(Query):
resp = self.get(url, params)
if not resp:
return
subdomains = utils.match_subdomain(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/riddler.py
+1 -1
View File
@@ -19,7 +19,7 @@ class Riddler(Query):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/robtex.py
+1 -1
View File
@@ -32,7 +32,7 @@ class Robtex(Query):
resp = self.get(url)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if subdomains:
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/sitedossier.py
+1 -1
View File
@@ -24,7 +24,7 @@ class SiteDossier(Query):
resp = self.get(url)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
# 合并搜索子域名搜索结果
modules/datasets/spyse_api.py
+1 -1
View File
@@ -27,7 +27,7 @@ class SpyseAPI(Query):
if not resp:
return
json = resp.json()
subdomains = utils.match_subdomain(self.domain, str(json))
subdomains = self.match_subdomains(self.domain, str(json))
if not subdomains: # 搜索没有发现子域名则停止搜索
break
# 合并搜索子域名搜索结果
modules/datasets/threatcrowd.py
+1 -1
View File
@@ -25,7 +25,7 @@ class ThreatCrowd(Query):
return
if resp.status_code != 200:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/datasets/wzpc.py
+1 -1
View File
@@ -31,7 +31,7 @@ class WZPCQuery(Query):
break
if not resp:
break
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
self.subdomains = self.subdomains.union(subdomains)
if not subdomains:
break
modules/datasets/ximcx.py
+1 -1
View File
@@ -20,7 +20,7 @@ class Ximcx(Query):
if not resp:
return
json = resp.json()
subdomains = self.match(self.domain, str(json))
subdomains = self.match_subdomains(self.domain, str(json))
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/dnsquery/srv.py
+1 -1
View File
@@ -50,7 +50,7 @@ class BruteSRV(Module):
continue
for item in answer:
record = str(item)
subdomains = utils.match_subdomain(self.domain, record)
subdomains = self.match_subdomains(self.domain, record)
self.subdomains = self.subdomains.union(subdomains)
self.gen_record(subdomains, record)
modules/intelligence/alienvault.py
+2 -2
View File
@@ -21,7 +21,7 @@ class AlienVault(Query):
if not resp:
return
json = resp.json()
subdomains = self.match(self.domain, str(json))
subdomains = self.match_subdomains(self.domain, str(json))
self.subdomains = self.subdomains.union(subdomains)
url = f'{base}/{self.domain}/url_list'
@@ -29,7 +29,7 @@ class AlienVault(Query):
if not resp:
return
json = resp.json()
subdomains = self.match(self.domain, str(json))
subdomains = self.match_subdomains(self.domain, str(json))
self.subdomains = self.subdomains.union(subdomains)
def run(self):
modules/intelligence/threatbook_api.py
+1 -1
View File
@@ -23,7 +23,7 @@ class ThreatBookAPI(Query):
resp = self.post(self.addr, params)
if not resp:
return
subdomains = self.match(self.domain, str(resp.json()))
subdomains = self.match_subdomains(self.domain, str(resp.json()))
self.subdomains = self.subdomains.union(subdomains)
def run(self):
modules/intelligence/threatminer.py
+1 -1
View File
@@ -20,7 +20,7 @@ class ThreatMiner(Query):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
# 合并搜索子域名搜索结果
self.subdomains = self.subdomains.union(subdomains)
modules/search/ask.py
+1 -1
View File
@@ -30,7 +30,7 @@ class Ask(Search):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(domain, resp.text)
subdomains = self.match_subdomains(domain, resp.text)
if not subdomains:
break
if not full_search:
modules/search/baidu.py
+1 -1
View File
@@ -54,7 +54,7 @@ class Baidu(Search):
# 获取百度跳转URL响应头的Location字段获取直链
subdomains = self.redirect_match(domain, resp.text)
else:
subdomains = self.match(domain, resp.text)
subdomains = self.match_subdomains(domain, resp.text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
if not full_search:
modules/search/bing.py
+1 -1
View File
@@ -36,7 +36,7 @@ class Bing(Search):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(domain, resp.text)
subdomains = self.match_subdomains(domain, resp.text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
if not full_search:
modules/search/bing_api.py
+1 -1
View File
@@ -37,7 +37,7 @@ class BingAPI(Search):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(domain, str(resp.json()))
subdomains = self.match_subdomains(domain, str(resp.json()))
if not subdomains: # 搜索没有发现子域名则停止搜索
break
if not full_search:
modules/search/fofa_api.py
+1 -1
View File
@@ -36,7 +36,7 @@ class FoFa(Search):
if not resp:
return
resp_json = resp.json()
subdomains = self.match(self.domain, str(resp_json))
subdomains = self.match_subdomains(self.domain, str(resp_json))
if not subdomains: # 搜索没有发现子域名则停止搜索
break
self.subdomains = self.subdomains.union(subdomains)
modules/search/gitee.py
+1 -1
View File
@@ -34,7 +34,7 @@ class Gitee(Search):
if 'class="empty-box"' in resp.text:
break
soup = BeautifulSoup(resp.text, 'html.parser')
subdomains = self.match(self.domain, soup.text)
subdomains = self.match_subdomains(self.domain, soup.text)
if not subdomains:
break
if not full_search:
modules/search/github_api.py
+1 -2
View File
@@ -1,6 +1,5 @@
import requests
from config import api
from common.utils import match_subdomain
from common.search import Search
from config.log import logger
@@ -61,7 +60,7 @@ class GithubAPI(Search):
if resp.status_code != 200:
logger.log('ERROR', f'{self.source}模块搜索出错')
break
subdomains = match_subdomain(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if not subdomains:
break
self.subdomains = self.subdomains.union(subdomains)
modules/search/google.py
+1 -1
View File
@@ -40,7 +40,7 @@ class Google(Search):
resp = self.get(url=self.addr, params=payload)
if not resp:
return
subdomains = self.match(domain, resp.text)
subdomains = self.match_subdomains(domain, resp.text)
if not subdomains:
break
if not full_search:
modules/search/google_api.py
+1 -1
View File
@@ -35,7 +35,7 @@ class GoogleAPI(Search):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(domain, str(resp.json()))
subdomains = self.match_subdomains(domain, str(resp.json()))
if not subdomains:
break
if not full_search:
modules/search/shodan_api.py
+1 -1
View File
@@ -25,7 +25,7 @@ class ShodanAPI(Search):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
if subdomains:
modules/search/so.py
+1 -1
View File
@@ -31,7 +31,7 @@ class So(Search):
resp = self.get(url=self.addr, params=payload)
if not resp:
return
subdomains = self.match(domain, resp.text)
subdomains = self.match_subdomains(domain, resp.text)
if not subdomains:
break
if not full_search:
modules/search/sogou.py
+1 -1
View File
@@ -28,7 +28,7 @@ class Sogou(Search):
resp = self.get(self.addr, payload)
if not resp:
return
subdomains = self.match(domain, resp.text)
subdomains = self.match_subdomains(domain, resp.text)
if not subdomains:
break
if not full_search:
modules/search/yahoo.py
+1 -1
View File
@@ -36,7 +36,7 @@ class Yahoo(Search):
if not resp:
return
text = resp.text.replace('<b>', '').replace('</b>', '')
subdomains = self.match(domain, text)
subdomains = self.match_subdomains(domain, text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
if not full_search:
modules/search/yandex.py
+1 -1
View File
@@ -36,7 +36,7 @@ class Yandex(Search):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(domain, resp.text)
subdomains = self.match_subdomains(domain, resp.text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
if not full_search:
modules/search/zoomeye_api.py
+1 -1
View File
@@ -48,7 +48,7 @@ class ZoomEyeAPI(Search):
resp = self.get(self.addr, params)
if not resp:
return
subdomains = self.match(self.domain, resp.text)
subdomains = self.match_subdomains(self.domain, resp.text)
if not subdomains: # 搜索没有发现子域名则停止搜索
break
self.subdomains = self.subdomains.union(subdomains)