wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Throw exception if decryption fails

Browse source 
For #11868

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-11-14 12:47:35 +01:00
parent fef51895c2
commit be5c050acc
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/private/Security/Crypto.php
View file

@ -108,15 +108,16 @@ class Crypto implements ICrypto {
* @param string $password Password to encrypt, if not specified the secret from config.php will be taken
* @return string plaintext
* @throws \Exception If the HMAC does not match
* @throws \Exception If the decryption failed
*/
public function decrypt(string $authenticatedCiphertext, string $password = ''): string {
if($password === '') {
if ($password === '') {
$password = $this->config->getSystemValue('secret');
}
$this->cipher->setPassword($password);
$parts = explode('|', $authenticatedCiphertext);
if(\count($parts) !== 3) {
if (\count($parts) !== 3) {
throw new \Exception('Authenticated ciphertext could not be decoded.');
}
@ -126,11 +127,16 @@ class Crypto implements ICrypto {
$this->cipher->setIV($iv);
if(!hash_equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
if (!hash_equals($this->calculateHMAC($parts[0] . $parts[1], $password), $hmac)) {
throw new \Exception('HMAC does not match.');
}
return $this->cipher->decrypt($ciphertext);
$result = $this->cipher->decrypt($ciphertext);
if ($result === false) {
throw new \Exception('Decryption failed');
}
return $result;
}
}

1
lib/public/Security/ICrypto.php
View file

@ -60,6 +60,7 @@ interface ICrypto {
* @param string $password Password to encrypt, if not specified the secret from config.php will be taken
* @return string plaintext
* @throws \Exception If the HMAC does not match
* @throws \Exception If the decryption failed
* @since 8.0.0
*/
public function decrypt(string $authenticatedCiphertext, string $password = ''): string;