Skip to content

Virtual cwd refactoring #15524

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

Draft
Girgias wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Virtual cwd refactoring #15524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
439f904
Zend: Refactor VCWD_CHDIR_FILE() to take path length
Girgias Aug 21, 2024
1c33031
Remove duplicate test conditions
Girgias Aug 21, 2024
84e39bb
Zend: Refactor virtual_file_ex() to take path length
Girgias Aug 21, 2024
64a2693
Zend: Refactor virtual_rename() to take path lengths
Girgias Aug 21, 2024
60782d2
ext/standard: Use zend_string for path of move_uploaded_file()
Girgias Aug 21, 2024
2eb31b5
Use CLEAN section in some tests
Girgias Aug 21, 2024
8d5e3a9
streams: Refactor rename stream op to use zend_string
Girgias Aug 21, 2024
9048e85
Zend: Refactor virtual_rmdir() to take path lengths
Girgias Aug 21, 2024
d8f33a2
Add a CLEAN section
Girgias Aug 22, 2024
567d8b5
streams: Refactor rmdir stream op to use zend_string
Girgias Aug 22, 2024
947c402
Zend: Refactor virtual_unlink() to take path lengths
Girgias Aug 23, 2024
5194bd9
streams: Refactor unlink stream op to use zend_string
Girgias Aug 23, 2024
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
Prev Previous commit
Next Next commit
Zend: Refactor virtual_file_ex() to take path length
  • Loading branch information
@Girgias
Girgias committed Aug 23, 2024
commit 84e39bb62b64a7ff746568a52f277b3242168457
70 changes: 45 additions & 25 deletions Zend/zend_virtual_cwd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,9 +1004,8 @@ static size_t tsrm_realpath_r(char *path, size_t start, size_t len, int *ll, tim

/* Resolve path relatively to state and put the real path into state */
/* returns 0 for ok, 1 for error, -1 if (path_length >= MAXPATHLEN-1) */
CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath) /* {{{ */
CWD_API int virtual_file_ex(cwd_state *state, const char *path, size_t path_length, verify_path_func verify_path, int use_realpath) /* {{{ */
{
size_t path_length = strlen(path);
char resolved_path[MAXPATHLEN];
size_t start = 1;
int ll = 0;
Expand Down Expand Up @@ -1202,7 +1201,8 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func

CWD_API zend_result virtual_chdir(const char *path) /* {{{ */
{
return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, CWD_REALPATH) ? FAILURE : SUCCESS;
size_t path_length = strlen(path);
return virtual_file_ex(&CWDG(cwd), path, path_length, php_is_dir_ok, CWD_REALPATH) ? FAILURE : SUCCESS;
}
/* }}} */

Expand Down Expand Up @@ -1246,24 +1246,26 @@ CWD_API char *virtual_realpath(const char *path, char *real_path) /* {{{ */
cwd_state new_state;
char *retval;
char cwd[MAXPATHLEN];
size_t path_length = strlen(path);

/* realpath("") returns CWD */
if (!*path) {
if (path_length == 0) {
new_state.cwd = (char*)emalloc(1);
new_state.cwd[0] = '\0';
new_state.cwd_length = 0;
if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
path = cwd;
path_length = strlen(cwd);
}
} else if (!IS_ABSOLUTE_PATH(path, strlen(path))) {
} else if (!IS_ABSOLUTE_PATH(path, path_length)) {
CWD_STATE_COPY(&new_state, &CWDG(cwd));
} else {
new_state.cwd = (char*)emalloc(1);
new_state.cwd[0] = '\0';
new_state.cwd_length = 0;
}

