scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-03 03:28:10 +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

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

@@ -37,27 +37,32 @@ 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):
return { status = True
"Auth-Status": "OK", if status:
"Auth-Server": server, if protocol == "imap" and not user.enable_imap:
"Auth-Port": port status = False
} elif protocol == "pop3" and not user.enable_pop:
status, code = get_status(protocol, "authentication") status = False
return { if status:
"Auth-Status": status, return {
"Auth-Error-Code": code, "Auth-Status": "OK",
"Auth-Wait": 0 "Auth-Server": server,
} "Auth-Port": port
}
else:
status, code = get_status(protocol, "authentication")
return {
"Auth-Status": status,
"Auth-Error-Code": code,
"Auth-Wait": 0
}
# Unexpected # Unexpected
return {} return {}