Commit ec6e305f authored by Ziirish's avatar Ziirish

make sure to use the correct version of Click (fix #308 and #307)

parent e4c1474d
Pipeline #1622 passed with stages
in 31 minutes and 20 seconds
......@@ -121,7 +121,7 @@ class Burp(BUIbackend):
try:
cmd = [self.burpbin, '-v']
self.client_version = subprocess.check_output(cmd, universal_newlines=True).rstrip().replace('burp-', '')
self.client_version = subprocess.check_output(cmd).rstrip().replace('burp-', '')
except:
pass
......@@ -129,7 +129,7 @@ class Burp(BUIbackend):
cmd = [self.burpbin, '-a', 'l']
if self.burpconfcli:
cmd += ['-c', self.burpconfcli]
for line in subprocess.check_output(cmd, universal_newlines=True).split('\n'):
for line in subprocess.check_output(cmd).split('\n'):
result = re.search(r'^.*Server version:\s+(\d+\.\d+\.\d+)', line)
if result:
self.server_version = result.group(1)
......
......@@ -84,7 +84,6 @@ class Monitor(object):
try:
version = subprocess.check_output(
cmd,
universal_newlines=True,
stderr=subprocess.DEVNULL
).rstrip()
except subprocess.CalledProcessError:
......@@ -93,7 +92,7 @@ class Monitor(object):
cmd = [self.burpbin, '-v']
version = subprocess.check_output(
cmd,
universal_newlines=True
stderr=subprocess.DEVNULL
).rstrip()
if version < BURP_MINIMAL_VERSION and \
getattr(self.app, 'strict', True):
......
......@@ -13,3 +13,4 @@ tzlocal==1.5.1
pyOpenSSL==19.0.0
configobj==5.0.6
async_generator
Click==7.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment