Merge pull request #35 from f-froehlich/master

Resolve #34

Author: nmmapper

nmap3/exceptions.py

@@ -41,4 +41,7 @@ class NmapXMLParserError(Exception):
     def __init__(self, message="Unable to parse xml output"):
         self.message = message 
         super().__init__(message)
-        
+
+class NmapExecutionError(Exception):
+    """Exception raised when en error occurred during nmap call"""
+

nmap3/nmap3.py

@@ -31,7 +31,7 @@
 from nmap3.nmapparser import NmapCommandParser
 from xml.etree import ElementTree as ET
 from xml.etree.ElementTree import ParseError
-from nmap3.exceptions import NmapNotInstalledError, NmapXMLParserError
+from nmap3.exceptions import NmapNotInstalledError, NmapXMLParserError, NmapExecutionError
 import xml
 
 __author__ = 'Wangolo Joel ([email protected])'
@@ -58,13 +58,23 @@ def __init__(self, path=None):
         self.top_ports = dict()
         self.parser  = NmapCommandParser(None)
         self.raw_ouput = None
+        self.as_root = False
+
+    def require_root(self, required=True):
+        """
+        Call this method to add "sudo" in front of nmap call
+        """
+        self.as_root = required
 
     def default_command(self):
         """
         Returns the default nmap command
         that will be chained with all others
         eg nmap -oX -
         """
+        if self.as_root:
+            return self.default_command_privileged()
+
         return self.default_args.format(nmap=self.nmaptool, outarg="-oX")
 
     def default_command_privileged(self):
@@ -244,19 +254,22 @@ def run_command(self, cmd):
 
         @param: cmd--> the command we want run eg /usr/bin/nmap -oX -  nmmapper.com --top-ports 10
         """
-        if(os.path.exists(self.nmaptool)):
-            sub_proc = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+        if (os.path.exists(self.nmaptool)):
+            sub_proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             try:
                 output, errs = sub_proc.communicate()
             except Exception as e:
                 sub_proc.kill()
-                raise(e)
+                raise (e)
             else:
+                if 0 != sub_proc.returncode:
+                    raise NmapExecutionError('Error during command: "' + ' '.join(cmd) + '"\n\n' + errs.decode('utf8'))
+
                 # Response is bytes so decode the output and return
                 return output.decode('utf8').strip()
         else:
             raise NmapNotInstalledError()
-            
+
     def get_xml_et(self, command_output):
         """
         @ return xml ET
@@ -330,6 +343,8 @@ def nmap_fin_scan(self, target, args=None):
         @cmd nmap -sF 192.168.178.1
 
         """
+        self.require_root()
+
         xml_root = self.scan_command(self.fin_scan, target=target, args=args)
 
         fin_results = self.parser.parse_nmap_idlescan(xml_root)
@@ -342,6 +357,7 @@ def nmap_syn_scan(self, target, args=None):
 
         @cmd nmap -sS 192.168.178.1
         """
+        self.require_root()
         xml_root = self.scan_command(self.sync_scan, target=target, args=args)
 
         # Use the top_port_parser
@@ -368,9 +384,11 @@ def nmap_udp_scan(self, target, args=None):
 
         @cmd nmap -sU 192.168.178.1
         """
+        self.require_root()
+
         if(args):
             assert(isinstance(args, str)), "Expected string got {0} instead".format(type(args))
-        
+
         xml_root = self.scan_command(self.udp_scan, target=target, args=args)
 
         tcp_results = self.parser.filter_top_ports(xml_root)