bug #35099 [FrameworkBundle] Do not throw exception on value generate key (jderusse)

nicolas-grekas · nicolas-grekas · commit 84de1a35d213 · 2020-01-09T15:20:34.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] Do not throw exception on value generate key | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A When using env variable instead of key files and creating a new Secret, the check in `generateKeys` (called by the command `SecretsSetCommand`) prevents generating a secret. reproducer: ``` $ rm config/secrets/prod/prod.decrypt.private.php $ export SYMFONY_DECRYPTION_SECRET=XXX $ ./bin/console secret:set FOO In SodiumVault.php line 50: Cannot generate keys when a decryption key has been provided while instantiating the vault. ``` This PR converts the exception in a warning message. Commits ------- 2f608b4 Do not throw exception on valut generate key
diff --git a/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php b/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php
@@ -47,7 +47,9 @@ public function generateKeys(bool $override = false): bool
         $this->lastMessage = null;
 
         if (null === $this->encryptionKey && '' !== $this->decryptionKey = (string) $this->decryptionKey) {
-            throw new \LogicException('Cannot generate keys when a decryption key has been provided while instantiating the vault.');
+            $this->lastMessage = 'Cannot generate keys when a decryption key has been provided while instantiating the vault.';
+
+            return false;
         }
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,9 @@ public function generateKeys(bool $override = false): bool`
`47`	`47`	`$this->lastMessage = null;`
`48`	`48`
`49`	`49`	`if (null === $this->encryptionKey && '' !== $this->decryptionKey = (string) $this->decryptionKey) {`
`50`		`- throw new \LogicException('Cannot generate keys when a decryption key has been provided while instantiating the vault.');`
	`50`	`+ $this->lastMessage = 'Cannot generate keys when a decryption key has been provided while instantiating the vault.';`
	`51`	`+`
	`52`	`+ return false;`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`try {`