diff options
| author | Arthur <arthur@hoa.ro> | 2015-09-02 17:55:11 +0200 |
|---|---|---|
| committer | Arthur <arthur@hoa.ro> | 2015-09-02 17:55:11 +0200 |
| commit | 67ee1435f8a92894b6bf08404b5d26a3141c0b9e (patch) | |
| tree | 5756a3816ca0fbeb4036c632c369406aef86f29a | |
| parent | 53cc2b93b85a080c6c06bc3633fb454241fc5699 (diff) | |
| parent | 4d30975a06354c5a01d2dfdfc5441e160ef4073e (diff) | |
| download | Shaarli-0.5.3.tar.gz Shaarli-0.5.3.tar.zst Shaarli-0.5.3.zip | |
Merge pull request #336 from ArthurHoaro/login-hotfix0.5.3
Allow uppercase letters in PHP sessionid format
| -rwxr-xr-x[-rw-r--r--] | application/Utils.php | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/UtilsTest.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/application/Utils.php b/application/Utils.php index fa18f158..cb03f11c 100644..100755 --- a/application/Utils.php +++ b/application/Utils.php | |||
| @@ -156,7 +156,7 @@ function is_session_id_valid($sessionId) | |||
| 156 | return false; | 156 | return false; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | if (!preg_match('/^[a-z0-9]{2,32}$/', $sessionId)) { | 159 | if (!preg_match('/^[a-z0-9]{2,32}$/i', $sessionId)) { |
| 160 | return false; | 160 | return false; |
| 161 | } | 161 | } |
| 162 | 162 | ||
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php index e39ce6be..5175dde0 100644..100755 --- a/tests/UtilsTest.php +++ b/tests/UtilsTest.php | |||
| @@ -156,7 +156,7 @@ class UtilsTest extends PHPUnit_Framework_TestCase | |||
| 156 | */ | 156 | */ |
| 157 | public function testIsSessionIdValid() | 157 | public function testIsSessionIdValid() |
| 158 | { | 158 | { |
| 159 | $this->assertTrue(is_session_id_valid('123456789012345678901234567890az')); | 159 | $this->assertTrue(is_session_id_valid('azertyuiop123456789AZERTYUIOP1aA')); |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | /** | 162 | /** |