Commit 954ff806 authored by Benjamin "Ziirish" SANS's avatar Benjamin "Ziirish" SANS
Browse files

update requirements

parent 0f7d5b14
......@@ -69,6 +69,17 @@ except ImportError:
pass
def _die(error):
click.echo(
click.style(
'Unable to initialize the application: {}'.format(error),
fg='red'
),
err=True
)
sys.exit(2)
@app.cli.command()
def legacy():
"""Legacy server for backward compatibility"""
......@@ -96,7 +107,13 @@ def legacy():
@click.argument('name')
def create_user(backend, password, ask, verbose, name):
"""Create a new user."""
app.load_modules(False)
try:
msg = app.load_modules(False)
except Exception as e:
msg = str(e)
if msg:
_die(msg)
click.echo(click.style('[*] Adding \'{}\' user...'.format(name), fg='blue'))
try:
......@@ -237,7 +254,13 @@ def setup_burp(bconfcli, bconfsrv, client, host, redis, database, dry):
)
sys.exit(1)
app.load_modules(False)
try:
msg = app.load_modules(False)
except Exception as e:
msg = str(e)
if msg:
_die(msg)
from .misc.parser.utils import Config
from .app import get_redis_server
......@@ -647,7 +670,13 @@ def diag(client, host, tips):
)
sys.exit(1)
app.load_modules(False)
try:
msg = app.load_modules(False)
except Exception as e:
msg = str(e)
if msg:
_die(msg)
from .misc.parser.utils import Config
from .app import get_redis_server
......
......@@ -206,6 +206,8 @@ class Burp(Burp1):
# check the burp version because this backend only supports clients
# newer than BURP_MINIMAL_VERSION
try:
if not self.burpbin:
raise Exception('No Burp binary found!')
cmd = [self.burpbin, '-v']
version = subprocess.check_output(
cmd,
......
......@@ -385,14 +385,15 @@ class BUIServer(Flask):
Client = mod.Burp
self.client = Client(self, conf=self.conf)
except Exception as e:
self.logger.critical(traceback.format_exc())
self.logger.critical(
'Failed loading backend for Burp version {0}: {1}'.format(
self.vers,
str(e)
)
msg = 'Failed loading backend for Burp version {0}: {1}'.format(
self.vers,
str(e)
)
sys.exit(2)
if not strict:
self.logger.critical(traceback.format_exc())
self.logger.critical(msg)
sys.exit(2)
return msg
@property
def acl(self):
......
Flask==0.12
Flask-Login==0.4.0
Flask-Bower==1.2.1
Flask-Babel==0.11.1
Flask-WTF==0.13.1
flask-restplus==0.9.2
Flask-Babel==0.11.2
Flask-WTF==0.14.2
flask-restplus==0.10.1
Flask-Cache==0.13.1
Flask-Script==2.0.5
WTForms==2.0.2
arrow==0.7.0
tzlocal==1.2
WTForms==2.1
arrow==0.10.0
tzlocal==1.4
six==1.10.0
pyOpenSSL==16.0.0
pyOpenSSL==17.0.0
configobj==5.0.6
pyasn1==0.1.9
cffi==1.7.0
sphinxcontrib-httpdomain==1.3.0
pyasn1==0.2.3
cffi==1.10.0
sphinxcontrib-httpdomain==1.5.0
Flask==0.12
Flask-Login==0.4.0
Flask-Bower==1.2.1
Flask-Babel==0.11.1
Flask-WTF==0.13.1
Flask-Babel==0.11.2
Flask-WTF==0.14.2
flask-restplus==0.10.1
Flask-Cache==0.13.1
Flask-Script==2.0.5
WTForms==2.0.2
arrow==0.7.0
tzlocal==1.2
WTForms==2.1
arrow==0.10.0
tzlocal==1.4
six==1.10.0
pyOpenSSL==16.0.0
pyOpenSSL==17.0.0
configobj==5.0.6
pyasn1==0.1.9
cffi==1.7.0
pyasn1==0.2.3
cffi==1.10.0
......@@ -7,26 +7,3 @@ omit =
burpui/datastructures.py
burpui/misc/parser/openssl.py
burpui/api/async.py
[metadata]
provides-extra =
sql
extra
ldap_authentication
gunicorn
agent
celery
limit
ci
requires-dist =
ldap3; extra == 'ldap_authentication'
gevent; extra in ['agent', 'gunicorn']
gunicorn; extra == 'gunicorn'
Flask-Session==0.3.0; extra == 'extra'
redis; extra in ['extra', 'celery', 'limit']
ujson; extra == 'extra'
Celery; extra == 'celery'
Flask-SQLAlchemy; extra == 'sql'
Flask-Migrate>=2.0.3; extra == 'sql'
sqlalchemy-utils; extra == 'sql'
Flask-Limiter; extra == 'limit'
......@@ -281,7 +281,7 @@ setup(
'dev': dev_requires,
'debian_wheezy': ['functools32'],
'celery': ['Celery', 'redis'],
'sql': ['Flask-SQLAlchemy', 'Flask-Migrate>=2.0.1', 'sqlalchemy-utils'],
'sql': ['Flask-SQLAlchemy', 'Flask-Migrate>=2.0.3', 'sqlalchemy-utils'],
'limit': ['Flask-Limiter', 'redis'],
},
tests_require=test_requires,
......
Supports Markdown
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