fixed: message id, small refactoring the boundary

Author: bashkarev

src/HeadersTrait.php

@@ -93,7 +93,7 @@ public function findInHeader($header, $type, $default = null)
         $len = strlen($type);
         foreach ($this->getHeader($header) as $head) {
             if (strncasecmp($head, $type, $len) === 0) {
-                return trim(substr($head, $len), "= \t\"'");
+                return trim(ltrim(substr($head, $len), " \t="), " \t\"'");
             }
         }
         return $default;

src/Message.php

@@ -192,15 +192,16 @@ protected function findTextParts($mime = 'text/html')
         ) {
             $parts[] = $this;
         }
-        if ($this->boundary === null) {
+        if (($boundary = $this->getBoundary()) === null) {
             return $parts;
         }
-        $ids = [$this->boundary];
-
+        $boundaries = [$boundary];
         foreach ($this->parts as $part) {
-            if (in_array($part->getId(), $ids) && ($type = $part->getMimeType()) !== null) {
+            if (in_array($part->getParentBoundary(), $boundaries) && ($type = $part->getMimeType()) !== null) {
                 if ($type === 'multipart/alternative' || $type === 'multipart/related') {
-                    $ids[] = $part->boundary;
+                    if (($boundary = $part->getBoundary()) !== null) {
+                        $boundaries[] = $boundary;
+                    }
                     continue;
                 }
                 if (
@@ -225,7 +226,7 @@ protected function replaceCid($html)
              * @var Part $attachment
              */
             if (
-                ($id = $attachment->getContentID()) !== null
+                ($id = $attachment->getID()) !== null
                 && ($mime = $attachment->getMimeType()) !== null
                 && strncasecmp($mime, 'image/', 6) === 0
                 && strpos($html, "cid:{$id}") !== false

src/Mime.php

@@ -18,10 +18,6 @@ class Mime
 {
     use HeadersTrait;
 
-    /**
-     * @var string
-     */
-    public $boundary;
     /**
      * @var Stream
      */
@@ -101,14 +97,22 @@ public function getAccessType()
     /**
      * @return null|string
      */
-    public function getContentID()
+    public function getID()
     {
         if ($this->hasHeader('content-id')) {
-            return trim(str_replace(['<', '>'], '', $this->getHeader('content-id')[0]));
+            return trim($this->getHeader('content-id')[0], " <>\t\n\r\0\x0B");
         }
         return null;
     }
 
+    /**
+     * @return null|string
+     */
+    public function getBoundary()
+    {
+        return $this->findInHeader('content-type', 'boundary');
+    }
+
     /**
      * @return null|string
      */

src/Part.php

@@ -12,16 +12,26 @@
  */
 class Part extends Mime
 {
-    protected $id;
+    /**
+     * @var string
+     */
+    private $_parentBoundary;
 
-    public function __construct($id)
+    /**
+     * Part constructor.
+     * @param string $parentBoundary
+     */
+    public function __construct($parentBoundary)
     {
-        $this->id = $id;
+        $this->_parentBoundary = $parentBoundary;
     }
 
-    public function getId()
+    /**
+     * @return null|string
+     */
+    public function getParentBoundary()
     {
-        return $this->id;
+        return $this->_parentBoundary;
     }
 
 }

src/parser/Email.php

@@ -146,12 +146,11 @@ protected function bindBoundary($type, $value)
             && strcasecmp($value[0], 'Content-Type') === 0
             && preg_match('/boundary(?:=|\s=)([^;]+)/i', $value[1], $out)
         ) {
-            $id = trim(str_replace(['"', "'"], '', $out[1]));
+            $id = trim($out[1], " \t\"'");
             $this->boundary['--' . $id] = [self::T_START_BOUNDARY, $id];
             $this->boundary['--' . $id . '--'] = [self::T_END_BOUNDARY, $id];
         } else if ($type === self::T_START_BOUNDARY) {
             $this->allowedHeader = true;
-            $this->context()->boundary = $value;
             $this->insertPart();
             $this->part = new Part($value);
         }

tests/BoundaryTest.php

@@ -31,11 +31,21 @@ public function testParse()
                      ["Content-type: multipart/mixed; boundary=\"te\n     st\"", 'new line'],
                      ['Content-Type: "multipart/mixed"; boundary="te st"', '>"<'],
                      ["Content-Type: 'multipart/mixed'; boundary='te st'", ">'<"],
+                     ['Content-Type: "multipart/mixed"; boundary = "te st"', "with spaces"],
+                     ["Content-Type: \"multipart/mixed\"; boundary\t=\t\"te st\"", "with tab"],
                  ] as $eml) {
             $parser = new Email();
             $parser->parse($eml[0]);
             $this->assertEquals($expected, $this->getProperty('bashkarev\email\parser\Email', 'boundary')->getValue($parser), $eml[1]);
         }
+
+        $parser = new Email();
+        $parser->parse('Content-Type: multipart/alternative; boundary="=felis-alternative=20170125210403=141032"');
+        $this->assertEquals([
+            '--=felis-alternative=20170125210403=141032' => [Email::T_START_BOUNDARY, '=felis-alternative=20170125210403=141032'],
+            '--=felis-alternative=20170125210403=141032--' => [Email::T_END_BOUNDARY, '=felis-alternative=20170125210403=141032'],
+        ], $this->getProperty('bashkarev\email\parser\Email', 'boundary')->getValue($parser));
+
     }
 
     public function testMultipartAlternative()

tests/HeaderTest.php

@@ -53,9 +53,9 @@ public function testFindInHeader()
                      ['CONTENT-TYPE', 'TEXT/PLAIN;CHARSET="UTF-8"', 'UTF-8', 'uppercase'],
                      ['Content-Type', 'text/plain;charset=utf-8', 'utf-8', 'without quotes'],
                      ['Content-Type', "text/plain;charset='utf-8'", 'utf-8', 'quotes'],
-                     ['Content-Type', 'text/plain;charset= utf-8 ', 'utf-8', 'with spaces'],
-                     ['Content-Type', 'text/plain;charset=  utf-8  ', 'utf-8', 'with spaces 2'],
-                     ['Content-Type', "text/plain;charset=\tutf-8\t", 'utf-8', 'with tab'],
+                     ['Content-Type', 'text/plain;charset = utf-8 ', 'utf-8', 'with spaces'],
+                     ['Content-Type', 'text/plain;charset  =  utf-8  ', 'utf-8', 'with spaces 2'],
+                     ['Content-Type', "text/plain;charset\t=\tutf-8\t", 'utf-8', 'with tab'],
                  ] as $item) {
             list($header, $value, $expected, $message) = $item;
             $mime = new Mime();

tests/MimeTest.php

@@ -108,4 +108,26 @@ public function testMessageRFC822()
         });
     }
 
+    public function testBoundary()
+    {
+        $mime = new Mime();
+        $mime->setHeader('Content-Type', 'multipart/alternative; boundary="=felis-alternative=20170125210403=141032"');
+        $this->assertEquals('=felis-alternative=20170125210403=141032', $mime->getBoundary(), '');
+    }
+
+    public function testId()
+    {
+        foreach ([
+                     ['<id>', 'id', 'simple'],
+                     ['< id >', 'id', 'space'],
+                     [' < id > ', 'id', 'space'],
+                     ["\t<id>\t", 'id', 'tab'],
+                 ] as $data) {
+            list($value, $expected, $message) = $data;
+            $mime = new Mime();
+            $mime->setHeader('Content-Id', $value);
+            $this->assertEquals($expected, $mime->getID(), $message);
+        }
+    }
+
 }