Fixes input with timeout

Author: dimeko

deltascan/cli/cmd.py

@@ -18,6 +18,7 @@
 import signal
 import select
 import sys
+from time import sleep
 
 
 def interactive_shell(_app, _ui, _is_interactive):
@@ -44,6 +45,10 @@ def interactive_shell(_app, _ui, _is_interactive):
             a, b, c = select.select([sys.stdin], [], [], 2)
             if a == [] and b == [] and c == []:
                 continue
+            else:
+                # the line below is necessary since we are clearing the stdin buffer
+                # if we ommit this line, the stdin buffer is not getting cleared
+                sys.stdin.readline().strip()
 
         _ui["ui_live"].stop()
         try:
@@ -136,9 +141,6 @@ def do_scan(self, v):
             return
         v1, v2 = v.split(" ")
         _r = self._app.add_scan(v1, v2)
-        if self._app.is_running is False:
-            _dscan_thread = threading.Thread(target=self._app.scan)
-            _dscan_thread.start()
         if _r is False:
             print("Not starting scan. Check your host and profile. Maybe the scan is already in the queue.")
             return
@@ -219,6 +221,12 @@ def do_quit(self, _):
     def do_exit(self, _):
         """exit
         Exit Deltascan"""
+        print("Shutting down...")
+        self._app.cleanup()
+        while self._app.cleaning_up is False or self._app.is_running is True:
+            sleep(1)
+            continue
+        print("Cancelled all scans. Exiting with grace ...")
         os._exit(0)
 
 

deltascan/core/deltascan.py

@@ -188,7 +188,7 @@ def _scan_orchestrator(self):
             self._remove_finished_scan_from_list()
             if self.scans_to_wait == 0 and self.scans_to_execute == 0:
                 time.sleep(2)
-                if self.scans_to_wait == 0 and self.scans_to_execute == 0:
+                if self.cleaning_up:
                     self._is_running = False
                     break
                 continue

deltascan/core/nmap/libnmap_wrapper.py

@@ -143,10 +143,12 @@ def _run(self, queue: Queue, event: Event):
         """
         np = NmapProcess(targets=self.target, options=self.scan_args)
         np.sudo_run_background()
+        _cancelled = False
 
         while np.is_running() or np.is_successful() is False or np.rc != 0:
             if event.is_set():
                 np.stop()
+                _cancelled = True
                 break
             queue.put(self._create_queue_message(
                 QueueMsg.PROGRESS, self.target, {
@@ -156,7 +158,7 @@ def _run(self, queue: Queue, event: Event):
             ))
             sleep(0.5)
 
-        if np.rc != 0:
+        if np.rc != 0 or _cancelled is True:
             queue.put(self._create_queue_message(
                 QueueMsg.EXIT, self.target, np.rc
             ))