bluetoothsniffer.py: more pythonic

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
This commit is contained in:
Jeroen Oudshoorn
2023-09-22 10:25:36 +02:00
parent 9cf87f8c45
commit 7404638f5f
2 changed files with 57 additions and 85 deletions

View File

@ -12,7 +12,7 @@ from datetime import datetime
class BluetoothSniffer(plugins.Plugin):
__author__ = 'diytechtinker'
__author__ = 'diytechtinker, fixed by Jayofelony'
__version__ = '0.1.3'
__license__ = 'GPL3'
__description__ = 'A plugin that sniffs Bluetooth devices and saves their MAC addresses, name and counts to a JSON file'
@ -70,23 +70,21 @@ class BluetoothSniffer(plugins.Plugin):
# Method for scanning the nearby bluetooth devices
def scan(self, display):
logging.info("[BtS] Scanning for bluetooths...")
logging.info("[BtS] Scanning for bluetooth devices...")
current_time = time.time()
changed = False
device_class = None
# Running the system command hcitool to scan nearby bluetooth devices
cmd_inq = "hcitool inq --flush"
try:
inq_output = subprocess.check_output(cmd_inq.split())
except subprocess.CalledProcessError as e:
logging.error("[BtS] Error running command: %s", e)
for line in inq_output.splitlines()[1:]:
fields = line.split()
mac_address = fields[0].decode()
for i in range(len(fields)):
if fields[i].decode() == "class:" and i+1 < len(fields):
device_class = fields[i+1].decode()
if fields[i].decode() == "class:" and i + 1 < len(fields):
device_class = fields[i + 1].decode()
logging.info("[BtS] Found bluetooth %s", mac_address)
# Update the count, first_seen, and last_seen time of the device
@ -111,27 +109,37 @@ class BluetoothSniffer(plugins.Plugin):
logging.info("[BtS] Updated bluetooth class: %s", device_class)
changed = True
last_seen_time = int(datetime.strptime(self.data[mac_address]['last_seen'], '%H:%M:%S %d-%m-%Y').timestamp())
last_seen_time = int(
datetime.strptime(self.data[mac_address]['last_seen'], '%H:%M:%S %d-%m-%Y').timestamp())
if current_time - last_seen_time >= self.options['count_interval']:
self.data[mac_address]['count'] += 1
self.data[mac_address]['last_seen'] = time.strftime('%H:%M:%S %d-%m-%Y', time.localtime(current_time))
self.data[mac_address]['last_seen'] = time.strftime('%H:%M:%S %d-%m-%Y',
time.localtime(current_time))
self.data[mac_address]['new_info'] = 2
logging.info("[BtS] Updated bluetooth count.")
changed = True
else:
name = self.get_device_name(mac_address)
manufacturer = self.get_device_manufacturer(mac_address)
self.data[mac_address] = {'name': name, 'count': 1, 'class': device_class, 'manufacturer': manufacturer, 'first_seen': time.strftime('%H:%M:%S %d-%m-%Y', time.localtime(current_time)), 'last_seen': time.strftime('%H:%M:%S %d-%m-%Y', time.localtime(current_time)), 'new_info': True}
self.data[mac_address] = {'name': name, 'count': 1, 'class': device_class,
'manufacturer': manufacturer,
'first_seen': time.strftime('%H:%M:%S %d-%m-%Y',
time.localtime(current_time)),
'last_seen': time.strftime('%H:%M:%S %d-%m-%Y',
time.localtime(current_time)),
'new_info': True}
logging.info("[BtS] Added new bluetooth device %s with MAC: %s", name, mac_address)
changed = True
except subprocess.CalledProcessError as e:
logging.error("[BtS] Error running command: %s", e)
# Save the updated devices to the JSON file
if changed:
with open(self.options['devices_file'], 'w') as f:
logging.info("[BtS] Saving bluetooths %s into json.", name)
json.dump(self.data, f)
display.set('status', 'Bluetooth sniffed and stored!')
display.update(force=True)
display.set('status', 'Bluetooth sniffed and stored!').update(force=True)
# Method to get the device name
def get_device_name(self, mac_address):

View File

@ -1,36 +0,0 @@
import os
import logging
import re
import subprocess
from io import TextIOWrapper
from pwnagotchi import plugins
class Watchdog(plugins.Plugin):
__author__ = '33197631+dadav@users.noreply.github.com'
__version__ = '0.1.0'
__license__ = 'GPL3'
__description__ = 'Restart pwnagotchi when blindbug is detected.'
def __init__(self):
self.options = dict()
self.pattern = re.compile(r'brcmf_cfg80211_nexmon_set_channel.*?Set Channel failed')
def on_loaded(self):
"""
Gets called when the plugin gets loaded
"""
logging.info("Watchdog plugin loaded.")
def on_epoch(self, agent, epoch, epoch_data):
# get last 10 lines
last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl','-n10','-k', '--since', '-5m'],
stdout=subprocess.PIPE).stdout))[-10:])
if len(self.pattern.findall(last_lines)) >= 5:
display = agent.view()
display.set('status', 'Blind-Bug detected. Restarting.')
display.update(force=True)
logging.info('[WATCHDOG] Blind-Bug detected. Restarting.')
mode = 'MANU' if agent.mode == 'manual' else 'AUTO'
import pwnagotchi
pwnagotchi.reboot(mode=mode)