Merge pull request #39 from shaffe-fr/feat/raw-message

Prevent raw messages to be processed

src/Listeners/SwiftEmbedImages.php

@@ -69,13 +69,35 @@ private function attachImages()
             return;
         }
 
+        // Invalid HTML (raw message)
+        if ($this->shouldSkipDocument($document)) {
+            return;
+        }
+
         // Add images
         $this->attachImagesToDom($document);
 
         // Replace body
         $this->message->setBody($parser->saveHTML($document));
     }
 
+    /**
+     * @param  DOMDocument $document
+     * @return bool
+     */
+    private function shouldSkipDocument($document)
+    {
+        if ($document->childNodes->count() != 1) {
+            return false;
+        }
+
+        if ($document->childNodes->item(0)->nodeType == XML_DOCUMENT_TYPE_NODE) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * @param DOMDocument $document
      * @return string

tests/MailTest.php

@@ -144,4 +144,17 @@ public function testDoesntHandleSendPerformedEvent()
             $embedPlugin->sendPerformed($this->createSwiftEvent($message))
         );
     }
+
+    /**
+     * @test
+     */
+    public function testDoesntTransformRawMessages()
+    {
+        $message = $this->handleBeforeSendPerformedEvent('raw-message.txt', [
+            'enabled' => true,
+            'method' => 'attachment',
+        ]);
+
+        $this->assertEquals($this->getLibraryFile('raw-message.txt'), $message->getBody());
+    }
 }

tests/lib/raw-message.txt

@@ -0,0 +1,2 @@
+The is a raw message that should be skipped.
+It doesn't contain any images.