Changeset d6584f7 in github

Timestamp:

Jan 19, 2010 8:17:48 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a7dba854

Parents:

638fb8a

Message:

• Use PLAIN auth when CRAM fails and imap_auth_type='check' (#1486371)

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/imap.inc (modified) (3 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Use PLAIN auth when CRAM fails and imap_auth_type='check' (#1486371)
 - Fix removal of <title> tag from HTML messages (#1486432)
 - Fix 'force_https' to specified port when URL contains a port number (#1486411)

program/lib/imap.inc

@@ -648 +648 @@
         }
 
-        $conn->message .= $line . "\n";
+        $conn->message .= $line;
 
         // TLS connection
@@ -673 +673 @@
         }
 
+        $orig_method = $auth_method;
+
         if ($auth_method == 'CHECK') {
-                //check for supported auth methods
+                // check for supported auth methods
                 if (iil_C_GetCapability($conn, 'AUTH=CRAM-MD5') || iil_C_GetCapability($conn, 'AUTH=CRAM_MD5')) {
                         $auth_method = 'AUTH';
                 }
                 else {
-                        //default to plain text auth
+                        // default to plain text auth
                         $auth_method = 'PLAIN';
                 }
@@ -685 +687 @@
 
         if ($auth_method == 'AUTH') {
-                //do CRAM-MD5 authentication
+                // do CRAM-MD5 authentication
                 iil_PutLine($conn->fp, "a000 AUTHENTICATE CRAM-MD5");
                 $line = trim(iil_ReadLine($conn->fp, 1024));
 
                 if ($line[0] == '+') {
-                        //got a challenge string, try CRAM-5
+                        // got a challenge string, try CRAM-MD5
                         $result = iil_C_Authenticate($conn, $user, $password, substr($line,2));
                         
                         // stop if server sent BYE response
-                        if($result == -3) {
+                        if ($result == -3) {
                                 $iil_error = $conn->error;
                                 $iil_errornum = $conn->errorNum;
                                 return false;
                         }
-                        $conn->message .= "AUTH CRAM-MD5: $result\n";
-                } else {
-                        $conn->message .= "AUTH CRAM-MD5: failed\n";
+                }
+                
+                if (!is_resource($result) && $orig_method == 'CHECK') {
                         $auth_method = 'PLAIN';
                 }
         }
                 
-        if (!$result || $auth_method == 'PLAIN') {
-                //do plain text auth
+        if ($auth_method == 'PLAIN') {
+                // do plain text auth
                 $result = iil_C_Login($conn, $user, $password);
-                $conn->message .= "AUTH PLAIN: $result\n";
-        }
-                
-        if (!is_int($result)) {
+        }
+
+        if (is_resource($result)) {
                 iil_C_Namespace($conn);
                 return $conn;