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

fix 2145

Browse Source 
(cherry picked from commit 7bd1fd3489)

# Conflicts:
#	core/admin/mailu/internal/views/auth.py
This commit is contained in:
Florent Daigniere
2022-01-07 09:07:32 +01:00
committed by Mergify
parent a28aa0d1a0
commit 0034ede053
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/admin/mailu/internal/views/auth.py
View File

@@ -22,8 +22,12 @@ def nginx_authentication():
utils.limiter.rate_limit_ip(client_ip) utils.limiter.rate_limit_ip(client_ip)
return response return response
is_from_webmail = headers['Auth-Port'] in ['10143', '10025'] is_from_webmail = headers['Auth-Port'] in ['10143', '10025']
<<<<<<< HEAD
is_app_token = utils.is_app_token(headers.get('Auth-Pass','')) is_app_token = utils.is_app_token(headers.get('Auth-Pass',''))
if not is_from_webmail and not is_port_25 and not is_app_token and utils.limiter.should_rate_limit_ip(client_ip): if not is_from_webmail and not is_port_25 and not is_app_token and utils.limiter.should_rate_limit_ip(client_ip):
=======
if not is_from_webmail and utils.limiter.should_rate_limit_ip(client_ip):
>>>>>>> 7bd1fd34 (fix 2145)
status, code = nginx.get_status(flask.request.headers['Auth-Protocol'], 'ratelimit') status, code = nginx.get_status(flask.request.headers['Auth-Protocol'], 'ratelimit')
response = flask.Response() response = flask.Response()
response.headers['Auth-Status'] = status response.headers['Auth-Status'] = status
@@ -34,9 +38,15 @@ def nginx_authentication():
for key, value in headers.items(): for key, value in headers.items():
response.headers[key] = str(value) response.headers[key] = str(value)
is_valid_user = False is_valid_user = False
<<<<<<< HEAD
username = response.headers.get('Auth-User', None) username = response.headers.get('Auth-User', None)
if response.headers.get("Auth-User-Exists") == "True": if response.headers.get("Auth-User-Exists") == "True":
if not is_from_webmail and not is_app_token and utils.limiter.should_rate_limit_user(username, client_ip): if not is_from_webmail and not is_app_token and utils.limiter.should_rate_limit_user(username, client_ip):
=======
if response.headers.get("Auth-User-Exists"):
username = response.headers["Auth-User"]
if utils.limiter.should_rate_limit_user(username, client_ip):
>>>>>>> 7bd1fd34 (fix 2145)
# FIXME could be done before handle_authentication() # FIXME could be done before handle_authentication()
status, code = nginx.get_status(flask.request.headers['Auth-Protocol'], 'ratelimit') status, code = nginx.get_status(flask.request.headers['Auth-Protocol'], 'ratelimit')
response = flask.Response() response = flask.Response()