serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-26 08:23:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add "RcptTo" to webapi MessageGet result

Browse source 
otherwise, if the recipient was a bcc, there's no good way to see why the
message was received.

incoming webhooks already have this rcptto field, but that's not always the
moment you want to process it.

for mattanja on matrix, thanks for reporting!
This commit is contained in:
Mechiel Lukkien 2024-09-30 10:43:48 +02:00
parent a7bdc41cd4
commit b0c4b09010
No known key found for this signature in database
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapi/doc.go
View file

@ -238,9 +238,10 @@ Get a message in parsed form:
"$notjunk", "$notjunk",
"\seen" "\seen"
], ],
"MailFrom": "", "MailFrom": "mox@localhost",
"RcptTo": "mox@localhost",
"MailFromValidated": false, "MailFromValidated": false,
"MsgFrom": "", "MsgFrom": "mox@localhost",
"MsgFromValidated": false, "MsgFromValidated": false,
"DKIMVerifiedDomains": [], "DKIMVerifiedDomains": [],
"RemoteIP": "", "RemoteIP": "",

5
webapi/gendoc.sh
View file

@ -249,9 +249,10 @@ Get a message in parsed form:
"\$notjunk", "\$notjunk",
"\\seen" "\\seen"
], ],
"MailFrom": "", "MailFrom": "mox@localhost",
"RcptTo": "mox@localhost",
"MailFromValidated": false, "MailFromValidated": false,
"MsgFrom": "", "MsgFrom": "mox@localhost",
"MsgFromValidated": false, "MsgFromValidated": false,
"DKIMVerifiedDomains": [], "DKIMVerifiedDomains": [],
"RemoteIP": "", "RemoteIP": "",

3
webapi/webapi.go
View file

@ -157,8 +157,9 @@ type MessageMeta struct {
Size int64 // Total size of raw message file. Size int64 // Total size of raw message file.
DSN bool // Whether this message is a DSN. DSN bool // Whether this message is a DSN.
Flags []string // Standard message flags like \seen, \answered, $forwarded, $junk, $nonjunk, and custom keywords. Flags []string // Standard message flags like \seen, \answered, $forwarded, $junk, $nonjunk, and custom keywords.
MailFrom string // Address used during SMTP "MAIL FROM" command. MailFrom string // Address used during SMTP "MAIL FROM" command. Unicode.
MailFromValidated bool // Whether SMTP MAIL FROM address was SPF-validated. MailFromValidated bool // Whether SMTP MAIL FROM address was SPF-validated.
RcptTo string // Address delivered to with SMTP "RCPT TO" command. Unicode.
MsgFrom string // Address used in message "From" header. MsgFrom string // Address used in message "From" header.
MsgFromValidated bool // Whether address in message "From"-header was DMARC(-like) validated. MsgFromValidated bool // Whether address in message "From"-header was DMARC(-like) validated.
DKIMVerifiedDomains []string // Verified domains from DKIM-signature in message. Can be different domain than used in addresses. DKIMVerifiedDomains []string // Verified domains from DKIM-signature in message. Can be different domain than used in addresses.

5
webapisrv/server.go
View file

@ -1245,12 +1245,17 @@ func (s server) MessageGet(ctx context.Context, req webapi.MessageGetRequest) (r
if d, err := dns.ParseDomain(m.MsgFromDomain); err == nil { if d, err := dns.ParseDomain(m.MsgFromDomain); err == nil {
msgFrom = smtp.NewAddress(m.MsgFromLocalpart, d).Pack(true) msgFrom = smtp.NewAddress(m.MsgFromLocalpart, d).Pack(true)
} }
var rcptTo string
if m.RcptToDomain != "" {
rcptTo = m.RcptToLocalpart.String() + "@" + m.RcptToDomain
}
meta := webapi.MessageMeta{ meta := webapi.MessageMeta{
Size: m.Size, Size: m.Size,
DSN: m.DSN, DSN: m.DSN,
Flags: append(m.Flags.Strings(), m.Keywords...), Flags: append(m.Flags.Strings(), m.Keywords...),
MailFrom: m.MailFrom, MailFrom: m.MailFrom,
MailFromValidated: m.MailFromValidated, MailFromValidated: m.MailFromValidated,
RcptTo: rcptTo,
MsgFrom: msgFrom, MsgFrom: msgFrom,
MsgFromValidated: m.MsgFromValidated, MsgFromValidated: m.MsgFromValidated,
DKIMVerifiedDomains: m.DKIMDomains, DKIMVerifiedDomains: m.DKIMDomains,