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

v2.4.1

Browse Source 
Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
This commit is contained in:
Jeroen Oudshoorn
2023-09-17 09:55:18 +02:00
parent c9501fe95c
commit fd0a9afc51
6 changed files with 123 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pwnagotchi/_version.py
View File

@ -1 +1 @@
__version__ = '2.4' __version__ = '2.4.x'

2
pwnagotchi/defaults.toml
View File

@ -1,4 +1,4 @@
main.name = "" main.name = "pwnagotchi"
main.lang = "en" main.lang = "en"
main.confd = "/etc/pwnagotchi/conf.d/" main.confd = "/etc/pwnagotchi/conf.d/"
main.custom_plugin_repos = [ main.custom_plugin_repos = [

1
pwnagotchi/plugins/default/bluetoothsniffer.py
View File

@ -60,7 +60,6 @@ class BluetoothSniffer(plugins.Plugin):
ui.remove_element('BtS') ui.remove_element('BtS')
def on_ui_update(self, ui): def on_ui_update(self, ui):
with ui._lock:
current_time = time.time() current_time = time.time()
# Checking the time elapsed since last scan # Checking the time elapsed since last scan
if current_time - self.last_scan_time >= self.options['timer']: if current_time - self.last_scan_time >= self.options['timer']:

1
pwnagotchi/plugins/default/bt-tether.py
View File

@ -583,5 +583,4 @@ class BTTether(plugins.Plugin):
label_font=fonts.Bold, text_font=fonts.Medium)) label_font=fonts.Bold, text_font=fonts.Medium))
def on_ui_update(self, ui): def on_ui_update(self, ui):
with ui._lock:
ui.set('bluetooth', self.status) ui.set('bluetooth', self.status)

46
pwnagotchi/plugins/default/fix_services.py
View File

