Commit52ceda7

authored and

committed

[Mime] Fix missing sprintf in DkimSigner

1 parent6a5db15 commit52ceda7Copy full SHA for 52ceda7

File tree

+18

-2

lines changed

src/Symfony/Component/Mime
- Crypto
  - DkimSigner.php
- Tests/Crypto
  - DkimSignerTest.php

+18

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function sign(Message $message, array $options = []): Message`
`65`	`65`	`{`
`66`	`66`	`$options +=$this->defaultOptions;`
`67`	`67`	`if (!\in_array($options['algorithm'], [self::ALGO_SHA256,self::ALGO_ED25519],true)) {`
`68`		`-thrownewInvalidArgumentException('Invalid DKIM signing algorithm "%s".',$options['algorithm']);`
	`68`	`+thrownewInvalidArgumentException(sprintf('Invalid DKIM signing algorithm "%s".',$options['algorithm']));`
`69`	`69`	`}`
`70`	`70`	`$headersToIgnore['return-path'] =true;`
`71`	`71`	`$headersToIgnore['x-transport'] =true;`
`@@ -205,7 +205,7 @@ private function hashBody(AbstractPart $body, string $bodyCanon, int $maxLength)`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`// Add trailing Line return if last line is non empty`
`208`		`-if (\strlen($currentLine) >0) {`
	`208`	`+if ('' !==$currentLine) {`
`209`	`209`	`hash_update($hash,"\r\n");`
`210`	`210`	`$length +=\strlen("\r\n");`
`211`	`211`	`}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`useSymfony\Component\Mime\Address;`
`17`	`17`	`useSymfony\Component\Mime\Crypto\DkimSigner;`
`18`	`18`	`useSymfony\Component\Mime\Email;`
	`19`	`+useSymfony\Component\Mime\Message;`
`19`	`20`
`20`	`21`	`/**`
`21`	`22`	`* @group time-sensitive`
`@@ -90,6 +91,21 @@ public function getSignData()`
`90`	`91`	`];`
`91`	`92`	`}`
`92`	`93`
	`94`	`+publicfunctiontestSignWithUnsupportedAlgorithm()`
	`95`	`+ {`
	`96`	`+$message =$this->createMock(Message::class);`
	`97`	`+`
	`98`	`+$signer =newDkimSigner(self::$pk,'testdkim.symfony.net','sf', [`
	`99`	`+'algorithm' =>'unsupported-value',`
	`100`	`+ ]);`
	`101`	`+`
	`102`	`+$this->expectExceptionObject(`
	`103`	`+new \LogicException('Invalid DKIM signing algorithm "unsupported-value".')`
	`104`	`+ );`
	`105`	`+`
	`106`	`+$signer->sign($message, []);`
	`107`	`+ }`
	`108`	`+`
`93`	`109`	`/**`
`94`	`110`	`* @dataProvider getCanonicalizeHeaderData`
`95`	`111`	`*/`

Comments

(0)