Add trailing Line return if last line is non empty

metaer · fabpot · commit ad1ff4fe949b · 2021-08-07T10:01:57.000+02:00
diff --git a/src/Symfony/Component/Mime/Crypto/DkimSigner.php b/src/Symfony/Component/Mime/Crypto/DkimSigner.php
@@ -203,7 +203,13 @@ private function hashBody(AbstractPart $body, string $bodyCanon, int $maxLength)
             hash_update($hash, $canon);
         }
 
-        if (0 === $length) {
+        // Add trailing Line return if last line is non empty
+        if (\strlen($currentLine) > 0) {
+            hash_update($hash, "\r\n");
+            $length += \strlen("\r\n");
+        }
+
+        if (!$relaxed && 0 === $length) {
             hash_update($hash, "\r\n");
             $length = 2;
         }
diff --git a/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php b/src/Symfony/Component/Mime/Tests/Crypto/DkimSignerTest.php
@@ -122,14 +122,14 @@ public function getCanonicalizeHeaderData()
             DkimSigner::CANON_SIMPLE, "\r\n", '', \PHP_INT_MAX,
         ];
         yield 'relaxed_empty' => [
-            DkimSigner::CANON_RELAXED, "\r\n", '', \PHP_INT_MAX,
+            DkimSigner::CANON_RELAXED, '', '', \PHP_INT_MAX,
         ];
 
         yield 'simple_empty_single_ending_CLRF' => [
             DkimSigner::CANON_SIMPLE, "\r\n", "\r\n", \PHP_INT_MAX,
         ];
         yield 'relaxed_empty_single_ending_CLRF' => [
-            DkimSigner::CANON_RELAXED, "\r\n", "\r\n", \PHP_INT_MAX,
+            DkimSigner::CANON_RELAXED, '', "\r\n", \PHP_INT_MAX,
         ];
 
         yield 'simple_multiple_ending_CLRF' => [

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,13 @@ private function hashBody(AbstractPart $body, string $bodyCanon, int $maxLength)`
`203`	`203`	`hash_update($hash, $canon);`
`204`	`204`	`}`
`205`	`205`
`206`		`- if (0 === $length) {`
	`206`	`+ // Add trailing Line return if last line is non empty`
	`207`	`+ if (\strlen($currentLine) > 0) {`
	`208`	`+ hash_update($hash, "\r\n");`
	`209`	`+ $length += \strlen("\r\n");`
	`210`	`+ }`
	`211`	`+`
	`212`	`+ if (!$relaxed && 0 === $length) {`
`207`	`213`	`hash_update($hash, "\r\n");`
`208`	`214`	`$length = 2;`
`209`	`215`	`}`