beenull/simple-login
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

improve logging

Browse source
This commit is contained in:
Son 2021-11-22 11:23:21 +01:00
parent 04d6ab519b
commit dc243d6027
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
email_handler.py
View file

@ -1039,15 +1039,18 @@ def handle_reply(envelope, msg: Message, rcpt_to: str) -> (bool, str):
from_header = alias.email from_header = alias.email
# add alias name from alias # add alias name from alias
if alias.name: if alias.name:
LOG.d("Put alias name in from header") LOG.d("Put alias name %s in from header", alias.name)
from_header = formataddr((alias.name, alias.email)) from_header = formataddr((alias.name, alias.email))
elif alias.custom_domain: elif alias.custom_domain:
LOG.d("Put domain default alias name in from header")
# add alias name from domain # add alias name from domain
if alias.custom_domain.name: if alias.custom_domain.name:
LOG.d(
"Put domain default alias name %s in from header",
alias.custom_domain.name,
)
from_header = formataddr((alias.custom_domain.name, alias.email)) from_header = formataddr((alias.custom_domain.name, alias.email))
LOG.d("From header is %s", from_header)
add_or_replace_header(msg, headers.FROM, from_header) add_or_replace_header(msg, headers.FROM, from_header)
replace_header_when_reply(msg, alias, headers.TO) replace_header_when_reply(msg, alias, headers.TO)
@ -1187,10 +1190,13 @@ def get_mailbox_from_mail_from(mail_from: str, alias) -> Optional[Mailbox]:
if mailbox.email == mail_from: if mailbox.email == mail_from:
return mailbox return mailbox
for addr in mailbox.authorized_addresses: for authorized_address in mailbox.authorized_addresses:
if addr.email == mail_from: if authorized_address.email == mail_from:
LOG.d( LOG.d(
"Found an authorized address for %s %s %s", alias, mailbox, address "Found an authorized address for %s %s %s",
alias,
mailbox,
authorized_address,
) )
return mailbox return mailbox