infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-10 06:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

recognize more charsets than utf-8/iso-8859-1/us-ascii when parsing message headers with address

Browse Source 
as they occur in From/To headers, for example: "From:
=?iso-8859-2?Q?Krist=FDna?= <k@example.com>".  we are using net/mail to parse
such headers. most address-parsing functions in that package will only decode
charsets utf-8, iso-8859-1 and us-ascii. we have to be careful to always use
net/mail.AddressParser with a WordDecoder that understands more that the
basics.

for issue #204 by morki, thanks for reporting!
This commit is contained in:
Mechiel Lukkien
2024-08-22 17:36:49 +02:00
parent 0bb4501472
commit 5678b03324
6 changed files with 64 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webmail/api.go
View File

@ -517,13 +517,14 @@ type File struct {
// parseAddress expects either a plain email address like "user@domain", or a
// single address as used in a message header, like "name <user@domain>".
func parseAddress(msghdr string) (message.NameAddress, error) {
a, err := mail.ParseAddress(msghdr)
// todo: parse more fully according to ../rfc/5322:959
parser := mail.AddressParser{WordDecoder: &wordDecoder}
a, err := parser.Parse(msghdr)
if err != nil {
return message.NameAddress{}, err
}
// todo: parse more fully according to ../rfc/5322:959
path, err := smtp.ParseAddress(a.Address)
path, err := smtp.ParseNetMailAddress(a.Address)
if err != nil {
return message.NameAddress{}, err
}
@ -1658,12 +1659,12 @@ func recipientSecurity(ctx context.Context, log mlog.Log, resolver dns.Resolver,
SecurityResultUnknown,
}
msgAddr, err := mail.ParseAddress(messageAddressee)
parser := mail.AddressParser{WordDecoder: &wordDecoder}
msgAddr, err := parser.Parse(messageAddressee)
if err != nil {
return rs, fmt.Errorf("parsing message addressee: %v", err)
return rs, fmt.Errorf("parsing addressee: %v", err)
}
addr, err := smtp.ParseAddress(msgAddr.Address)
addr, err := smtp.ParseNetMailAddress(msgAddr.Address)
if err != nil {
return rs, fmt.Errorf("parsing address: %v", err)
}