Changeset 3437:71b9f5245f22

Timestamp:

2003-07-16 04:18:12 (5 years ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

I noticed that my mutt hung when I tried SASL DIGEST-MD5
authentication (I'm not sure when this started). I believe this
patch should solve that problem in a reliable way.

This patch also attempts to reuse connections even when
authentication fails, instead of just throwing away a perfectly good
socket.

Files:

• account.c (modified) (2 diffs)
• account.h (modified) (2 diffs)
• imap/auth_sasl.c (modified) (4 diffs)
• imap/imap.c (modified) (7 diffs)

account.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2000 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 2000-3 Brendan Cully <brendan@kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
@@ -181 +181 @@
   return 0;
 }
+
+void mutt_account_unsetpass (ACCOUNT* account)
+{
+  account->flags &= !M_ACCT_PASS;
+}

account.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2000 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 2000-3 Brendan Cully <brendan@kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
@@ -53 +53 @@
 int mutt_account_getuser (ACCOUNT* account);
 int mutt_account_getpass (ACCOUNT* account);
+void mutt_account_unsetpass (ACCOUNT* account);
 
 #endif /* _MUTT_ACCOUNT_H_ */

imap/auth_sasl.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2000-2 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 2000-3 Brendan Cully <brendan@kublai.com>
  * 
  *     This program is free software; you can redistribute it and/or modify
@@ -110 +110 @@
   }
 
-  mutt_message _("Authenticating (SASL)...");
+  mutt_message (_("Authenticating (%s)..."), mech);
 
   snprintf (buf, sizeof (buf), "AUTHENTICATE %s", mech);
@@ -154 +154 @@
 
     /* send out response, or line break if none needed */
-    if (pc)
+    if (olen)
     {
       if (sasl_encode64 (pc, olen, buf, sizeof (buf), &olen) != SASL_OK)
@@ -169 +169 @@
     }
     
-    if (olen || rc == SASL_CONTINUE)
+    if (irc == IMAP_CMD_RESPOND)
     {
       strfcpy (buf + olen, "\r\n", sizeof (buf) - olen);

imap/imap.c

@@ -341 +341 @@
   /* don't open a new connection if one isn't wanted */
   if (flags & M_IMAP_CONN_NONEW)
-    if (!idata || idata->state == IMAP_DISCONNECTED)
-      goto err_conn;
+  {
+    if (!idata)
+    {
+      mutt_socket_free (conn);
+      return NULL;
+    }
+    if (idata->state < IMAP_AUTHENTICATED)
+      return NULL;
+  }
   
   if (!idata)
@@ -348 +355 @@
     /* The current connection is a new connection */
     if (! (idata = imap_new_idata ()))
-      goto err_conn;
+    {
+      mutt_socket_free (conn);
+      return NULL;
+    }
 
     conn->data = idata;
     idata->conn = conn;
   }
+
   if (idata->state == IMAP_DISCONNECTED)
-    if (imap_open_connection (idata) != 0)
-      goto err_idata;
+    imap_open_connection (idata);
+  if (idata->state == IMAP_CONNECTED)
+  {
+    if (!imap_authenticate (idata))
+    {
+      idata->state = IMAP_AUTHENTICATED;
+      if (idata->conn->ssf)
+        dprint (2, (debugfile, "Communication encrypted at %d bits\n",
+                    idata->conn->ssf));
+      imap_get_delim (idata);
+    }
+    else
+      mutt_account_unsetpass (&idata->conn->account);
+    
+    FREE (&idata->capstr);
+  }
   
   return idata;
-
- err_idata:
-  imap_free_idata (&idata);
- err_conn:
-  mutt_socket_free (conn);
-
-  return NULL;
 }
 
@@ -376 +394 @@
   idata->state = IMAP_CONNECTED;
 
-  if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE)
-    goto bail;
+  if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE) {
+    mutt_error (_("Unexpected response received from server: %s"), idata->cmd.buf);
+    mutt_sleep (1);
+
+    mutt_socket_close (idata->conn);
+    idata->state = IMAP_DISCONNECTED;
+    return -1;
+  }
 
   if (ascii_strncasecmp ("* OK", idata->cmd.buf, 4) == 0)
@@ -414 +438 @@
     }
 #endif    
-    if (imap_authenticate (idata))
-      goto bail;
-    if (idata->conn->ssf)
-      dprint (2, (debugfile, "Communication encrypted at %d bits\n",
-        idata->conn->ssf));
   }
   else if (ascii_strncasecmp ("* PREAUTH", idata->cmd.buf, 9) == 0)
   {
+    idata->state = IMAP_AUTHENTICATED;
     if (imap_check_capabilities (idata) != 0)
       goto bail;
+    FREE (&idata->capstr);
   } 
   else
@@ -431 +452 @@
   }
 
-  FREE (&idata->capstr);
-  idata->state = IMAP_AUTHENTICATED;
-
-  imap_get_delim (idata);
   return 0;
 
@@ -441 +458 @@
  bail:
   FREE (&idata->capstr);
-  idata->state = IMAP_DISCONNECTED;
   return -1;
 }
@@ -521 +537 @@
   if (!(idata = imap_conn_find (&(mx.account), M_IMAP_CONN_NOSELECT)))
     goto fail_noidata;
+  if (idata->state < IMAP_AUTHENTICATED)
+    goto fail;
+
   conn = idata->conn;