mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 06:39:14 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2023-10-31 20:24:59 +01:00
commit 9a1a613c0c
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 95 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/common.php
View File

@ -51,20 +51,10 @@ if (!defined('PHPBB_INSTALLED'))
$server_port = 443;
}
$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
if (!$script_name)
{
$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
}
// $phpbb_root_path accounts for redirects from e.g. /adm
$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/app.' . $phpEx;
// Replace any number of consecutive backslashes and/or slashes with a single slash
// (could happen on some proxy setups and/or Windows servers)
$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
$script_path = phpbb_get_install_redirect($phpbb_root_path, $phpEx);
// Eliminate . and .. from the path
require($phpbb_root_path . 'phpbb/filesystem.' . $phpEx);
require($phpbb_root_path . 'phpbb/filesystem/helper.' . $phpEx);
$script_path = \phpbb\filesystem\helper::clean_path($script_path);
$url = (($secure) ? 'https://' : 'http://') . $server_name;

25
phpBB/includes/functions.php
View File

@ -1795,6 +1795,31 @@ function redirect($url, $return = false, $disable_cd_check = false)
exit;
}
/**
* Returns the install redirect path for phpBB.
*
* @param string $phpbb_root_path The root path of the phpBB installation.
* @param string $phpEx The file extension of php files, e.g., "php".
* @return string The install redirect path.
*/
function phpbb_get_install_redirect(string $phpbb_root_path, string $phpEx): string
{
$script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI');
if (!$script_name)
{
$script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF');
}
// Add trailing dot to prevent dirname() from returning parent directory if $script_name is a directory
$script_name = substr($script_name, -1) === '/' ? $script_name . '.' : $script_name;
// $phpbb_root_path accounts for redirects from e.g. /adm
$script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/app.' . $phpEx;
// Replace any number of consecutive backslashes and/or slashes with a single slash
// (could happen on some proxy setups and/or Windows servers)
return preg_replace('#[\\\\/]{2,}#', '/', $script_path);
}
/**
* Re-Apply session id after page reloads
*/

68
tests/functions/phpbb_get_install_redirect_test.php Normal file
View File

@ -0,0 +1,68 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
class phpbb_get_install_redirect_test extends phpbb_test_case
{
public function data_redirect(): array
{
return [
[
['REQUEST_URI' => '/foo/bar/'],
'/foo/bar/install/app.php',
],
[
['REQUEST_URI' => '/foo/bar/index.php'],
'/foo/bar/install/app.php',
],
[
['REQUEST_URI' => '/foo/bar'],
'/foo/install/app.php',
],
[
['REQUEST_URI' => '/foo/'],
'/foo/install/app.php',
],
[
['REQUEST_URI' => '/foo/index.php'],
'/foo/install/app.php',
],
[
[
'REQUEST_URI' => '/foo/bar/',
'PHP_SELF' => '/foo/bar/index.php'
],
'/foo/bar/install/app.php',
],
[
[
'REQUEST_URI' => '',
'PHP_SELF' => '/foo/bar/index.php'
],
'/foo/bar/install/app.php',
],
];
}
/**
* @backupGlobals enabled
* @dataProvider data_redirect
*/
public function test_install_redirect($server_vars, $expected)
{
$phpbb_root_path = '/';
$phpEx = 'php';
$_SERVER = array_merge($_SERVER, $server_vars);
$this->assertEquals($expected, phpbb_get_install_redirect($phpbb_root_path, $phpEx));
}
}