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

table: Merge 'replace_sender', 'replace_rcpt' into 'alias'

Browse source 
With 'regexp' and 'static' tables, separate implementations in replace_*
are not necessary.
This commit is contained in:
fox.cpp 2020-03-06 04:19:28 +03:00
parent a5288aa27a
commit aa1804c66d
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
6 changed files with 131 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

86
internal/modify/replace_addr_test.go
View file

@ -5,45 +5,75 @@ import (
"testing"
"github.com/foxcpp/maddy/internal/config"
"github.com/foxcpp/maddy/internal/testutils"
)
func replaceAddrFromArgs(t *testing.T, modName, from, to string) *replaceAddr {
r, err := NewReplaceAddr(modName, "", nil, []string{from, to})
if err != nil {
t.Fatal(err)
}
if err := r.Init(&config.Map{Block: config.Node{}}); err != nil {
t.Fatal(err)
}
return r.(*replaceAddr)
}
func testReplaceAddr(t *testing.T, modName string, rewriter func(*replaceAddr, context.Context, string) (string, error)) {
test := func(from, to string, input, expectedOutput string) {
test := func(addr, expected string, aliases map[string]string) {
t.Helper()
r := replaceAddrFromArgs(t, modName, from, to)
output, err := rewriter(r, context.Background(), input)
mod, err := NewReplaceAddr(modName, "", nil, []string{"dummy"})
if err != nil {
t.Fatal(err)
}
if output != expectedOutput {
t.Fatalf("wrong result: %s != %s", output, expectedOutput)
m := mod.(*replaceAddr)
if err := m.Init(config.NewMap(nil, config.Node{})); err != nil {
t.Fatal(err)
}
m.table = testutils.Table{M: aliases}
var actual string
if modName == "replace_sender" {
actual, err = m.RewriteSender(context.Background(), addr)
if err != nil {
t.Fatal(err)
}
}
if modName == "replace_rcpt" {
actual, err = m.RewriteRcpt(context.Background(), addr)
if err != nil {
t.Fatal(err)
}
}
if actual != expected {
t.Errorf("want %s, got %s", expected, actual)
}
}
test("test@example.org", "test2@example.org", "test@example.org", "test2@example.org")
test("test@EXAmple.org", "test2@example.org", "teST@exaMPLe.org", "test2@example.org")
test(`/test@example\.org/`, "test2@example.org", "test@example.org", "test2@example.org")
test(`/test@EXAmple\.org/`, "test2@example.org", "teST@exaMPLe.org", "test2@example.org")
test(`/example/`, "test2@example.org", "teST@exaMPLe.org", "teST@exaMPLe.org")
test(`/(.+)@example\.org/`, "$1@example.com", "test@example.org", "test@example.com")
test(`/(.+)@example\.org/`, "$1@example.com", "teST@example.org", "teST@example.com")
test(`/(.+)@example\.org/`, "$1@example.com", "teST@example.org", "teST@example.com")
test("rcpt@\u00E9.example.com", "rcpt@foo.example.com", "rcpt@E\u0301.example.com", "rcpt@foo.example.com")
test(`/rcpt@é\.example\.com/`, "rcpt@foo.example.com", "rcpt@E\u0301.example.com", "rcpt@foo.example.com")
test("rcpt@E\u0301.example.com", "rcpt@foo.example.com", "rcpt@\u00E9.example.com", "rcpt@foo.example.com")
test("test@example.org", "test@example.org", nil)
test("postmaster", "postmaster", nil)
test("test@example.com", "test@example.org",
map[string]string{"test@example.com": "test@example.org"})
test(`"\"test @ test\""@example.com`, "test@example.org",
map[string]string{`"\"test @ test\""@example.com`: "test@example.org"})
test(`test@example.com`, `"\"test @ test\""@example.org`,
map[string]string{`test@example.com`: `"\"test @ test\""@example.org`})
test(`"\"test @ test\""@example.com`, `"\"b @ b\""@example.com`,
map[string]string{`"\"test @ test\""`: `"\"b @ b\""`})
test("TeSt@eXAMple.com", "test@example.org",
map[string]string{"test@example.com": "test@example.org"})
test("test@example.com", "test2@example.com",
map[string]string{"test": "test2"})
test("test@example.com", "test2@example.org",
map[string]string{"test": "test2@example.org"})
test("postmaster", "test2@example.org",
map[string]string{"postmaster": "test2@example.org"})
test("TeSt@examPLE.com", "test2@example.com",
map[string]string{"test": "test2"})
test("test@example.com", "test3@example.com",
map[string]string{
"test@example.com": "test3@example.com",
"test": "test2",
})
test("rcpt@E\u0301.example.com", "rcpt@foo.example.com",
map[string]string{
"rcpt@\u00E9.example.com": "rcpt@foo.example.com",
})
test("E\u0301@foo.example.com", "rcpt@foo.example.com",
map[string]string{
"\u00E9@foo.example.com": "rcpt@foo.example.com",
})
}
func TestReplaceAddr_RewriteSender(t *testing.T) {