feature #45376 [Mime] Fix embed logic for background attributes (flack)

fabpot · fabpot · commit f12943d9bedb · 2022-02-10T15:02:29.000+01:00
This PR was submitted for the 4.4 branch but it was squashed and merged into the 6.1 branch instead. Discussion ---------- [Mime] Fix embed logic for background attributes | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #42921 | License | MIT | Doc PR | As suggested by @fabpot here #43255 (comment), this is the most minimal fix for the linked issue. I guess the same problem can happen if you use e.g. ```html <div style="background-image:url(cid:test.gif)"></div> ``` I have changed it so that there is now an array of regexes to look for embedded images, so at least code for the `background-image` case (or others that might be found later on) can easily be added. Commits ------- d4a87d2 [Mime] Fix embed logic for background attributes
diff --git a/src/Symfony/Component/Mime/Email.php b/src/Symfony/Component/Mime/Email.php
@@ -460,8 +460,17 @@ private function prepareParts(): ?array
         if (null !== $this->html) {
             $htmlPart = new TextPart($html, $this->htmlCharset, 'html');
             $html = $htmlPart->getBody();
-            preg_match_all('(<img\s+[^>]*src\s*=\s*(?:([\'"])cid:([^"]+)\\1|cid:([^>\s]+)))i', $html, $names);
-            $names = array_filter(array_unique(array_merge($names[2], $names[3])));
+
+            $regexes = [
+                '<img\s+[^>]*src\s*=\s*(?:([\'"])cid:([^"]+)\\1|cid:([^>\s]+))',
+                '<\w+\s+[^>]*background\s*=\s*(?:([\'"])cid:([^"]+)\\1|cid:([^>\s]+))',
+            ];
+            $tmpMatches = [];
+            foreach ($regexes as $regex) {
+                preg_match_all('/'.$regex.'/i', $html, $tmpMatches);
+                $names = array_merge($names, $tmpMatches[2], $tmpMatches[3]);
+            }
+            $names = array_filter(array_unique($names));
         }
 
         $attachmentParts = $inlineParts = [];
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -351,6 +351,14 @@ public function testGenerateBody()
         // 2 parts only, not 3 (text + embedded image once)
         $this->assertCount(2, $parts = $body->getParts());
         $this->assertStringMatchesFormat('html content <img src=3D"cid:%s@symfony">', $parts[0]->bodyToString());
+
+        $e = (new Email())->from('me@example.com')->to('you@example.com');
+        $e->html('<div background="cid:test.gif"></div>');
+        $e->embed($image, 'test.gif');
+        $body = $e->getBody();
+        $this->assertInstanceOf(RelatedPart::class, $body);
+        $this->assertCount(2, $parts = $body->getParts());
+        $this->assertStringMatchesFormat('<div background=3D"cid:%s@symfony"></div>', $parts[0]->bodyToString());
     }
 
     public function testAttachments()
