Merge pull request zendframework#44 from mleko/fix/special-chars

Inverse decode-split order, allow special char containing labels

Author: weierophinney

src/Header/AbstractAddressList.php

@@ -42,31 +42,44 @@ abstract class AbstractAddressList implements HeaderInterface
     public static function fromString($headerLine)
     {
         list($fieldName, $fieldValue) = GenericHeader::splitHeaderLine($headerLine);
-        $decodedValue = HeaderWrap::mimeDecodeValue($fieldValue);
-        $wasEncoded = ($decodedValue !== $fieldValue);
-        $fieldValue = $decodedValue;
-
         if (strtolower($fieldName) !== static::$type) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Invalid header line for "%s" string',
-                __CLASS__
-            ));
-        }
-        $header = new static();
-        if ($wasEncoded) {
-            $header->setEncoding('UTF-8');
+                    'Invalid header line for "%s" string',
+                    __CLASS__
+                ));
         }
+
         // split value on ","
         $fieldValue = str_replace(Headers::FOLDING, ' ', $fieldValue);
         $fieldValue = preg_replace('/[^:]+:([^;]*);/', '$1,', $fieldValue);
-        $values     = str_getcsv($fieldValue, ',');
+        $values = str_getcsv($fieldValue, ',');
+
+        $wasEncoded = false;
         array_walk(
             $values,
-            function (&$value) {
-                $value = trim($value);
+            function (&$value) use (&$wasEncoded) {
+                $decodedValue = HeaderWrap::mimeDecodeValue($value);
+                $wasEncoded = $wasEncoded || ($decodedValue !== $value);
+                $value = trim($decodedValue);
                 $value = self::stripComments($value);
+                $value = preg_replace(
+                    [
+                        '#(?<!\\\)"(.*)(?<!\\\)"#', //quoted-text
+                        '#\\\([\x01-\x09\x0b\x0c\x0e-\x7f])#' //quoted-pair
+                    ],
+                    [
+                        '\\1',
+                        '\\1'
+                    ],
+                    $value
+                );
             }
         );
+        $header = new static();
+        if ($wasEncoded) {
+            $header->setEncoding('UTF-8');
+        }
+
         $values = array_filter($values);
 
         $addressList = $header->getAddressList();

test/Header/AddressListHeaderTest.php

@@ -210,4 +210,38 @@ public function getAddressListsWithGroup()
             ['To: friends: [email protected]; enemies: [email protected], [email protected];', 3, '[email protected]'],
         ];
     }
+
+    public function specialCharHeaderProvider()
+    {
+        return [
+            [
+                "To: =?UTF-8?B?dGVzdCxsYWJlbA==?= <[email protected]>, [email protected]",
+                ['[email protected]' => 'test,label', '[email protected]' => null],
+                'UTF-8'
+            ],
+            [
+                'To: "TEST\",QUOTE" <[email protected]>, [email protected]',
+                ['[email protected]' => 'TEST",QUOTE', '[email protected]' => null],
+                'ASCII'
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider specialCharHeaderProvider
+     */
+    public function testDeserializationFromSpecialCharString($headerLine, $expected, $encoding)
+    {
+        $header = To::fromString($headerLine);
+
+        $expectedTo = new To();
+        $addressList = $expectedTo->getAddressList();
+        $addressList->addMany($expected);
+        $expectedTo->setEncoding($encoding);
+        $this->assertEquals($expectedTo, $header);
+        foreach ($expected as $k => $v) {
+            $this->assertTrue($addressList->has($k));
+            $this->assertEquals($addressList->get($k)->getName(), $v);
+        }
+    }
 }