Another fix for bt-tether

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>

pwnagotchi/_version.py

@@ -1 +1 @@
-__version__ = '2.9.5'
+__version__ = '2.9.5.2'

pwnagotchi/defaults.toml

@@ -54,10 +54,14 @@ main.plugins.memtemp.enabled = false
 main.plugins.memtemp.scale = "celsius"
 main.plugins.memtemp.orientation = "horizontal"
 
-main.plugins.ohcapi.enabled = true
+main.plugins.ohcapi.enabled = false
 main.plugins.ohcapi.api_key = "sk_your_api_key_here"
 main.plugins.ohcapi.receive_email = "yes"
 
+main.plugins.pwndroid.enabled = false
+main.plugins.pwndroid.display = false # show coords on display
+main.plugins.pwndroid.display_alitude = false # show altitude on display
+
 main.plugins.pisugarx.enabled = false
 main.plugins.pisugarx.rotation = false
 main.plugins.pisugarx.default_display = "percentage"

pwnagotchi/plugins/default/bt-tether.py

@@ -41,15 +41,15 @@ class BTTether(plugins.Plugin):
                 'bluetooth.type', 'panu',
                 'bluetooth.bdaddr', f'{mac}',
                 'ipv4.method', 'manual',
-                'ipv4.dns', '8.8.8.8;1.1.1.1;'
-                'ipv4.addresses', f'{address}',
+                'ipv4.dns', '8.8.8.8 1.1.1.1',
+                'ipv4.addresses', f'{address}/24',
                 'ipv4.gateway', f'{gateway}',
                 'ipv4.route-metric', '100'
             ], check=True)
             subprocess.run(['nmcli', 'connection', 'reload'], check=True)
             subprocess.run(['nmcli', 'connection', 'up', f'{phone_name}'], check=True)
         except Exception as e:
-            logging.debug(f"[BT-Tether] Failed to connect to device: {e}")
+            logging.error(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
 

pwnagotchi/plugins/default/grid.py

@@ -44,7 +44,7 @@ def parse_pcap(filename):
 
 class Grid(plugins.Plugin):
     __author__ = 'evilsocket@gmail.com'
-    __version__ = '1.0.1'
+    __version__ = '1.1.0'
     __license__ = 'GPL3'
     __description__ = 'This plugin signals the unit cryptographic identity and list of pwned networks and list of pwned ' \
                       'networks to opwngrid.xyz '
@@ -69,6 +69,11 @@ class Grid(plugins.Plugin):
     def on_loaded(self):
         logging.info("grid plugin loaded.")
 
+    def on_webhook(self, path, request):
+        from flask import make_response, redirect
+        response = make_response(redirect("https://opwngrid.xyz", code=302))
+        return response
+
     def set_reported(self, reported, net_id):
         if net_id not in reported:
             reported.append(net_id)

pwnagotchi/plugins/default/ohcapi.py

@@ -10,7 +10,7 @@ from json.decoder import JSONDecodeError
 
 class ohcapi(plugins.Plugin):
     __author__ = 'Rohan Dayaram'
-    __version__ = '1.0.3'
+    __version__ = '1.1.0'
     __license__ = 'GPL3'
     __description__ = 'Uploads WPA/WPA2 handshakes to OnlineHashCrack.com using the new API (V2), no dashboard.'
 
@@ -45,6 +45,11 @@ class ohcapi(plugins.Plugin):
         self.ready = True
         logging.info("OHC NewAPI: Plugin loaded and ready.")
 
+    def on_webhook(self, path, request):
+        from flask import make_response, redirect
+        response = make_response(redirect("https://www.onlinehashcrack.com", code=302))
+        return response
+    
     def on_internet_available(self, agent):
         """
         Called once when the internet becomes available.
@@ -70,7 +75,12 @@ class ohcapi(plugins.Plugin):
             return
 
         # Check if the internet is still available by pinging Google
-        response = requests.get('https://www.google.com', timeout=5)
+        try:
+            response = requests.get('https://www.google.com', timeout=5)
+        except requests.ConnectionError:
+            self.internet_active = False
+            return
+            
         if response.status_code == 200:
             self.internet_active = True
         else:

pwnagotchi/plugins/default/wigle.py

@@ -106,7 +106,7 @@ def _send_to_wigle(lines, api_key, donate=True, timeout=30):
 
 class Wigle(plugins.Plugin):
     __author__ = "Dadav and updated by Jayofelony"
-    __version__ = "3.0.1"
+    __version__ = "3.1.0"
     __license__ = "GPL3"
     __description__ = "This plugin automatically uploads collected WiFi to wigle.net"
 
@@ -128,6 +128,11 @@ class Wigle(plugins.Plugin):
         self.ready = True
         logging.info("WIGLE: ready")
     
+    def on_webhook(self, path, request):
+        from flask import make_response, redirect
+        response = make_response(redirect("https://www.wigle.net/", code=302))
+        return response
+
     def on_internet_available(self, agent):
         """
         Called when there's internet connectivity