@ -17,8 +17,8 @@ import pwnagotchi.ui.fonts as fonts
class FixServices(plugins.Plugin): class FixServices(plugins.Plugin):
__author__ = 'xBits' __author__ = 'jayofelony'
__version__ = '0.1.1' __version__ = '1.0'
__license__ = 'GPL3' __license__ = 'GPL3'
__description__ = 'Fix blindness, firmware crashes and brain not being loaded' __description__ = 'Fix blindness, firmware crashes and brain not being loaded'
__name__ = 'Fix_Services' __name__ = 'Fix_Services'
@ -38,6 +38,7 @@ class FixServices(plugins.Plugin):
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.pattern3 = re.compile(r'Firmware has halted or crashed')
self.pattern4 = re.compile(r'error 400: could not find interface wlan0mon') self.pattern4 = re.compile(r'error 400: could not find interface wlan0mon')
self.pattern5 = re.compile(r'connection to the bettercap endpoint failed')
self.isReloadingMon = False self.isReloadingMon = False
self.connection = None self.connection = None
self.LASTTRY = 0 self.LASTTRY = 0
@ -98,7 +99,8 @@ class FixServices(plugins.Plugin):
logging.info("[Fix_Services] wifi.recon flip: success!") logging.info("[Fix_Services] 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:
display.update(force=True, new_data={"status": "Wifi recon flipped!",
"face": faces.COOL}) "face": faces.COOL})
else: else:
print("Wifi recon flipped") print("Wifi recon flipped")
@ -189,6 +191,20 @@ class FixServices(plugins.Plugin):
except Exception as err: except Exception as err:
logging.error("[Fix_Services monstart]: %s" % repr(err)) logging.error("[Fix_Services monstart]: %s" % repr(err))
# Look for pattern 5
elif len(self.pattern5.findall(other_other_last_lines)) >= 3:
logging.info("[Fix_Services] bettercap is down!")
if hasattr(agent, 'view'):
display = agent.view()
display.set('status', 'Restarting wlan0 now!')
display.update(force=True)
try:
# Restart bettercap/pwnagotchi
logging.info("[Fix_Services restarting]")
pwnagotchi.restart("AUTO")
except Exception as err:
logging.error("[Fix_Services restarting]: %s" % repr(err))
else: else:
print("logs look good") print("logs look good")
@ -224,7 +240,8 @@ class FixServices(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:
@ -312,7 +329,7 @@ class FixServices(plugins.Plugin):
# try accessing mon0 in bettercap # try accessing mon0 in bettercap
result = connection.run("set wifi.interface wlan0mon") result = connection.run("set wifi.interface wlan0mon")
if "success" in result: if "success" in result:
logging.info("[Fix_Services set wifi.interface wlan0mon] worked: %s" % repr(result)) logging.info("[Fix_Services set wifi.interface wlan0mon] worked!")
self._status = "" self._status = ""
self._count = self._count + 1 self._count = self._count + 1
time.sleep(1) time.sleep(1)
@ -325,21 +342,25 @@ class FixServices(plugins.Plugin):
logging.info( logging.info(
"[Fix_Services set wifi.interface wlan0mon] except: %s" % repr(err)) "[Fix_Services set wifi.interface wlan0mon] except: %s" % repr(err))
except Exception as cerr: # except Exception as cerr: #
if not display: print("failed loading wlan0mon attempt #%s: %s" % (tries, repr(cerr))) if not display:
print("failed loading wlan0mon attempt #%s: %s" % (tries, repr(cerr)))
except Exception as err: # from modprobe except Exception as err: # from modprobe
if not display: print("Failed reloading brcmfmac") if not display:
print("Failed reloading brcmfmac")
logging.error("[Fix_Services] Failed reloading brcmfmac %s" % repr(err)) logging.error("[Fix_Services] Failed reloading brcmfmac %s" % repr(err))
except Exception as nope: # from modprobe -r except Exception as nope: # from modprobe -r
# fails if already unloaded, so probably fine # fails if already unloaded, so probably fine
logging.error("[Fix_Services #%s modprobe -r] %s" % (tries, repr(nope))) logging.error("[Fix_Services #%s modprobe -r] %s" % (tries, repr(nope)))
if not display: print("[Fix_Services #%s modprobe -r] %s" % (tries, repr(nope))) if not display:
print("[Fix_Services #%s modprobe -r] %s" % (tries, repr(nope)))
pass pass
tries = tries + 1 tries = tries + 1
if tries < 3: if tries < 3:
logging.info("[Fix_Services] wlan0mon didn't make it. trying again") logging.info("[Fix_Services] wlan0mon didn't make it. trying again")
if not display: print(" wlan0mon didn't make it. trying again") if not display:
print(" wlan0mon didn't make it. trying again")
# exited the loop, so hopefully it loaded # exited the loop, so hopefully it loaded
if tries < 3: if tries < 3:
@ -363,15 +384,15 @@ class FixServices(plugins.Plugin):
if "success" in result: # and result["success"] is True: if "success" in result: # and result["success"] is True:
self._status = "" self._status = ""
if display: if display:
display.update(force=True, new_data={"status": "I can see again! (probably): %s" % repr(result), display.update(force=True, new_data={"status": "I can see again! (probably)",
"brcmfmac_status": self._status, "brcmfmac_status": self._status,
"face": faces.HAPPY}) "face": faces.HAPPY})
else: else:
print("I can see again") print("I can see again")
logging.info("[Fix_Services] wifi.recon on %s" % repr(result)) logging.info("[Fix_Services] wifi.recon on")
self.LASTTRY = time.time() + 120 # 2-minute pause until next time. self.LASTTRY = time.time() + 120 # 2-minute pause until next time.
else: else:
logging.error("[Fix_Services] wifi.recon did not start up: %s" % repr(result)) logging.error("[Fix_Services] wifi.recon did not start up")
self.LASTTRY = time.time() - 300 # failed, so try again ASAP self.LASTTRY = time.time() - 300 # failed, so try again ASAP
self.isReloadingMon = False self.isReloadingMon = False
@ -393,7 +414,6 @@ class FixServices(plugins.Plugin):
# called when the ui is updated # called when the ui is updated
def on_ui_update(self, ui): def on_ui_update(self, ui):
with ui._lock:
# update those elements # update those elements
if self._status: if self._status:
ui.set('brcmfmac_status', "wlan0mon %s" % self._status) ui.set('brcmfmac_status', "wlan0mon %s" % self._status)

1
pwnagotchi/plugins/default/memtemp.py
View File

@ -103,7 +103,6 @@ class MemTemp(plugins.Plugin):
return " " * (self.FIELD_WIDTH - len(data)) + data return " " * (self.FIELD_WIDTH - len(data)) + data
def on_ui_setup(self, ui): def on_ui_setup(self, ui):
with ui._lock:
try: try:
# Configure field list # Configure field list
self.fields = self.options['fields'].split(',') self.fields = self.options['fields'].split(',')