From cc197b0915695bb9c26278c9b5e559430890b42c Mon Sep 17 00:00:00 2001 From: Jan Tvrdik Date: Sat, 7 May 2016 17:30:51 +0200 Subject: [PATCH] increased CSRF token entropy --- src/Helpers.php | 7 ++++++- tests/cases/SecuredLinksTest.phpt | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Helpers.php b/src/Helpers.php index de25c3d..773bd7b 100644 --- a/src/Helpers.php +++ b/src/Helpers.php @@ -33,6 +33,11 @@ public static function getCsrfToken(Session $session, $controlName, $method, arr $params = Nette\Utils\Arrays::flatten($params); $params = implode('|', array_keys($params)) . '|' . implode('|', array_values($params)); - return substr(md5($controlName . $method . $params . $sessionSection->token . $session->getId()), 0, 8); + + $data = $controlName . $method . $params . $session->getId(); + $hash = hash_hmac('sha1', $data, $sessionSection->token, TRUE); + $token = strtr(substr(base64_encode($hash), 0, 8), '+/', '-_'); + + return $token; } } diff --git a/tests/cases/SecuredLinksTest.phpt b/tests/cases/SecuredLinksTest.phpt index a0da629..bccd1ea 100644 --- a/tests/cases/SecuredLinksTest.phpt +++ b/tests/cases/SecuredLinksTest.phpt @@ -73,20 +73,20 @@ $presenter->injectPrimary(NULL, NULL, $router, $httpRequest, $httpResponse, $ses $presenter->run($request); -Assert::same( '/index.php?action=default&do=pay&presenter=Test&_sec=15b97390', $presenter->link('pay!') ); -Assert::same( '/index.php?amount=200&action=default&do=pay&presenter=Test&_sec=15b97390', $presenter->link('pay!', [200]) ); -Assert::same( '/index.php?amount=100&action=default&do=pay2&presenter=Test&_sec=1292dd35', $presenter->link('pay2!', [100]) ); -Assert::same( '/index.php?amount=200&action=default&do=pay2&presenter=Test&_sec=6c9cc123', $presenter->link('pay2!', [200]) ); -Assert::same( '/index.php?sections[0]=a§ions[1]=b&action=default&do=list&presenter=Test&_sec=52c37d1f', urldecode($presenter->link('list!', [['a', 'b']])) ); -Assert::same( '/index.php?sections[0]=a§ions[1]=c&action=default&do=list&presenter=Test&_sec=a0f08fca', urldecode($presenter->link('list!', [['a', 'c']])) ); +Assert::same( '/index.php?action=default&do=pay&presenter=Test&_sec=7VNmMotk', $presenter->link('pay!') ); +Assert::same( '/index.php?amount=200&action=default&do=pay&presenter=Test&_sec=7VNmMotk', $presenter->link('pay!', [200]) ); +Assert::same( '/index.php?amount=100&action=default&do=pay2&presenter=Test&_sec=JtQFHCP3', $presenter->link('pay2!', [100]) ); +Assert::same( '/index.php?amount=200&action=default&do=pay2&presenter=Test&_sec=S2PM9nnh', $presenter->link('pay2!', [200]) ); +Assert::same( '/index.php?sections[0]=a§ions[1]=b&action=default&do=list&presenter=Test&_sec=btNfK0zF', urldecode($presenter->link('list!', [['a', 'b']])) ); +Assert::same( '/index.php?sections[0]=a§ions[1]=c&action=default&do=list&presenter=Test&_sec=2oGtxq6E', urldecode($presenter->link('list!', [['a', 'c']])) ); -Assert::same( '/index.php?action=default&do=mycontrol-pay&presenter=Test&mycontrol-_sec=3370fd04', $presenter['mycontrol']->link('pay') ); -Assert::same( '/index.php?mycontrol-amount=200&action=default&do=mycontrol-pay&presenter=Test&mycontrol-_sec=3370fd04', $presenter['mycontrol']->link('pay', [200]) ); +Assert::same( '/index.php?action=default&do=mycontrol-pay&presenter=Test&mycontrol-_sec=_eyaqc4b', $presenter['mycontrol']->link('pay') ); +Assert::same( '/index.php?mycontrol-amount=200&action=default&do=mycontrol-pay&presenter=Test&mycontrol-_sec=_eyaqc4b', $presenter['mycontrol']->link('pay', [200]) ); $session->shouldReceive('getId')->times(2)->andReturn('session_id_2'); -Assert::same( '/index.php?sections[0]=a§ions[1]=b&action=default&do=list&presenter=Test&_sec=ea0c9a62', urldecode($presenter->link('list!', [['a', 'b']])) ); -Assert::same( '/index.php?sections[0]=a§ions[1]=c&action=default&do=list&presenter=Test&_sec=a4ddd9f8', urldecode($presenter->link('list!', [['a', 'c']])) ); +Assert::same( '/index.php?sections[0]=a§ions[1]=b&action=default&do=list&presenter=Test&_sec=Y3v1C1cr', urldecode($presenter->link('list!', [['a', 'b']])) ); +Assert::same( '/index.php?sections[0]=a§ions[1]=c&action=default&do=list&presenter=Test&_sec=kfY-zsLy', urldecode($presenter->link('list!', [['a', 'c']])) ); Mockery::close();