scottk/Mailu-OIDC
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu-OIDC.git synced 2025-11-01 10:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify the logic

Browse Source
This commit is contained in:
Florent Daigniere
2024-04-18 18:50:13 +02:00
parent da36ac0e92
commit 4837a05c71
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/admin/mailu/api/common.py
View File

@@ -24,19 +24,11 @@ def api_token_authorization(func):
if utils.limiter.should_rate_limit_ip(client_ip): if utils.limiter.should_rate_limit_ip(client_ip):
abort(429, 'Too many attempts from your IP (rate-limit)' ) abort(429, 'Too many attempts from your IP (rate-limit)' )
if not request.headers.get('Authorization'): if not request.headers.get('Authorization'):
abort(401, 'A valid Bearer token is expected which is provided as request header') abort(401, 'A valid Authorization header is mandatory')
#Client provides 'Authentication: Bearer <token>' if (not hmac.compare_digest(request.headers.get('Authorization').removeprefix('Bearer '), v1.api_token)):
if (' ' in request.headers.get('Authorization')
and not hmac.compare_digest(request.headers.get('Authorization'), 'Bearer ' + v1.api_token)):
utils.limiter.rate_limit_ip(client_ip) utils.limiter.rate_limit_ip(client_ip)
flask.current_app.logger.warn(f'Invalid API token provided by {client_ip}.') flask.current_app.logger.warn(f'Invalid API token provided by {client_ip}.')
abort(403, 'A valid Bearer token is expected which is provided as request header') abort(403, 'Invalid API token')
#Client provides 'Authentication: <token>'
elif (' ' not in request.headers.get('Authorization')
and not hmac.compare_digest(request.headers.get('Authorization'), v1.api_token)):
utils.limiter.rate_limit_ip(client_ip)
flask.current_app.logger.warn(f'Invalid API token provided by {client_ip}.')
abort(403, 'A valid Bearer token is expected which is provided as request header')
flask.current_app.logger.info(f'Valid API token provided by {client_ip}.') flask.current_app.logger.info(f'Valid API token provided by {client_ip}.')
return func(*args, **kwds) return func(*args, **kwds)
return decorated_function return decorated_function