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

Add checks for non empty config

Browse Source 
Add manual DNS 8.8.8.8/1.1.1.1

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
This commit is contained in:
Jeroen Oudshoorn
2025-01-06 21:50:18 +01:00
parent 9b969375b7
commit c7a06a4e43
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@ class BTTether(plugins.Plugin):
logging.info("[BT-Tether] plugin loaded.") logging.info("[BT-Tether] plugin loaded.")
def on_config_changed(self, config): def on_config_changed(self, config):
if any(self.options[key] == '' for key in ['phone', 'phone-name', 'ip', 'mac']):
self.ready = False
ip = self.options['ip'] ip = self.options['ip']
mac = self.options['mac'] mac = self.options['mac']
phone_name = self.options['phone-name'] + ' Network' phone_name = self.options['phone-name'] + ' Network'
@ -39,6 +41,7 @@ class BTTether(plugins.Plugin):
'bluetooth.type', 'panu', 'bluetooth.type', 'panu',
'bluetooth.bdaddr', f'{mac}', 'bluetooth.bdaddr', f'{mac}',
'ipv4.method', 'manual', 'ipv4.method', 'manual',
'ipv4.dns', '8.8.8.8;1.1.1.1;'
'ipv4.addresses', f'{address}', 'ipv4.addresses', f'{address}',
'ipv4.gateway', f'{gateway}', 'ipv4.gateway', f'{gateway}',
'ipv4.route-metric', '100' 'ipv4.route-metric', '100'
@ -46,10 +49,13 @@ class BTTether(plugins.Plugin):
subprocess.run(['nmcli', 'connection', 'reload'], check=True) subprocess.run(['nmcli', 'connection', 'reload'], check=True)
subprocess.run(['nmcli', 'connection', 'up', f'{phone_name}'], check=True) subprocess.run(['nmcli', 'connection', 'up', f'{phone_name}'], check=True)
except Exception as e: except Exception as e:
logging.error(f"[BT-Tether] Failed to connect to device: {e}") logging.debug(f"[BT-Tether] Failed to connect to device: {e}")
logging.error(f"[BT-Tether] Failed to connect to device: have you enabled bluetooth tethering on your phone?")
self.ready = True self.ready = True
def on_ready(self, agent): def on_ready(self, agent):
if any(self.options[key] == '' for key in ['phone', 'phone-name', 'ip', 'mac']):
self.ready = False
self.ready = True self.ready = True
def on_ui_setup(self, ui): def on_ui_setup(self, ui):
@ -59,6 +65,7 @@ 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):
if self.ready:
phone_name = self.options['phone-name'] + ' Network' phone_name = self.options['phone-name'] + ' Network'
if (subprocess.run(['bluetoothctl', 'info'], capture_output=True, text=True)).stdout.find('Connected: yes') != -1: if (subprocess.run(['bluetoothctl', 'info'], capture_output=True, text=True)).stdout.find('Connected: yes') != -1:
self.status = 'C' self.status = 'C'
@ -67,8 +74,10 @@ class BTTether(plugins.Plugin):
try: try:
subprocess.run(['nmcli', 'connection', 'up', f'{phone_name}'], check=True) subprocess.run(['nmcli', 'connection', 'up', f'{phone_name}'], check=True)
except Exception as e: except Exception as e:
logging.error(f"[BT-Tether] Failed to connect to device: {e}") logging.debug(f"[BT-Tether] Failed to connect to device: {e}")
logging.error(f"[BT-Tether] Failed to connect to device: have you enabled bluetooth tethering on your phone?")
ui.set('bluetooth', self.status) ui.set('bluetooth', self.status)
return
def on_unload(self, ui): def on_unload(self, ui):
phone_name = self.options['phone-name'] + ' Network' phone_name = self.options['phone-name'] + ' Network'