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

go fmt

Browse source
This commit is contained in:
angelnu 2022-01-31 21:59:27 +00:00
parent cd45490c16
commit db569891a5
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/modify/replace_addr.go
View file

@ -80,7 +80,7 @@ func (r replaceAddr) RewriteSender(ctx context.Context, mailFrom string) (string
if err != nil {
return mailFrom, err
}
mailFrom = results [0]
mailFrom = results[0]
}
return mailFrom, nil
}

12
internal/modify/replace_addr_test.go
View file

@ -19,8 +19,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
package modify
import (
"reflect"
"context"
"reflect"
"testing"
"github.com/foxcpp/maddy/framework/config"
@ -57,7 +57,7 @@ func testReplaceAddr(t *testing.T, modName string) {
}
}
if ! reflect.DeepEqual(actualMulti,expectedMulti) {
if !reflect.DeepEqual(actualMulti, expectedMulti) {
t.Errorf("want %s, got %s", expectedMulti, actualMulti)
}
}
@ -95,15 +95,15 @@ func testReplaceAddr(t *testing.T, modName string) {
map[string][]string{
"\u00E9@foo.example.com": []string{"rcpt@foo.example.com"},
})
if modName == "modify.replace_rcpt" {
//multiple aliases
test("test@example.com", []string{"test@example.org", "test@example.net"},
map[string][]string{"test@example.com": []string{"test@example.org", "test@example.net"}})
test("test@example.com", []string{"1@example.com", "2@example.com", "3@example.com"},
map[string][]string{"test@example.com": []string{"1@example.com", "2@example.com", "3@example.com"}})
test("test@example.com", []string{"1@example.com", "2@example.com", "3@example.com"},
map[string][]string{"test@example.com": []string{"1@example.com", "2@example.com", "3@example.com"}})
}
}
func TestReplaceAddr_RewriteSender(t *testing.T) {

4
internal/msgpipeline/msgpipeline.go
View file

@ -301,7 +301,7 @@ func (dd *msgpipelineDelivery) AddRcpt(ctx context.Context, to string) error {
if err != nil {
return err
}
newTo = append(newTo, tempTo...)
newTo = append(newTo, tempTo...)
}
dd.log.Debugln("per-source rcpt modifiers:", to, "=>", newTo)
resultTo = newTo
@ -337,7 +337,7 @@ func (dd *msgpipelineDelivery) AddRcpt(ctx context.Context, to string) error {
return wrapErr(err)
}
dd.log.Debugln("per-rcpt modifiers:", to, "=>", newTo)
for _, to = range newTo {
wrapErr = func(err error) error {

10
internal/msgpipeline/msgpipeline_test.go
View file

@ -26,8 +26,8 @@ import (
"github.com/emersion/go-message/textproto"
"github.com/foxcpp/maddy/framework/buffer"
"github.com/foxcpp/maddy/framework/module"
"github.com/foxcpp/maddy/internal/testutils"
"github.com/foxcpp/maddy/internal/modify"
"github.com/foxcpp/maddy/internal/testutils"
)
func TestMsgPipeline_AllToTarget(t *testing.T) {
@ -664,7 +664,7 @@ func TestMsgPipeline_TwoRcptToOneTarget(t *testing.T) {
func TestMsgPipeline_multi_alias(t *testing.T) {
target1, target2 := testutils.Target{InstName: "target1"}, testutils.Target{InstName: "target2"}
mod := testutils.Modifier{
RcptTo: map[string][]string {
RcptTo: map[string][]string{
"recipient@example.com": []string{
"recipient-1@example.org",
"recipient-2@example.net",
@ -674,9 +674,9 @@ func TestMsgPipeline_multi_alias(t *testing.T) {
d := MsgPipeline{
msgpipelineCfg: msgpipelineCfg{
perSource: map[string]sourceBlock{},
defaultSource: sourceBlock{
modifiers: modify.Group {
Modifiers: []module.Modifier {mod},
defaultSource: sourceBlock{
modifiers: modify.Group{
Modifiers: []module.Modifier{mod},
},
perRcpt: map[string]*rcptBlock{
"example.org": {

4
internal/table/chain.go
View file

@ -91,7 +91,7 @@ func (s *Chain) Lookup(ctx context.Context, key string) (string, bool, error) {
func (s *Chain) LookupMulti(ctx context.Context, key string) ([]string, error) {
result := []string{key}
STEP:
STEP:
for i, step := range s.chain {
new_result := []string{}
for _, key = range result {
@ -105,7 +105,7 @@ func (s *Chain) LookupMulti(ctx context.Context, key string) ([]string, error) {
}
new_result = append(new_result, val...)
} else {
val, ok, err := step.Lookup(ctx, key)
val, ok, err := step.Lookup(ctx, key)
if err != nil {
return []string{}, err
}

2
internal/table/regexp.go
View file

@ -100,7 +100,7 @@ func (r *Regexp) LookupMulti(_ context.Context, key string) ([]string, error) {
}
result := []string{}
for _,replacement := range r.replacements{
for _, replacement := range r.replacements {
if !r.expandPlaceholders {
result = append(result, replacement)
} else {