phpBB

Code Changes

File: phpbb/session.php

  Unmodified   Added   Modified   Removed
Line 92Line 92
		}

// current directory within the phpBB root (for example: adm)

		}

// current directory within the phpBB root (for example: adm)

		$root_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($root_path)));
$page_dirs = explode('/', str_replace('\\', '/', phpbb_realpath('./')));

		$root_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath($root_path)));
$page_dirs = explode('/', str_replace('\\', '/', $phpbb_filesystem->realpath('./')));

		$intersection = array_intersect_assoc($root_dirs, $page_dirs);

$root_dirs = array_diff_assoc($root_dirs, $intersection);

		$intersection = array_intersect_assoc($root_dirs, $page_dirs);

$root_dirs = array_diff_assoc($root_dirs, $intersection);

Line 219Line 219
	function session_begin($update_session_page = true)
{
global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $config, $phpbb_root_path;

	function session_begin($update_session_page = true)
{
global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $config, $phpbb_root_path;

		global $request, $phpbb_container;

		global $request, $phpbb_container, $user, $phpbb_log, $phpbb_dispatcher;


// Give us some basic information
$this->time_now = time();


// Give us some basic information
$this->time_now = time();

Line 257Line 257

if ($request->is_set($config['cookie_name'] . '_sid', \phpbb\request\request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', \phpbb\request\request_interface::COOKIE))
{


if ($request->is_set($config['cookie_name'] . '_sid', \phpbb\request\request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', \phpbb\request\request_interface::COOKIE))
{

			$this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true);
$this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true);
$this->session_id = request_var($config['cookie_name'] . '_sid', '', false, true);

			$this->cookie_data['u'] = $request->variable($config['cookie_name'] . '_u', 0, false, \phpbb\request\request_interface::COOKIE);
$this->cookie_data['k'] = $request->variable($config['cookie_name'] . '_k', '', false, \phpbb\request\request_interface::COOKIE);
$this->session_id = $request->variable($config['cookie_name'] . '_sid', '', false, \phpbb\request\request_interface::COOKIE);


$SID = (defined('NEED_SID')) ? '?sid=' . $this->session_id : '?sid=';
$_SID = (defined('NEED_SID')) ? $this->session_id : '';

if (empty($this->session_id))
{


$SID = (defined('NEED_SID')) ? '?sid=' . $this->session_id : '?sid=';
$_SID = (defined('NEED_SID')) ? $this->session_id : '';

if (empty($this->session_id))
{

				$this->session_id = $_SID = request_var('sid', '');

				$this->session_id = $_SID = $request->variable('sid', '');

				$SID = '?sid=' . $this->session_id;
$this->cookie_data = array('u' => 0, 'k' => '');
}
}
else
{

				$SID = '?sid=' . $this->session_id;
$this->cookie_data = array('u' => 0, 'k' => '');
}
}
else
{

			$this->session_id = $_SID = request_var('sid', '');

			$this->session_id = $_SID = $request->variable('sid', '');

			$SID = '?sid=' . $this->session_id;
}


			$SID = '?sid=' . $this->session_id;
}


Line 281Line 281

// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.


// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.

		$this->ip = htmlspecialchars_decode($request->server('REMOTE_ADDR'));
$this->ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->ip));











		$ip = htmlspecialchars_decode($request->server('REMOTE_ADDR'));
$ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $ip));

/**
* Event to alter user IP address
*
* @event core.session_ip_after
* @var string ip REMOTE_ADDR
* @since 3.1.10-RC1
*/
$vars = array('ip');
extract($phpbb_dispatcher->trigger_event('core.session_ip_after', compact($vars)));


// split the list of IPs


// split the list of IPs

		$ips = explode(' ', trim($this->ip));

		$ips = explode(' ', trim($ip));


// Default IP if REMOTE_ADDR is invalid
$this->ip = '127.0.0.1';


// Default IP if REMOTE_ADDR is invalid
$this->ip = '127.0.0.1';

Line 349Line 359
			}
else
{

			}
else
{

				set_config('limit_load', '0');
set_config('limit_search_load', '0');

				$config->set('limit_load', '0');
$config->set('limit_search_load', '0');

			}
}


			}
}


Line 413Line 423
					$session_expired = false;

// Check whether the session is still valid if we have one

					$session_expired = false;

// Check whether the session is still valid if we have one

 
					/* @var $provider_collection \phpbb\auth\provider_collection */

					$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();


					$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();


Line 460Line 471
					{
if ($referer_valid)
{

					{
if ($referer_valid)
{

							add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $u_ip, $s_ip, $u_browser, $s_browser, htmlspecialchars($u_forwarded_for), htmlspecialchars($s_forwarded_for));








							$phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_IP_BROWSER_FORWARDED_CHECK', false, array(
$u_ip,
$s_ip,
$u_browser,
$s_browser,
htmlspecialchars($u_forwarded_for),
htmlspecialchars($s_forwarded_for)
));

						}
else
{

						}
else
{

							add_log('critical', 'LOG_REFERER_INVALID', $this->referer);

							$phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_REFERER_INVALID', false, array($this->referer));

						}
}
}

						}
}
}

Line 486Line 504
	*/
