From 3ce2755018fa2c9c5bbcee1280733ca746174a32 Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Wed, 20 Dec 2023 07:52:31 -0500 Subject: [PATCH 1/3] rotate DNS servers --- bbot/core/helpers/dns.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bbot/core/helpers/dns.py b/bbot/core/helpers/dns.py index 58dbce3e20..03aacf3e39 100644 --- a/bbot/core/helpers/dns.py +++ b/bbot/core/helpers/dns.py @@ -39,6 +39,7 @@ def __init__(self, *args, **kwargs): dns_queries_per_second = self._parent_helper.config.get("dns_queries_per_second", 100) self._dns_rate_limiter = RateLimiter(dns_queries_per_second, "DNS") super().__init__(*args, **kwargs) + self.rotate = True async def resolve(self, *args, **kwargs): async with self._dns_rate_limiter: @@ -139,6 +140,9 @@ def __init__(self, parent_helper): # copy the system's current resolvers to a text file for tool use self.system_resolvers = dns.resolver.Resolver().nameservers + if len(self.system_resolvers) == 1: + nameserver = next(iter(self.system_resolvers)) + log.warning(f'BBOT performs better with multiple DNS servers. Your system currently only has one.') self.resolver_file = self.parent_helper.tempfile(self.system_resolvers, pipe=False) self.filter_bad_ptrs = self.parent_helper.config.get("dns_filter_ptrs", True) From 9c4fc22b3aad851cce93cbad42b19b9054731938 Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Wed, 20 Dec 2023 07:54:10 -0500 Subject: [PATCH 2/3] blacked --- bbot/core/helpers/dns.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbot/core/helpers/dns.py b/bbot/core/helpers/dns.py index 03aacf3e39..f611bbbb7a 100644 --- a/bbot/core/helpers/dns.py +++ b/bbot/core/helpers/dns.py @@ -142,7 +142,7 @@ def __init__(self, parent_helper): self.system_resolvers = dns.resolver.Resolver().nameservers if len(self.system_resolvers) == 1: nameserver = next(iter(self.system_resolvers)) - log.warning(f'BBOT performs better with multiple DNS servers. Your system currently only has one.') + log.warning("BBOT performs better with multiple DNS servers. Your system currently only has one.") self.resolver_file = self.parent_helper.tempfile(self.system_resolvers, pipe=False) self.filter_bad_ptrs = self.parent_helper.config.get("dns_filter_ptrs", True) From a7218dde5c482cb7cfcdc511f3450b2af634954a Mon Sep 17 00:00:00 2001 From: TheTechromancer Date: Wed, 20 Dec 2023 07:55:41 -0500 Subject: [PATCH 3/3] flaked --- bbot/core/helpers/dns.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bbot/core/helpers/dns.py b/bbot/core/helpers/dns.py index f611bbbb7a..ed880150a5 100644 --- a/bbot/core/helpers/dns.py +++ b/bbot/core/helpers/dns.py @@ -141,7 +141,6 @@ def __init__(self, parent_helper): # copy the system's current resolvers to a text file for tool use self.system_resolvers = dns.resolver.Resolver().nameservers if len(self.system_resolvers) == 1: - nameserver = next(iter(self.system_resolvers)) log.warning("BBOT performs better with multiple DNS servers. Your system currently only has one.") self.resolver_file = self.parent_helper.tempfile(self.system_resolvers, pipe=False)