bug #34145 [FrameworkBundle] make SodiumVault report bad decryption key accurately (nicolas-grekas)

fabpot · fabpot · commit 0472dbfccb33 · 2019-10-27T18:49:11.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] make SodiumVault report bad decryption key accurately | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- d9d16d2 [FrameworkBundle] make SodiumVault report bad decryption key accurately
diff --git a/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php b/src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php
@@ -115,7 +115,13 @@ public function reveal(string $name): ?string
             return null;
         }
 
-        return sodium_crypto_box_seal_open(include $file, $this->decryptionKey);
+        if (false === $value = sodium_crypto_box_seal_open(include $file, $this->decryptionKey)) {
+            $this->lastMessage = sprintf('Secrets cannot be revealed as the wrong decryption key was provided for "%s".', $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
+
+            return null;
+        }
+
+        return $value;
     }
 
     public function remove(string $name): bool

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,13 @@ public function reveal(string $name): ?string`
`115`	`115`	`return null;`
`116`	`116`	`}`
`117`	`117`
`118`		`- return sodium_crypto_box_seal_open(include $file, $this->decryptionKey);`
	`118`	`+ if (false === $value = sodium_crypto_box_seal_open(include $file, $this->decryptionKey)) {`
	`119`	`+ $this->lastMessage = sprintf('Secrets cannot be revealed as the wrong decryption key was provided for "%s".', $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));`
	`120`	`+`
	`121`	`+ return null;`
	`122`	`+ }`
	`123`	`+`
	`124`	`+ return $value;`
`119`	`125`	`}`
`120`	`126`
`121`	`127`	`public function remove(string $name): bool`