Implement real LOGIN auth method for IMAP.

[claws.git] / src / imap.c

diff --git a/src/imap.c b/src/imap.c
index f40d00274667ec966c08d634722394b3ade95904..e430c8fbc9b6a5c84459991e7261bdc3dfa3390e 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -902,9 +902,15 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
        case IMAP_AUTH_SCRAM_SHA1:
                ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
                break;
+       case IMAP_AUTH_PLAIN:
+               ok = imap_cmd_login(session, user, pass, "PLAIN");
+               break;
        case IMAP_AUTH_LOGIN:
                ok = imap_cmd_login(session, user, pass, "LOGIN");
                break;
+       case IMAP_AUTH_PLAINTEXT:
+               ok = imap_cmd_login(session, user, pass, "plaintext");
+               break;
        case IMAP_AUTH_GSSAPI:
                ok = imap_cmd_login(session, user, pass, "GSSAPI");
                break;
@@ -914,12 +920,14 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
                                "\t CRAM-MD5 %d\n"
                                "\t DIGEST-MD5 %d\n"
                                "\t SCRAM-SHA-1 %d\n"
+                               "\t PLAIN %d\n"
                                "\t LOGIN %d\n"
                                "\t GSSAPI %d\n", 
                        imap_has_capability(session, "ANONYMOUS"),
                        imap_has_capability(session, "CRAM-MD5"),
                        imap_has_capability(session, "DIGEST-MD5"),
                        imap_has_capability(session, "SCRAM-SHA-1"),
+                       imap_has_capability(session, "PLAIN"),
                        imap_has_capability(session, "LOGIN"),
                        imap_has_capability(session, "GSSAPI"));
                if (imap_has_capability(session, "CRAM-MD5"))
@@ -928,10 +936,14 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
                        ok = imap_cmd_login(session, user, pass, "DIGEST-MD5");
                if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "SCRAM-SHA-1"))
                        ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
+               if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "PLAIN"))
+                       ok = imap_cmd_login(session, user, pass, "PLAIN");
+               if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "LOGIN"))
+                       ok = imap_cmd_login(session, user, pass, "LOGIN");
                if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "GSSAPI"))
                        ok = imap_cmd_login(session, user, pass, "GSSAPI");
-               if (ok == MAILIMAP_ERROR_LOGIN) /* we always try LOGIN before giving up */
-                       ok = imap_cmd_login(session, user, pass, "LOGIN");
+               if (ok == MAILIMAP_ERROR_LOGIN) /* we always try plaintext login before giving up */
+                       ok = imap_cmd_login(session, user, pass, "plaintext");
        }
 
        if (ok == MAILIMAP_NO_ERROR)
@@ -955,6 +967,12 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
                                     "SCRAM SASL plugin is installed.");
                }
 
+               if (type == IMAP_AUTH_PLAIN) {
+                       ext_info = _("\n\nPLAIN logins only work if libetpan has been "
+                                    "compiled with SASL support and the "
+                                    "PLAIN SASL plugin is installed.");
+               }
+
                if (time(NULL) - last_login_err > 10) {
                        if (!prefs_common.no_recv_err_panel) {
                                alertpanel_error_log(_("Connection to %s failed: "
@@ -4078,7 +4096,7 @@ static gint imap_cmd_login(IMAPSession *session,
        int r;
        gint ok;
 
-       if (!strcmp(type, "LOGIN") && imap_has_capability(session, "LOGINDISABLED")) {
+       if (!strcmp(type, "plaintext") && imap_has_capability(session, "LOGINDISABLED")) {
                gint ok = MAILIMAP_ERROR_BAD_STATE;
                if (imap_has_capability(session, "STARTTLS")) {
 #ifdef USE_GNUTLS