Merge pull request #5 from flashnuke/fix/dns_left

Fix/dns count

Author: flashnuke

scanners/subdomain_scanner.py

@@ -26,24 +26,23 @@ def __init__(self, domains_queue=None, original_subdomain=None, *args, **kwargs)
         super().__init__(*args, **kwargs)
         self.original_subdomain = original_subdomain
         if self.original_subdomain is not None:
-            url_path = self.generate_url_base_path(self.original_subdomain)
-            self._save_results(f"{url_path}\n")
+            self._record_found(self.generate_url_base_path(self.original_subdomain))
         self.domains_queue = domains_queue if domains_queue else queue.Queue()
 
     def single_bruter(self):
 
         while not self.words_queue.empty() and not ScanManager._SHOULD_ABORT:
             subdomain = self.words_queue.get()
+            url_path = self.generate_url_base_path(subdomain)
             if subdomain == self.original_subdomain:
+                self._update_count(url_path, True)
                 continue
-            url_path = self.generate_url_base_path(subdomain)
             found = False
             try:
                 res = self._make_request(method="GET", url=url_path)
                 found = res.status_code
                 if found:
-                    self._save_results(f"{url_path}\n")
-                    self._log_progress(f"found -> {url_path}")
+                    self._record_found(url_path)
                     self.domains_queue.put(url_path)
             except (requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout,
                     requests.exceptions.ReadTimeout, HTTPError):
@@ -58,6 +57,10 @@ def single_bruter(self):
                 self._update_count(url_path, found)
                 time.sleep(self.request_cooldown)
 
+    def _record_found(self, url_path: str):
+        self._save_results(f"{url_path}\n")
+        self._log_progress(f"added to queue -> {url_path}")
+
     def _start_scanner(self) -> queue.Queue:
         threads = list()
         self._log_status(OutputStatusKeys.State, OutputValues.StateRunning)