mirror of
https://github.com/mjl-/mox.git
synced 2025-07-10 07:54:40 +03:00
new feature: when delivering messages from the queue, make it possible to use a "transport"
the default transport is still just "direct delivery", where we connect to the destination domain's MX servers. other transports are: - regular smtp without authentication, this is relaying to a smarthost. - submission with authentication, e.g. to a third party email sending service. - direct delivery, but with with connections going through a socks proxy. this can be helpful if your ip is blocked, you need to get email out, and you have another IP that isn't blocked. keep in mind that for all of the above, appropriate SPF/DKIM settings have to be configured. the "dnscheck" for a domain does a check for any SOCKS IP in the SPF record. SPF for smtp/submission (ranges? includes?) and any DKIM requirements cannot really be checked. which transport is used can be configured through routes. routes can be set on an account, a domain, or globally. the routes are evaluated in that order, with the first match selecting the transport. these routes are evaluated for each delivery attempt. common selection criteria are recipient domain and sender domain, but also which delivery attempt this is. you could configured mox to attempt sending through a 3rd party from the 4th attempt onwards. routes and transports are optional. if no route matches, or an empty/zero transport is selected, normal direct delivery is done. we could already "submit" emails with 3rd party accounts with "sendmail". but we now support more SASL authentication mechanisms with SMTP (not only PLAIN, but also SCRAM-SHA-256, SCRAM-SHA-1 and CRAM-MD5), which sendmail now also supports. sendmail will use the most secure mechanism supported by the server, or the explicitly configured mechanism. for issue #36 by dmikushin. also based on earlier discussion on hackernews.
This commit is contained in:
34
main.go
34
main.go
@ -1140,19 +1140,24 @@ error.
|
||||
}
|
||||
|
||||
func cmdQueueKick(c *cmd) {
|
||||
c.params = "[-id id] [-todomain domain] [-recipient address]"
|
||||
c.params = "[-id id] [-todomain domain] [-recipient address] [-transport transport]"
|
||||
c.help = `Schedule matching messages in the queue for immediate delivery.
|
||||
|
||||
Messages deliveries are normally attempted with exponential backoff. The first
|
||||
retry after 7.5 minutes, and doubling each time. Kicking messages sets their
|
||||
next scheduled attempt to now, it can cause delivery to fail earlier than
|
||||
without rescheduling.
|
||||
|
||||
With the -transport flag, future delivery attempts are done using the specified
|
||||
transport. Transports can be configured in mox.conf, e.g. to submit to a remote
|
||||
queue over SMTP.
|
||||
`
|
||||
var id int64
|
||||
var todomain, recipient string
|
||||
var todomain, recipient, transport string
|
||||
c.flag.Int64Var(&id, "id", 0, "id of message in queue")
|
||||
c.flag.StringVar(&todomain, "todomain", "", "destination domain of messages")
|
||||
c.flag.StringVar(&recipient, "recipient", "", "recipient email address")
|
||||
c.flag.StringVar(&transport, "transport", "", "transport to use for the next delivery")
|
||||
if len(c.Parse()) != 0 {
|
||||
c.Usage()
|
||||
}
|
||||
@ -1163,6 +1168,7 @@ without rescheduling.
|
||||
ctl.xwrite(fmt.Sprintf("%d", id))
|
||||
ctl.xwrite(todomain)
|
||||
ctl.xwrite(recipient)
|
||||
ctl.xwrite(transport)
|
||||
count := ctl.xread()
|
||||
line := ctl.xread()
|
||||
if line == "ok" {
|
||||
@ -2041,27 +2047,3 @@ func cmdBumpUIDValidity(c *cmd) {
|
||||
})
|
||||
xcheckf(err, "updating database")
|
||||
}
|
||||
|
||||
var submitconf struct {
|
||||
LocalHostname string `sconf-doc:"Hosts don't always have an FQDN, set it explicitly, for EHLO."`
|
||||
Host string `sconf-doc:"Host to dial for delivery, e.g. mail.<domain>."`
|
||||
Port int `sconf-doc:"Port to dial for delivery, e.g. 465 for submissions, 587 for submission, or perhaps 25 for smtp."`
|
||||
TLS bool `sconf-doc:"Connect with TLS. Usually for connections to port 465."`
|
||||
STARTTLS bool `sconf-doc:"After starting in plain text, use STARTTLS to enable TLS. For port 587 and 25."`
|
||||
Username string `sconf-doc:"For SMTP plain auth."`
|
||||
Password string `sconf-doc:"For SMTP plain auth."`
|
||||
AuthMethod string `sconf-doc:"Ignored for now, regardless of value, AUTH PLAIN is done. This will change in the future."`
|
||||
From string `sconf-doc:"Address for MAIL FROM in SMTP and From-header in message."`
|
||||
DefaultDestination string `sconf:"optional" sconf-doc:"Used when specified address does not contain an @ and may be a local user (eg root)."`
|
||||
}
|
||||
|
||||
func cmdConfigDescribeSendmail(c *cmd) {
|
||||
c.params = ">/etc/moxsubmit.conf"
|
||||
c.help = `Describe configuration for mox when invoked as sendmail.`
|
||||
if len(c.Parse()) != 0 {
|
||||
c.Usage()
|
||||
}
|
||||
|
||||
err := sconf.Describe(os.Stdout, submitconf)
|
||||
xcheckf(err, "describe config")
|
||||
}
|
||||
|
Reference in New Issue
Block a user