scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-03 19:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Honor feature limitations for imap and pop3

Browse Source
This commit is contained in:
kaiyou
2017-11-21 20:46:18 +01:00
parent b6a7e04124
commit c545b8d110
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/admin/mailu/internal/nginx.py
View File

@@ -37,21 +37,26 @@ def handle_authentication(headers):
password = urllib.parse.unquote(headers["Auth-Pass"]) password = urllib.parse.unquote(headers["Auth-Pass"])
ip = urllib.parse.unquote(headers["Client-Ip"]) ip = urllib.parse.unquote(headers["Client-Ip"])
user = models.User.query.get(user_email) user = models.User.query.get(user_email)
status = False
if user: if user:
for token in user.tokens: for token in user.tokens:
if (token.check_password(password) and if (token.check_password(password) and
(not token.ip or token.ip == ip)): (not token.ip or token.ip == ip)):
return { status = True
"Auth-Status": "OK",
"Auth-Server": server,
"Auth-Port": port
}
if user.check_password(password): if user.check_password(password):
status = True
if status:
if protocol == "imap" and not user.enable_imap:
status = False
elif protocol == "pop3" and not user.enable_pop:
status = False
if status:
return { return {
"Auth-Status": "OK", "Auth-Status": "OK",
"Auth-Server": server, "Auth-Server": server,
"Auth-Port": port "Auth-Port": port
} }
else:
status, code = get_status(protocol, "authentication") status, code = get_status(protocol, "authentication")
return { return {
"Auth-Status": status, "Auth-Status": status,