don't retry 404s

Author: github-actions

bbot/modules/base.py

@@ -1203,7 +1203,8 @@ def _prepare_api_iter_req(self, url, page, page_size, offset, **requests_kwargs)
         return url, requests_kwargs
 
     def _api_response_is_success(self, r):
-        return r.is_success
+        # 404s typically indicate no data rather than an actual error with the API, so we don't want to retry them
+        return getattr(r, "is_success", False) and not getattr(r, "status_code", 0) == 404
 
     async def api_page_iter(self, url, page_size=100, _json=True, next_key=None, iter_key=None, **requests_kwargs):
         """

bbot/modules/shodan_idb.py

@@ -69,10 +69,6 @@ async def setup(self):
     def _incoming_dedup_hash(self, event):
         return hash(self.get_ip(event))
 
-    def _api_response_is_success(self, r):
-        # 404s are normal, so we don't want to retry them
-        return r.is_success and not getattr(r, "status_code", 0) == 404
-
     @property
     def api_retries(self):
         # allow the module to override global retry setting