Changeset 4153 in subversion

Timestamp:

Oct 28, 2010 12:35:49 PM (3 years ago)

Author:

alec

Message:

• Close properly IMAP connection when login fails
• Don't use LOGIN when server sent LOGINDISABLED

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (8 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -681 +681 @@
         }
 
-            $message = "INITIAL: $auth_method\n";
-
             $result = false;
 
@@ -738 +736 @@
             if (!preg_match('/^\* (OK|PREAUTH)/i', $line)) {
                     if ($line)
-                            $this->error = sprintf("Wrong startup greeting (%s:%d): %s", $host, $this->prefs['port'], $line);
+                            $error = sprintf("Wrong startup greeting (%s:%d): %s", $host, $this->prefs['port'], $line);
                     else
-                            $this->error = sprintf("Empty startup greeting (%s:%d)", $host, $this->prefs['port']);
-                $this->errornum = self::ERROR_BAD;
+                            $error = sprintf("Empty startup greeting (%s:%d)", $host, $this->prefs['port']);
+
+                $this->set_error(self::ERROR_BAD, $error);
+            $this->close();
                 return false;
             }
@@ -750 +750 @@
             }
 
-            $this->message .= $line;
+            $this->message = $line;
 
             // TLS connection
@@ -758 +758 @@
 
                 if ($res[0] != self::ERROR_OK) {
+                    $this->close();
                     return false;
                 }
@@ -763 +764 @@
                             if (!stream_socket_enable_crypto($this->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
                                     $this->set_error(self::ERROR_BAD, "Unable to negotiate TLS");
+                    $this->close();
                                     return false;
                             }
@@ -791 +793 @@
             }
         else {
+            // Prevent from sending credentials in plain text when connection is not secure
+                    if ($auth_method == 'LOGIN' && $this->getCapability('LOGINDISABLED')) {
+                            $this->set_error(self::ERROR_BAD, "Login disabled by IMAP server");
+                $this->close();
+                            return false;
+            }
             // replace AUTH with CRAM-MD5 for backward compat.
             $auth_methods[] = $auth_method == 'AUTH' ? 'CRAM-MD5' : $auth_method;
@@ -830 +838 @@
 
         // Close connection
-        @fclose($this->fp);
-        $this->fp = false;
-
-            return false;
+        $this->close();
+
+        return false;
     }
 
@@ -843 +850 @@
     function close()
     {
-            if ($this->logged && $this->putLine($this->next_tag() . ' LOGOUT')) {
-                    if (!feof($this->fp))
-                            fgets($this->fp, 1024);
-            }
+            if ($this->putLine($this->next_tag() . ' LOGOUT')) {
+            $this->readReply();
+        }
+
                 @fclose($this->fp);
                 $this->fp = false;