scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-29 17:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

supply missing fields argument

Browse Source 
(cherry picked from commit f809be39bf)

# Conflicts:
#	core/admin/mailu/sso/views/base.py
This commit is contained in:
Alexander Graf
2022-01-11 18:53:01 +01:00
committed by Mergify
parent a28aa0d1a0
commit 88c6761d6b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/admin/mailu/sso/views/base.py
View File

@@ -43,6 +43,7 @@ def login():
destination = app.config['WEB_WEBMAIL']
device_cookie, device_cookie_username = utils.limiter.parse_device_cookie(flask.request.cookies.get('rate_limit'))
username = form.email.data
<<<<<<< HEAD
if not utils.is_app_token(form.pw.data):
if username != device_cookie_username and utils.limiter.should_rate_limit_ip(client_ip):
flask.flash(_('Too many attempts from your IP (rate-limit)'), 'error')
@@ -50,6 +51,14 @@ def login():
if utils.limiter.should_rate_limit_user(username, client_ip, device_cookie, device_cookie_username):
flask.flash(_('Too many attempts for this user (rate-limit)'), 'error')
return flask.render_template('login.html', form=form, fields=fields)
=======
if username != device_cookie_username and utils.limiter.should_rate_limit_ip(client_ip):
flask.flash('Too many attempts from your IP (rate-limit)', 'error')
return flask.render_template('login.html', form=form, fields=fields)
if utils.limiter.should_rate_limit_user(username, client_ip, device_cookie, device_cookie_username):
flask.flash('Too many attempts for this user (rate-limit)', 'error')
return flask.render_template('login.html', form=form, fields=fields)
>>>>>>> f809be39 (supply missing fields argument)
user = models.User.login(username, form.pw.data)
if user:
flask.session.regenerate()