diff --git a/burpui/api/custom/fields.py b/burpui/api/custom/fields.py index 34d4a43f..c215344c 100644 --- a/burpui/api/custom/fields.py +++ b/burpui/api/custom/fields.py @@ -11,13 +11,8 @@ import flask_restx.fields from flask_restx.fields import * # noqa # pylint: disable=locally-disabled, wildcard-import, unused-wildcard-import -from .my_fields import ( - BackupNumber, - DateTime, - DateTimeHuman, # noqa - LocalizedString, - SafeString, -) +from .my_fields import DateTimeHuman # noqa +from .my_fields import BackupNumber, DateTime, LocalizedString, SafeString __all__ = flask_restx.fields.__all__ + ( DateTime, diff --git a/burpui/app.py b/burpui/app.py index 1cf00aed..7090d2a0 100644 --- a/burpui/app.py +++ b/burpui/app.py @@ -236,7 +236,7 @@ def create_app(conf=None, verbose=0, logfile=None, **kwargs): cache.init_app( app, config={ - "CACHE_TYPE": "redis", + "CACHE_TYPE": "flask_caching.backends.redis", "CACHE_REDIS_HOST": host, "CACHE_REDIS_PORT": port, "CACHE_REDIS_PASSWORD": pwd, diff --git a/burpui/ext/cache.py b/burpui/ext/cache.py index 0ce2440b..c61c6dfc 100644 --- a/burpui/ext/cache.py +++ b/burpui/ext/cache.py @@ -11,7 +11,7 @@ from flask_caching import Cache cache = Cache( config={ - "CACHE_TYPE": "simple", + "CACHE_TYPE": "flask_caching.backends.simple", "CACHE_THRESHOLD": 50, "CACHE_DEFAULT_TIMEOUT": 7200, } diff --git a/burpui/ext/i18n.py b/burpui/ext/i18n.py index 24af2ec7..36f2af15 100644 --- a/burpui/ext/i18n.py +++ b/burpui/ext/i18n.py @@ -14,8 +14,6 @@ from flask_login import current_user from .._compat import to_unicode from ..config import config -babel = Babel() - LANGUAGES = { "en": to_unicode("English"), "fr": to_unicode("Français"), @@ -25,7 +23,6 @@ LANGUAGES = { config["LANGUAGES"] = LANGUAGES -@babel.localeselector def get_locale(): locale = None if current_user and not current_user.is_anonymous: @@ -35,3 +32,6 @@ def get_locale(): if locale not in LANGUAGES: locale = None return locale or request.accept_languages.best_match(config["LANGUAGES"].keys()) + + +babel = Babel() diff --git a/pkgs/burp-ui-tpl/setup.py b/pkgs/burp-ui-tpl/setup.py index 736627d0..fb1e60d0 100755 --- a/pkgs/burp-ui-tpl/setup.py +++ b/pkgs/burp-ui-tpl/setup.py @@ -18,7 +18,6 @@ Burp-UI Meta package for ##TPL## requirements """ from burpui_##TPL## import __author__, __author_email__, __description__, \ -name = __title__ author = __author__ author_email = __author_email__ description = __description__ diff --git a/requirements.txt b/requirements.txt index eed16d06..d93ca1c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,17 @@ -trio==0.19.0 -Flask==2.0.3 +trio==0.22.0 +Flask==2.2.3 Flask-Login==0.6.2 -Flask-Babel==2.0.0 +Flask-Babel==3.0.1 Flask-WTF==0.15.1 -flask-restx==1.0.3 -Flask-Caching==1.10.1 +flask-restx==1.1.0 +Flask-Caching==2.0.2 Flask-Session==0.4.0 -WTForms==2.3.3 -arrow==1.1.1 +WTForms==3.0.0 +arrow==1.2.3 pluginbase==1.0.1 -tzlocal==3.0 -pyOpenSSL==22.1.0 -configobj==5.0.6 +tzlocal==4.3 +pyOpenSSL==23.0.0 +configobj==5.0.8 async_generator==1.10 -Click==7.1.2 -python-pam==1.8.4 +Click==8.1.3 +python-pam==2.0.2 diff --git a/setup.py b/setup.py index ed889f19..b15ce2f5 100755 --- a/setup.py +++ b/setup.py @@ -245,13 +245,8 @@ def readme(): sys.path.insert(0, os.path.join(ROOT)) -from burpui.desc import ( - __author__, - __author_email__, - __description__, # noqa - __title__, - __url__, -) +from burpui.desc import __description__ # noqa +from burpui.desc import __author__, __author_email__, __title__, __url__ name = __title__ author = __author__ diff --git a/tests/unit/test_redis.py b/tests/unit/test_redis.py index ea92868f..f50cbc00 100644 --- a/tests/unit/test_redis.py +++ b/tests/unit/test_redis.py @@ -34,6 +34,7 @@ def app(mocker): from burpui.ext.sql import db from burpui.models import Session, Task # noqa + del bui.extensions["sqlalchemy"] bui.config["WITH_SQL"] = True create_db(bui, True) db.create_all() @@ -83,7 +84,11 @@ def test_current_session(app): session_manager.store_session("toto") assert session_manager.session_expired() is False - sess = Session.query.filter_by(uuid=session_manager.get_session_id()).first() + sess = ( + db.session.query(Session) + .filter_by(uuid=session_manager.get_session_id()) + .first() + ) sess.timestamp = datetime.utcfromtimestamp(0) db.session.commit() assert session_manager.session_expired() is True