| Author: Ryo Chijiiwa <Ryo@IlohaMail.org> |
+-----------------------------------------------------------------------+
- $Id: rcube_imap_generic.php 4516 2011-02-09 12:46:46Z alec $
+ $Id: rcube_imap_generic.php 4643 2011-04-11 12:24:00Z alec $
*/
{
$line = '';
- if (!$this->fp) {
- return NULL;
- }
-
if (!$size) {
$size = 1024;
}
do {
- if (feof($this->fp)) {
+ if ($this->eof()) {
return $line ? $line : NULL;
}
$buffer = fgets($this->fp, $size);
if ($buffer === false) {
- @fclose($this->fp);
- $this->fp = null;
+ $this->closeSocket();
break;
}
if ($this->_debug) {
$this->debug('S: '. rtrim($buffer));
}
$line .= $buffer;
- } while ($buffer[strlen($buffer)-1] != "\n");
+ } while (substr($buffer, -1) != "\n");
return $line;
}
{
$data = '';
$len = 0;
- while ($len < $bytes && !feof($this->fp))
+ while ($len < $bytes && !$this->eof())
{
$d = fread($this->fp, $bytes-$len);
if ($this->_debug) {
} else if ($res == 'BAD') {
$this->errornum = self::ERROR_BAD;
} else if ($res == 'BYE') {
- @fclose($this->fp);
- $this->fp = null;
+ $this->closeSocket();
$this->errornum = self::ERROR_BYE;
}
return self::ERROR_UNKNOWN;
}
+ private function eof()
+ {
+ if (!is_resource($this->fp)) {
+ return true;
+ }
+
+ // If a connection opened by fsockopen() wasn't closed
+ // by the server, feof() will hang.
+ $start = microtime(true);
+
+ if (feof($this->fp) ||
+ ($this->prefs['timeout'] && (microtime(true) - $start > $this->prefs['timeout']))
+ ) {
+ $this->closeSocket();
+ return true;
+ }
+
+ return false;
+ }
+
+ private function closeSocket()
+ {
+ @fclose($this->fp);
+ $this->fp = null;
+ }
+
function setError($code, $msg='')
{
$this->errornum = $code;
}
if ($error && preg_match('/^\* (BYE|BAD) /i', $string, $m)) {
if (strtoupper($m[1]) == 'BYE') {
- @fclose($this->fp);
- $this->fp = null;
+ $this->closeSocket();
}
return true;
}
$host = $this->prefs['ssl_mode'] . '://' . $host;
}
+ if ($this->prefs['timeout'] <= 0) {
+ $this->prefs['timeout'] = ini_get('default_socket_timeout');
+ }
+
// Connect
- if ($this->prefs['timeout'] > 0)
- $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, $this->prefs['timeout']);
- else
- $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr);
+ $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, $this->prefs['timeout']);
if (!$this->fp) {
$this->setError(self::ERROR_BAD, sprintf("Could not connect to %s:%d: %s", $host, $this->prefs['port'], $errstr));
// Now we're secure, capabilities need to be reread
$this->clearCapability();
}
+
+ // Use best (for security) supported authentication method
+ foreach (array('DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN') as $auth_method) {
+ if (in_array($auth_method, $auth_methods)) {
+ break;
+ }
+ }
}
// Send ID info
else if (!$login_disabled) {
$auth_methods[] = 'LOGIN';
}
+\r
+ // Use best (for security) supported authentication method\r
+ foreach (array('DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN') as $auth_method) {\r
+ if (in_array($auth_method, $auth_methods)) {\r
+ break;\r
+ }\r
+ }\r
}
else {
// Prevent from sending credentials in plain text when connection is not secure
return false;
}
// replace AUTH with CRAM-MD5 for backward compat.
- $auth_methods[] = $auth_method == 'AUTH' ? 'CRAM-MD5' : $auth_method;
+ if ($auth_method == 'AUTH') {
+ $auth_method = 'CRAM-MD5';
+ }
}
// pre-login capabilities can be not complete
$this->capability_readed = false;
// Authenticate
- foreach ($auth_methods as $method) {
- switch ($method) {
+ switch ($auth_method) {
case 'CRAM_MD5':
- $method = 'CRAM-MD5';
+ $auth_method = 'CRAM-MD5';
case 'CRAM-MD5':
case 'DIGEST-MD5':
case 'PLAIN':
- $result = $this->authenticate($user, $password, $method);
+ $result = $this->authenticate($user, $password, $auth_method);
break;
case 'LOGIN':
$result = $this->login($user, $password);
break;
default:
- $this->setError(self::ERROR_BAD, "Configuration error. Unknown auth method: $method");
- }
-
- if (is_resource($result)) {
- break;
- }
+ $this->setError(self::ERROR_BAD, "Configuration error. Unknown auth method: $auth_method");
}
// Connected and authenticated
$this->readReply();
}
- @fclose($this->fp);
- $this->fp = false;
+ $this->closeSocket();
}
/**
list($mbox, $items) = $this->tokenizeResponse($response, 2);
+ // Fix for #1487859. Some buggy server returns not quoted
+ // folder name with spaces. Let's try to handle this situation
+ if (!is_array($items) && ($pos = strpos($response, '(')) !== false) {
+ $response = substr($response, $pos);
+ $items = $this->tokenizeResponse($response, 1);
+ if (!is_array($items)) {
+ return $result;
+ }
+ }
+
for ($i=0, $len=count($items); $i<$len; $i += 2) {
$result[$items[$i]] = (int) $items[$i+1];
}
$result[$id] = '';
}
} else if ($mode == 2) {
- if (preg_match('/\((UID|RFC822\.SIZE) ([0-9]+)/', $line, $matches)) {
+ if (preg_match('/(UID|RFC822\.SIZE) ([0-9]+)/', $line, $matches)) {
$result[$id] = trim($matches[2]);
} else {
$result[$id] = 0;
if (preg_match('/^\* [0-9]+ FETCH \((.*) BODY/sU', $line, $matches)) {
$str = $matches[1];
- // swap parents with quotes, then explode
- $str = preg_replace('/[()]/', '"', $str);
- $a = rcube_explode_quoted_string(' ', $str);
-
- // did we get the right number of replies?
- $parts_count = count($a);
- if ($parts_count>=6) {
- for ($i=0; $i<$parts_count; $i=$i+2) {
- if ($a[$i] == 'UID') {
- $result[$id]->uid = intval($a[$i+1]);
- }
- else if ($a[$i] == 'RFC822.SIZE') {
- $result[$id]->size = intval($a[$i+1]);
- }
- else if ($a[$i] == 'INTERNALDATE') {
- $time_str = $a[$i+1];
- }
- else if ($a[$i] == 'FLAGS') {
- $flags_str = $a[$i+1];
- }
+ while (list($name, $value) = $this->tokenizeResponse($str, 2)) {
+ if ($name == 'UID') {
+ $result[$id]->uid = intval($value);
+ }
+ else if ($name == 'RFC822.SIZE') {
+ $result[$id]->size = intval($value);
+ }
+ else if ($name == 'INTERNALDATE') {
+ $result[$id]->internaldate = $value;
+ $result[$id]->date = $value;
+ $result[$id]->timestamp = $this->StrToTime($value);
+ }
+ else if ($name == 'FLAGS') {
+ $flags_a = $value;
}
-
- $time_str = str_replace('"', '', $time_str);
-
- // if time is gmt...
- $time_str = str_replace('GMT','+0000',$time_str);
-
- $result[$id]->internaldate = $time_str;
- $result[$id]->timestamp = $this->StrToTime($time_str);
- $result[$id]->date = $time_str;
}
// BODYSTRUCTURE
// handle FLAGS reply after headers (AOL, Zimbra?)
if (preg_match('/\s+FLAGS \((.*)\)\)$/', $line, $matches)) {
- $flags_str = $matches[1];
+ $flags_a = $this->tokenizeResponse($matches[1]);
break;
}
// create array with header field:data
while (list($lines_key, $str) = each($lines)) {
- list($field, $string) = $this->splitHeaderLine($str);
+ list($field, $string) = explode(':', $str, 2);
$field = strtolower($field);
- $string = preg_replace('/\n\s*/', ' ', $string);
+ $string = preg_replace('/\n[\t\s]*/', ' ', trim($string));
switch ($field) {
case 'date';
}
// process flags
- if (!empty($flags_str)) {
- $flags_str = preg_replace('/[\\\"]/', '', $flags_str);
- $flags_a = explode(' ', $flags_str);
-
- if (is_array($flags_a)) {
- foreach($flags_a as $flag) {
- $flag = strtoupper($flag);
- if ($flag == 'SEEN') {
- $result[$id]->seen = true;
- } else if ($flag == 'DELETED') {
- $result[$id]->deleted = true;
- } else if ($flag == 'RECENT') {
- $result[$id]->recent = true;
- } else if ($flag == 'ANSWERED') {
- $result[$id]->answered = true;
- } else if ($flag == '$FORWARDED') {
- $result[$id]->forwarded = true;
- } else if ($flag == 'DRAFT') {
- $result[$id]->is_draft = true;
- } else if ($flag == '$MDNSENT') {
- $result[$id]->mdn_sent = true;
- } else if ($flag == 'FLAGGED') {
- $result[$id]->flagged = true;
- }
+ if (!empty($flags_a)) {
+ foreach ($flags_a as $flag) {
+ $flag = str_replace('\\', '', $flag);
+ $result[$id]->flags[] = $flag;
+
+ switch (strtoupper($flag)) {
+ case 'SEEN':
+ $result[$id]->seen = true;
+ break;
+ case 'DELETED':
+ $result[$id]->deleted = true;
+ break;
+ case 'ANSWERED':
+ $result[$id]->answered = true;
+ break;
+ case '$FORWARDED':
+ $result[$id]->forwarded = true;
+ break;
+ case '$MDNSENT':
+ $result[$id]->mdn_sent = true;
+ break;
+ case 'FLAGGED':
+ $result[$id]->flagged = true;
+ break;
}
- $result[$id]->flags = $flags_a;
}
}
}
{
// support non-standard "GMTXXXX" literal
$date = preg_replace('/GMT\s*([+-][0-9]+)/', '\\1', $date);
+
// if date parsing fails, we have a date in non-rfc format.
// remove token from the end and try again
- while ((($ts = @strtotime($date))===false) || ($ts < 0)) {
+ while (($ts = intval(@strtotime($date))) <= 0) {
$d = explode(' ', $date);
array_pop($d);
if (!$d) {
return $ts < 0 ? 0 : $ts;
}
- private function splitHeaderLine($string)
- {
- $pos = strpos($string, ':');
- if ($pos>0) {
- $res[0] = substr($string, 0, $pos);
- $res[1] = trim(substr($string, $pos+1));
- return $res;
- }
- return $string;
- }
-
private function parseCapability($str, $trusted=false)
{
$str = preg_replace('/^\* CAPABILITY /i', '', $str);