Some improvements

pwnagotchi/plugins/default/net-pos.py

@@ -0,0 +1,144 @@
+__author__ = 'zenzen san'
+__version__ = '1.0.0'
+__name__ = 'net-pos'
+__license__ = 'GPL3'
+__description__ = """Saves a json file with the access points with more signal
+                     whenever a handshake is captured.
+                     When internet is available the files are converted in geo locations
+                     using Mozilla LocationService """
+
+import logging
+import json
+import os
+import requests
+
+MOZILLA_API_URL = 'https://location.services.mozilla.com/v1/geolocate?key={api}'
+ALREADY_SAVED = None
+SKIP = None
+READY = False
+OPTIONS = {}
+
+
+def on_loaded():
+    global ALREADY_SAVED
+    global SKIP
+    global READY
+
+    SKIP = list()
+
+    if 'api_key' not in OPTIONS or ('api_key' in OPTIONS and OPTIONS['api_key'] is None):
+        logging.error("NET-POS: api_key isn't set. Can't use mozilla's api.")
+        return
+
+    try:
+        with open('/root/.net_pos_saved', 'r') as f:
+            ALREADY_SAVED = f.read().splitlines()
+    except OSError:
+        logging.warning('NET-POS: No net-pos-file found.')
+        ALREADY_SAVED = []
+
+    READY = True
+    logging.info("net-pos plugin loaded.")
+
+def _append_saved(path):
+    to_save = list()
+    if isinstance(path, str):
+        to_save.append(path)
+    elif isinstance(path, list):
+        to_save += path
+    else:
+        raise TypeError("Expected list or str, got %s" % type(path))
+
+    with open('/root/.net_pos_saved', 'a') as saved_file:
+        for x in to_save:
+            saved_file.write(x + "\n")
+
+def on_internet_available(agent):
+    global SKIP
+
+    if READY:
+        config = agent.config()
+        display = agent.view()
+        handshake_dir = config['bettercap']['handshakes']
+
+        all_files = os.listdir(handshake_dir)
+        all_np_files = [os.path.join(handshake_dir, filename)
+                     for filename in all_files
+                     if filename.endswith('.net-pos.json')]
+        new_np_files = set(all_np_files) - set(ALREADY_SAVED) - set(SKIP)
+
+        if new_np_files:
+            logging.info("NET-POS: Found {num} new net-pos files. Fetching positions ...", len(new_np_files))
+            display.set('status', f"Found {len(new_np_files)} new net-pos files. Fetching positions ...")
+            display.update(force=True)
+            for idx, np_file in enumerate(new_np_files):
+
+                geo_file = np_file.replace('.net-pos.json', '.geo.json')
+                if os.path.exists(geo_file):
+                    # got already the position
+                    ALREADY_SAVED.append(np_file)
+                    _append_saved(np_file)
+                    continue
+
+                try:
+                    geo_data = _get_geo_data(np_file) # returns json obj
+                except requests.exceptions.RequestException as req_e:
+                    logging.error("NET-POS: %s", req_e)
+                    SKIP += np_file
+                except json.JSONDecodeError as js_e:
+                    logging.error("NET-POS: %s", js_e)
+                    SKIP += np_file
+                except OSError as os_e:
+                    logging.error("NET-POS: %s", os_e)
+                    SKIP += np_file
+
+                with open(geo_file, 'w+t') as sf:
+                    json.dump(geo_data, sf)
+
+                ALREADY_SAVED.append(np_file)
+                _append_saved(np_file)
+
+                display.set('status', f"Fetching positions ({idx+1}/{len(new_np_files)}")
+                display.update(force=True)
+
+
+def on_handshake(agent, filename, access_point, client_station):
+    netpos = _get_netpos(agent)
+    netpos_filename = filename.replace('.pcap', '.net-pos.json')
+    logging.info("NET-POS: Saving net-location to %s", netpos_filename)
+
+    try:
+        with open(netpos_filename, 'w+t') as fp:
+            json.dump(netpos, fp)
+    except OSError as os_e:
+        logging.error("NET-POS: %s", os_e)
+
+
+def _get_netpos(agent):
+    aps = agent.get_access_points()
+    netpos = {}
+    netpos['wifiAccessPoints'] = list()
+    # 6 seems a good number to save a wifi networks location
+    for access_point in sorted(aps, key=lambda i: i['rssi'], reverse=True)[:6]:
+        netpos['wifiAccessPoints'].append({'macAddress': access_point['mac'],
+                                           'signalStrength': access_point['rssi']})
+    return netpos
+
+def _get_geo_data(path, timeout=30):
+    geourl = MOZILLA_API_URL.format(api=OPTIONS['api_key'])
+
+    try:
+        with open(path, "r") as json_file:
+            data = json.load(json_file)
+    except json.JSONDecodeError as js_e:
+        raise js_e
+    except OSError as os_e:
+        raise os_e
+
+    try:
+        result = requests.post(geourl,
+                json=data,
+                timeout=timeout)
+        return result.json()
+    except requests.exceptions.RequestException as req_e:
+        raise req_e

