Skip to content

streams: call php_stream_wrapper_warn calls checking REPORT_ERRORS is set #22965

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
Girgias merged 1 commit into from
Jul 31, 2026
+44 −79
Merged

streams: call php_stream_wrapper_warn calls checking REPORT_ERRORS is set #22965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 24 additions & 48 deletions ext/standard/ftp_fopen_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,18 +915,14 @@ static int php_stream_ftp_unlink(php_stream_wrapper *wrapper, const char *url, i

stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, context, NULL, &resource, NULL, NULL);
if (!stream) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", url);
}
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", url);
goto unlink_errexit;
}

if (resource->path == NULL) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, InvalidPath,
"Invalid path provided in %s", url);
}
php_stream_wrapper_warn(wrapper, context, options, InvalidPath,
"Invalid path provided in %s", url);
goto unlink_errexit;
}

Expand All @@ -935,10 +931,8 @@ static int php_stream_ftp_unlink(php_stream_wrapper *wrapper, const char *url, i

result = GET_FTP_RESULT(stream);
if (result < 200 || result > 299) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, UnlinkFailed,
"Error Deleting file: %s", tmp_line);
}
php_stream_wrapper_warn(wrapper, context, options, UnlinkFailed,
"Error Deleting file: %s", tmp_line);
goto unlink_errexit;
}

Expand Down Expand Up @@ -1000,10 +994,8 @@ static int php_stream_ftp_rename(php_stream_wrapper *wrapper, const char *url_fr

stream = php_ftp_fopen_connect(wrapper, url_from, "r", 0, NULL, context, NULL, NULL, NULL, NULL);
if (!stream) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", ZSTR_VAL(resource_from->host));
}
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", ZSTR_VAL(resource_from->host));
goto rename_errexit;
}

Expand All @@ -1012,10 +1004,8 @@ static int php_stream_ftp_rename(php_stream_wrapper *wrapper, const char *url_fr

result = GET_FTP_RESULT(stream);
if (result < 300 || result > 399) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, RenameFailed,
"Error Renaming file: %s", tmp_line);
}
php_stream_wrapper_warn(wrapper, context, options, RenameFailed,
"Error Renaming file: %s", tmp_line);
goto rename_errexit;
}

Expand All @@ -1024,10 +1014,8 @@ static int php_stream_ftp_rename(php_stream_wrapper *wrapper, const char *url_fr

result = GET_FTP_RESULT(stream);
if (result < 200 || result > 299) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, RenameFailed,
"Error Renaming file: %s", tmp_line);
}
php_stream_wrapper_warn(wrapper, context, options, RenameFailed,
"Error Renaming file: %s", tmp_line);
goto rename_errexit;
}

Expand Down Expand Up @@ -1058,18 +1046,14 @@ static int php_stream_ftp_mkdir(php_stream_wrapper *wrapper, const char *url, in

stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, context, NULL, &resource, NULL, NULL);
if (!stream) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", url);
}
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", url);
goto mkdir_errexit;
}

if (resource->path == NULL) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, InvalidPath,
"Invalid path provided in %s", url);
}
php_stream_wrapper_warn(wrapper, context, options, InvalidPath,
"Invalid path provided in %s", url);
goto mkdir_errexit;
}

Expand Down Expand Up @@ -1108,10 +1092,8 @@ static int php_stream_ftp_mkdir(php_stream_wrapper *wrapper, const char *url, in
php_stream_printf(stream, "MKD %s\r\n", buf);
result = GET_FTP_RESULT(stream);
if (result < 200 || result > 299) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, MkdirFailed,
"%s", tmp_line);
}
php_stream_wrapper_warn(wrapper, context, options, MkdirFailed,
"%s", tmp_line);
break;
}
}
Expand Down Expand Up @@ -1153,29 +1135,23 @@ static int php_stream_ftp_rmdir(php_stream_wrapper *wrapper, const char *url, in

stream = php_ftp_fopen_connect(wrapper, url, "r", 0, NULL, context, NULL, &resource, NULL, NULL);
if (!stream) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", url);
}
php_stream_wrapper_warn(wrapper, context, options, AuthFailed,
"Unable to connect to %s", url);
goto rmdir_errexit;
}

if (resource->path == NULL) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, InvalidPath,
"Invalid path provided in %s", url);
}
php_stream_wrapper_warn(wrapper, context, options, InvalidPath,
"Invalid path provided in %s", url);
goto rmdir_errexit;
}

php_stream_printf(stream, "RMD %s\r\n", ZSTR_VAL(resource->path));
result = GET_FTP_RESULT(stream);

if (result < 200 || result > 299) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options, RmdirFailed,
"%s", tmp_line);
}
php_stream_wrapper_warn(wrapper, context, options, RmdirFailed,
"%s", tmp_line);
goto rmdir_errexit;
}

Expand Down
32 changes: 12 additions & 20 deletions ext/standard/php_fopen_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,9 @@ static php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const c
php_stream_input_t *input;

if ((options & STREAM_OPEN_FOR_INCLUDE) && !PG(allow_url_include) ) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"URL file-access is disabled in the server configuration");
}
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"URL file-access is disabled in the server configuration");
return NULL;
}

Expand All @@ -241,11 +239,9 @@ static php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const c

if (!strcasecmp(path, "stdin")) {
if ((options & STREAM_OPEN_FOR_INCLUDE) && !PG(allow_url_include) ) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"URL file-access is disabled in the server configuration");
}
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"URL file-access is disabled in the server configuration");
return NULL;
}
if (!strcmp(sapi_module.name, "cli")) {
Expand Down Expand Up @@ -302,20 +298,16 @@ static php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const c
int dtablesize;

if (strcmp(sapi_module.name, "cli")) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"Direct access to file descriptors is only available from command-line PHP");
}
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"Direct access to file descriptors is only available from command-line PHP");
return NULL;
}

if ((options & STREAM_OPEN_FOR_INCLUDE) && !PG(allow_url_include) ) {
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"URL file-access is disabled in the server configuration");
}
php_stream_wrapper_warn(wrapper, context, options,
Disabled,
"URL file-access is disabled in the server configuration");
return NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion main/streams/plain_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,7 @@ static int php_plain_files_mkdir(php_stream_wrapper *wrapper, const char *dir, i
}

int ret = VCWD_MKDIR(dir, (mode_t)mode);
if (ret < 0 && (options & REPORT_ERRORS)) {
if (ret < 0) {
php_stream_wrapper_warn(wrapper, context, options,
MkdirFailed, "%s", strerror(errno));
return 0;
Expand Down
17 changes: 7 additions & 10 deletions main/streams/streams.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,11 +1909,10 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const
#else
if (!localhost && path[n+3] != '\0' && path[n+3] != '/') {
#endif
if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(plain_files_wrapper, NULL, options,
ProtocolUnsupported,
"Remote host file access not supported, %s", path);
}
php_stream_wrapper_warn(plain_files_wrapper, NULL, options,
ProtocolUnsupported,
"Remote host file access not supported, %s", path);

return NULL;
}

Expand Down Expand Up @@ -1950,11 +1949,9 @@ PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path, const
return wrapper;
}

if (options & REPORT_ERRORS) {
php_stream_wrapper_warn(plain_files_wrapper, NULL, options,
Disabled,
"file:// wrapper is disabled in the server configuration");
}
php_stream_wrapper_warn(plain_files_wrapper, NULL, options,
Disabled,
"file:// wrapper is disabled in the server configuration");
return NULL;
}

Expand Down
Loading