From 6f4fd16cdbf21ec64cb92e1f8c776d653ac2f0fb Mon Sep 17 00:00:00 2001 From: shmilylty Date: Tue, 17 Dec 2019 18:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B2=A1=E6=9C=89=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E8=AF=B7=E6=B1=82=E6=97=B6=E5=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oneforall/modules/certificates/censys_api.py | 2 -- oneforall/modules/certificates/certspotter.py | 2 -- oneforall/modules/certificates/crtsh.py | 2 -- oneforall/modules/certificates/entrust.py | 2 -- oneforall/modules/certificates/google.py | 2 -- oneforall/modules/certificates/spyse_api.py | 2 -- oneforall/modules/datasets/binaryedge_api.py | 2 -- oneforall/modules/datasets/bufferover.py | 2 -- oneforall/modules/datasets/cebaidu.py | 2 -- oneforall/modules/datasets/chinaz.py | 2 -- oneforall/modules/datasets/chinaz_api.py | 2 -- oneforall/modules/datasets/circl_api.py | 2 -- oneforall/modules/datasets/dnsdb_api.py | 2 -- oneforall/modules/datasets/dnsdumpster.py | 2 -- oneforall/modules/datasets/ip138.py | 2 -- oneforall/modules/datasets/passivedns_api.py | 2 -- oneforall/modules/datasets/riddler.py | 2 -- oneforall/modules/datasets/securitytrails_api.py | 2 -- oneforall/modules/datasets/sitedossier.py | 2 -- oneforall/modules/datasets/ximcx.py | 2 -- oneforall/modules/intelligence/alienvault.py | 3 --- oneforall/modules/intelligence/threatminer.py | 3 --- oneforall/modules/intelligence/virustotal.py | 3 --- 23 files changed, 49 deletions(-) diff --git a/oneforall/modules/certificates/censys_api.py b/oneforall/modules/certificates/censys_api.py index af1d09b..ead4ba9 100644 --- a/oneforall/modules/certificates/censys_api.py +++ b/oneforall/modules/certificates/censys_api.py @@ -1,4 +1,3 @@ -import time import config from common.query import Query from config import logger @@ -38,7 +37,6 @@ class CensysAPI(Query): self.subdomains = self.subdomains.union(subdomains) pages = json.get('metadata').get('pages') for page in range(2, pages + 1): - time.sleep(self.delay) data['page'] = page resp = self.post(self.addr, json=data, auth=(self.id, self.secret)) if not resp: diff --git a/oneforall/modules/certificates/certspotter.py b/oneforall/modules/certificates/certspotter.py index 8e7274c..84acf7c 100644 --- a/oneforall/modules/certificates/certspotter.py +++ b/oneforall/modules/certificates/certspotter.py @@ -1,4 +1,3 @@ -import time from common import utils from common.query import Query @@ -15,7 +14,6 @@ class CertSpotter(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'domain': self.domain, diff --git a/oneforall/modules/certificates/crtsh.py b/oneforall/modules/certificates/crtsh.py index 2f2943c..38b470a 100644 --- a/oneforall/modules/certificates/crtsh.py +++ b/oneforall/modules/certificates/crtsh.py @@ -1,4 +1,3 @@ -import time from common import utils from common.query import Query @@ -15,7 +14,6 @@ class Crtsh(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'q': f'%.{self.domain}', 'output': 'json'} diff --git a/oneforall/modules/certificates/entrust.py b/oneforall/modules/certificates/entrust.py index 9943a5f..ab3e82c 100644 --- a/oneforall/modules/certificates/entrust.py +++ b/oneforall/modules/certificates/entrust.py @@ -1,4 +1,3 @@ -import time from common import utils from common.query import Query @@ -15,7 +14,6 @@ class Entrust(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'fields': 'subjectDN', diff --git a/oneforall/modules/certificates/google.py b/oneforall/modules/certificates/google.py index cbacedb..5f11a7d 100644 --- a/oneforall/modules/certificates/google.py +++ b/oneforall/modules/certificates/google.py @@ -1,4 +1,3 @@ -import time from common import utils from common.query import Query @@ -16,7 +15,6 @@ class Google(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'include_expired': 'true', diff --git a/oneforall/modules/certificates/spyse_api.py b/oneforall/modules/certificates/spyse_api.py index a2b829b..01c52f0 100644 --- a/oneforall/modules/certificates/spyse_api.py +++ b/oneforall/modules/certificates/spyse_api.py @@ -1,4 +1,3 @@ -import time import config from common import utils from common.query import Query @@ -19,7 +18,6 @@ class SpyseAPI(Query): """ page_num = 1 while True: - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'domain': self.domain, diff --git a/oneforall/modules/datasets/binaryedge_api.py b/oneforall/modules/datasets/binaryedge_api.py index 14ea737..05d5e95 100644 --- a/oneforall/modules/datasets/binaryedge_api.py +++ b/oneforall/modules/datasets/binaryedge_api.py @@ -1,4 +1,3 @@ -import time import config from common.query import Query @@ -16,7 +15,6 @@ class BinaryEdgeAPI(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.header.update({'X-Key': self.api}) self.proxy = self.get_proxy(self.source) diff --git a/oneforall/modules/datasets/bufferover.py b/oneforall/modules/datasets/bufferover.py index f3f3f7d..72b2d7f 100644 --- a/oneforall/modules/datasets/bufferover.py +++ b/oneforall/modules/datasets/bufferover.py @@ -1,4 +1,3 @@ -import time import cloudscraper from common.query import Query from config import logger @@ -16,7 +15,6 @@ class BufferOver(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) # 绕过cloudFlare验证 scraper = cloudscraper.create_scraper() scraper.interpreter = 'js2py' diff --git a/oneforall/modules/datasets/cebaidu.py b/oneforall/modules/datasets/cebaidu.py index c6eb567..44ed6d4 100644 --- a/oneforall/modules/datasets/cebaidu.py +++ b/oneforall/modules/datasets/cebaidu.py @@ -1,4 +1,3 @@ -import time from common.query import Query @@ -14,7 +13,6 @@ class CeBaidu(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'site_address': self.domain} diff --git a/oneforall/modules/datasets/chinaz.py b/oneforall/modules/datasets/chinaz.py index 8de56be..f054338 100644 --- a/oneforall/modules/datasets/chinaz.py +++ b/oneforall/modules/datasets/chinaz.py @@ -1,4 +1,3 @@ -import time from common.query import Query @@ -14,7 +13,6 @@ class Chinaz(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) self.addr = self.addr + self.domain diff --git a/oneforall/modules/datasets/chinaz_api.py b/oneforall/modules/datasets/chinaz_api.py index d26541c..9ca8637 100644 --- a/oneforall/modules/datasets/chinaz_api.py +++ b/oneforall/modules/datasets/chinaz_api.py @@ -1,4 +1,3 @@ -import time import config from common.query import Query @@ -16,7 +15,6 @@ class ChinazAPI(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'key': self.api, 'domainName': self.domain} diff --git a/oneforall/modules/datasets/circl_api.py b/oneforall/modules/datasets/circl_api.py index 54c413a..2aa9345 100644 --- a/oneforall/modules/datasets/circl_api.py +++ b/oneforall/modules/datasets/circl_api.py @@ -1,4 +1,3 @@ -import time import config from common.query import Query @@ -17,7 +16,6 @@ class CirclAPI(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) resp = self.get(self.addr + self.domain, auth=(self.user, self.pwd)) diff --git a/oneforall/modules/datasets/dnsdb_api.py b/oneforall/modules/datasets/dnsdb_api.py index 2c010cb..c513933 100644 --- a/oneforall/modules/datasets/dnsdb_api.py +++ b/oneforall/modules/datasets/dnsdb_api.py @@ -1,4 +1,3 @@ -import time import config from common import utils from common.query import Query @@ -17,7 +16,6 @@ class DNSdbAPI(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.header.update({'X-API-Key': self.api}) self.proxy = self.get_proxy(self.source) diff --git a/oneforall/modules/datasets/dnsdumpster.py b/oneforall/modules/datasets/dnsdumpster.py index 0f91beb..58d0723 100644 --- a/oneforall/modules/datasets/dnsdumpster.py +++ b/oneforall/modules/datasets/dnsdumpster.py @@ -1,4 +1,3 @@ -import time from common import utils from common.query import Query @@ -15,7 +14,6 @@ class DNSdumpster(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.header.update({'Referer': 'https://dnsdumpster.com'}) self.proxy = self.get_proxy(self.source) diff --git a/oneforall/modules/datasets/ip138.py b/oneforall/modules/datasets/ip138.py index e54945c..dca8f0c 100644 --- a/oneforall/modules/datasets/ip138.py +++ b/oneforall/modules/datasets/ip138.py @@ -1,4 +1,3 @@ -import time from common.query import Query @@ -14,7 +13,6 @@ class IP138(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) data = {'domain': self.domain} diff --git a/oneforall/modules/datasets/passivedns_api.py b/oneforall/modules/datasets/passivedns_api.py index cc02dd8..83c075c 100644 --- a/oneforall/modules/datasets/passivedns_api.py +++ b/oneforall/modules/datasets/passivedns_api.py @@ -1,4 +1,3 @@ -import time import config from common.query import Query @@ -16,7 +15,6 @@ class PassiveDnsAPI(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.header.update({'X-AuthToken': self.token}) self.proxy = self.get_proxy(self.source) diff --git a/oneforall/modules/datasets/riddler.py b/oneforall/modules/datasets/riddler.py index fff7e50..6e7ed00 100644 --- a/oneforall/modules/datasets/riddler.py +++ b/oneforall/modules/datasets/riddler.py @@ -1,4 +1,3 @@ -import time from common.query import Query @@ -14,7 +13,6 @@ class Riddler(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'q': 'pld:' + self.domain} diff --git a/oneforall/modules/datasets/securitytrails_api.py b/oneforall/modules/datasets/securitytrails_api.py index d1e1e7b..b44fbb3 100644 --- a/oneforall/modules/datasets/securitytrails_api.py +++ b/oneforall/modules/datasets/securitytrails_api.py @@ -1,4 +1,3 @@ -import time import config from common.query import Query @@ -17,7 +16,6 @@ class SecurityTrailsAPI(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'apikey': self.api} diff --git a/oneforall/modules/datasets/sitedossier.py b/oneforall/modules/datasets/sitedossier.py index 87d84f0..c122564 100644 --- a/oneforall/modules/datasets/sitedossier.py +++ b/oneforall/modules/datasets/sitedossier.py @@ -1,4 +1,3 @@ -import time from common.query import Query @@ -19,7 +18,6 @@ class SiteDossier(Query): 向接口查询子域并做子域匹配 """ while True: - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) url = f'{self.addr}{self.domain}/{self.page_num}' diff --git a/oneforall/modules/datasets/ximcx.py b/oneforall/modules/datasets/ximcx.py index e00af40..943b6ca 100644 --- a/oneforall/modules/datasets/ximcx.py +++ b/oneforall/modules/datasets/ximcx.py @@ -1,4 +1,3 @@ -import time from common.query import Query @@ -14,7 +13,6 @@ class Ximcx(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) data = {'domain': self.domain} diff --git a/oneforall/modules/intelligence/alienvault.py b/oneforall/modules/intelligence/alienvault.py index 599c61f..a7eeeee 100644 --- a/oneforall/modules/intelligence/alienvault.py +++ b/oneforall/modules/intelligence/alienvault.py @@ -1,5 +1,3 @@ -import time - from common.query import Query @@ -14,7 +12,6 @@ class AlienVault(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) diff --git a/oneforall/modules/intelligence/threatminer.py b/oneforall/modules/intelligence/threatminer.py index b729d38..cc06eab 100644 --- a/oneforall/modules/intelligence/threatminer.py +++ b/oneforall/modules/intelligence/threatminer.py @@ -1,5 +1,3 @@ -import time - from common.query import Query @@ -15,7 +13,6 @@ class ThreatMiner(Query): """ 向接口查询子域并做子域匹配 """ - time.sleep(self.delay) self.header = self.get_header() self.proxy = self.get_proxy(self.source) params = {'e': 'subdomains_container', diff --git a/oneforall/modules/intelligence/virustotal.py b/oneforall/modules/intelligence/virustotal.py index 31b3c48..6f27eec 100644 --- a/oneforall/modules/intelligence/virustotal.py +++ b/oneforall/modules/intelligence/virustotal.py @@ -1,5 +1,3 @@ -import time - from common.query import Query ''' @@ -21,7 +19,6 @@ class VirusTotal(Query): """ next_cursor = '' while True: - time.sleep(self.delay) self.header = self.get_header() self.header.update({'Referer': 'https://www.virustotal.com/', 'TE': 'Trailers'})