Migrate to statusfile

pwnagotchi/plugins/default/onlinehashcrack.py

@@ -1,5 +1,5 @@
 __author__ = '33197631+dadav@users.noreply.github.com'
-__version__ = '1.0.0'
+__version__ = '2.0.0'
 __name__ = 'onlinehashcrack'
 __license__ = 'GPL3'
 __description__ = 'This plugin automatically uploades handshakes to https://onlinehashcrack.com'
@@ -7,9 +7,11 @@ __description__ = 'This plugin automatically uploades handshakes to https://onli
 import os
 import logging
 import requests
+from pwnagotchi.utils import StatusFile
 
 READY = False
-ALREADY_UPLOADED = None
+REPORT = StatusFile('/root/.ohc_uploads', data_format='json')
+SKIP = list()
 OPTIONS = dict()
 
 
@@ -18,20 +20,11 @@ def on_loaded():
     Gets called when the plugin gets loaded
     """
     global READY
-    global EMAIL
-    global ALREADY_UPLOADED
 
-    if not 'email' in OPTIONS or ('email' in OPTIONS and OPTIONS['email'] is None):
+    if 'email' not in OPTIONS or ('email' in OPTIONS and OPTIONS['email'] is None):
         logging.error("OHC: Email isn't set. Can't upload to onlinehashcrack.com")
         return
 
-    try:
-        with open('/root/.ohc_uploads', 'r') as f:
-            ALREADY_UPLOADED = f.read().splitlines()
-    except OSError:
-        logging.warning('OHC: No upload-file found.')
-        ALREADY_UPLOADED = []
-
     READY = True
 
 
@@ -59,14 +52,17 @@ def on_internet_available(agent):
     """
     Called in manual mode when there's internet connectivity
     """
+    global REPORT
+    global SKIP
     if READY:
         display = agent.view()
         config = agent.config()
+        reported = REPORT.data_field_or('reported', default=list())
 
         handshake_dir = config['bettercap']['handshakes']
         handshake_filenames = os.listdir(handshake_dir)
         handshake_paths = [os.path.join(handshake_dir, filename) for filename in handshake_filenames if filename.endswith('.pcap')]
-        handshake_new = set(handshake_paths) - set(ALREADY_UPLOADED)
+        handshake_new = set(handshake_paths) - set(reported) - set(SKIP)
 
         if handshake_new:
             logging.info("OHC: Internet connectivity detected. Uploading new handshakes to onelinehashcrack.com")
@@ -76,12 +72,15 @@ def on_internet_available(agent):
                 display.update(force=True)
                 try:
                     _upload_to_ohc(handshake)
-                    ALREADY_UPLOADED.append(handshake)
-                    with open('/root/.ohc_uploads', 'a') as f:
-                        f.write(handshake + "\n")
+                    reported.append(handshake)
+                    REPORT.update(data={'reported': reported})
                     logging.info(f"OHC: Successfuly uploaded {handshake}")
-                except requests.exceptions.RequestException:
-                    pass
+                except requests.exceptions.RequestException as req_e:
+                    SKIP.append(handshake)
+                    logging.error("OHC: %s", req_e)
+                    continue
                 except OSError as os_e:
-                    logging.error(f"OHC: Got the following error: {os_e}")
+                    SKIP.append(handshake)
+                    logging.error("OHC: %s", os_e)
+                    continue