function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true)
{

	*/
function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true)
{

		global $SID, $_SID, $db, $config, $cache, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;

		global $SID, $_SID, $db, $config, $cache, $phpbb_container, $phpbb_dispatcher;


$this->data = array();



$this->data = array();


Line 549Line 567
			}
}


			}
}


 
		/* @var $provider_collection \phpbb\auth\provider_collection */

		$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();
$this->data = $provider->autologin();

		$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();
$this->data = $provider->autologin();

Line 819Line 838
			$sql = 'SELECT COUNT(session_id) AS sessions
FROM ' . SESSIONS_TABLE . '
WHERE session_user_id = ' . (int) $this->data['user_id'] . '

			$sql = 'SELECT COUNT(session_id) AS sessions
FROM ' . SESSIONS_TABLE . '
WHERE session_user_id = ' . (int) $this->data['user_id'] . '

					AND session_time >= ' . (int) ($this->time_now - (max($config['session_length'], $config['form_token_lifetime'])));

					AND session_time >= ' . (int) ($this->time_now - (max((int) $config['session_length'], (int) $config['form_token_lifetime'])));

			$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);

			$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);

Line 874Line 893
	*/
function session_kill($new_session = true)
{

	*/
function session_kill($new_session = true)
{

		global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;

		global $SID, $_SID, $db, $phpbb_container, $phpbb_dispatcher;


$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
WHERE session_id = '" . $db->sql_escape($this->session_id) . "'


$sql = 'DELETE FROM ' . SESSIONS_TABLE . "
WHERE session_id = '" . $db->sql_escape($this->session_id) . "'

Line 899Line 918
		unset($session_id);

// Allow connecting logout with external auth method logout

		unset($session_id);

// Allow connecting logout with external auth method logout

 
		/* @var $provider_collection \phpbb\auth\provider_collection */

		$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();
$provider->logout($this->data, $new_session);

		$provider_collection = $phpbb_container->get('auth.provider_collection');
$provider = $provider_collection->get_provider();
$provider->logout($this->data, $new_session);

Line 965Line 985
	*/
function session_gc()
{

	*/
function session_gc()
{

		global $db, $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;

		global $db, $config, $phpbb_container, $phpbb_dispatcher;


$batch_size = 10;



$batch_size = 10;


Line 1015Line 1035
		{
// Less than 10 users, update gc timer ... else we want gc
// called again to delete other sessions

		{
// Less than 10 users, update gc timer ... else we want gc
// called again to delete other sessions

			set_config('session_last_gc', $this->time_now, true);

			$config->set('session_last_gc', $this->time_now, false);


if ($config['max_autologin_time'])
{


if ($config['max_autologin_time'])
{

Line 1025Line 1045
			}

// only called from CRON; should be a safe workaround until the infrastructure gets going

			}

// 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']);


			$captcha_factory = $phpbb_container->get('captcha.factory');
$captcha_factory->garbage_collect($config['captcha_plugin']);


Line 1057Line 1078
	function set_cookie($name, $cookiedata, $cookietime, $httponly = true)
{
global $config;

	function set_cookie($name, $cookiedata, $cookietime, $httponly = true)
{
global $config;

 

// If headers are already set, we just return
if (headers_sent())
{
return;
}


$name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata);
$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);


$name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata);
$expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime);

Line 1209Line 1236

if ($banned && !$return)
{


if ($banned && !$return)
{

			global $template, $phpbb_root_path, $phpEx;

			global $phpbb_root_path, $phpEx;


// If the session is empty we need to create a valid one...
if (empty($this->session_id))


// If the session is empty we need to create a valid one...
if (empty($this->session_id))

Line 1386Line 1413
	*/
function set_login_key($user_id = false, $key = false, $user_ip = false)
{

	*/
function set_login_key($user_id = false, $key = false, $user_ip = false)
{

		global $config, $db;

		global $db;


$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
$user_ip = ($user_ip === false) ? $this->ip : $user_ip;


$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
$user_ip = ($user_ip === false) ? $this->ip : $user_ip;

Line 1396Line 1423

$sql_ary = array(
'key_id' => (string) md5($key_id),


$sql_ary = array(
'key_id' => (string) md5($key_id),

			'last_ip'		=> (string) $this->ip,

			'last_ip'		=> (string) $user_ip,

			'last_login'	=> (int) time()
);


			'last_login'	=> (int) time()
);


Line 1433Line 1460
	*/
function reset_login_keys($user_id = false)
{

	*/
function reset_login_keys($user_id = false)
{

		global $config, $db;

		global $db;


$user_id = ($user_id === false) ? (int) $this->data['user_id'] : (int) $user_id;



$user_id = ($user_id === false) ? (int) $this->data['user_id'] : (int) $user_id;


Line 1585Line 1612

$this->data = array_merge($this->data, $sql_ary);



$this->data = array_merge($this->data, $sql_ary);


			if ($this->data['user_id'] != ANONYMOUS && !empty($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts'])

			if ($this->data['user_id'] != ANONYMOUS && isset($config['new_member_post_limit']) && $this->data['user_new'] && $config['new_member_post_limit'] <= $this->data['user_posts'])

			{
$this->leave_newly_registered();
}

			{
$this->leave_newly_registered();
}