From aa7cec7fbbddd60af3a91116aab9115408e77863 Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Tue, 15 Sep 2020 23:51:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=87=BD=E6=95=B0=E5=90=8D?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/module.py | 2 +- modules/certificates/censys_api.py | 2 +- modules/datasets/binaryedge_api.py | 2 +- modules/datasets/chinaz_api.py | 2 +- modules/datasets/circl_api.py | 2 +- modules/datasets/cloudflare_api.py | 2 +- modules/datasets/dnsdb_api.py | 2 +- modules/datasets/ipv4info_api.py | 2 +- modules/datasets/passivedns_api.py | 2 +- modules/datasets/securitytrails_api.py | 2 +- modules/datasets/spyse_api.py | 2 +- modules/intelligence/riskiq_api.py | 2 +- modules/intelligence/threatbook_api.py | 2 +- modules/intelligence/virustotal_api.py | 2 +- modules/search/bing_api.py | 2 +- modules/search/fofa_api.py | 2 +- modules/search/github_api.py | 2 +- modules/search/google_api.py | 2 +- modules/search/shodan_api.py | 2 +- modules/search/zoomeye_api.py | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/common/module.py b/common/module.py index e9e5880..cc2a8fc 100644 --- a/common/module.py +++ b/common/module.py @@ -33,7 +33,7 @@ class Module(object): self.end = None # 模块结束执行时间 self.elapse = None # 模块执行耗时 - def check(self, *apis): + def have_api(self, *apis): """ Simply check whether the api information configure or not diff --git a/modules/certificates/censys_api.py b/modules/certificates/censys_api.py index 33d6682..3e13d62 100644 --- a/modules/certificates/censys_api.py +++ b/modules/certificates/censys_api.py @@ -45,7 +45,7 @@ class CensysAPI(Query): """ 类执行入口 """ - if not self.check(self.id, self.secret): + if not self.have_api(self.id, self.secret): return self.begin() self.query() diff --git a/modules/datasets/binaryedge_api.py b/modules/datasets/binaryedge_api.py index 4057105..e5383da 100644 --- a/modules/datasets/binaryedge_api.py +++ b/modules/datasets/binaryedge_api.py @@ -26,7 +26,7 @@ class BinaryEdgeAPI(Query): """ 类执行入口 """ - if not self.check(self.api): + if not self.have_api(self.api): return self.begin() self.query() diff --git a/modules/datasets/chinaz_api.py b/modules/datasets/chinaz_api.py index e7a8d37..f8d2f90 100644 --- a/modules/datasets/chinaz_api.py +++ b/modules/datasets/chinaz_api.py @@ -25,7 +25,7 @@ class ChinazAPI(Query): """ 类执行入口 """ - if not self.check(self.api): + if not self.have_api(self.api): return self.begin() self.query() diff --git a/modules/datasets/circl_api.py b/modules/datasets/circl_api.py index ddd0bc5..52b4075 100644 --- a/modules/datasets/circl_api.py +++ b/modules/datasets/circl_api.py @@ -25,7 +25,7 @@ class CirclAPI(Query): """ 类执行入口 """ - if not self.check(self.user, self.pwd): + if not self.have_api(self.user, self.pwd): return self.begin() self.query() diff --git a/modules/datasets/cloudflare_api.py b/modules/datasets/cloudflare_api.py index 89f95b3..4c7a6f2 100644 --- a/modules/datasets/cloudflare_api.py +++ b/modules/datasets/cloudflare_api.py @@ -109,7 +109,7 @@ class CloudFlareAPI(Query): """ class entrance """ - if not self.check(self.token): + if not self.have_api(self.token): return self.begin() self.query() diff --git a/modules/datasets/dnsdb_api.py b/modules/datasets/dnsdb_api.py index 0a30e64..497818e 100644 --- a/modules/datasets/dnsdb_api.py +++ b/modules/datasets/dnsdb_api.py @@ -26,7 +26,7 @@ class DNSdbAPI(Query): """ 类执行入口 """ - if not self.check(self.api): + if not self.have_api(self.api): return self.begin() self.query() diff --git a/modules/datasets/ipv4info_api.py b/modules/datasets/ipv4info_api.py index c41d7f3..3674d45 100644 --- a/modules/datasets/ipv4info_api.py +++ b/modules/datasets/ipv4info_api.py @@ -49,7 +49,7 @@ class IPv4InfoAPI(Query): """ 类执行入口 """ - if not self.check(self.api): + if not self.have_api(self.api): return self.begin() self.query() diff --git a/modules/datasets/passivedns_api.py b/modules/datasets/passivedns_api.py index cabc202..9da805e 100644 --- a/modules/datasets/passivedns_api.py +++ b/modules/datasets/passivedns_api.py @@ -27,7 +27,7 @@ class PassiveDnsAPI(Query): 类执行入口 """ if 'api.passivedns.cn' in self.addr: - if not self.check(self.token): + if not self.have_api(self.token): return self.begin() self.query() diff --git a/modules/datasets/securitytrails_api.py b/modules/datasets/securitytrails_api.py index 7a8e34d..13580d7 100644 --- a/modules/datasets/securitytrails_api.py +++ b/modules/datasets/securitytrails_api.py @@ -32,7 +32,7 @@ class SecurityTrailsAPI(Query): """ 类执行入口 """ - if not self.check(self.api): + if not self.have_api(self.api): return self.begin() self.query() diff --git a/modules/datasets/spyse_api.py b/modules/datasets/spyse_api.py index 59651f3..8d70b6a 100644 --- a/modules/datasets/spyse_api.py +++ b/modules/datasets/spyse_api.py @@ -38,7 +38,7 @@ class SpyseAPI(Query): """ 类执行入口 """ - if not self.check(self.token): + if not self.have_api(self.token): return self.begin() self.query() diff --git a/modules/intelligence/riskiq_api.py b/modules/intelligence/riskiq_api.py index 4a4cca0..b388551 100644 --- a/modules/intelligence/riskiq_api.py +++ b/modules/intelligence/riskiq_api.py @@ -33,7 +33,7 @@ class RiskIQ(Query): """ 类执行入口 """ - if not self.check(self.user, self.key): + if not self.have_api(self.user, self.key): return self.begin() self.query() diff --git a/modules/intelligence/threatbook_api.py b/modules/intelligence/threatbook_api.py index d50c5aa..237b4bc 100644 --- a/modules/intelligence/threatbook_api.py +++ b/modules/intelligence/threatbook_api.py @@ -26,7 +26,7 @@ class ThreatBookAPI(Query): """ 类执行入口 """ - if not self.check(self.key): + if not self.have_api(self.key): return self.begin() self.query() diff --git a/modules/intelligence/virustotal_api.py b/modules/intelligence/virustotal_api.py index 19ae9e5..8b3ba12 100644 --- a/modules/intelligence/virustotal_api.py +++ b/modules/intelligence/virustotal_api.py @@ -33,7 +33,7 @@ class VirusTotalAPI(Query): """ 类执行入口 """ - if not self.check(self.key): + if not self.have_api(self.key): return self.begin() self.query() diff --git a/modules/search/bing_api.py b/modules/search/bing_api.py index 9c6f787..54c6b51 100644 --- a/modules/search/bing_api.py +++ b/modules/search/bing_api.py @@ -45,7 +45,7 @@ class BingAPI(Search): """ 类执行入口 """ - if not self.check(self.id, self.key): + if not self.have_api(self.id, self.key): return self.begin() self.search(self.domain) diff --git a/modules/search/fofa_api.py b/modules/search/fofa_api.py index 4ce17fe..d97b7ef 100644 --- a/modules/search/fofa_api.py +++ b/modules/search/fofa_api.py @@ -50,7 +50,7 @@ class FoFa(Search): """ 类执行入口 """ - if not self.check(self.email, self.key): + if not self.have_api(self.email, self.key): return self.begin() self.search() diff --git a/modules/search/github_api.py b/modules/search/github_api.py index c71f2d9..cef1544 100644 --- a/modules/search/github_api.py +++ b/modules/search/github_api.py @@ -83,7 +83,7 @@ class GithubAPI(Search): """ 类执行入口 """ - if not self.check(self.token): + if not self.have_api(self.token): return self.begin() self.search() diff --git a/modules/search/google_api.py b/modules/search/google_api.py index 2027df7..042afaf 100644 --- a/modules/search/google_api.py +++ b/modules/search/google_api.py @@ -44,7 +44,7 @@ class GoogleAPI(Search): """ 类执行入口 """ - if not self.check(self.id, self.key): + if not self.have_api(self.id, self.key): return self.begin() self.search(self.domain) diff --git a/modules/search/shodan_api.py b/modules/search/shodan_api.py index e0ae022..e80cf2a 100644 --- a/modules/search/shodan_api.py +++ b/modules/search/shodan_api.py @@ -33,7 +33,7 @@ class ShodanAPI(Search): """ 类执行入口 """ - if not self.check(self.key): + if not self.have_api(self.key): return self.begin() self.search() diff --git a/modules/search/zoomeye_api.py b/modules/search/zoomeye_api.py index b95e10b..d63b93e 100644 --- a/modules/search/zoomeye_api.py +++ b/modules/search/zoomeye_api.py @@ -61,7 +61,7 @@ class ZoomEyeAPI(Search): """ 类执行入口 """ - if not self.check(self.user, self.pwd): + if not self.have_api(self.user, self.pwd): return self.begin() self.search()