chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Version 2.2.5:

Browse Source 
upgraded fix_brcmf_plugin.py to look for firmware halted or crashed log
Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
This commit is contained in:
Jeroen Oudshoorn
2023-09-03 10:45:47 +02:00
parent e7ab471c50
commit ba7268f753
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pwnagotchi/_version.py
View File

@ -1 +1 @@
__version__ = '2.2.4' __version__ = '2.2.5'

32
pwnagotchi/plugins/default/fix_brcmf_plugin.py
View File

@ -15,8 +15,8 @@ import pwnagotchi.ui.fonts as fonts
class Fix_BRCMF(plugins.Plugin): class Fix_BRCMF(plugins.Plugin):
__author__ = 'xBits' __author__ = 'xBITS'
__version__ = '0.1.1' __version__ = '0.1.2'
__license__ = 'GPL3' __license__ = 'GPL3'
__description__ = 'Reload brcmfmac module when blindbug is detected, instead of rebooting. Adapted from WATCHDOG.' __description__ = 'Reload brcmfmac module when blindbug is detected, instead of rebooting. Adapted from WATCHDOG.'
__name__ = 'Fix_BRCMF' __name__ = 'Fix_BRCMF'
@ -27,13 +27,14 @@ class Fix_BRCMF(plugins.Plugin):
'pip': ['scapy'] 'pip': ['scapy']
} }
__defaults__ = { __defaults__ = {
'enabled': False, 'enabled': True,
} }
def __init__(self): def __init__(self):
self.options = dict() self.options = dict()
self.pattern = re.compile(r'brcmf_cfg80211_nexmon_set_channel.*?Set Channel failed') self.pattern = re.compile(r'brcmf_cfg80211_nexmon_set_channel.*?Set Channel failed')
self.pattern2 = re.compile(r'wifi error while hopping to channel') self.pattern2 = re.compile(r'wifi error while hopping to channel')
self.pattern3 = re.compile(r'Firmware has halted or crashed')
self.isReloadingMon = False self.isReloadingMon = False
self.connection = None self.connection = None
self.LASTTRY = 0 self.LASTTRY = 0
@ -44,7 +45,6 @@ class Fix_BRCMF(plugins.Plugin):
""" """
Gets called when the plugin gets loaded Gets called when the plugin gets loaded
""" """
self.pattern = re.compile(r'brcmf_cfg80211_nexmon_set_channel.*?Set Channel failed')
self._status = "ld" self._status = "ld"
logging.info("[FixBRCMF] plugin loaded.") logging.info("[FixBRCMF] plugin loaded.")
@ -93,8 +93,8 @@ class Fix_BRCMF(plugins.Plugin):
logging.info("[FixBRCMF] wifi.recon flip: success!") logging.info("[FixBRCMF] wifi.recon flip: success!")
if hasattr(agent, 'view'): if hasattr(agent, 'view'):
display = agent.view() display = agent.view()
if display: display.update(force=True, new_data={"status": "Wifi recon flipped!", if display:
"face": faces.COOL}) display.update(force=True, new_data={"status": "Wifi recon flipped!", "face": faces.COOL})
else: else:
print("Wifi recon flipped") print("Wifi recon flipped")
else: else:
@ -113,6 +113,8 @@ class Fix_BRCMF(plugins.Plugin):
other_last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl', '-n10'], other_last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl', '-n10'],
stdout=subprocess.PIPE).stdout))[-10:]) stdout=subprocess.PIPE).stdout))[-10:])
logging.debug("[FixBRCMF]**** checking") logging.debug("[FixBRCMF]**** checking")
# Find pattern 1
if len(self.pattern.findall(last_lines)) >= 3: if len(self.pattern.findall(last_lines)) >= 3:
logging.info("[FixBRCMF]**** Should trigger a reload of the wlan0mon device:\n%s" % last_lines) logging.info("[FixBRCMF]**** Should trigger a reload of the wlan0mon device:\n%s" % last_lines)
if hasattr(agent, 'view'): if hasattr(agent, 'view'):
@ -124,6 +126,8 @@ class Fix_BRCMF(plugins.Plugin):
self._tryTurningItOffAndOnAgain(agent) self._tryTurningItOffAndOnAgain(agent)
except Exception as err: except Exception as err:
logging.warning("[FixBRCMF] TTOAOA: %s" % repr(err)) logging.warning("[FixBRCMF] TTOAOA: %s" % repr(err))
# Find pattern 2
elif len(self.pattern2.findall(other_last_lines)) >= 5: elif len(self.pattern2.findall(other_last_lines)) >= 5:
if hasattr(agent, 'view'): if hasattr(agent, 'view'):
display = agent.view() display = agent.view()
@ -147,6 +151,19 @@ class Fix_BRCMF(plugins.Plugin):
except Exception as err: except Exception as err:
logging.error("[FixBRCMF wifi.recon flip] %s" % repr(err)) logging.error("[FixBRCMF wifi.recon flip] %s" % repr(err))
# Look for pattern 3
elif len(self.pattern3.findall(other_last_lines)) >= 1:
if self.pattern3.search(last_lines):
logging.info("[FixBRCMF]**** Should trigger a reload of the wlan0mon device:\n%s" % last_lines)
if hasattr(agent, 'view'):
display = agent.view()
display.set('status', 'Firmware has halted or crashed. Restarting.')
display.update(force=True)
logging.info('[FixBRCMF] Firmware has halted or crashed. Restarting.')
try:
self._tryTurningItOffAndOnAgain(agent)
except Exception as err:
logging.warning("[FixBRCMF] TTOAOA: %s" % repr(err))
else: else:
print("logs look good") print("logs look good")
@ -182,7 +199,8 @@ class Fix_BRCMF(plugins.Plugin):
self._status = "BL" self._status = "BL"
if hasattr(connection, 'view'): if hasattr(connection, 'view'):
display = connection.view() display = connection.view()
if display: display.update(force=True, new_data={"status": "I'm blind! Try turning it off and on again", if display:
display.update(force=True, new_data={"status": "I'm blind! Try turning it off and on again",
"brcmfmac_status": self._status, "brcmfmac_status": self._status,
"face": faces.BORED}) "face": faces.BORED})
else: else: