scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: more robust version parsing in auto-update (fixes #469)

Browse Source
This commit is contained in:
Simone Margaritelli 2019-10-30 17:37:17 +01:00
parent 78a036ed1a
commit 965416483d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pwnagotchi/plugins/default/auto-update.py
View File

@ -1,10 +1,11 @@
__author__ = 'evilsocket@gmail.com' __author__ = 'evilsocket@gmail.com'
__version__ = '1.1.0' __version__ = '1.1.1'
__name__ = 'auto-update' __name__ = 'auto-update'
__license__ = 'GPL3' __license__ = 'GPL3'
__description__ = 'This plugin checks when updates are available and applies them when internet is available.' __description__ = 'This plugin checks when updates are available and applies them when internet is available.'
import os import os
import re
import logging import logging
import subprocess import subprocess
import requests import requests
@ -147,6 +148,15 @@ def install(display, update):
return True return True
def parse_version(cmd):
out = subprocess.getoutput(cmd)
for part in out.split(' '):
part = part.replace('v', '').strip()
if re.search(r'^\d+\.\d+\.\d+.*$', part):
return part
raise Exception('could not parse version from "%s": output=\n%s' % (cmd, out))
def on_internet_available(agent): def on_internet_available(agent):
global STATUS global STATUS
@ -167,9 +177,8 @@ def on_internet_available(agent):
to_install = [] to_install = []
to_check = [ to_check = [
('bettercap/bettercap', subprocess.getoutput('bettercap -version').split(' ')[1].replace('v', ''), ('bettercap/bettercap', parse_version('bettercap -version'), True, 'bettercap'),
True, 'bettercap'), ('evilsocket/pwngrid', parse_version('pwngrid -version'), True, 'pwngrid-peer'),
('evilsocket/pwngrid', subprocess.getoutput('pwngrid -version').replace('v', ''), True, 'pwngrid-peer'),
('evilsocket/pwnagotchi', pwnagotchi.version, False, 'pwnagotchi') ('evilsocket/pwnagotchi', pwnagotchi.version, False, 'pwnagotchi')
] ]