Skip to content

fix: Catch ValueError from hex2bin() in Security::derandomize() on PHP 8 #10320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gr8man wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: Catch ValueError from hex2bin() in Security::derandomize() on PHP 8 #10320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24b1921
Fix: Catch ValueError thrown by hex2bin() in Security::derandomize()
gr8man Jun 17, 2026
3401716
Trigger rebuild
gr8man Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion system/Security/Security.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use ErrorException;
use JsonException;
use SensitiveParameter;
use ValueError;

/**
* Class Security
Expand Down Expand Up @@ -419,7 +420,7 @@ protected function derandomize(#[SensitiveParameter] string $token): string

try {
return bin2hex((string) hex2bin($value) ^ (string) hex2bin($key));
} catch (ErrorException $e) {
} catch (ErrorException|ValueError $e) {
// "hex2bin(): Hexadecimal input string must have an even length"
throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
}
Expand Down
12 changes: 12 additions & 0 deletions tests/system/Security/SecurityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

use CodeIgniter\Config\Factories;
use CodeIgniter\Config\Services;
use CodeIgniter\Exceptions\InvalidArgumentException;
use CodeIgniter\HTTP\IncomingRequest;
use CodeIgniter\HTTP\SiteURI;
use CodeIgniter\HTTP\UserAgent;
Expand Down Expand Up @@ -419,4 +420,15 @@ public static function provideGetPostedTokenReturnsNullForInvalidInputs(): itera

yield 'invalid_form_data' => [self::createIncomingRequest()->setBody('csrf_test_name[]=invalid')];
}

public function testDerandomizeThrowsInvalidArgumentExceptionOnInvalidHex(): void
{
$security = $this->createMockSecurity();
$derandomize = self::getPrivateMethodInvoker($security, 'derandomize');

$this->expectException(InvalidArgumentException::class);

// 'G' is not a valid hexadecimal character, which will trigger hex2bin's ValueError/Warning
$derandomize(str_repeat('G', 64));
}
}
Loading