Changeset 3922

Timestamp:

01/07/09 13:10:29 (4 years ago)

Author:

gpolo

Message:

Updated XMLStore to work with the new parser

Files:

• branch/NetworkInventory/umitDB/XMLStore.py (modified) (8 diffs)

branch/NetworkInventory/umitDB/XMLStore.py

@@ -227 +227 @@
 
             # insert host os match
-            if host.osmatch: # ToFix: Parser is returning only last osmatch ?
-                self.insert_osmatch_db(host_d["pk"], host.osmatch)
+            if host.osmatch:
+                # ToFix: Parser is returning only last osmatch ?
+                # XXX the new parser stores all osmatches but this is still
+                # using only the last osmatch -- for now.
+                self.insert_osmatch_db(host_d["pk"], host.osmatch[-1])
 
             # insert os classes
-            for osclass in host.osclasses:
+            for osclass in host.osclass:
                 # get fk_osgen
                 osgen_id = self.get_osgen_id_from_db(osclass["osgen"])
@@ -261 +264 @@
 
             # insert ports used
-            if host.ports_used:
-                for portused in host.ports_used:
+            if host.portused:
+                for portused in host.portused:
                     # get fk_port_state
                     port_state_id = self.get_port_state_id_from_db(
@@ -282 +285 @@
 
             # some scan may not return any ports
-            if host.ports:
+            if host.extraports:
                 # insert extraports
-                for extraport in host.ports[0]["extraports"]:
+                for extraport in host.extraports:
                     port_state = self.get_port_state_id_from_db(
                         extraport["state"])
@@ -294 +297 @@
                         port_state)
 
+            if host.ports:
                 # insert ports
-                for port in host.ports[0]["port"]:
+                for port in host.ports:
                     # get fk_protocol
                     protocol_id = self.get_protocol_id_from_db(port["protocol"])
@@ -304 +308 @@
                     # get fk_port_state
                     port_state_id = self.get_port_state_id_from_db(
-                        port["port_state"])
+                        port["state"])
                     if not port_state_id:
-                        self.insert_port_state_db(port["port_state"])
+                        self.insert_port_state_db(port["state"])
                         port_state_id = self.get_id_for("port_state")
 
-                    if not "service_name" in port:
-                        port["service_name"] = empty()
+                    if not "name" in port:
+                        port["name"] = empty()
 
                     service_name_id = self.get_service_name_id_from_db(
-                        port["service_name"])
+                        port["name"])
                     if not service_name_id:
-                        self.insert_service_name_db(port["service_name"])
+                        self.insert_service_name_db(port["name"])
                         service_name_id = self.get_id_for("service_name")
 
                     # get fk_service_info
-                    keys = [
-                        "service_product", "service_version",
-                        "service_extrainfo", "service_method",
-                        "service_conf"]
+                    keys = ["product", "version", "extrainfo", "method", "conf"]
 
                     for k in keys:
@@ -334 +335 @@
                     if not service_info_id:
                         data = (
-                            port["service_product"],
-                            port["service_version"],
-                            port["service_extrainfo"],
-                            port["service_method"],
-                            port["service_conf"], service_name_id)
+                            port["product"],
+                            port["version"],
+                            port["extrainfo"],
+                            port["method"],
+                            port["conf"], service_name_id)
 
                         self.insert_service_info_db(data)
@@ -408 +409 @@
 
         scan_d = { }
-        scan_d["args"] = parsedsax.nmap["nmaprun"]["args"]
-        timestamp_start = parsedsax.nmap["nmaprun"]["start"]
+        scan_d["args"] = parsedsax.nmap_command
+        timestamp_start = parsedsax.start
         scan_d["start"] = datetime.fromtimestamp(float(timestamp_start))
         scan_d["startstr"] = empty() # ToFix: Parser isnt storing this
-        timestamp_finish = parsedsax.nmap["runstats"]["finished_time"]
-        scan_d["finish"] = datetime.fromtimestamp(float(timestamp_finish))
-        scan_d["finishstr"] = empty() # ToFix: Parser isnt storing this
+        scan_d["finish"] = datetime(*parsedsax.finish_epoch_time[:6])
+        scan_d["finishstr"] = parsedsax.finish_time
         scan_d["xmloutputversion"] = (
             parsedsax.nmap["nmaprun"]["xmloutputversion"])
@@ -423 +423 @@
             scan_d["xmloutput"] = empty()
 
-        scan_d["verbose"] = parsedsax.nmap["verbose"]
-        scan_d["debugging"] = parsedsax.nmap["debugging"]
-        scan_d["hosts_up"] = parsedsax.nmap["runstats"]["hosts_up"]
-        scan_d["hosts_down"] = parsedsax.nmap["runstats"]["hosts_down"]
-
-        scanner_name = parsedsax.nmap["nmaprun"]["scanner"]
-        scanner_version = parsedsax.nmap["nmaprun"]["version"]
+        scan_d["verbose"] = parsedsax.verbose_level
+        scan_d["debugging"] = parsedsax.debugging_level
+        scan_d["hosts_up"] = parsedsax.hosts_up
+        scan_d["hosts_down"] = parsedsax.hosts_down
+
+        scanner_name = parsedsax.scanner
+        scanner_version = parsedsax.scanner_version
 
         # get fk_scanner