Changeset 3890

Timestamp:

01/06/09 13:43:36 (4 years ago)

Author:

gpolo

Message:

Simplified parsing of the simpler xml entities;
Improved ParserBasics? mapping and added HostInfo? mapping of what to
expect from parsed xmls.

Files:

• branch/nmapparser/NmapParser.py (modified) (7 diffs)

branch/nmapparser/NmapParser.py

@@ -36 +36 @@
     def __init__(self, id):
         self.id = id
+        self.nmap_host = {
+                'status': {'state': '', 'reason': ''},
+                'smurf': {'responses': ''},
+                'times': {'to': '', 'srtt': '', 'rttvar': ''},
+                'hostscript': [],
+                'distance': {'value': ''},
+                'trace': {},
+                'address': [],
+                'hostnames': [],
+                'ports': {},
+                'uptime': {'seconds': '', 'lastboot': ''},
+                'tcpsequence': {'index': '', 'values': '', 'class': ''},
+                'tcptssequence': {'values': '', 'class': ''},
+                'ipidsequence': {'values': '', 'class': ''},
+                'os': {}
+                }
 
     # Host ID
     def get_id(self):
-        if self._id != 0:
+        try:
             return self._id
-        raise Exception("Id was not set yet.")
+        except AttributeError:
+            raise Exception("Id was not set yet.")
 
     def set_id(self, id):
@@ -364 +381 @@
 
 
-    _id = 0
     _tcpsequence = {}
     _osclasses = []
@@ -390 +406 @@
         self.nmap = {
                 'nmaprun': {},
-                'runstats': {},
-                'verbose': {},
-                'debugging': {},
+                'runstats': {
+                    'finished': {},
+                    'hosts': {'up': '', 'down': '', 'total': ''}
+                    },
+                'verbose': {'level': ''},
+                'debugging': {'level': ''},
                 'scaninfo': [],
                 'taskbegin': [],
@@ -477 +496 @@
 
     def get_debugging_level (self):
-        return self.nmap.get('debugging', '')
+        return self.nmap['debugging'].get('level', '')
 
     def set_debugging_level(self, level):
-        self.nmap['debugging'] = level
+        self.nmap['debugging']['level'] = level
+
+    def set_debugging(self, debug):
+        self.nmap['debugging'] = debug
 
     def get_verbose_level (self):
-        return self.nmap.get('verbose', '')
+        return self.nmap['verbose'].get('level', '')
 
     def set_verbose_level(self, level):
-        self.nmap['verbose'] = level
+        self.nmap['verbose']['level'] = level
+
+    def set_verbose(self, verbose):
+        self.nmap['verbose'] = verbose
 
     def get_scaninfo(self):
-        return self.nmap.get('scaninfo', '')
+        return self.nmap.get('scaninfo', [])
 
     def set_scaninfo(self, info):
         self.nmap['scaninfo'] = info
+
+    def append_scaninfo(self, info):
+        self.nmap['scaninfo'].append(info)
 
     def get_services_scanned (self):
@@ -837 +865 @@
         self.nmap["scan_name"] = attrs.get("scan_name", "")
 
-    def _parse_scaninfo(self, attrs):
-        dic = {}
-
-        dic["type"] = attrs.get("type", "")
-        dic["protocol"] = attrs.get("protocol", "")
-        dic["numservices"] = attrs.get("numservices", "")
-        dic["services"] = attrs.get("services", "")
-
-        self.nmap["scaninfo"].append(dic)
-
-    def _parse_verbose(self, attrs):
-        self.nmap["verbose"] = attrs.get("level", "")
-
-    def _parse_debugging(self, attrs):
-        self.nmap["debugging"] = attrs.get("level", "")
 
     def _parse_runstats_finished(self, attrs):
@@ -971 +984 @@
         if name == "nmaprun":
             self._parse_nmaprun(attrs)
+        elif name in ("verbose", "debugging", "taskbegin", "taskprogress",
+                "taskend"):
+            getattr(self, "set_%s" % name)(attrs.copy())
         elif name == "scaninfo":
-            self._parse_scaninfo(attrs)
-        elif name == "verbose":
-            self._parse_verbose(attrs)
-        elif name == "debugging":
-            self._parse_debugging(attrs)
+            self.append_scaninfo(attrs.copy())
+
+        # Parse runstats
         elif name == "runstats":
             self.in_run_stats = True
@@ -983 +997 @@
         elif self.in_run_stats and name == "hosts":
             self._parse_runstats_hosts(attrs)
+
+        # Parse hosts
         elif name == "host":
             self.in_host = True