pwnagotchi/plugins/default/wifips.py

@@ -1,67 +0,0 @@
-__author__ = 'zenzen san'
-__version__ = '1.0.0'
-__name__ = 'wifips'
-__license__ = 'GPL3'
-__description__ = """Saves a json file with the access points with more signal 
-                     whenever a handshake is captured. 
-                     When internet is available the files are converted in geo locations 
-                     using Mozilla LocationService """
-
-import logging
-import json
-import os
-from urllib.request import urlopen
-from datetime import datetime
-from time import sleep 
-
-URL_API_MOZILLA_LOCATION_SERVICE = 'https://location.services.mozilla.com/v1/geolocate?key='
-KEY_API_MOZILLA_LOCATION_SERVICE = 'test'   
-
-def on_loaded():
-    logging.info("wifips plugin loaded. :)")
-
-def on_internet_available(ui, keypair, config):
-    try:
-        for ff in os.listdir('/root/handshakes'):
-            geo_file = os.path.join('/root/handshakes', ff.replace('.wifips.json','.geo.json'))
-            if not os.path.isfile(geo_file):
-                if ff.endswith(".wifips.json"):
-                    ff = os.path.join('/root/handshakes',ff)
-                    with open(ff, 'r') as fp:
-                        data = fp.read()
-                    geo = _get_geolocation_moz_wifips(data)
-                    with open(geo_file, 'w+t') as fp:
-                        fp.write(geo.decode('ascii'))
-                    logging.info("wifips plugin: saving coordinates for: {}".format(ff.replace('.wifips.json','')))
-                    sleep(.500)
-    except Exception as e:
-        logging.exception('WIFIPS PLUGIN ERROR')
-
-def on_ready(agent):
-    pass
-
-def on_handshake(agent, filename, access_point, client_station):
-    wifips = _get_wifips(agent)
-    wifips_filename = filename.replace('.pcap', '.wifips.json')
-    logging.info("wifips plugin: saving location to %s" % (wifips_filename))
-    with open(wifips_filename, 'w+t') as fp:
-        json.dump(wifips, fp)
-
-def _get_wifips(agent):
-    info = agent.session()
-    aps = agent.get_access_points()
-    wifips = {}
-    wifips['wifiAccessPoints'] = []
-    # 6 seems a good number to save a wifi networks location  
-    for ap in sorted(aps,key=lambda i:i['rssi'],reverse=True)[:6]: 
-        wifips['wifiAccessPoints'].append({'macAddress': ap['mac'], 'signalStrength': ap['rssi']}) 
-    return wifips
-
-def _get_geolocation_moz_wifips(post_data):
-    geourl = URL_API_MOZILLA_LOCATION_SERVICE+KEY_API_MOZILLA_LOCATION_SERVICE
-    try:
-        response = urlopen(geourl, post_data.encode('ascii')).read()
-        return response
-    except Exception as e:
-        logging.exception('WIFIPS PLUGIN - Something went wrong with Mozilla Location Service')
-