Changeset 9565 for src/django_gheat/gheat/management

Timestamp:

Aug 25, 2011, 1:39:23 PM (13 years ago)

Author:

rick

Message:

Make sure all bssid are upper case to avoid fake unique matches.

Location:

src/django_gheat/gheat/management/commands

Files:

• import_droidstumbler.py (modified) (3 diffs)
• import_kismet.py (modified) (2 diffs)

src/django_gheat/gheat/management/commands/import_droidstumbler.py

@@ -40 +40 @@
   except IntegrityError, e:
     logger.error("Unable to import - %s" %  e)
+    raise
   return count
 
@@ -63 +64 @@
     try:
       epoch, msg_type, lat, lon, accuracy, ssid, bssid, level, frequency, capabilities = row
+      bssid = bssid.upper()
     except ValueError:
       # Known error, please ignore
@@ -94 +96 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid,ssid.replace('%','%%'),encryption))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption))
       sql_values.append(item)
     counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`)',sql_values)

src/django_gheat/gheat/management/commands/import_kismet.py

@@ -76 +76 @@
       ssid, encryption = ap_pool[bssid]
       # Special trick in SSID ts avoid escaping in later stage
-      item = str((bssid,ssid.replace('%','%%'),encryption))
+      item = str((bssid.upper(),ssid.replace('%','%%'),encryption))
       sql_values.append(item)
     counters['ap_added'] = bulk_sql('gheat_accespoint (`mac`, `ssid`, `encryptie`)',sql_values)
 
-  # Determine which Wireless to add
+  # Determine which Wireless Clients to add
   bssid_list_present = WirelessClient.objects.filter(mac__in=client_pool.keys()).values_list('mac', flat=True)
   bssid_list_insert = set(client_pool.keys()) - set(bssid_list_present)
@@ -88 +88 @@
     sql_values = []
     for bssid in bssid_list_insert:
-      sql_values.append("('%s')" % bssid)
+      sql_values.append("('%s')" % bssid.upper())
     counters['client_added'] = bulk_sql('gheat_wirelessclient (`mac`)',sql_values)