Skip to content

Fix #71542: disk_total_space does not work with relative paths #7377

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

Closed
wants to merge 2 commits into from
Closed

Fix #71542: disk_total_space does not work with relative paths #7377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4790ad
Fix #71542: disk_total_space does not work with relative paths
cmb69 Aug 16, 2021
b41e6a0
Update open_basedir_disk_free_space.phpt
cmb69 Aug 16, 2021
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
20 changes: 14 additions & 6 deletions ext/standard/filestat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,18 +183,22 @@ static int php_disk_total_space(char *path, double *space) /* {{{ */
PHP_FUNCTION(disk_total_space)
{
double bytestotal;
char *path;
char *path, fullpath[MAXPATHLEN];
size_t path_len;

ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_PATH(path, path_len)
ZEND_PARSE_PARAMETERS_END();

if (php_check_open_basedir(path)) {
if (!expand_filepath(path, fullpath)) {
RETURN_FALSE;
}

if (php_disk_total_space(path, &bytestotal) == SUCCESS) {
if (php_check_open_basedir(fullpath)) {
RETURN_FALSE;
}

if (php_disk_total_space(fullpath, &bytestotal) == SUCCESS) {
RETURN_DOUBLE(bytestotal);
}
RETURN_FALSE;
Expand Down Expand Up @@ -278,18 +282,22 @@ static int php_disk_free_space(char *path, double *space) /* {{{ */
PHP_FUNCTION(disk_free_space)
{
double bytesfree;
char *path;
char *path, fullpath[MAXPATHLEN];
size_t path_len;

ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_PATH(path, path_len)
ZEND_PARSE_PARAMETERS_END();

if (php_check_open_basedir(path)) {
if (!expand_filepath(path, fullpath)) {
RETURN_FALSE;
}

if (php_check_open_basedir(fullpath)) {
RETURN_FALSE;
}

if (php_disk_free_space(path, &bytesfree) == SUCCESS) {
if (php_disk_free_space(fullpath, &bytesfree) == SUCCESS) {
RETURN_DOUBLE(bytesfree);
}
RETURN_FALSE;
Expand Down
14 changes: 14 additions & 0 deletions ext/standard/tests/dir/bug71542.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
Bug #71542 (disk_total_space does not work with relative paths)
--FILE--
<?php
$dir = basename(getcwd());
chdir("..");
var_dump(
disk_total_space($dir) !== false,
disk_free_space($dir) !== false
);
?>
--EXPECT--
bool(true)
bool(true)
16 changes: 8 additions & 8 deletions tests/security/open_basedir_disk_free_space.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,28 @@ bool(true)
bool(true)
bool(true)

Warning: disk_free_space(): open_basedir restriction in effect. File(../bad) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)

Warning: disk_free_space(): open_basedir restriction in effect. File(../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)

Warning: disk_free_space(): open_basedir restriction in effect. File(..) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)

Warning: disk_free_space(): open_basedir restriction in effect. File(../) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)

Warning: disk_free_space(): open_basedir restriction in effect. File(/) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)

Warning: disk_free_space(): open_basedir restriction in effect. File(../bad/.) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)

Warning: disk_free_space(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)

Warning: disk_free_space(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
Warning: disk_free_space(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d
bool(false)
float(%s)
*** Finished testing open_basedir configuration [disk_free_space] ***