Fix process termination, update default arguments (#94)

* Add --open flag for Nmap * Remove unused imports from decorators * Close unused processes after queue.join
sdnewhop · Apr 3, 2020 · ae1f2b1 · ae1f2b1
1 parent 868b506
commit ae1f2b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/grinder/core.py b/grinder/core.py
@@ -1191,7 +1191,7 @@ def vulners_scan(
 
         # Check for top-ports if defined
         arguments = (
-            f"-Pn -sV --script=.{vulners_path} --host-timeout {str(host_timeout)}s"
+            f"-Pn -sV --open --script=.{vulners_path} --host-timeout {str(host_timeout)}s"
         )
         if top_ports:
             arguments = f"{arguments} --top-ports {str(top_ports)}"

diff --git a/grinder/decorators.py b/grinder/decorators.py
@@ -2,7 +2,7 @@
 
 import sys
 from functools import wraps
-from os import path, makedirs, system
+from os import system
 from time import time, strftime, gmtime
 
 

diff --git a/grinder/defaultvalues.py b/grinder/defaultvalues.py
@@ -114,7 +114,7 @@ class DefaultNmapScanValues:
     TOP_PORTS = None
     SUDO = False
     HOST_TIMEOUT = 30
-    ARGUMENTS = "-Pn -T4 -A"
+    ARGUMENTS = "-Pn -T4 -A --open"
     WORKERS = 10
 
 
@@ -124,7 +124,7 @@ class DefaultProcessManagerValues:
     """
     PORTS = None
     SUDO = False
-    ARGUMENTS = "-Pn -A"
+    ARGUMENTS = "-Pn -A --open"
     WORKERS = 10
 
 

diff --git a/grinder/nmapprocessmanager.py b/grinder/nmapprocessmanager.py
@@ -21,7 +21,6 @@ class NmapProcessingDefaultManagerValues:
 
     POLLING_RATE = 0.5
     EMPTY_QUEUE_POLLING_RATE = 1.0
-    PROCESS_TIMEOUT = 300
 
 
 class NmapProcessing(Process):
@@ -166,7 +165,8 @@ def organize_processes(self) -> None:
             queue.put((None, None))
         queue.join()
         for process in processes:
-            process.join(timeout=NmapProcessingDefaultManagerValues.PROCESS_TIMEOUT)
+            if process.is_alive():
+                process.terminate()
 
     def start(self) -> None:
         """

diff --git a/grinder/pyscriptexecutor.py b/grinder/pyscriptexecutor.py
@@ -24,7 +24,6 @@ class PyProcessingValues:
 
     POLLING_RATE = 0.5
     EMPTY_QUEUE_POLLING_RATE = 1.0
-    PROCESS_TIMEOUT = 300
 
 
 class PyProcessing(Process):
@@ -238,7 +237,8 @@ def organize_processes(self) -> None:
             queue.put((None, None, None))
         queue.join()
         for process in processes:
-            process.join(timeout=PyProcessingValues.PROCESS_TIMEOUT)
+            if process.is_alive():
+                process.terminate()
 
     def start(self) -> None:
         """