Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-17 14:37:02 +00:00
Code Releases Activity

aliases: Skip resolution logic for non-local addresses

Browse Source 
This patch skips the resolution logic if the address is not local.
Today, the resolution logic handles that case transparently, and returns
the original email address, so this should be a no-op.

However, having an explicit early check makes the resolution logic more
robust, and will simplify future patches.

Note this also means that the `alias-resolve` hook is no longer run for
non-local aliases, which should also help simplify their implementation.
This commit is contained in:
Alberto Bertogli
2022-01-20 09:55:16 +00:00
parent 67d0064f57
commit feb10299be
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/aliases/aliases_test.go
View File

@@ -13,6 +13,7 @@ type Cases []struct {
}
func (cases Cases) check(t *testing.T, r *Resolver) {
t.Helper()
for _, c := range cases {
got, err := r.Resolve(c.addr)
if err != nil {
@@ -26,6 +27,7 @@ func (cases Cases) check(t *testing.T, r *Resolver) {
}
func mustExist(t *testing.T, r *Resolver, addrs ...string) {
t.Helper()
for _, addr := range addrs {
if _, ok := r.Exists(addr); !ok {
t.Errorf("address %q does not exist, it should", addr)
@@ -34,6 +36,7 @@ func mustExist(t *testing.T, r *Resolver, addrs ...string) {
}
func mustNotExist(t *testing.T, r *Resolver, addrs ...string) {
t.Helper()
for _, addr := range addrs {
if _, ok := r.Exists(addr); ok {
t.Errorf("address %q exists, it should not", addr)
@@ -43,20 +46,22 @@ func mustNotExist(t *testing.T, r *Resolver, addrs ...string) {
func TestBasic(t *testing.T) {
resolver := NewResolver()
resolver.AddDomain("localA")
resolver.AddDomain("localB")
resolver.aliases = map[string][]Recipient{
"a@b": {{"c@d", EMAIL}, {"e@f", EMAIL}},
"e@f": {{"cmd", PIPE}},
"cmd": {{"x@y", EMAIL}}, // it's a trap!
"a@localA": {{"c@d", EMAIL}, {"e@localB", EMAIL}},
"e@localB": {{"cmd", PIPE}},
"cmd": {{"x@y", EMAIL}}, // it's a trap!
}
cases := Cases{
{"a@b", []Recipient{{"c@d", EMAIL}, {"cmd", PIPE}}},
{"e@f", []Recipient{{"cmd", PIPE}}},
{"a@localA", []Recipient{{"c@d", EMAIL}, {"cmd", PIPE}}},
{"e@localB", []Recipient{{"cmd", PIPE}}},
{"x@y", []Recipient{{"x@y", EMAIL}}},
}
cases.check(t, resolver)
mustExist(t, resolver, "a@b", "e@f", "cmd")
mustExist(t, resolver, "a@localA", "e@localB", "cmd")
mustNotExist(t, resolver, "x@y")
}
@@ -68,6 +73,7 @@ func TestAddrRewrite(t *testing.T) {
"abc@def": {{"x@y", EMAIL}},
"ñoño@def": {{"x@y", EMAIL}},
"recu@def": {{"ab+cd@p-q.com", EMAIL}},
"remo@def": {{"x-@y-z.com", EMAIL}},
}
resolver.DropChars = ".~"
resolver.SuffixSep = "-+"
@@ -96,6 +102,7 @@ func TestAddrRewrite(t *testing.T) {
{"x.y@z.com", []Recipient{{"x.y@z.com", EMAIL}}},
{"x-@y-z.com", []Recipient{{"x-@y-z.com", EMAIL}}},
{"x+blah@y", []Recipient{{"x+blah@y", EMAIL}}},
{"remo@def", []Recipient{{"x-@y-z.com", EMAIL}}},
}
cases.check(t, resolver)
}
@@ -143,7 +150,9 @@ func TestExistsRewrite(t *testing.T) {
}
func TestTooMuchRecursion(t *testing.T) {
resolver := Resolver{}
resolver := NewResolver()
resolver.AddDomain("b")
resolver.AddDomain("d")
resolver.aliases = map[string][]Recipient{
"a@b": {{"c@d", EMAIL}},
"c@d": {{"a@b", EMAIL}},