Skip to content

Commit

Permalink
[9.x] Fixed errors occurring when encrypted cookies has been tampered…
Browse files Browse the repository at this point in the history
… with (#45313)

* Fixed errors occurring when encrypted cookies has been tampered with

* Corrected code style

* Update Encrypter.php

Co-authored-by: Taylor Otwell <taylor@laravel.com>
  • Loading branch information
vbezaras-leasingmarkt and taylorotwell authored Dec 14, 2022
1 parent 945c45e commit 28bd786
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 2 deletions.
17 changes: 15 additions & 2 deletions src/Illuminate/Encryption/Encrypter.php
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,21 @@ protected function getJsonPayload($payload)
*/
protected function validPayload($payload)
{
return is_array($payload) && isset($payload['iv'], $payload['value'], $payload['mac']) &&
strlen(base64_decode($payload['iv'], true)) === openssl_cipher_iv_length(strtolower($this->cipher));
if (! is_array($payload)) {
return false;
}

foreach (['iv', 'value', 'mac'] as $item) {
if (! isset($payload[$item]) || ! is_string($payload[$item])) {
return false;
}
}

if (isset($payload['tag']) && ! is_string($payload['tag'])) {
return false;
}

return strlen(base64_decode($payload['iv'], true)) === openssl_cipher_iv_length(strtolower($this->cipher));
}

/**
Expand Down
23 changes: 23 additions & 0 deletions tests/Encryption/EncrypterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,27 @@ public function testSupportedMethodAcceptsAnyCasing()
$this->assertTrue(Encrypter::supported($key, 'aes-128-CBC'));
$this->assertTrue(Encrypter::supported($key, 'aes-128-cbc'));
}

public function provideTamperedData()
{
return [
[['iv' => ['value_in_array'], 'value' => '', 'mac' => '']],
[['iv' => '', 'value' => '', 'mac' => '']],
[['iv' => '', 'value' => ['value_in_array'], 'mac' => '']],
[['iv' => '', 'value' => '', 'mac' => ['value_in_array']]],
[['iv' => '', 'value' => '', 'mac' => ['value_in_array'], 'tag' => ['value_in_array']]],
];
}

/**
* @dataProvider provideTamperedData
*/
public function testTamperedPayloadWillGetRejected($payload)
{
$this->expectException(DecryptException::class);
$this->expectExceptionMessage('The payload is invalid.');

$enc = new Encrypter(str_repeat('x', 16));
$enc->decrypt(base64_encode(json_encode($payload)));
}
}

0 comments on commit 28bd786

Please sign in to comment.