Skip to content
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

Session: use session_regenerate_id() to obtain a fresh session id and… #339

Closed
wants to merge 1 commit into from
Closed

Session: use session_regenerate_id() to obtain a fresh session id and… #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion application/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function is_session_id_valid($sessionId)
return false;
}

if (!preg_match('/^[a-z0-9]{2,32}$/i', $sessionId)) {
if (!preg_match('/^[-,a-z0-9]{1,128}$/i', $sessionId)) {
return false;
}

Expand Down
10 changes: 6 additions & 4 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,18 @@
// Prevent PHP form using sessionID in URL if cookies are disabled.
ini_set('session.use_trans_sid', false);

// Regenerate session id if invalid or not defined in cookie.
if (isset($_COOKIE['shaarli']) && !is_session_id_valid($_COOKIE['shaarli'])) {
$_COOKIE['shaarli'] = uniqid();
}
session_name('shaarli');
// Start session if needed (Some server auto-start sessions).
if (session_id() == '') {
session_start();
}

// Regenerate session id if invalid or not defined in cookie.
if (isset($_COOKIE['shaarli']) && !is_session_id_valid($_COOKIE['shaarli'])) {
session_regenerate_id(true);
$_COOKIE['shaarli'] = session_id();
}

include "inc/rain.tpl.class.php"; //include Rain TPL
raintpl::$tpl_dir = $GLOBALS['config']['RAINTPL_TPL']; // template directory
raintpl::$cache_dir = $GLOBALS['config']['RAINTPL_TMP']; // cache directory
Expand Down
3 changes: 2 additions & 1 deletion tests/UtilsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function testCheckSupportedPHPVersion52()
*/
public function testIsSessionIdValid()
{
$this->assertTrue(is_session_id_valid('azertyuiop123456789AZERTYUIOP1aA'));
$this->assertTrue(is_session_id_valid('iXJWB-H1w439c02a4ff8770d3a652d344-QhXGZlJsBPQnaeAGaG,SmZFcYxYsxtjXdlslXQn8UyHB0ZkGZeiN5ZAsUsR38YcICkTe1197k7pt5g7b10nq2sqp4bfssf'));
}

/**
Expand All @@ -167,5 +167,6 @@ public function testIsSessionIdInvalid()
$this->assertFalse(is_session_id_valid(''));
$this->assertFalse(is_session_id_valid(array()));
$this->assertFalse(is_session_id_valid('c0ZqcWF3VFE2NmJBdm1HMVQ0ZHJ3UmZPbTFsNGhkNHI='));
$this->assertFalse(is_session_id_valid('c0asFsAfSffsAOfsdvZqcWF3VFE2d43asfNmJBdm1HMV3a8AsQ0ZHJ3UmZPbTFsNGhkNHI='));
}
}