From 269bdd547ad50c54ef1bc8a004a4473a718f2bee Mon Sep 17 00:00:00 2001 From: m0rning0o0 <88267371+m0rning0o0@users.noreply.github.com> Date: Sun, 1 Aug 2021 17:15:45 +0800 Subject: [PATCH 1/4] Update utils.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正因为某些模块更改请求头导致后续模块无法正常工作的情况 --- common/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/utils.py b/common/utils.py index ea3b6f1..14de144 100644 --- a/common/utils.py +++ b/common/utils.py @@ -54,7 +54,7 @@ def gen_fake_header(): """ Generate fake request headers """ - headers = settings.request_default_headers + headers = settings.request_default_headers.copy() if not isinstance(headers, dict): headers = dict() if settings.enable_random_ua: From 9af50e91b8d6b73a7323aeb56d240957fdcf0406 Mon Sep 17 00:00:00 2001 From: m0rning0o0 <88267371+m0rning0o0@users.noreply.github.com> Date: Sun, 1 Aug 2021 17:18:28 +0800 Subject: [PATCH 2/4] Update censys_api.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit API查询接口变更 --- modules/certificates/censys_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/certificates/censys_api.py b/modules/certificates/censys_api.py index 3e13d62..4940d00 100644 --- a/modules/certificates/censys_api.py +++ b/modules/certificates/censys_api.py @@ -9,7 +9,7 @@ class CensysAPI(Query): self.domain = domain self.module = 'Certificate' self.source = "CensysAPIQuery" - self.addr = 'https://www.censys.io/api/v1/search/certificates' + self.addr = 'https://search.censys.io/api/v1/search/certificates' self.id = settings.censys_api_id self.secret = settings.censys_api_secret self.delay = 3.0 # Censys 接口查询速率限制 最快2.5秒查1次 From 4a76407edbe9e70e9189eb90788aeb9f46b9f4ee Mon Sep 17 00:00:00 2001 From: m0rning0o0 <88267371+m0rning0o0@users.noreply.github.com> Date: Sun, 1 Aug 2021 17:19:40 +0800 Subject: [PATCH 3/4] Update dnsdumpster.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 请求参数变化 --- modules/datasets/dnsdumpster.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/datasets/dnsdumpster.py b/modules/datasets/dnsdumpster.py index fb55526..7dbe01f 100644 --- a/modules/datasets/dnsdumpster.py +++ b/modules/datasets/dnsdumpster.py @@ -21,7 +21,8 @@ class DNSDumpster(Query): return self.cookie = resp.cookies data = {'csrfmiddlewaretoken': self.cookie.get('csrftoken'), - 'targetip': self.domain} + 'targetip': self.domain, + 'user':'free'} resp = self.post(self.addr, data) self.subdomains = self.collect_subdomains(resp) From 53dcbcf423c0008d0cf050c995ea1463abb8c45c Mon Sep 17 00:00:00 2001 From: m0rning0o0 <88267371+m0rning0o0@users.noreply.github.com> Date: Sun, 1 Aug 2021 17:21:27 +0800 Subject: [PATCH 4/4] Update threatminer.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit API地址和参数更新 --- modules/intelligence/threatminer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/intelligence/threatminer.py b/modules/intelligence/threatminer.py index 0f79900..7580283 100644 --- a/modules/intelligence/threatminer.py +++ b/modules/intelligence/threatminer.py @@ -7,7 +7,7 @@ class ThreatMiner(Query): self.domain = domain self.module = 'Intelligence' self.source = 'ThreatMinerQuery' - self.addr = 'https://www.threatminer.org/getData.php' + self.addr = 'https://api.threatminer.org/v2/domain.php' def query(self): """ @@ -15,8 +15,7 @@ class ThreatMiner(Query): """ self.header = self.get_header() self.proxy = self.get_proxy(self.source) - params = {'e': 'subdomains_container', - 'q': self.domain, 't': 0, 'rt': 10} + params = {'q': self.domain, 'rt': 5} resp = self.get(self.addr, params) self.subdomains = self.collect_subdomains(resp)