update flask version and import flask_bower code since it doesn't see…

…m maintained anymore
ziirish · Sep 17, 2021 · a793ede · a793ede
1 parent b2551b2
commit a793ede
Show file tree

Hide file tree

Showing 6 changed files with 542 additions and 7 deletions.
diff --git a/burpui/api/custom/my_fields.py b/burpui/api/custom/my_fields.py
@@ -36,7 +36,7 @@ def parse(self, value):
             try:
                 a = arrow.get(value)
                 a = a.to(TZ)
-            except arrow.parser.ParserError:
+            except (arrow.parser.ParserError, TypeError):
                 return None
         return fields.DateTime.parse(self, a.datetime)
 

diff --git a/burpui/api/misc.py b/burpui/api/misc.py
@@ -754,7 +754,7 @@ def _get_backup_history(self, client=None, server=None, data=None):
             if moment in args:
                 try:
                     if args[moment] is not None:
-                        moments[moment] = arrow.get(args[moment]).timestamp
+                        moments[moment] = arrow.get(args[moment]).int_timestamp
                 except arrow.parser.ParserError:
                     pass
 

diff --git a/burpui/app.py b/burpui/app.py
@@ -54,8 +54,8 @@ def create_app(conf=None, verbose=0, logfile=None, **kwargs):
     """
     from flask import g, request, session
     from flask_login import LoginManager
-    from flask_bower import Bower
     from flask_babel import gettext
+    from .thirdparty.flask_bower import Bower
     from .utils import ReverseProxied, lookup_file, is_uuid
     from .tools.logging import logger
     from .security import basic_login_from_request