Merge branch 'master' into patch-1

dpgaspar · Aug 19, 2024 · 8112e8b · 8112e8b
2 parents 0ca4907 + 1a85de9
commit 8112e8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py
@@ -304,7 +304,9 @@ def __init__(self, appbuilder):
         self.limiter = self.create_limiter(app)
 
     def create_limiter(self, app: Flask) -> Limiter:
-        limiter = Limiter(key_func=get_remote_address)
+        limiter = Limiter(
+            key_func=app.config.get("RATELIMIT_KEY_FUNC", get_remote_address)
+        )
         limiter.init_app(app)
         return limiter
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -22,7 +22,7 @@ colorama==0.4.6
     # via flask-appbuilder
 deprecated==1.2.14
     # via limits
-dnspython==2.4.2
+dnspython==2.6.1
     # via email-validator
 email-validator==1.3.1
     # via flask-appbuilder