makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15294] Fix session_gc() selecting expired sessions for unique users

Browse source 
Also remove limit of 10 as it does not allow to collect all the garbage.

PHPBB3-15294
This commit is contained in:
rxu 2019-11-03 18:44:39 +07:00
parent 78ce646c69
commit e9fc3ed22e
No known key found for this signature in database
GPG key ID: 955F0567380E586A
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
phpBB/phpbb/session.php
View file

@ -954,8 +954,6 @@ class session
{ {
global $db, $config, $phpbb_container, $phpbb_dispatcher; global $db, $config, $phpbb_container, $phpbb_dispatcher;
$batch_size = 10;
if (!$this->time_now) if (!$this->time_now)
{ {
$this->time_now = time(); $this->time_now = time();
@ -968,14 +966,21 @@ class session
$db->sql_query($sql); $db->sql_query($sql);
// Get expired sessions, only most recent for each user // Get expired sessions, only most recent for each user
$sql = 'SELECT session_user_id, session_page, MAX(session_time) AS recent_time // Inner SELECT gets most recent expired sessions for unique session_user_id
FROM ' . SESSIONS_TABLE . ' // Outer SELECT gets session_page for them
WHERE session_time < ' . ($this->time_now - $config['session_length']) . ' $sql = 'SELECT s1.session_page, s1.session_user_id, s1.session_time AS recent_time
GROUP BY session_user_id, session_page'; FROM ' . SESSIONS_TABLE . ' AS s1
$result = $db->sql_query_limit($sql, $batch_size); INNER JOIN (
SELECT session_user_id, MAX(session_time) AS recent_time
FROM ' . SESSIONS_TABLE . '
WHERE session_time < ' . ($this->time_now - (int) $config['session_length']) . '
GROUP BY session_user_id
) AS s2
ON s1.session_user_id = s2.session_user_id
AND s1.session_time = s2.recent_time';
$result = $db->sql_query($sql);
$del_user_id = array(); $del_user_id = array();
$del_sessions = 0;
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
@ -985,7 +990,6 @@ class session
$db->sql_query($sql); $db->sql_query($sql);
$del_user_id[] = (int) $row['session_user_id']; $del_user_id[] = (int) $row['session_user_id'];
$del_sessions++;
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -998,29 +1002,25 @@ class session
$db->sql_query($sql); $db->sql_query($sql);
} }
if ($del_sessions < $batch_size) // Update gc timer
$config->set('session_last_gc', $this->time_now, false);
if ($config['max_autologin_time'])
{ {
// Less than 10 users, update gc timer ... else we want gc $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
// called again to delete other sessions WHERE last_login < ' . (time() - (86400 * (int) $config['max_autologin_time']));
$config->set('session_last_gc', $this->time_now, false);
if ($config['max_autologin_time'])
{
$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . '
WHERE last_login < ' . (time() - (86400 * (int) $config['max_autologin_time']));
$db->sql_query($sql);
}
// only called from CRON; should be a safe workaround until the infrastructure gets going
/* @var $captcha_factory \phpbb\captcha\factory */
$captcha_factory = $phpbb_container->get('captcha.factory');
$captcha_factory->garbage_collect($config['captcha_plugin']);
$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);
$db->sql_query($sql); $db->sql_query($sql);
} }
// only called from CRON; should be a safe workaround until the infrastructure gets going
/* @var $captcha_factory \phpbb\captcha\factory */
$captcha_factory = $phpbb_container->get('captcha.factory');
$captcha_factory->garbage_collect($config['captcha_plugin']);
$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);
$db->sql_query($sql);
/** /**
* Event to trigger extension on session_gc * Event to trigger extension on session_gc
* *