imap: add support for plain auth

If the server reports the AUTH=PLAIN SASL mechanism, use it in priority over LOGIN which has been deprecated in favor of SASL. Pass an empty identity argument which results in identity=username. Aerc does not have the ability to configure it. Signed-off-by: Robin Jarry <[email protected]> Tested-by: Runxi Yu <[email protected]>
rjarry · Jan 16, 2025 · aef7bb0 · aef7bb0
1 parent 3d509bb
commit aef7bb0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/worker/imap/connect.go b/worker/imap/connect.go
@@ -10,6 +10,7 @@ import (
 	"git.sr.ht/~rjarry/aerc/lib/log"
 	"github.com/emersion/go-imap"
 	"github.com/emersion/go-imap/client"
+	"github.com/emersion/go-sasl"
 )
 
 // connect establishes a new tcp connection to the imap server, logs in and
@@ -88,6 +89,13 @@ func (w *IMAPWorker) connect() (*client.Client, error) {
 				username, password, w.config.name, c); err != nil {
 				return nil, err
 			}
+		} else if plain, err := c.SupportAuth("PLAIN"); err != nil {
+			return nil, err
+		} else if plain {
+			auth := sasl.NewPlainClient("", username, password)
+			if err := c.Authenticate(auth); err != nil {
+				return nil, err
+			}
 		} else if err := c.Login(username, password); err != nil {
 			return nil, err
 		}