update flask_limiter

Author: MoralCode

Pipfile

@@ -12,7 +12,7 @@ flasgger = "~=0.9.3"
 flask-marshmallow = "~=0.10.1"
 Flask = "~=2.0.0"
 Flask-Cors = "~=3.0.8"
-Flask-Limiter = "~=1.0.1"
+Flask-Limiter = "~=3.2.0"
 gunicorn = "~=19.9.0"
 sqlalchemy = "~=1.3.13"
 flask-sqlalchemy = "~=2.5.0"

Pipfile.lock

@@ -3,7 +3,8 @@
 from blueprints import v0, main
 from docs import create_docs
 from flask_limiter import Limiter
-from common.helpers import get_request_origin_identifier, make_error_object, respond
+from flask_limiter.util import get_remote_address
+from common.helpers import make_error_object, respond
 from common.db_schema import db
 from common.schemas import *
 from auth import db_connection_string
@@ -25,8 +26,8 @@ def create_app(config_filename=None):
     if config_filename:
         app.config.from_pyfile(config_filename)
 
-    limiter = Limiter(app, default_limits=[
-                  "25/hour", "5/minute"], key_func=get_request_origin_identifier, headers_enabled=True)
+    limiter = Limiter(get_remote_address, app=app, default_limits=[
+                  "25/hour", "5/minute"], headers_enabled=True)
 
     app.register_blueprint(v0.blueprint, url_prefix='/v0')
     app.register_blueprint(main.main_pages)

api.py

@@ -195,10 +195,6 @@ def get_request_body(request):
     """
     return request.get_json()
 
-def get_request_origin_identifier():
-    user_id_parts = get_api_user_id().split("|")
-    return flask_limiter.util.get_remote_address() + get_api_client_id() + user_id_parts[1] if len(user_id_parts) > 2 else ""
-
 
 def get_api_client_id():
     """Returns a string to group API calls together for the purposes of ratelimiting