infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 08:58:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

webmail: when q/b-word-decoding attachment filenames, recognize more charset encodings

Browse Source 
based on #113 by jsfan3
This commit is contained in:
Mechiel Lukkien 2024-01-12 15:25:23 +01:00
parent aea8740e65
commit 46aacdb79b
No known key found for this signature in database
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webmail/message.go
View File

@ -9,6 +9,7 @@ import (
"strings" "strings"
"golang.org/x/exp/slog" "golang.org/x/exp/slog"
"golang.org/x/text/encoding/ianaindex"
"github.com/mjl-/mox/dns" "github.com/mjl-/mox/dns"
"github.com/mjl-/mox/message" "github.com/mjl-/mox/message"
@ -21,6 +22,23 @@ import (
// todo: we should have all needed information for messageItem in store.Message (perhaps some data in message.Part) for fast access, not having to parse the on-disk message file. // todo: we should have all needed information for messageItem in store.Message (perhaps some data in message.Part) for fast access, not having to parse the on-disk message file.
var wordDecoder = mime.WordDecoder{
CharsetReader: func(charset string, r io.Reader) (io.Reader, error) {
switch strings.ToLower(charset) {
case "", "us-ascii", "utf-8":
return r, nil
}
enc, _ := ianaindex.MIME.Encoding(charset)
if enc == nil {
enc, _ = ianaindex.IANA.Encoding(charset)
}
if enc == nil {
return r, fmt.Errorf("unknown charset %q", charset)
}
return enc.NewDecoder().Reader(r), nil
},
}
// Attempt q/b-word-decode name, coming from Content-Type "name" field or // Attempt q/b-word-decode name, coming from Content-Type "name" field or
// Content-Disposition "filename" field. // Content-Disposition "filename" field.
// //
@ -43,8 +61,7 @@ func tryDecodeParam(log mlog.Log, name string) string {
log.Debug("attachment contains rfc2047 q/b-word-encoded mime parameter instead of rfc2231-encoded", slog.String("name", name)) log.Debug("attachment contains rfc2047 q/b-word-encoded mime parameter instead of rfc2231-encoded", slog.String("name", name))
return name return name
} }
dec := mime.WordDecoder{} s, err := wordDecoder.DecodeHeader(name)
s, err := dec.DecodeHeader(name)
if err != nil { if err != nil {
log.Debugx("q/b-word decoding mime parameter", err, slog.String("name", name)) log.Debugx("q/b-word decoding mime parameter", err, slog.String("name", name))
return name return name