mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 13:37:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

storage/imapsql: Implement delivery_map in addition to auth_map

Browse source
This commit is contained in:
fox.cpp 2021-08-09 09:47:29 +03:00
parent ef63383248
commit ce896c7036
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
4 changed files with 123 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
docs/man/maddy-storage.5.scd
View file

@ -157,8 +157,25 @@ imap_filters {
}
```
*Syntax:* delivery_map *table* ++
*Default:* identity
Use specified table module (*maddy-tables*(5)) to map recipient
addresses from incoming messages to mailbox names.
Normalization algorithm specified in delivery_normalize is appied before
delivery_map.
*Syntax:* delivery_normalize _name_ ++
*Default:* precis_casefold_email
Normalization function to apply to email addresses before mapping them
to mailboxes.
See auth_normalize.
*Syntax*: auth_map *table* ++
*Default*: not set
*Default*: identity
Use specified table module (*maddy-tables*(5)) to map authentication
usernames to mailbox names.
@ -166,13 +183,6 @@ usernames to mailbox names.
Normalization algorithm specified in auth_normalize is applied before
auth_map.
imapsql unconditionally requires a full email as an account name as they are
used to determine the right mailboxes for inbound messages. If you do not
want domain-specific accounts then you can use a dummy domain like
foxcpp@maddy.invalid. But you will need to ensure that on delivery recipient
addresses are rewritten appropriately (e.g.
foxcpp@example.org => foxcpp@maddy.invalid).
*Syntax*: auth_normalize _name_ ++
*Default*: precis_casefold_email

2
internal/storage/imapsql/delivery.go
View file

@ -58,7 +58,7 @@ func userDoesNotExist(actual error) error {
func (d *delivery) AddRcpt(ctx context.Context, rcptTo string) error {
defer trace.StartRegion(ctx, "sql/AddRcpt").End()
accountName, err := d.store.deliveryNormalize(rcptTo)
accountName, err := d.store.deliveryNormalize(ctx, rcptTo)
if err != nil {
return userDoesNotExist(err)
}

40
internal/storage/imapsql/imapsql.go
View file

@ -70,7 +70,8 @@ type Storage struct {
filters module.IMAPFilter
deliveryNormalize func(string) (string, error)
deliveryMap module.Table
deliveryNormalize func(context.Context, string) (string, error)
authMap module.Table
authNormalize func(context.Context, string) (string, error)
}
@ -102,11 +103,12 @@ func New(_, instName string, _, inlineArgs []string) (module.Module, error) {
func (store *Storage) Init(cfg *config.Map) error {
var (
driver string
dsn []string
appendlimitVal = -1
compression []string
authNormalize string
driver string
dsn []string
appendlimitVal = -1
compression []string
authNormalize string
deliveryNormalize string
blobStore module.BlobStore
)
@ -152,6 +154,10 @@ func (store *Storage) Init(cfg *config.Map) error {
return nil, nil
}, modconfig.TableDirective, &store.authMap)
cfg.String("auth_normalize", false, false, "precis_casefold_email", &authNormalize)
cfg.Custom("delivery_map", false, false, func() (interface{}, error) {
return nil, nil
}, modconfig.TableDirective, &store.deliveryMap)
cfg.String("delivery_normalize", false, false, "precis_casefold_email", &deliveryNormalize)
if _, err := cfg.Process(); err != nil {
return err
@ -164,7 +170,27 @@ func (store *Storage) Init(cfg *config.Map) error {
return errors.New("imapsql: driver is required")
}
store.deliveryNormalize = authz.NormalizeFuncs["precis_casefold_email"]
deliveryNormFunc, ok := authz.NormalizeFuncs[deliveryNormalize]
if !ok {
return errors.New("imapsql: unknown normalization function: " + deliveryNormalize)
}
store.deliveryNormalize = func(ctx context.Context, s string) (string, error) {
return deliveryNormFunc(s)
}
if store.deliveryMap != nil {
store.deliveryNormalize = func(ctx context.Context, email string) (string, error) {
email, err := deliveryNormFunc(email)
if err != nil {
return "", err
}
mapped, ok, err := store.deliveryMap.Lookup(ctx, email)
if err != nil || !ok {
return "", userDoesNotExist(err)
}
return mapped, nil
}
}
authNormFunc, ok := authz.NormalizeFuncs[authNormalize]
if !ok {
return errors.New("imapsql: unknown normalization function: " + authNormalize)

71
tests/imapsql_test.go
View file

@ -112,6 +112,77 @@ func TestImapsqlDelivery(tt *testing.T) {
imapConn.ExpectPattern(`. OK *`)
}
func TestImapsqlDeliveryMap(tt *testing.T) {
tt.Parallel()
t := tests.NewT(tt)
t.DNS(nil)
t.Port("imap")
t.Port("smtp")
t.Config(`
storage.imapsql test_store {
delivery_map regexp "(.*)@(.*)" "$1"
auth_normalize precis
driver sqlite3
dsn imapsql.db
}
imap tcp://127.0.0.1:{env:TEST_PORT_imap} {
tls off
auth dummy
storage &test_store
}
smtp tcp://127.0.0.1:{env:TEST_PORT_smtp} {
hostname maddy.test
tls off
deliver_to &test_store
}
`)
t.Run(2)
defer t.Close()
imapConn := t.Conn("imap")
defer imapConn.Close()
imapConn.ExpectPattern(`\* OK *`)
imapConn.Writeln(". LOGIN testusr 1234")
imapConn.ExpectPattern(". OK *")
imapConn.Writeln(". SELECT INBOX")
imapConn.ExpectPattern(`\* *`)
imapConn.ExpectPattern(`\* *`)
imapConn.ExpectPattern(`\* *`)
imapConn.ExpectPattern(`\* *`)
imapConn.ExpectPattern(`\* *`)
imapConn.ExpectPattern(`\* *`)
imapConn.ExpectPattern(`. OK *`)
smtpConn := t.Conn("smtp")
defer smtpConn.Close()
smtpConn.SMTPNegotation("localhost", nil, nil)
smtpConn.Writeln("MAIL FROM:<sender@maddy.test>")
smtpConn.ExpectPattern("2*")
smtpConn.Writeln("RCPT TO:<testusr@maddy.test>")
smtpConn.ExpectPattern("2*")
smtpConn.Writeln("DATA")
smtpConn.ExpectPattern("354 *")
smtpConn.Writeln("From: <sender@maddy.test>")
smtpConn.Writeln("To: <testusr@maddy.test>")
smtpConn.Writeln("Subject: Hi!")
smtpConn.Writeln("")
smtpConn.Writeln("Hi!")
smtpConn.Writeln(".")
smtpConn.ExpectPattern("2*")
time.Sleep(500 * time.Millisecond)
imapConn.Writeln(". NOOP")
imapConn.ExpectPattern(`\* 1 EXISTS`)
imapConn.ExpectPattern(". OK *")
}
func TestImapsqlAuthMap(tt *testing.T) {
tt.Parallel()
t := tests.NewT(tt)