Updated requirements

Bugfix from testrun
Testresults

cps/kobo_auth.py

@@ -164,6 +164,7 @@ def requires_kobo_auth(f):
             )
             if user is not None:
                 login_user(user)
+                [limiter.limiter.storage.clear(k.key) for k in limiter.current_limits]
                 return f(*args, **kwargs)
             log.debug("Received Kobo request without a recognizable auth token.")
             return abort(401)

cps/search.py

@@ -17,12 +17,12 @@
 import json
 from datetime import datetime
 
-from flask import Blueprint, request, redirect, url_for, flash, get_flashed_messages
+from flask import Blueprint, request, redirect, url_for, flash
 from flask import session as flask_session
 from flask_login import current_user
 from flask_babel import format_date
 from flask_babel import gettext as _
-from sqlalchemy.sql.expression import func, not_, and_, or_, text, false
+from sqlalchemy.sql.expression import func, not_, and_, or_, text, true
 from sqlalchemy.sql.functions import coalesce
 
 from . import logger, db, calibre_db, config, ub

cps/web.py

@@ -1309,7 +1309,7 @@ def login():
 
 @web.route('/login', methods=['POST'])
 @limiter.limit("40/day", key_func=lambda: request.form.get('username', "").strip().lower())
-@limiter.limit("2/minute", key_func=lambda: request.form.get('username', "").strip().lower())
+@limiter.limit("3/minute", key_func=lambda: request.form.get('username', "").strip().lower())
 def login_post():
     try:
         limiter.check()

setup.cfg

@@ -58,33 +58,34 @@ install_requires =
 	flask-wtf>=0.14.2,<1.2.0
 	chardet>=3.0.0,<4.1.0
 	advocate>=1.0.0,<1.1.0
+	Flask-Limiter>=2.3.0,<3.2.0
 	
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.50.0
-	gevent>20.6.0,<22.0.0
-	greenlet>=0.4.17,<1.2.0
-	httplib2>=0.9.2,<0.21.0
+	google-api-python-client>=1.7.11,<2.75.0
+	gevent>20.6.0,<23.0.0
+	greenlet>=0.4.17,<2.1.0
+	httplib2>=0.9.2,<0.22.0
 	oauth2client>=4.0.0,<4.1.4
 	uritemplate>=3.0.0,<4.2.0
 	pyasn1-modules>=0.0.8,<0.3.0
 	pyasn1>=0.1.9,<0.5.0
-	PyDrive2>=1.3.1,<1.11.0
+	PyDrive2>=1.3.1,<1.16.0
 	PyYAML>=3.12
-	rsa>=3.4.2,<4.9.0
+	rsa>=3.4.2,<4.10.0
 gmail = 
-	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.50.0
+	google-auth-oauthlib>=0.4.3,<0.9.0
+	google-api-python-client>=1.7.11,<2.75.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
-	python-Levenshtein>=0.12.0,<0.13.0
+	python-Levenshtein>=0.12.0,<0.21.0
 ldap = 
 	python-ldap>=3.0.0,<3.5.0
 	Flask-SimpleLDAP>=1.4.0,<1.5.0
 oauth = 
-	Flask-Dance>=2.0.0,<5.2.0
-	SQLAlchemy-Utils>=0.33.5,<0.39.0
+	Flask-Dance>=2.0.0,<6.3.0
+	SQLAlchemy-Utils>=0.33.5,<0.40.0
 metadata = 
 	rarfile>=3.2
 	scholarly>=1.2.0,<1.8
@@ -94,8 +95,8 @@ metadata =
 	beautifulsoup4>=4.0.1,<4.12.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
-	natsort>=2.2.0,<8.2.0
+	natsort>=2.2.0,<8.3.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
-	jsonschema>=3.2.0,<4.9.0
+	jsonschema>=3.2.0,<4.18.0