2023-01-30 16:27:06 +03:00
package queue
import (
"bufio"
"context"
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.
2023-06-16 19:38:28 +03:00
"crypto/ed25519"
cryptorand "crypto/rand"
"crypto/tls"
"crypto/x509"
2023-01-30 16:27:06 +03:00
"errors"
"fmt"
"io"
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.
2023-06-16 19:38:28 +03:00
"math/big"
2023-01-30 16:27:06 +03:00
"net"
"os"
"reflect"
"strings"
"testing"
"time"
"github.com/mjl-/bstore"
"github.com/mjl-/mox/dns"
"github.com/mjl-/mox/mox-"
"github.com/mjl-/mox/smtp"
"github.com/mjl-/mox/store"
)
2023-05-22 15:40:36 +03:00
var ctxbg = context . Background ( )
2023-01-30 16:27:06 +03:00
func tcheck ( t * testing . T , err error , msg string ) {
if err != nil {
t . Helper ( )
t . Fatalf ( "%s: %s" , msg , err )
}
}
func setup ( t * testing . T ) ( * store . Account , func ( ) ) {
// Prepare config so email can be delivered to mjl@mox.example.
os . RemoveAll ( "../testdata/queue/data" )
2023-05-22 15:40:36 +03:00
mox . Context = ctxbg
2023-01-30 16:27:06 +03:00
mox . ConfigStaticPath = "../testdata/queue/mox.conf"
2023-06-16 14:27:27 +03:00
mox . MustLoadConfig ( true , false )
2023-01-30 16:27:06 +03:00
acc , err := store . OpenAccount ( "mjl" )
tcheck ( t , err , "open account" )
err = acc . SetPassword ( "testtest" )
tcheck ( t , err , "set password" )
switchDone := store . Switchboard ( )
2023-05-22 15:40:36 +03:00
mox . Shutdown , mox . ShutdownCancel = context . WithCancel ( ctxbg )
2023-01-30 16:27:06 +03:00
return acc , func ( ) {
acc . Close ( )
2023-02-16 11:57:27 +03:00
mox . ShutdownCancel ( )
2023-05-22 15:40:36 +03:00
mox . Shutdown , mox . ShutdownCancel = context . WithCancel ( ctxbg )
2023-01-30 16:27:06 +03:00
Shutdown ( )
close ( switchDone )
}
}
var testmsg = strings . ReplaceAll ( ` From : < mjl @ mox . example >
To : < mjl @ mox . example >
Subject : test
test email
` , "\n" , "\r\n" )
func prepareFile ( t * testing . T ) * os . File {
t . Helper ( )
msgFile , err := store . CreateMessageTemp ( "queue" )
tcheck ( t , err , "create temp message for delivery to queue" )
_ , err = msgFile . Write ( [ ] byte ( testmsg ) )
tcheck ( t , err , "write message file" )
return msgFile
}
func TestQueue ( t * testing . T ) {
acc , cleanup := setup ( t )
defer cleanup ( )
err := Init ( )
tcheck ( t , err , "queue init" )
2023-05-22 15:40:36 +03:00
msgs , err := List ( ctxbg )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "listing messages in queue" )
if len ( msgs ) != 0 {
t . Fatalf ( "got %d messages in queue, expected 0" , len ( msgs ) )
}
path := smtp . Path { Localpart : "mjl" , IPDomain : dns . IPDomain { Domain : dns . Domain { ASCII : "mox.example" } } }
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.
2023-06-16 19:38:28 +03:00
_ , err = Add ( ctxbg , xlog , "mjl" , path , path , false , false , int64 ( len ( testmsg ) ) , nil , prepareFile ( t ) , nil , true )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "add message to queue for delivery" )
mf2 := prepareFile ( t )
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.
2023-06-16 19:38:28 +03:00
_ , err = Add ( ctxbg , xlog , "mjl" , path , path , false , false , int64 ( len ( testmsg ) ) , nil , mf2 , nil , false )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "add message to queue for delivery" )
os . Remove ( mf2 . Name ( ) )
2023-05-22 15:40:36 +03:00
msgs , err = List ( ctxbg )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "listing queue" )
if len ( msgs ) != 2 {
t . Fatalf ( "got msgs %v, expected 1" , msgs )
}
msg := msgs [ 0 ]
if msg . Attempts != 0 {
t . Fatalf ( "msg attempts %d, expected 0" , msg . Attempts )
}
2023-05-22 15:40:36 +03:00
n , err := Drop ( ctxbg , msgs [ 1 ] . ID , "" , "" )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "drop" )
if n != 1 {
t . Fatalf ( "dropped %d, expected 1" , n )
}
2023-05-22 16:03:23 +03:00
if _ , err := os . Stat ( msgs [ 1 ] . MessagePath ( ) ) ; err == nil || ! os . IsNotExist ( err ) {
t . Fatalf ( "dropped message not removed from file system" )
}
2023-01-30 16:27:06 +03:00
2023-05-22 15:40:36 +03:00
next := nextWork ( ctxbg , nil )
2023-01-30 16:27:06 +03:00
if next > 0 {
t . Fatalf ( "nextWork in %s, should be now" , next )
}
busy := map [ string ] struct { } { "mox.example" : { } }
2023-05-22 15:40:36 +03:00
if x := nextWork ( ctxbg , busy ) ; x != 24 * time . Hour {
2023-01-30 16:27:06 +03:00
t . Fatalf ( "nextWork in %s for busy domain, should be in 24 hours" , x )
}
if nn := launchWork ( nil , busy ) ; nn != 0 {
t . Fatalf ( "launchWork launched %d deliveries, expected 0" , nn )
}
// Override dial function. We'll make connecting fail for now.
resolver := dns . MockResolver {
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.
2023-06-16 19:38:28 +03:00
A : map [ string ] [ ] string {
"mox.example." : { "127.0.0.1" } ,
"submission.example." : { "127.0.0.1" } ,
} ,
2023-01-30 16:27:06 +03:00
MX : map [ string ] [ ] * net . MX { "mox.example." : { { Host : "mox.example" , Pref : 10 } } } ,
}
dialed := make ( chan struct { } , 1 )
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.
2023-06-16 19:38:28 +03:00
dial = func ( ctx context . Context , dialer contextDialer , timeout time . Duration , addr string , laddr net . Addr ) ( net . Conn , error ) {
2023-01-30 16:27:06 +03:00
dialed <- struct { } { }
return nil , fmt . Errorf ( "failure from test" )
}
launchWork ( resolver , map [ string ] struct { } { } )
// Wait until we see the dial and the failed attempt.
timer := time . NewTimer ( time . Second )
defer timer . Stop ( )
select {
case <- dialed :
i := 0
for {
add a "backup" subcommand to make consistent backups, and a "verifydata" subcommand to verify a backup before restoring, and add tests for future upgrades
the backup command will make consistent snapshots of all the database files. i
had been copying the db files before, and it usually works. but if the file is
modified during the backup, it is inconsistent and is likely to generate errors
when reading (can be at any moment in the future, when reading some db page).
"mox backup" opens the database file and writes out a copy in a transaction.
it also duplicates the message files.
before doing a restore, you could run "mox verifydata" on the to-be-restored
"data" directory. it check the database files, and compares the message files
with the database.
the new "gentestdata" subcommand generates a basic "data" directory, with a
queue and a few accounts. we will use it in the future along with "verifydata"
to test upgrades from old version to the latest version. both when going to the
next version, and when skipping several versions. the script test-upgrades.sh
executes these tests and doesn't do anything at the moment, because no releases
have this subcommand yet.
inspired by a failed upgrade attempt of a pre-release version.
2023-05-26 20:26:51 +03:00
m , err := bstore . QueryDB [ Msg ] ( ctxbg , DB ) . Get ( )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "get" )
if m . Attempts == 1 {
break
}
i ++
if i == 10 {
t . Fatalf ( "message in queue not updated" )
}
time . Sleep ( 100 * time . Millisecond )
}
case <- timer . C :
t . Fatalf ( "no dial within 1s" )
}
<- deliveryResult // Deliver sends here.
2023-05-22 15:40:36 +03:00
_ , err = OpenMessage ( ctxbg , msg . ID + 1 )
2023-01-30 16:27:06 +03:00
if err != bstore . ErrAbsent {
t . Fatalf ( "OpenMessage, got %v, expected ErrAbsent" , err )
}
2023-05-22 15:40:36 +03:00
reader , err := OpenMessage ( ctxbg , msg . ID )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "open message" )
defer reader . Close ( )
msgbuf , err := io . ReadAll ( reader )
tcheck ( t , err , "read message" )
if string ( msgbuf ) != testmsg {
t . Fatalf ( "message mismatch, got %q, expected %q" , string ( msgbuf ) , testmsg )
}
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.
2023-06-16 19:38:28 +03:00
n , err = Kick ( ctxbg , msg . ID + 1 , "" , "" , nil )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "kick" )
if n != 0 {
t . Fatalf ( "kick %d, expected 0" , n )
}
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.
2023-06-16 19:38:28 +03:00
n , err = Kick ( ctxbg , msg . ID , "" , "" , nil )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "kick" )
if n != 1 {
t . Fatalf ( "kicked %d, expected 1" , n )
}
smtpdone := make ( chan struct { } )
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.
2023-06-16 19:38:28 +03:00
fakeSMTPServer := func ( server net . Conn ) {
2023-01-30 16:27:06 +03:00
// We do a minimal fake smtp server. We cannot import smtpserver.Serve due to cyclic dependencies.
fmt . Fprintf ( server , "220 mox.example\r\n" )
br := bufio . NewReader ( server )
br . ReadString ( '\n' ) // Should be EHLO.
fmt . Fprintf ( server , "250 ok\r\n" )
br . ReadString ( '\n' ) // Should be MAIL FROM.
fmt . Fprintf ( server , "250 ok\r\n" )
br . ReadString ( '\n' ) // Should be RCPT TO.
fmt . Fprintf ( server , "250 ok\r\n" )
br . ReadString ( '\n' ) // Should be DATA.
fmt . Fprintf ( server , "354 continue\r\n" )
reader := smtp . NewDataReader ( br )
io . Copy ( io . Discard , reader )
fmt . Fprintf ( server , "250 ok\r\n" )
br . ReadString ( '\n' ) // Should be QUIT.
fmt . Fprintf ( server , "221 ok\r\n" )
smtpdone <- struct { } { }
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.
2023-06-16 19:38:28 +03:00
}
2023-01-30 16:27:06 +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.
2023-06-16 19:38:28 +03:00
fakeSubmitServer := func ( server net . Conn ) {
// We do a minimal fake smtp server. We cannot import smtpserver.Serve due to cyclic dependencies.
fmt . Fprintf ( server , "220 mox.example\r\n" )
br := bufio . NewReader ( server )
br . ReadString ( '\n' ) // Should be EHLO.
fmt . Fprintf ( server , "250-localhost\r\n" )
fmt . Fprintf ( server , "250 AUTH PLAIN\r\n" )
br . ReadString ( '\n' ) // Should be AUTH PLAIN
fmt . Fprintf ( server , "235 2.7.0 auth ok\r\n" )
br . ReadString ( '\n' ) // Should be MAIL FROM.
fmt . Fprintf ( server , "250 ok\r\n" )
br . ReadString ( '\n' ) // Should be RCPT TO.
fmt . Fprintf ( server , "250 ok\r\n" )
br . ReadString ( '\n' ) // Should be DATA.
fmt . Fprintf ( server , "354 continue\r\n" )
reader := smtp . NewDataReader ( br )
io . Copy ( io . Discard , reader )
fmt . Fprintf ( server , "250 ok\r\n" )
br . ReadString ( '\n' ) // Should be QUIT.
fmt . Fprintf ( server , "221 ok\r\n" )
smtpdone <- struct { } { }
2023-01-30 16:27:06 +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.
2023-06-16 19:38:28 +03:00
testDeliver := func ( fakeServer func ( conn net . Conn ) ) bool {
t . Helper ( )
// Setting up a pipe. We'll start a fake smtp server on the server-side. And return the
// client-side to the invocation dial, for the attempted delivery from the queue.
// The delivery should succeed.
server , client := net . Pipe ( )
defer server . Close ( )
defer client . Close ( )
var wasNetDialer bool
dial = func ( ctx context . Context , dialer contextDialer , timeout time . Duration , addr string , laddr net . Addr ) ( net . Conn , error ) {
_ , wasNetDialer = dialer . ( * net . Dialer )
dialed <- struct { } { }
return client , nil
}
waitDeliver := func ( ) {
t . Helper ( )
timer . Reset ( time . Second )
select {
case <- dialed :
select {
case <- smtpdone :
i := 0
for {
xmsgs , err := List ( ctxbg )
tcheck ( t , err , "list queue" )
if len ( xmsgs ) == 0 {
break
}
i ++
if i == 10 {
t . Fatalf ( "%d messages in queue, expected 0" , len ( xmsgs ) )
}
time . Sleep ( 100 * time . Millisecond )
}
case <- timer . C :
t . Fatalf ( "no deliver within 1s" )
2023-01-30 16:27:06 +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.
2023-06-16 19:38:28 +03:00
case <- timer . C :
t . Fatalf ( "no dial within 1s" )
2023-01-30 16:27:06 +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.
2023-06-16 19:38:28 +03:00
<- deliveryResult // Deliver sends here.
2023-01-30 16:27:06 +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.
2023-06-16 19:38:28 +03:00
go fakeServer ( server )
launchWork ( resolver , map [ string ] struct { } { } )
waitDeliver ( )
return wasNetDialer
}
// Test direct delivery.
wasNetDialer := testDeliver ( fakeSMTPServer )
if ! wasNetDialer {
t . Fatalf ( "expected net.Dialer as dialer" )
}
// Add a message to be delivered with submit because of its route.
topath := smtp . Path { Localpart : "mjl" , IPDomain : dns . IPDomain { Domain : dns . Domain { ASCII : "submit.example" } } }
_ , err = Add ( ctxbg , xlog , "mjl" , path , topath , false , false , int64 ( len ( testmsg ) ) , nil , prepareFile ( t ) , nil , true )
tcheck ( t , err , "add message to queue for delivery" )
wasNetDialer = testDeliver ( fakeSubmitServer )
if ! wasNetDialer {
t . Fatalf ( "expected net.Dialer as dialer" )
}
// Add a message to be delivered with submit because of explicitly configured transport, that uses TLS.
msgID , err := Add ( ctxbg , xlog , "mjl" , path , path , false , false , int64 ( len ( testmsg ) ) , nil , prepareFile ( t ) , nil , true )
tcheck ( t , err , "add message to queue for delivery" )
transportSubmitTLS := "submittls"
n , err = Kick ( ctxbg , msgID , "" , "" , & transportSubmitTLS )
tcheck ( t , err , "kick queue" )
if n != 1 {
t . Fatalf ( "kick changed %d messages, expected 1" , n )
}
// Make fake cert, and make it trusted.
cert := fakeCert ( t , "submission.example" , false )
mox . Conf . Static . TLS . CertPool = x509 . NewCertPool ( )
mox . Conf . Static . TLS . CertPool . AddCert ( cert . Leaf )
tlsConfig := tls . Config {
Certificates : [ ] tls . Certificate { cert } ,
}
wasNetDialer = testDeliver ( func ( conn net . Conn ) {
conn = tls . Server ( conn , & tlsConfig )
fakeSubmitServer ( conn )
} )
if ! wasNetDialer {
t . Fatalf ( "expected net.Dialer as dialer" )
}
// Add a message to be delivered with socks.
msgID , err = Add ( ctxbg , xlog , "mjl" , path , path , false , false , int64 ( len ( testmsg ) ) , nil , prepareFile ( t ) , nil , true )
tcheck ( t , err , "add message to queue for delivery" )
transportSocks := "socks"
n , err = Kick ( ctxbg , msgID , "" , "" , & transportSocks )
tcheck ( t , err , "kick queue" )
if n != 1 {
t . Fatalf ( "kick changed %d messages, expected 1" , n )
}
wasNetDialer = testDeliver ( fakeSMTPServer )
if wasNetDialer {
t . Fatalf ( "expected non-net.Dialer as dialer" ) // SOCKS5 dialer is a private type, we cannot check for it.
2023-01-30 16:27:06 +03:00
}
// Add another message that we'll fail to deliver entirely.
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.
2023-06-16 19:38:28 +03:00
_ , err = Add ( ctxbg , xlog , "mjl" , path , path , false , false , int64 ( len ( testmsg ) ) , nil , prepareFile ( t ) , nil , true )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "add message to queue for delivery" )
2023-05-22 15:40:36 +03:00
msgs , err = List ( ctxbg )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "list queue" )
if len ( msgs ) != 1 {
t . Fatalf ( "queue has %d messages, expected 1" , len ( msgs ) )
}
msg = msgs [ 0 ]
prepServer := func ( code string ) ( net . Conn , func ( ) ) {
server , client := net . Pipe ( )
go func ( ) {
fmt . Fprintf ( server , "%s mox.example\r\n" , code )
server . Close ( )
} ( )
return client , func ( ) {
server . Close ( )
client . Close ( )
}
}
conn2 , cleanup2 := prepServer ( "220" )
conn3 , cleanup3 := prepServer ( "451" )
defer func ( ) {
cleanup2 ( )
cleanup3 ( )
} ( )
seq := 0
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.
2023-06-16 19:38:28 +03:00
dial = func ( ctx context . Context , dialer contextDialer , timeout time . Duration , addr string , laddr net . Addr ) ( net . Conn , error ) {
2023-01-30 16:27:06 +03:00
seq ++
switch seq {
default :
return nil , fmt . Errorf ( "connect error from test" )
case 2 :
return conn2 , nil
case 3 :
return conn3 , nil
}
}
comm := store . RegisterComm ( acc )
defer comm . Unregister ( )
for i := 1 ; i < 8 ; i ++ {
go func ( ) { <- deliveryResult } ( ) // Deliver sends here.
deliver ( resolver , msg )
add a "backup" subcommand to make consistent backups, and a "verifydata" subcommand to verify a backup before restoring, and add tests for future upgrades
the backup command will make consistent snapshots of all the database files. i
had been copying the db files before, and it usually works. but if the file is
modified during the backup, it is inconsistent and is likely to generate errors
when reading (can be at any moment in the future, when reading some db page).
"mox backup" opens the database file and writes out a copy in a transaction.
it also duplicates the message files.
before doing a restore, you could run "mox verifydata" on the to-be-restored
"data" directory. it check the database files, and compares the message files
with the database.
the new "gentestdata" subcommand generates a basic "data" directory, with a
queue and a few accounts. we will use it in the future along with "verifydata"
to test upgrades from old version to the latest version. both when going to the
next version, and when skipping several versions. the script test-upgrades.sh
executes these tests and doesn't do anything at the moment, because no releases
have this subcommand yet.
inspired by a failed upgrade attempt of a pre-release version.
2023-05-26 20:26:51 +03:00
err = DB . Get ( ctxbg , & msg )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "get msg" )
if msg . Attempts != i {
t . Fatalf ( "got attempt %d, expected %d" , msg . Attempts , i )
}
if msg . Attempts == 5 {
timer . Reset ( time . Second )
changes := make ( chan struct { } , 1 )
go func ( ) {
comm . Get ( )
changes <- struct { } { }
} ( )
select {
case <- changes :
case <- timer . C :
t . Fatalf ( "no dsn in 1s" )
}
}
}
// Trigger final failure.
go func ( ) { <- deliveryResult } ( ) // Deliver sends here.
deliver ( resolver , msg )
add a "backup" subcommand to make consistent backups, and a "verifydata" subcommand to verify a backup before restoring, and add tests for future upgrades
the backup command will make consistent snapshots of all the database files. i
had been copying the db files before, and it usually works. but if the file is
modified during the backup, it is inconsistent and is likely to generate errors
when reading (can be at any moment in the future, when reading some db page).
"mox backup" opens the database file and writes out a copy in a transaction.
it also duplicates the message files.
before doing a restore, you could run "mox verifydata" on the to-be-restored
"data" directory. it check the database files, and compares the message files
with the database.
the new "gentestdata" subcommand generates a basic "data" directory, with a
queue and a few accounts. we will use it in the future along with "verifydata"
to test upgrades from old version to the latest version. both when going to the
next version, and when skipping several versions. the script test-upgrades.sh
executes these tests and doesn't do anything at the moment, because no releases
have this subcommand yet.
inspired by a failed upgrade attempt of a pre-release version.
2023-05-26 20:26:51 +03:00
err = DB . Get ( ctxbg , & msg )
2023-01-30 16:27:06 +03:00
if err != bstore . ErrAbsent {
t . Fatalf ( "attempt to fetch delivered and removed message from queue, got err %v, expected ErrAbsent" , err )
}
timer . Reset ( time . Second )
changes := make ( chan struct { } , 1 )
go func ( ) {
comm . Get ( )
changes <- struct { } { }
} ( )
select {
case <- changes :
case <- timer . C :
t . Fatalf ( "no dsn in 1s" )
}
}
// test Start and that it attempts to deliver.
func TestQueueStart ( t * testing . T ) {
// Override dial function. We'll make connecting fail and check the attempt.
resolver := dns . MockResolver {
A : map [ string ] [ ] string { "mox.example." : { "127.0.0.1" } } ,
MX : map [ string ] [ ] * net . MX { "mox.example." : { { Host : "mox.example" , Pref : 10 } } } ,
}
dialed := make ( chan struct { } , 1 )
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.
2023-06-16 19:38:28 +03:00
dial = func ( ctx context . Context , dialer contextDialer , timeout time . Duration , addr string , laddr net . Addr ) ( net . Conn , error ) {
2023-01-30 16:27:06 +03:00
dialed <- struct { } { }
return nil , fmt . Errorf ( "failure from test" )
}
_ , cleanup := setup ( t )
defer cleanup ( )
done := make ( chan struct { } , 1 )
defer func ( ) {
2023-02-16 11:57:27 +03:00
mox . ShutdownCancel ( )
2023-01-30 16:27:06 +03:00
<- done
2023-05-22 15:40:36 +03:00
mox . Shutdown , mox . ShutdownCancel = context . WithCancel ( ctxbg )
2023-01-30 16:27:06 +03:00
} ( )
err := Start ( resolver , done )
tcheck ( t , err , "queue start" )
checkDialed := func ( need bool ) {
t . Helper ( )
d := time . Second / 10
if need {
d = time . Second
}
timer := time . NewTimer ( d )
defer timer . Stop ( )
select {
case <- dialed :
if ! need {
t . Fatalf ( "unexpected dial attempt" )
}
case <- timer . C :
if need {
t . Fatalf ( "expected to see a dial attempt" )
}
}
}
path := smtp . Path { Localpart : "mjl" , IPDomain : dns . IPDomain { Domain : dns . Domain { ASCII : "mox.example" } } }
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.
2023-06-16 19:38:28 +03:00
_ , err = Add ( ctxbg , xlog , "mjl" , path , path , false , false , int64 ( len ( testmsg ) ) , nil , prepareFile ( t ) , nil , true )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "add message to queue for delivery" )
checkDialed ( true )
// Don't change message nextattempt time, but kick queue. Message should not be delivered.
queuekick ( )
checkDialed ( false )
// Kick for real, should see another attempt.
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.
2023-06-16 19:38:28 +03:00
n , err := Kick ( ctxbg , 0 , "mox.example" , "" , nil )
2023-01-30 16:27:06 +03:00
tcheck ( t , err , "kick queue" )
if n != 1 {
t . Fatalf ( "kick changed %d messages, expected 1" , n )
}
checkDialed ( true )
time . Sleep ( 100 * time . Millisecond ) // Racy... we won't get notified when work is done...
}
func TestWriteFile ( t * testing . T ) {
name := "../testdata/queue.test"
os . Remove ( name )
defer os . Remove ( name )
err := writeFile ( name , strings . NewReader ( "test" ) )
if err != nil {
t . Fatalf ( "writeFile, unexpected error %v" , err )
}
buf , err := os . ReadFile ( name )
if err != nil || string ( buf ) != "test" {
t . Fatalf ( "writeFile, read file, got err %v, data %q" , err , buf )
}
}
func TestGatherHosts ( t * testing . T ) {
2023-05-22 15:40:36 +03:00
mox . Context = ctxbg
2023-01-30 16:27:06 +03:00
// Test basic MX lookup case, but also following CNAME, detecting CNAME loops and
// having a CNAME limit, connecting directly to a host, and domain that does not
// exist or has temporary error.
resolver := dns . MockResolver {
MX : map [ string ] [ ] * net . MX {
"basic.example." : { { Host : "mail.basic.example." , Pref : 10 } } ,
"multimx.example." : { { Host : "mail1.multimx.example." , Pref : 10 } , { Host : "mail2.multimx.example." , Pref : 10 } } ,
"nullmx.example." : { { Host : "." , Pref : 10 } } ,
"temperror-mx.example." : { { Host : "absent.example." , Pref : 10 } } ,
} ,
A : map [ string ] [ ] string {
"mail.basic.example" : { "10.0.0.1" } ,
"justhost.example." : { "10.0.0.1" } , // No MX record for domain, only an A record.
"temperror-a.example." : { "10.0.0.1" } ,
} ,
AAAA : map [ string ] [ ] string {
"justhost6.example." : { "2001:db8::1" } , // No MX record for domain, only an AAAA record.
} ,
CNAME : map [ string ] string {
"cname.example." : "basic.example." ,
"cnameloop.example." : "cnameloop2.example." ,
"cnameloop2.example." : "cnameloop.example." ,
"danglingcname.example." : "absent.example." , // Points to missing name.
"temperror-cname.example." : "absent.example." ,
} ,
Fail : map [ dns . Mockreq ] struct { } {
{ Type : "mx" , Name : "temperror-mx.example." } : { } ,
{ Type : "host" , Name : "temperror-a.example." } : { } ,
{ Type : "cname" , Name : "temperror-cname.example." } : { } ,
} ,
}
for i := 0 ; i <= 16 ; i ++ {
s := fmt . Sprintf ( "cnamelimit%d.example." , i )
next := fmt . Sprintf ( "cnamelimit%d.example." , i + 1 )
resolver . CNAME [ s ] = next
}
test := func ( ipd dns . IPDomain , expHosts [ ] dns . IPDomain , expDomain dns . Domain , expPerm bool , expErr error ) {
t . Helper ( )
m := Msg { RecipientDomain : ipd }
hosts , ed , perm , err := gatherHosts ( resolver , m , 1 , xlog )
if ( err == nil ) != ( expErr == nil ) || err != nil && ! errors . Is ( err , expErr ) {
// todo: could also check the individual errors? code currently does not have structured errors.
t . Fatalf ( "gather hosts: %v" , err )
}
if err != nil {
return
}
if ! reflect . DeepEqual ( hosts , expHosts ) || ed != expDomain || perm != expPerm {
t . Fatalf ( "got hosts %#v, effectiveDomain %#v, permanent %#v, expected %#v %#v %#v" , hosts , ed , perm , expHosts , expDomain , expPerm )
}
}
domain := func ( s string ) dns . Domain {
d , err := dns . ParseDomain ( s )
if err != nil {
t . Fatalf ( "parse domain: %v" , err )
}
return d
}
ipdomain := func ( s string ) dns . IPDomain {
ip := net . ParseIP ( s )
if ip != nil {
return dns . IPDomain { IP : ip }
}
d , err := dns . ParseDomain ( s )
if err != nil {
t . Fatalf ( "parse domain %q: %v" , s , err )
}
return dns . IPDomain { Domain : d }
}
ipdomains := func ( s ... string ) ( l [ ] dns . IPDomain ) {
for _ , e := range s {
l = append ( l , ipdomain ( e ) )
}
return
}
var zerodom dns . Domain
test ( ipdomain ( "10.0.0.1" ) , ipdomains ( "10.0.0.1" ) , zerodom , false , nil )
test ( ipdomain ( "basic.example" ) , ipdomains ( "mail.basic.example" ) , domain ( "basic.example" ) , false , nil ) // Basic with simple MX.
test ( ipdomain ( "multimx.example" ) , ipdomains ( "mail1.multimx.example" , "mail2.multimx.example" ) , domain ( "multimx.example" ) , false , nil ) // Basic with simple MX.
test ( ipdomain ( "justhost.example" ) , ipdomains ( "justhost.example" ) , domain ( "justhost.example" ) , false , nil ) // Only an A record.
test ( ipdomain ( "justhost6.example" ) , ipdomains ( "justhost6.example" ) , domain ( "justhost6.example" ) , false , nil ) // Only an AAAA record.
test ( ipdomain ( "cname.example" ) , ipdomains ( "mail.basic.example" ) , domain ( "basic.example" ) , false , nil ) // Follow CNAME.
test ( ipdomain ( "cnamelimit1.example" ) , nil , zerodom , true , errCNAMELimit )
test ( ipdomain ( "cnameloop.example" ) , nil , zerodom , true , errCNAMELoop )
test ( ipdomain ( "absent.example" ) , nil , zerodom , true , errNoRecord )
test ( ipdomain ( "danglingcname.example" ) , nil , zerodom , true , errNoRecord )
test ( ipdomain ( "nullmx.example" ) , nil , zerodom , true , errNoMail )
test ( ipdomain ( "temperror-mx.example" ) , nil , zerodom , false , errDNS )
test ( ipdomain ( "temperror-cname.example" ) , nil , zerodom , false , errDNS )
test ( ipdomain ( "temperror-a.example" ) , nil , zerodom , false , errDNS )
}
func TestDialHost ( t * testing . T ) {
// We mostly want to test that dialing a second time switches to the other address family.
resolver := dns . MockResolver {
A : map [ string ] [ ] string {
"dualstack.example." : { "10.0.0.1" } ,
} ,
AAAA : map [ string ] [ ] string {
"dualstack.example." : { "2001:db8::1" } ,
} ,
}
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.
2023-06-16 19:38:28 +03:00
dial = func ( ctx context . Context , dialer contextDialer , timeout time . Duration , addr string , laddr net . Addr ) ( net . Conn , error ) {
2023-01-30 16:27:06 +03:00
return nil , nil // No error, nil connection isn't used.
}
ipdomain := func ( s string ) dns . IPDomain {
return dns . IPDomain { Domain : dns . Domain { ASCII : s } }
}
m := Msg { DialedIPs : map [ string ] [ ] net . IP { } }
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.
2023-06-16 19:38:28 +03:00
_ , ip , dualstack , err := dialHost ( ctxbg , xlog , resolver , nil , ipdomain ( "dualstack.example" ) , 25 , & m )
2023-01-30 16:27:06 +03:00
if err != nil || ip . String ( ) != "10.0.0.1" || ! dualstack {
t . Fatalf ( "expected err nil, address 10.0.0.1, dualstack true, got %v %v %v" , err , ip , dualstack )
}
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.
2023-06-16 19:38:28 +03:00
_ , ip , dualstack , err = dialHost ( ctxbg , xlog , resolver , nil , ipdomain ( "dualstack.example" ) , 25 , & m )
2023-01-30 16:27:06 +03:00
if err != nil || ip . String ( ) != "2001:db8::1" || ! dualstack {
t . Fatalf ( "expected err nil, address 2001:db8::1, dualstack true, got %v %v %v" , err , ip , dualstack )
}
}
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.
2023-06-16 19:38:28 +03:00
// Just a cert that appears valid.
func fakeCert ( t * testing . T , name string , expired bool ) tls . Certificate {
notAfter := time . Now ( )
if expired {
notAfter = notAfter . Add ( - time . Hour )
} else {
notAfter = notAfter . Add ( time . Hour )
}
privKey := ed25519 . NewKeyFromSeed ( make ( [ ] byte , ed25519 . SeedSize ) ) // Fake key, don't use this for real!
template := & x509 . Certificate {
SerialNumber : big . NewInt ( 1 ) , // Required field...
DNSNames : [ ] string { name } ,
NotBefore : time . Now ( ) . Add ( - time . Hour ) ,
NotAfter : notAfter ,
}
localCertBuf , err := x509 . CreateCertificate ( cryptorand . Reader , template , template , privKey . Public ( ) , privKey )
if err != nil {
t . Fatalf ( "making certificate: %s" , err )
}
cert , err := x509 . ParseCertificate ( localCertBuf )
if err != nil {
t . Fatalf ( "parsing generated certificate: %s" , err )
}
c := tls . Certificate {
Certificate : [ ] [ ] byte { localCertBuf } ,
PrivateKey : privKey ,
Leaf : cert ,
}
return c
}