Changeset 6d0ada3 in github

Timestamp:

Aug 9, 2011 5:46:54 AM (22 months ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

2185899

Parents:

efc24a5

Message:

• Fix handling of email addresses with quoted local part (#1487939)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (3 diffs)
• program/include/rcube_smtp.php (modified) (3 diffs)
• program/lib/Mail/mimePart.php (modified) (3 diffs)
• program/steps/mail/sendmail.inc (modified) (3 diffs)
• tests/maildecode.php (modified) (3 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix handling of email addresses with quoted local part (#1487939)
 - Fix EOL character in vCard exports (#1487873)
 - Added optional "multithreading" autocomplete feature

program/include/rcube_imap.php

@@ -4761 +4761 @@
         $result = array();
 
+        // simplified regexp, supporting quoted local part
+        $email_rx = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+';
+
         foreach ($str as $key => $val) {
             $name    = '';
@@ -4766 +4769 @@
             $val     = trim($val);
 
-            if (preg_match('/(.*)<(\S+@\S+)>$/', $val, $m)) {
+            if (preg_match('/(.*)<('.$email_rx.')>$/', $val, $m)) {
                 $address = $m[2];
                 $name    = trim($m[1]);
@@ -4780 +4783 @@
             // dequote and/or decode name
             if ($name) {
-                if ($name[0] == '"') {
+                if ($name[0] == '"' && $name[strlen($name)-1] == '"') {
                     $name = substr($name, 1, -1);
                     $name = stripslashes($name);

program/include/rcube_smtp.php

@@ -440 +440 @@
     if (is_array($recipients))
       $recipients = implode(', ', $recipients);
-    
+
     $addresses = array();
     $recipients = rcube_explode_quoted_string(',', $recipients);
@@ -447 +447 @@
     while (list($k, $recipient) = each($recipients))
     {
-      $a = explode(" ", $recipient);
+      $a = rcube_explode_quoted_string(' ', $recipient);
       while (list($k2, $word) = each($a))
       {
@@ -458 +458 @@
       }
     }
+
     return $addresses;
   }

program/lib/Mail/mimePart.php

@@ -132 +132 @@
     var $_eol = "\r\n";
 
+
     /**
     * Constructor.
@@ -801 +802 @@
         // Structured header (make sure addr-spec inside is not encoded)
         if (!empty($separator)) {
+            // Simple e-mail address regexp
+            $email_regexp = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+';
+
             $parts = Mail_mimePart::_explodeQuotedString($separator, $value);
             $value = '';
@@ -818 +822 @@
 
                 // let's find phrase (name) and/or addr-spec
-                if (preg_match('/^<\S+@\S+>$/', $part)) {
+                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
                     $value .= $part;
-                } else if (preg_match('/^\S+@\S+$/', $part)) {
+                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
                     // address without brackets and without name
                     $value .= $part;
-                } else if (preg_match('/<*\S+@\S+>*$/', $part, $matches)) {
+                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
                     // address with name (handle name)
                     $address = $matches[0];

program/steps/mail/sendmail.inc

@@ -144 +144 @@
   global $EMAIL_FORMAT_ERROR, $RECIPIENT_COUNT;
 
-  $regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/', '/(\S{1})(<\S+@\S+>)/U');
+  // simplified email regexp, supporting quoted local part
+  $email_regexp = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+';
+
+  $regexp  = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/', '/(\S{1})(<'.$email_regexp.'>)/U');
   $replace = array(', ', ', ', '', ',', '\\1 \\2');
 
@@ -156 +159 @@
     $item = trim($item);
     // address in brackets without name (do nothing)
-    if (preg_match('/^<\S+@\S+>$/', $item)) {
+    if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
       $item = rcube_idn_to_ascii($item);
       $result[] = $item;
     // address without brackets and without name (add brackets)
-    } else if (preg_match('/^\S+@\S+$/', $item)) {
+    } else if (preg_match('/^'.$email_regexp.'$/', $item)) {
       $item = rcube_idn_to_ascii($item);
       $result[] = '<'.$item.'>';
     // address with name (handle name)
-    } else if (preg_match('/\S+@\S+>*$/', $item, $matches)) {
+    } else if (preg_match('/'.$email_regexp.'>*$/', $item, $matches)) {
       $address = $matches[0];
       $name = str_replace($address, '', $item);
@@ -173 +176 @@
       }
       $address = rcube_idn_to_ascii($address);
-      if (!preg_match('/^<\S+@\S+>$/', $address))
+      if (!preg_match('/^<'.$email_regexp.'>$/', $address))
         $address = '<'.$address.'>';
 

tests/maildecode.php

@@ -45 +45 @@
         17 => 'test@domain.tld (comment)',
         18 => '"Test,Test" <test@domain.tld>',
+        // 1487939
+        19 => 'Test <"test test"@domain.tld>',
     );
 
@@ -67 +69 @@
         17 => array(1, '', 'test@domain.tld'),
         18 => array(1, 'Test,Test', 'test@domain.tld'),
+        19 => array(1, 'Test', '"test test"@domain.tld'),
     );
 
@@ -74 +77 @@
       $this->assertEqual($results[$idx][0], count($res), "Rows number in result for header: " . $header);
       $this->assertEqual($results[$idx][1], $res[1]['name'], "Name part decoding for header: " . $header);
-      $this->assertEqual($results[$idx][2], $res[1]['mailto'], "Name part decoding for header: " . $header);
+      $this->assertEqual($results[$idx][2], $res[1]['mailto'], "Email part decoding for header: " . $header);
     }
   }