Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions internal/target/smtp/sasl.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,18 @@ func saslAuthDirective(_ *config.Map, node config.Node) (interface{}, error) {
}
return sasl.NewPlainClient("", msgMeta.Conn.AuthUser, msgMeta.Conn.AuthPassword), nil
}, nil
case "plain":
case "plain", "login":
if len(node.Args) != 3 {
return nil, config.NodeErr(node, "two additional arguments are required (username, password)")
}
return func(*module.MsgMetadata) (sasl.Client, error) {
return sasl.NewPlainClient("", node.Args[1], node.Args[2]), nil
if node.Args[0] == "plain" {
return sasl.NewPlainClient("", node.Args[1], node.Args[2]), nil
}
if node.Args[0] == "login" {
return sasl.NewLoginClient(node.Args[1], node.Args[2]), nil
}
return nil, config.NodeErr(node, "unknown authentication mechanism: %s", node.Args[0])
}, nil
case "external":
if len(node.Args) > 1 {
Expand Down
17 changes: 17 additions & 0 deletions internal/target/smtp/sasl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,23 @@ func TestSASL_Plain_AuthFail(t *testing.T) {
}
}

func TestSASL_Login_Directive(t *testing.T) {
factory := testSaslFactory(t, "login", "test", "testpass")
client, err := factory(nil)
if err != nil {
t.Fatal(err)
}

mech, _, err := client.Start()
if err != nil {
t.Fatal(err)
}

if mech != "LOGIN" {
t.Fatalf("expected LOGIN mechanism, got %q", mech)
}
}

func TestSASL_Forward(t *testing.T) {
be, srv := testutils.SMTPServer(t, "127.0.0.1:"+testPort)
defer func() {
Expand Down