Changeset 9668

Timestamp:

Sep 6, 2011, 1:09:58 PM (13 years ago)

Author:

rick

Message:

Harden import such that is survives errors like:

• Empty files.
• Invalid XML files.

Location:

src/django_gheat/gheat/dataimport

Files:

• __init__.py (modified) (1 diff)
• kismet.py (modified) (2 diffs)

src/django_gheat/gheat/dataimport/__init__.py

@@ -162 +162 @@
     }
 
+  if os.path.getsize(filename) == 0:
+    logger.error("Cannot parse empty files")
+    return counters
+    
   fh = open_file(filename)
-  if 'ns1' in filename:
-    (counters, ap_pool, client_pool, meting_pool) = netstumbler.process_ns1(fh, counters)
-  elif 'gpsxml' in filename:
-    (counters, ap_pool, client_pool, meting_pool) = kismet.process_gpsxml(fh, counters)
-  elif 'netxml' in filename:
-    (counters, ap_pool, client_pool, meting_pool) = kismet.process_netxml(fh, counters)
-  elif 'ScanResult' in filename:
-    (counters, ap_pool, client_pool, meting_pool) = droidstumbler.process_csv(fh, counters)
-  else:
-    (ap_pool, client_pool, meting_pool) = (None, None, None)
-    logger.error("file '%s' format not recognized")
+  try:
+    if 'ns1' in filename:
+      (counters, ap_pool, client_pool, meting_pool) = netstumbler.process_ns1(fh, counters)
+    elif 'gpsxml' in filename:
+      (counters, ap_pool, client_pool, meting_pool) = kismet.process_gpsxml(fh, counters)
+    elif 'netxml' in filename:
+      (counters, ap_pool, client_pool, meting_pool) = kismet.process_netxml(fh, counters)
+    elif 'ScanResult' in filename:
+      (counters, ap_pool, client_pool, meting_pool) = droidstumbler.process_csv(fh, counters)
+    else:
+      (ap_pool, client_pool, meting_pool) = (None, None, None)
+      logger.error("file '%s' format not recognized")
+  except IOError, e:
+    logger.error("File invalid: %s", e)
+    return counters
 
   if ap_pool:

src/django_gheat/gheat/dataimport/kismet.py

@@ -12 +12 @@
 
 def process_netxml(fh,counters):
-  netxml_doc = etree.parse(fh)
+  try:
+    netxml_doc = etree.parse(fh)
+  except etree.XMLSyntaxError, e:
+    raise IOError(e)
 
   # Prepare new accespoints and measurements
@@ -45 +48 @@
 
 def process_gpsxml(fh,counters):
-  gpsxml_doc = etree.parse(fh)
+  try:
+    gpsxml_doc = etree.parse(fh)
+  except etree.XMLSyntaxError, e:
+    raise IOError(e)
 
   bssid_failed = defaultdict(int)