Skip to content

Retain full path of files for directory uploads #6917

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

Merged
nikic merged 7 commits into from
May 14, 2021
Merged

Retain full path of files for directory uploads #6917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ef375cb
Retain full path of files for directory uploads
bjoern-tantau Apr 26, 2021
4b6aa56
Include fullpath in file upload tests.
Apr 27, 2021
6a19403
Add fullpath to second file in test session rfc1867 no name
Apr 27, 2021
984c489
Remove is_anonymous checks, like in 61ba79df17867715b265de8b47238f96e…
Apr 27, 2021
d281776
Remove unneeded code blocks.
Apr 27, 2021
47d851d
Rename $_FILES[][fullpath] to $_FILES[][full_path].
May 11, 2021
b5955b2
Add test for $_FILES[full_path].
May 11, 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
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ string(%d) "rfc1867"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -67,9 +69,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_cleanup.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ string(%d) "rfc1867-cleanup"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -67,9 +69,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_disabled.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ session_destroy();
string(%d) "rfc1867-disabled"
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -60,9 +62,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_disabled_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ session_destroy();
string(%d) "rfc1867-disabled-2"
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -60,9 +62,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_inter.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ session_destroy();
string(%d) "rfc1867-inter"
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -70,9 +72,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_no_name.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ session_destroy();
string(%d) "rfc1867-no-name"
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -60,9 +62,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_sid_cookie.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ string(%d) "rfc1867-sid-cookie"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -66,9 +68,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_sid_get.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ string(%d) "rfc1867-sid-get"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -64,9 +66,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_sid_get_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ string(%d) "rfc1867-sid-get-2"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -66,9 +68,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_sid_invalid.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ string(%d) ""
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -78,9 +80,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_sid_only_cookie.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ string(%d) "rfc1867-sid-only-cookie"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -66,9 +68,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_sid_only_cookie_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ string(%d) "%s"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -63,9 +65,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
8 changes: 6 additions & 2 deletions ext/session/tests/rfc1867_sid_post.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ string(%d) "rfc1867-sid-post"
bool(true)
array(2) {
["file1"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file1.txt"
["full_path"]=>
string(9) "file1.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand All @@ -62,9 +64,11 @@ array(2) {
int(1)
}
["file2"]=>
array(5) {
array(6) {
["name"]=>
string(9) "file2.txt"
["full_path"]=>
string(9) "file2.txt"
["type"]=>
string(0) ""
["tmp_name"]=>
Expand Down
15 changes: 13 additions & 2 deletions main/rfc1867.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ PHPAPI int (*php_rfc1867_callback)(unsigned int event, void *event_data, void **
static void safe_php_register_variable(char *var, char *strval, size_t val_len, zval *track_vars_array, bool override_protection);

/* The longest property name we use in an uploaded file array */
#define MAX_SIZE_OF_INDEX sizeof("[tmp_name]")
#define MAX_SIZE_OF_INDEX sizeof("[full_path]")

/* The longest anonymous name */
#define MAX_SIZE_ANONNAME 33
Expand Down Expand Up @@ -1142,9 +1142,20 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
snprintf(lbuf, llen, "%s[name]", param);
}
register_http_post_files_variable(lbuf, s, &PG(http_globals)[TRACK_VARS_FILES], 0);
efree(filename);
s = NULL;

/* Add full path of supplied file for folder uploads via
* <input type="file" name="files" multiple webkitdirectory>
*/
/* Add $foo[full_path] */
if (is_arr_upload) {
snprintf(lbuf, llen, "%s[full_path][%s]", abuf, array_index);
} else {
snprintf(lbuf, llen, "%s[full_path]", param);
}
register_http_post_files_variable(lbuf, filename, &PG(http_globals)[TRACK_VARS_FILES], 0);
efree(filename);

/* Possible Content-Type: */
if (cancel_upload || !(cd = php_mime_get_hdr_value(header, "Content-Type"))) {
cd = "";
Expand Down
4 changes: 3 additions & 1 deletion sapi/cli/tests/php_cli_server_005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ Content-type: text/html; charset=UTF-8

array(1) {
["userfile"]=>
array(5) {
array(6) {
["name"]=>
string(12) "laruence.txt"
["full_path"]=>
string(12) "laruence.txt"
["type"]=>
string(10) "text/plain"
["tmp_name"]=>
Expand Down
4 changes: 3 additions & 1 deletion tests/basic/021.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ var_dump($_POST);
--EXPECTF--
array(1) {
["pics"]=>
array(5) {
array(6) {
["name"]=>
string(12) "bug37276.txt"
["full_path"]=>
string(12) "bug37276.txt"
["type"]=>
string(10) "text/plain"
["tmp_name"]=>
Expand Down
Loading