Boundary parsing fixed and improved to support more formats #544

Author: Webklex

CHANGELOG.md

@@ -8,6 +8,7 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 ### Fixed
 - Filename sanitization is now optional (enabled via default)
 - Address parsing improved and extended to include more cases
+- Boundary parsing fixed and improved to support more formats #544
 
 ### Added
 - Security configuration options added

src/Structure.php

@@ -132,7 +132,10 @@ private function parsePart(string $context, int $part_number = 0): array {
  * @throws InvalidMessageDateException
  */
  private function detectParts(string $boundary, string $context, int $part_number = 0): array {
- $base_parts = explode( $boundary, $context);
+ $base_parts = explode( "--".$boundary, $context);
+ if(count($base_parts) == 0) {
+ $base_parts = explode($boundary, $context);
+ }
  $final_parts = [];
  foreach($base_parts as $ctx) {
  $ctx = substr($ctx, 2);

tests/HeaderTest.php

@@ -51,7 +51,6 @@ public function testHeaderParsing(): void {
  $header = new Header($raw_header, $this->config);
  $subject = $header->get("subject");
  $returnPath = $header->get("return_path");
- var_dump($returnPath);
  /** @var Carbon $date */
  $date = $header->get("date")->first();
  /** @var Address $from */

tests/fixtures/BooleanDecodedContentTest.php

@@ -48,7 +48,7 @@ public function testFixture() : void {
  self::assertEquals("application/pdf", $attachment->content_type);
  self::assertEquals("1c449aaab4f509012fa5eaa180fd017eb7724ccacabdffc1c6066d3756dcde5c", hash("sha256", $attachment->content));
  self::assertEquals(53, $attachment->size);
- self::assertEquals(3, $attachment->part_number);
+ self::assertEquals(2, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
  }

tests/fixtures/EmbeddedEmailWithoutContentDispositionEmbeddedTest.php

@@ -55,7 +55,7 @@ public function testFixture() : void {
  self::assertEquals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $attachment->content_type);
  self::assertEquals("87737d24c106b96e177f9564af6712e2c6d3e932c0632bfbab69c88b0bb934dc", hash("sha256", $attachment->content));
  self::assertEquals(40, $attachment->size);
- self::assertEquals(3, $attachment->part_number);
+ self::assertEquals(2, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -67,7 +67,7 @@ public function testFixture() : void {
  self::assertEquals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $attachment->content_type);
  self::assertEquals("87737d24c106b96e177f9564af6712e2c6d3e932c0632bfbab69c88b0bb934dc", hash("sha256", $attachment->content));
  self::assertEquals(40, $attachment->size);
- self::assertEquals(4, $attachment->part_number);
+ self::assertEquals(3, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
  }

tests/fixtures/EmbeddedEmailWithoutContentDispositionTest.php

@@ -54,7 +54,7 @@ public function testFixture() : void {
  self::assertEquals("image/jpeg", $attachment->content_type);
  self::assertEquals("6b7fa434f92a8b80aab02d9bf1a12e49ffcae424e4013a1c4f68b67e3d2bbcd0", hash("sha256", $attachment->content));
  self::assertEquals(96, $attachment->size);
- self::assertEquals(3, $attachment->part_number);
+ self::assertEquals(2, $attachment->part_number);
  self::assertEquals("inline", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -66,7 +66,7 @@ public function testFixture() : void {
  self::assertEquals("message/rfc822", $attachment->content_type);
  self::assertEquals("2476c8b91a93c6b2fe1bfff593cb55956c2fe8e7ca6de9ad2dc9d101efe7a867", hash("sha256", $attachment->content));
  self::assertEquals(2073, $attachment->size);
- self::assertEquals(5, $attachment->part_number);
+ self::assertEquals(3, $attachment->part_number);
  self::assertNull($attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -78,7 +78,7 @@ public function testFixture() : void {
  self::assertEquals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $attachment->content_type);
  self::assertEquals("87737d24c106b96e177f9564af6712e2c6d3e932c0632bfbab69c88b0bb934dc", hash("sha256", $attachment->content));
  self::assertEquals(40, $attachment->size);
- self::assertEquals(6, $attachment->part_number);
+ self::assertEquals(4, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -90,7 +90,7 @@ public function testFixture() : void {
  self::assertEquals("application/x-zip-compressed", $attachment->content_type);
  self::assertEquals("87737d24c106b96e177f9564af6712e2c6d3e932c0632bfbab69c88b0bb934dc", hash("sha256", $attachment->content));
  self::assertEquals(40, $attachment->size);
- self::assertEquals(7, $attachment->part_number);
+ self::assertEquals(5, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
  }

tests/fixtures/MultipleHtmlPartsAndAttachmentsTest.php

@@ -57,7 +57,7 @@ public function testFixture() : void {
  self::assertEquals("application/pdf", $attachment->content_type);
  self::assertEquals("c162adf19e0f67e26ef0b7f791b33a60b2c23b175560a505dc7f9ec490206e49", hash("sha256", $attachment->content));
  self::assertEquals(4814, $attachment->size);
- self::assertEquals(4, $attachment->part_number);
+ self::assertEquals(2, $attachment->part_number);
  self::assertEquals("inline", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -69,7 +69,7 @@ public function testFixture() : void {
  self::assertEquals("application/pdf", $attachment->content_type);
  self::assertEquals("a337b37e9d3edb172a249639919f0eee3d344db352046d15f8f9887e55855a25", hash("sha256", $attachment->content));
  self::assertEquals(5090, $attachment->size);
- self::assertEquals(6, $attachment->part_number);
+ self::assertEquals(4, $attachment->part_number);
  self::assertEquals("inline", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
  }

tests/fixtures/MultipleNestedAttachmentsTest.php

@@ -50,7 +50,7 @@ public function testFixture() : void {
  self::assertEquals("image/png", $attachment->content_type);
  self::assertEquals("e0e99b0bd6d5ea3ced99add53cc98b6f8eea6eae8ddd773fd06f3489289385fb", hash("sha256", $attachment->content));
  self::assertEquals(114, $attachment->size);
- self::assertEquals(5, $attachment->part_number);
+ self::assertEquals(3, $attachment->part_number);
  self::assertEquals("inline", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -62,7 +62,7 @@ public function testFixture() : void {
  self::assertEquals("image/png", $attachment->content_type);
  self::assertEquals("e0e99b0bd6d5ea3ced99add53cc98b6f8eea6eae8ddd773fd06f3489289385fb", hash("sha256", $attachment->content));
  self::assertEquals(114, $attachment->size);
- self::assertEquals(8, $attachment->part_number);
+ self::assertEquals(4, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
  }

tests/fixtures/NestesEmbeddedWithAttachmentTest.php

@@ -50,7 +50,7 @@ public function testFixture() : void {
  self::assertEquals("message/rfc822", $attachment->content_type);
  self::assertEquals("From: from@there.com\r\nTo: to@here.com\r\nSubject: FIRST\r\nDate: Sat, 28 Apr 2018 14:37:16 -0400\r\nMIME-Version: 1.0\r\nContent-Type: multipart/mixed;\r\nboundary=\"----=_NextPart_000_222_000\"\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n------=_NextPart_000_222_000\r\nContent-Type: multipart/alternative;\r\nboundary=\"----=_NextPart_000_222_111\"\r\n\r\n\r\n------=_NextPart_000_222_111\r\nContent-Type: text/plain;\r\ncharset=\"UTF-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\nPlease respond directly to this email to update your RMA\r\n\r\n\r\n2018-04-17T11:04:03-04:00\r\n------=_NextPart_000_222_111\r\nContent-Type: text/html;\r\ncharset=\"UTF-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n<HTML><HEAD></HEAD>\r\n<BODY dir=3Dltr>\r\n<DIV>Please respond directly to this =\r\nemail to=20\r\nupdate your RMA</DIV></BODY></HTML>\r\n\r\n------=_NextPart_000_222_111--\r\n\r\n------=_NextPart_000_222_000\r\nContent-Type: image/png;\r\nname=\"chrome.png\"\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment;\r\nfilename=\"chrome.png\"\r\n\r\niVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAB+FBMVEUAAAA/mUPidDHiLi5Cn0Xk\r\nNTPmeUrkdUg/m0Q0pEfcpSbwaVdKskg+lUP4zA/iLi3msSHkOjVAmETdJSjtYFE/lkPnRj3sWUs8\r\nkkLeqCVIq0fxvhXqUkbVmSjwa1n1yBLepyX1xxP0xRXqUkboST9KukpHpUbuvRrzrhF/ljbwalju\r\nZFM4jELaoSdLtElJrUj1xxP6zwzfqSU4i0HYnydMtUlIqUfywxb60AxZqEXaoifgMCXptR9MtklH\r\npEY2iUHWnSjvvRr70QujkC+pUC/90glMuEnlOjVMt0j70QriLS1LtEnnRj3qUUXfIidOjsxAhcZF\r\no0bjNDH0xxNLr0dIrUdmntVTkMoyfL8jcLBRuErhJyrgKyb4zA/5zg3tYFBBmUTmQTnhMinruBzv\r\nvhnxwxZ/st+Ktt5zp9hqota2vtK6y9FemNBblc9HiMiTtMbFtsM6gcPV2r6dwroseLrMrbQrdLGd\r\nyKoobKbo3Zh+ynrgVllZulTsXE3rV0pIqUf42UVUo0JyjEHoS0HmsiHRGR/lmRz/1hjqnxjvpRWf\r\nwtOhusaz0LRGf7FEfbDVmqHXlJeW0pbXq5bec3fX0nTnzmuJuWvhoFFhm0FtrziBsjaAaDCYWC+u\r\nSi6jQS3FsSfLJiTirCOkuCG1KiG+wSC+GBvgyhTszQ64Z77KAAAARXRSTlMAIQRDLyUgCwsE6ebm\r\n5ubg2dLR0byXl4FDQzU1NDEuLSUgC+vr6urq6ubb29vb2tra2tG8vLu7u7uXl5eXgYGBgYGBLiUA\r\nLabIAAABsElEQVQoz12S9VPjQBxHt8VaOA6HE+AOzv1wd7pJk5I2adpCC7RUcHd3d3fXf5PvLkxh\r\neD++z+yb7GSRlwD/+Hj/APQCZWxM5M+goF+RMbHK594v+tPoiN1uHxkt+xzt9+R9wnRTZZQpXQ0T\r\n5uP1IQxToyOAZiQu5HEpjeA4SWIoksRxNiGC1tRZJ4LNxgHgnU5nJZBDvuDdl8lzQRBsQ+s9PZt7\r\ns7Pz8wsL39/DkIfZ4xlB2Gqsq62ta9oxVlVrNZpihFRpGO9fzQw1ms0NDWZz07iGkJmIFH8xxkc3\r\na/WWlubmFkv9AB2SEpDvKxbjidN2faseaNV3zoHXvv7wMODJdkOHAegweAfFPx4G67KluxzottCU\r\n9n8CUqXzcIQdXOytAHqXxomvykhEKN9EFutG22p//0rbNvHVxiJywa8yS2KDfV1dfbu31H8jF1RH\r\niTKtWYeHxUvq3bn0pyjCRaiRU6aDO+gb3aEfEeVNsDgm8zzLy9egPa7Qt8TSJdwhjplk06HH43ZN\r\nJ3s91KKCHQ5x4sw1fRGYDZ0n1L4FKb9/BP5JLYxToheoFCVxz57PPS8UhhEpLBVeAAAAAElFTkSu\r\nQmCC\r\n\r\n------=_NextPart_000_222_000--", $attachment->content);
  self::assertEquals(2535, $attachment->size);
- self::assertEquals(5, $attachment->part_number);
+ self::assertEquals(3, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -62,7 +62,7 @@ public function testFixture() : void {
  self::assertEquals("message/rfc822", $attachment->content_type);
  self::assertEquals("From: from@there.com\r\nTo: to@here.com\r\nSubject: SECOND\r\nDate: Sat, 28 Apr 2018 13:37:30 -0400\r\nMIME-Version: 1.0\r\nContent-Type: multipart/alternative;\r\nboundary=\"----=_NextPart_000_333_000\"\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n------=_NextPart_000_333_000\r\nContent-Type: text/plain;\r\ncharset=\"UTF-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\nT whom it may concern:\r\n------=_NextPart_000_333_000\r\nContent-Type: text/html;\r\ncharset=\"UTF-8\"\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n<HTML><HEAD></HEAD>\r\n<BODY dir=3Dltr>\r\n<DIV>T whom it may concern:</DIV>\r\n</BODY></HTML>\r\n\r\n------=_NextPart_000_333_000--", $attachment->content);
  self::assertEquals(631, $attachment->size);
- self::assertEquals(6, $attachment->part_number);
+ self::assertEquals(4, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
  }

tests/fixtures/PecTest.php

@@ -51,7 +51,7 @@ public function testFixture() : void {
  self::assertEquals("application/xml", $attachment->content_type);
  self::assertEquals("<xml/>", $attachment->content);
  self::assertEquals(8, $attachment->size);
- self::assertEquals(4, $attachment->part_number);
+ self::assertEquals(3, $attachment->part_number);
  self::assertEquals("inline", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -63,7 +63,7 @@ public function testFixture() : void {
  self::assertEquals("message/rfc822", $attachment->content_type);
  self::assertEquals("To: test@example.com\r\nFrom: test@example.com\r\nSubject: test-subject\r\nDate: Mon, 2 Oct 2017 12:13:50 +0200\r\nContent-Type: text/plain; charset=iso-8859-15; format=flowed\r\nContent-Transfer-Encoding: 7bit\r\n\r\ntest-content", $attachment->content);
  self::assertEquals(216, $attachment->size);
- self::assertEquals(5, $attachment->part_number);
+ self::assertEquals(4, $attachment->part_number);
  self::assertEquals("inline", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
 
@@ -75,7 +75,7 @@ public function testFixture() : void {
  self::assertEquals("application/x-pkcs7-signature", $attachment->content_type);
  self::assertEquals("1", $attachment->content);
  self::assertEquals(4, $attachment->size);
- self::assertEquals(7, $attachment->part_number);
+ self::assertEquals(5, $attachment->part_number);
  self::assertEquals("attachment", $attachment->disposition);
  self::assertNotEmpty($attachment->id);
  }