if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)==0) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_REALPATH)==0) {
size_t len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;

memcpy(real_path, new_state.cwd, len);
Expand All @@ -1282,10 +1284,11 @@ CWD_API char *virtual_realpath(const char *path, char *real_path) /* {{{ */
CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path) /* {{{ */
{
cwd_state new_state;
size_t path_length = strlen(path);
int retval;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
retval = virtual_file_ex(&new_state, path, verify_path, CWD_FILEPATH);
retval = virtual_file_ex(&new_state, path, path_length, verify_path, CWD_FILEPATH);

*filepath = new_state.cwd;

Expand All @@ -1304,14 +1307,15 @@ CWD_API int virtual_filepath(const char *path, char **filepath) /* {{{ */
CWD_API FILE *virtual_fopen(const char *path, const char *mode) /* {{{ */
{
cwd_state new_state;
size_t path_length = strlen(path);
FILE *f;

if (path[0] == '\0') { /* Fail to open empty path */
return NULL;
}

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_EXPAND)) {
CWD_STATE_FREE_ERR(&new_state);
return NULL;
}
Expand All @@ -1331,10 +1335,11 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode) /* {{{ */
CWD_API int virtual_access(const char *pathname, int mode) /* {{{ */
{
cwd_state new_state;
size_t path_length = strlen(pathname);
int ret;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, pathname, path_length, NULL, CWD_REALPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1355,10 +1360,11 @@ CWD_API int virtual_access(const char *pathname, int mode) /* {{{ */
CWD_API int virtual_utime(const char *filename, struct utimbuf *buf) /* {{{ */
{
cwd_state new_state;
size_t filename_length = strlen(filename);
int ret;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, filename, filename_length, NULL, CWD_REALPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1378,10 +1384,11 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf) /* {{{ */
CWD_API int virtual_chmod(const char *filename, mode_t mode) /* {{{ */
{
cwd_state new_state;
size_t filename_length = strlen(filename);
int ret;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, filename, filename_length, NULL, CWD_REALPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand Down Expand Up @@ -1413,10 +1420,11 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode) /* {{{ */
CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int link) /* {{{ */
{
cwd_state new_state;
size_t filename_length = strlen(filename);
int ret;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, filename, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, filename, filename_length, NULL, CWD_REALPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1440,10 +1448,11 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int li
CWD_API int virtual_open(const char *path, int flags, ...) /* {{{ */
{
cwd_state new_state;
size_t path_length = strlen(path);
int f;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_FILEPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand Down Expand Up @@ -1476,10 +1485,11 @@ CWD_API int virtual_open(const char *path, int flags, ...) /* {{{ */
CWD_API int virtual_creat(const char *path, mode_t mode) /* {{{ */
{
cwd_state new_state;
size_t path_length = strlen(path);
int f;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, path, NULL, CWD_FILEPATH)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_FILEPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1495,17 +1505,19 @@ CWD_API int virtual_rename(const char *oldname, const char *newname) /* {{{ */
{
cwd_state old_state;
cwd_state new_state;
size_t old_name_length = strlen(oldname);
size_t new_name_length = strlen(newname);
int retval;

CWD_STATE_COPY(&old_state, &CWDG(cwd));
if (virtual_file_ex(&old_state, oldname, NULL, CWD_EXPAND)) {
if (virtual_file_ex(&old_state, oldname, old_name_length, NULL, CWD_EXPAND)) {
CWD_STATE_FREE_ERR(&old_state);
return -1;
}
oldname = old_state.cwd;

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, newname, NULL, CWD_EXPAND)) {
if (virtual_file_ex(&new_state, newname, new_name_length, NULL, CWD_EXPAND)) {
CWD_STATE_FREE_ERR(&old_state);
CWD_STATE_FREE_ERR(&new_state);
return -1;
Expand All @@ -1532,9 +1544,10 @@ CWD_API int virtual_stat(const char *path, zend_stat_t *buf) /* {{{ */
{
cwd_state new_state;
int retval;
size_t path_length = strlen(path);

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_REALPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1550,9 +1563,10 @@ CWD_API int virtual_lstat(const char *path, zend_stat_t *buf) /* {{{ */
{
cwd_state new_state;
int retval;
size_t path_length = strlen(path);

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_EXPAND)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1568,9 +1582,10 @@ CWD_API int virtual_unlink(const char *path) /* {{{ */
{
cwd_state new_state;
int retval;
size_t path_length = strlen(path);

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, path, NULL, CWD_EXPAND)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_EXPAND)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1590,9 +1605,10 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode) /* {{{ */
{
cwd_state new_state;
int retval;
size_t path_length = strlen(pathname);

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, pathname, NULL, CWD_FILEPATH)) {
if (virtual_file_ex(&new_state, pathname, path_length, NULL, CWD_FILEPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1611,9 +1627,10 @@ CWD_API int virtual_rmdir(const char *pathname) /* {{{ */
{
cwd_state new_state;
int retval;
size_t path_length = strlen(pathname);

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, pathname, NULL, CWD_EXPAND)) {
if (virtual_file_ex(&new_state, pathname, path_length, NULL, CWD_EXPAND)) {
CWD_STATE_FREE_ERR(&new_state);
return -1;
}
Expand All @@ -1636,9 +1653,10 @@ CWD_API DIR *virtual_opendir(const char *pathname) /* {{{ */
{
cwd_state new_state;
DIR *retval;
size_t path_length = strlen(pathname);

CWD_STATE_COPY(&new_state, &CWDG(cwd));
if (virtual_file_ex(&new_state, pathname, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, pathname, path_length, NULL, CWD_REALPATH)) {
CWD_STATE_FREE_ERR(&new_state);
return NULL;
}
Expand Down Expand Up @@ -1717,16 +1735,18 @@ CWD_API char *tsrm_realpath(const char *path, char *real_path) /* {{{ */
{
cwd_state new_state;
char cwd[MAXPATHLEN];
size_t path_length = strlen(path);

/* realpath("") returns CWD */
if (!*path) {
if (path_length == 0) {
new_state.cwd = (char*)emalloc(1);
new_state.cwd[0] = '\0';
new_state.cwd_length = 0;
if (VCWD_GETCWD(cwd, MAXPATHLEN)) {
path = cwd;
path_length = strlen(cwd);
}
} else if (!IS_ABSOLUTE_PATH(path, strlen(path)) &&
} else if (!IS_ABSOLUTE_PATH(path, path_length) &&
VCWD_GETCWD(cwd, MAXPATHLEN)) {
new_state.cwd = estrdup(cwd);
new_state.cwd_length = strlen(cwd);
Expand All @@ -1736,7 +1756,7 @@ CWD_API char *tsrm_realpath(const char *path, char *real_path) /* {{{ */
new_state.cwd_length = 0;
}

if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_REALPATH)) {
efree(new_state.cwd);
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_virtual_cwd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group, int li
#define CWD_FILEPATH 1 /* resolve symlinks if file is exist otherwise expand */
#define CWD_REALPATH 2 /* call realpath(), resolve symlinks. File must exist */

CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);
CWD_API int virtual_file_ex(cwd_state *state, const char *path, size_t path_length, verify_path_func verify_path, int use_realpath);

CWD_API char *tsrm_realpath(const char *path, char *real_path);

Expand Down
2 changes: 1 addition & 1 deletion ext/phar/phar_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4130,7 +4130,7 @@ static int phar_extract_file(bool overwrite, phar_entry_info *entry, char *dest,
new_state.cwd[0] = DEFAULT_SLASH;
new_state.cwd[1] = '\0';
new_state.cwd_length = 1;
if (virtual_file_ex(&new_state, entry->filename, NULL, CWD_EXPAND) != 0 ||
if (virtual_file_ex(&new_state, entry->filename, entry->filename_len, NULL, CWD_EXPAND) != 0 ||
new_state.cwd_length <= 1) {
if (EINVAL == errno && entry->filename_len > 50) {
char *tmp = estrndup(entry->filename, 50);
Expand Down
2 changes: 1 addition & 1 deletion ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, const char *file, s
/* Clean/normlize the path and then transform any path (absolute or relative)
to a path relative to cwd (../../mydir/foo.txt > mydir/foo.txt)
*/
virtual_file_ex(&new_state, file, NULL, CWD_EXPAND);
virtual_file_ex(&new_state, file, file_len, NULL, CWD_EXPAND);
path_cleaned = php_zip_make_relative_path(new_state.cwd, new_state.cwd_length);
if(!path_cleaned) {
CWD_STATE_FREE(new_state.cwd);
Expand Down
2 changes: 1 addition & 1 deletion main/fopen_wrappers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co
new_state.cwd = estrdup(cwd);
new_state.cwd_length = strlen(cwd);

if (virtual_file_ex(&new_state, filepath, NULL, realpath_mode)) {
if (virtual_file_ex(&new_state, filepath, path_len, NULL, realpath_mode)) {
efree(new_state.cwd);
return NULL;
}
Expand Down
3 changes: 2 additions & 1 deletion main/php_open_temporary_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, zend_st

new_state.cwd = estrdup(cwd);
new_state.cwd_length = strlen(cwd);
size_t path_length = strlen(path);

if (virtual_file_ex(&new_state, path, NULL, CWD_REALPATH)) {
if (virtual_file_ex(&new_state, path, path_length, NULL, CWD_REALPATH)) {
efree(new_state.cwd);
return -1;
}
Expand Down