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.3.8

Browse Source 
Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
This commit is contained in:
Jeroen Oudshoorn
2023-09-12 13:17:37 +02:00
parent 04157b318a
commit fe34c1e76d
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builder/data/etc/systemd/system/bettercap.service
View File

@ -5,7 +5,6 @@ Wants=network.target
[Service] [Service]
Type=simple Type=simple
PermissionsStartOnly=true
ExecStart=/usr/bin/bettercap-launcher ExecStart=/usr/bin/bettercap-launcher
Restart=always Restart=always
RestartSec=30 RestartSec=30

1
builder/data/etc/systemd/system/pwnagotchi.service
View File

@ -7,7 +7,6 @@ After=pwngrid-peer.service
[Service] [Service]
Type=simple Type=simple
WorkingDirectory=/tmp WorkingDirectory=/tmp
PermissionsStartOnly=true
ExecStart=/usr/bin/pwnagotchi-launcher ExecStart=/usr/bin/pwnagotchi-launcher
Restart=always Restart=always
RestartSec=30 RestartSec=30

1
builder/data/etc/systemd/system/pwngrid-peer.service
View File

@ -6,7 +6,6 @@ After=bettercap.service
[Service] [Service]
Type=simple Type=simple
PermissionsStartOnly=true
ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /var/log/pwngrid-peer.log -iface wlan0mon ExecStart=/usr/local/bin/pwngrid -keys /etc/pwnagotchi -peers /root/peers -address 127.0.0.1:8666 -client-token /root/.api-enrollment.json -wait -log /var/log/pwngrid-peer.log -iface wlan0mon
Restart=always Restart=always
RestartSec=30 RestartSec=30

33
pwnagotchi/bettercap.py
View File

@ -40,29 +40,26 @@ class Client(object):
async def start_websocket(self, consumer): async def start_websocket(self, consumer):
s = "%s/events" % self.websocket s = "%s/events" % self.websocket
async with websockets.connect(s, ping_interval=60, ping_timeout=90) as ws: while True:
# After the websocket connection is opened, loop waiting for messages try:
# Moved the websocket connection before the loop to avoid runaway websocket async with websockets.connect(s, ping_interval=60, ping_timeout=90) as ws:
# connections that were exhausting all possible TCP ports (ephemeral port exhaustion)
while True:
try:
async for msg in ws: async for msg in ws:
try: try:
await consumer(msg) await consumer(msg)
except Exception as ex: except Exception as ex:
logging.debug("Error while parsing event (%s)", ex) logging.debug("Error while parsing event (%s)", ex)
except websockets.ConnectionClosedError: except websockets.ConnectionClosedError:
logging.error("Lost websocket connection. Reconnecting...") logging.error("Lost websocket connection. Reconnecting...")
continue continue
except websockets.WebSocketException as wex: except websockets.WebSocketException as wex:
logging.error("Websocket exception (%s)", wex) logging.error("Websocket exception (%s)", wex)
continue continue
except OSError as e: except OSError as e:
logging.error("Websocket OSError exception (%s) with parameter %s", e, s) logging.error("Websocket OSError exception (%s) with parameter %s", e, s)
continue continue
except Exception as e: except Exception as e:
logging.error("Other exception (%s) with parameter %s", e, s) logging.error("Other exception (%s) with parameter %s", e, s)
continue continue
def run(self, command, verbose_errors=True): def run(self, command, verbose_errors=True):
for _ in range(0,2): for _ in range(0,2):