[php-src] PHP-8.1: Add proc_open escaping for cmd file execution
| From: | Jakub Zelenka via Ben Ramsey | Date: | Wed, 10 Apr 2024 04:55:40 +0000 |
| Subject: | [php-src] PHP-8.1: Add proc_open escaping for cmd file execution | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128025@lists.php.net to get a copy of this message | ||
Author: Jakub Zelenka (bukka)
Committer: Ben Ramsey (ramsey)
Date: 2024-04-09T23:29:28-05:00
Commit: https://github.com/php/php-src/commit/e3c784f2bfb6029b49d27783b2efc87ee6923f79
Raw diff: https://github.com/php/php-src/commit/e3c784f2bfb6029b49d27783b2efc87ee6923f79.diff
Add proc_open escaping for cmd file execution
Changed paths:
A ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_1.phpt
A ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_2.phpt
A ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_3.phpt
M ext/standard/proc_open.c
Diff:
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index 3f8eaafd6d281..8aae54072650e 100644
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -492,11 +492,32 @@ static void append_backslashes(smart_str *str, size_t num_bs)
}
}
-/* See https://docs.microsoft.com/en-us/cpp/cpp/parsing-cpp-command-line-arguments
*/
-static void append_win_escaped_arg(smart_str *str, zend_string *arg)
+const char *special_chars = "()!^\"<>&|%";
+
+static bool is_special_character_present(const zend_string *arg)
+{
+ for (size_t i = 0; i < ZSTR_LEN(arg); ++i) {
+ if (strchr(special_chars, ZSTR_VAL(arg)[i]) != NULL) {
+ return true;
+ }
+ }
+ return false;
+}
+
+/* See https://docs.microsoft.com/en-us/cpp/cpp/parsing-cpp-command-line-arguments
and
+ * https://learn.microsoft.com/en-us/archive/blogs/twistylittlepassagesallalike/everyone-quotes-command-line-arguments-the-wrong-way
*/
+static void append_win_escaped_arg(smart_str *str, zend_string *arg, bool is_cmd_argument)
{
size_t num_bs = 0;
+ bool has_special_character = false;
+ if (is_cmd_argument) {
+ has_special_character = is_special_character_present(arg);
+ if (has_special_character) {
+ /* Escape double quote with ^ if executed by cmd.exe. */
+ smart_str_appendc(str, '^');
+ }
+ }
smart_str_appendc(str, '"');
for (size_t i = 0; i < ZSTR_LEN(arg); ++i) {
char c = ZSTR_VAL(arg)[i];
@@ -510,18 +531,71 @@ static void append_win_escaped_arg(smart_str *str, zend_string *arg)
num_bs = num_bs * 2 + 1;
}
append_backslashes(str, num_bs);
+ if (has_special_character && strchr(special_chars, c) != NULL) {
+ /* Escape special chars with ^ if executed by cmd.exe. */
+ smart_str_appendc(str, '^');
+ }
smart_str_appendc(str, c);
num_bs = 0;
}
append_backslashes(str, num_bs * 2);
+ if (has_special_character) {
+ /* Escape double quote with ^ if executed by cmd.exe. */
+ smart_str_appendc(str, '^');
+ }
smart_str_appendc(str, '"');
}
+static inline int stricmp_end(const char* suffix, const char* str) {
+ size_t suffix_len = strlen(suffix);
+ size_t str_len = strlen(str);
+
+ if (suffix_len > str_len) {
+ return -1; /* Suffix is longer than string, cannot match. */
+ }
+
+ /* Compare the end of the string with the suffix, ignoring case. */
+ return _stricmp(str + (str_len - suffix_len), suffix);
+}
+
+static bool is_executed_by_cmd(const char *prog_name)
+{
+ /* If program name is cmd.exe, then return true. */
+ if (_stricmp("cmd.exe", prog_name) == 0 || _stricmp("cmd", prog_name) == 0
+ || stricmp_end("\\cmd.exe", prog_name) == 0 || stricmp_end("\\cmd",
prog_name) == 0) {
+ return true;
+ }
+
+ /* Find the last occurrence of the directory separator (backslash or forward slash). */
+ char *last_separator = strrchr(prog_name, '\\');
+ char *last_separator_fwd = strrchr(prog_name, '/');
+ if (last_separator_fwd && (!last_separator || last_separator < last_separator_fwd))
{
+ last_separator = last_separator_fwd;
+ }
+
+ /* Find the last dot in the filename after the last directory separator. */
+ char *extension = NULL;
+ if (last_separator != NULL) {
+ extension = strrchr(last_separator, '.');
+ } else {
+ extension = strrchr(prog_name, '.');
+ }
+
+ if (extension == NULL || extension == prog_name) {
+ /* No file extension found, it is not batch file. */
+ return false;
+ }
+
+ /* Check if the file extension is ".bat" or ".cmd" which is always executed
by cmd.exe. */
+ return _stricmp(extension, ".bat") == 0 || _stricmp(extension, ".cmd") ==
0;
+}
+
static zend_string *create_win_command_from_args(HashTable *args)
{
smart_str str = {0};
zval *arg_zv;
- bool is_prog_name = 1;
+ bool is_prog_name = true;
+ bool is_cmd_execution = false;
int elem_num = 0;
ZEND_HASH_FOREACH_VAL(args, arg_zv) {
@@ -531,11 +605,13 @@ static zend_string *create_win_command_from_args(HashTable *args)
return NULL;
}
- if (!is_prog_name) {
+ if (is_prog_name) {
+ is_cmd_execution = is_executed_by_cmd(ZSTR_VAL(arg_str));
+ } else {
smart_str_appendc(&str, ' ');
}
- append_win_escaped_arg(&str, arg_str);
+ append_win_escaped_arg(&str, arg_str, !is_prog_name && is_cmd_execution);
is_prog_name = 0;
zend_string_release(arg_str);
diff --git a/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_1.phpt
b/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_1.phpt
new file mode 100644
index 0000000000000..8d0939cdf1bc7
--- /dev/null
+++ b/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_1.phpt
@@ -0,0 +1,29 @@
+--TEST--
+GHSA-54hq-v5wp-fqgv - proc_open does not correctly escape args for bat files
+--SKIPIF--
+<?php
+if( substr(PHP_OS, 0, 3) != "WIN" )
+ die('skip Run only on Windows');
+?>
+--FILE--
+<?php
+
+$batch_file_content = <<<EOT
+@echo off
+powershell -Command "Write-Output '%1%'"
+EOT;
+$batch_file_path = __DIR__ . '/ghsa-54hq-v5wp-fqgv.bat';
+
+file_put_contents($batch_file_path, $batch_file_content);
+
+$descriptorspec = [STDIN, STDOUT, STDOUT];
+$proc = proc_open([$batch_file_path, "\"¬epad.exe"], $descriptorspec,
$pipes);
+proc_close($proc);
+
+?>
+--EXPECT--
+"¬epad.exe
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/ghsa-54hq-v5wp-fqgv.bat');
+?>
diff --git a/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_2.phpt
b/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_2.phpt
new file mode 100644
index 0000000000000..a1e39d7ef9ba0
--- /dev/null
+++ b/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_2.phpt
@@ -0,0 +1,29 @@
+--TEST--
+GHSA-54hq-v5wp-fqgv - proc_open does not correctly escape args for cmd files
+--SKIPIF--
+<?php
+if( substr(PHP_OS, 0, 3) != "WIN" )
+ die('skip Run only on Windows');
+?>
+--FILE--
+<?php
+
+$batch_file_content = <<<EOT
+@echo off
+powershell -Command "Write-Output '%1%'"
+EOT;
+$batch_file_path = __DIR__ . '/ghsa-54hq-v5wp-fqgv.cmd';
+
+file_put_contents($batch_file_path, $batch_file_content);
+
+$descriptorspec = [STDIN, STDOUT, STDOUT];
+$proc = proc_open([$batch_file_path, "\"¬epad<>^()!.exe"],
$descriptorspec, $pipes);
+proc_close($proc);
+
+?>
+--EXPECT--
+"¬epad<>^()!.exe
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/ghsa-54hq-v5wp-fqgv.cmd');
+?>
diff --git a/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_3.phpt
b/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_3.phpt
new file mode 100644
index 0000000000000..69f12d7b358d2
--- /dev/null
+++ b/ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_3.phpt
@@ -0,0 +1,29 @@
+--TEST--
+GHSA-54hq-v5wp-fqgv - proc_open does not correctly escape args for cmd executing batch files
+--SKIPIF--
+<?php
+if( substr(PHP_OS, 0, 3) != "WIN" )
+ die('skip Run only on Windows');
+?>
+--FILE--
+<?php
+
+$batch_file_content = <<<EOT
+@echo off
+powershell -Command "Write-Output '%1%'"
+EOT;
+$batch_file_path = __DIR__ . '/ghsa-54hq-v5wp-fqgv.bat';
+
+file_put_contents($batch_file_path, $batch_file_content);
+
+$descriptorspec = [STDIN, STDOUT, STDOUT];
+$proc = proc_open(["cmd.exe", "/c", $batch_file_path,
"\"¬epad.exe"], $descriptorspec, $pipes);
+proc_close($proc);
+
+?>
+--EXPECT--
+"¬epad.exe
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/ghsa-54hq-v5wp-fqgv.bat');
+?>