From 3714899e956a344c3a5ca193671d85f2332bbda3 Mon Sep 17 00:00:00 2001 From: Jeremy O'Brien Date: Wed, 30 Oct 2019 15:33:01 -0400 Subject: [PATCH] fix: don't attempt to parse/upload pcaps with malformed filenames Signed-off-by: Jeremy O'Brien --- pwnagotchi/plugins/default/grid.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pwnagotchi/plugins/default/grid.py b/pwnagotchi/plugins/default/grid.py index c15b465..9ffd61f 100644 --- a/pwnagotchi/plugins/default/grid.py +++ b/pwnagotchi/plugins/default/grid.py @@ -9,6 +9,7 @@ import os import logging import time import glob +import re import pwnagotchi.grid as grid from pwnagotchi.utils import StatusFile, WifiInfo, extract_from_pcap @@ -36,6 +37,10 @@ def parse_pcap(filename): # /root/handshakes/BSSID.pcap essid, bssid = '', net_id + mac_re = re.compile('[0-9a-fA-F]{12}') + if not mac_re.match(bssid): + return '', '' + it = iter(bssid) bssid = ':'.join([a + b for a, b in zip(it, it)])