Skip to content

Commit a9ffc44

Browse files
ramseyramsey
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 20959c3 + de4f7f9 commit a9ffc44

9 files changed

+276
-19
lines changed

‎NEWS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,12 @@ PHP NEWS
110110
(SakiTakamachi)
111111
. Fixed bug GH-13203 (file_put_contents fail on strings over 4GB on Windows).
112112
(divinity76)
113+
. Fixed bug GHSA-pc52-254m-w9w7 (Command injection via array-ish $command
114+
parameter of proc_open). (CVE-2024-1874) (Jakub Zelenka)
115+
. Fixed bug GHSA-wpj3-hf5j-x4v4 (__Host-/__Secure- cookie bypass due to
116+
partial CVE-2022-31629 fix). (CVE-2024-2756) (nielsdos)
117+
. Fixed bug GHSA-h746-cjrr-wfmr (password_verify can erroneously return true,
118+
opening ATO risk). (CVE-2024-3096) (Jakub Zelenka)
113119

114120
- XML:
115121
. Fixed bug GH-13517 (Multiple test failures when building with

‎ext/standard/password.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@ static zend_string* php_password_bcrypt_hash(const zend_string *password, zend_a
180180
zval *zcost;
181181
zend_long cost = PHP_PASSWORD_BCRYPT_COST;
182182

183+
if (memchr(ZSTR_VAL(password), '\0', ZSTR_LEN(password))) {
184+
zend_value_error("Bcrypt password must not contain null character");
185+
return NULL;
186+
}
187+
183188
if (options && (zcost = zend_hash_str_find(options, "cost", sizeof("cost")-1)) != NULL) {
184189
cost = zval_get_long(zcost);
185190
}

‎ext/standard/proc_open.c

Lines changed: 81 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,11 +492,32 @@ static void append_backslashes(smart_str *str, size_t num_bs)
492492
}
493493
}
494494

495-
/* See https://docs.microsoft.com/en-us/cpp/cpp/parsing-cpp-command-line-arguments */
496-
static void append_win_escaped_arg(smart_str *str, zend_string *arg)
495+
const char *special_chars = "()!^\"<>&|%";
496+
497+
static bool is_special_character_present(const zend_string *arg)
498+
{
499+
for (size_t i = 0; i < ZSTR_LEN(arg); ++i) {
500+
if (strchr(special_chars, ZSTR_VAL(arg)[i]) != NULL) {
501+
return true;
502+
}
503+
}
504+
return false;
505+
}
506+
507+
/* See https://docs.microsoft.com/en-us/cpp/cpp/parsing-cpp-command-line-arguments and
508+
* https://learn.microsoft.com/en-us/archive/blogs/twistylittlepassagesallalike/everyone-quotes-command-line-arguments-the-wrong-way */
509+
static void append_win_escaped_arg(smart_str *str, zend_string *arg, bool is_cmd_argument)
497510
{
498511
size_t num_bs = 0;
512+
bool has_special_character = false;
499513

514+
if (is_cmd_argument) {
515+
has_special_character = is_special_character_present(arg);
516+
if (has_special_character) {
517+
/* Escape double quote with ^ if executed by cmd.exe. */
518+
smart_str_appendc(str, '^');
519+
}
520+
}
500521
smart_str_appendc(str, '"');
501522
for (size_t i = 0; i < ZSTR_LEN(arg); ++i) {
502523
char c = ZSTR_VAL(arg)[i];
@@ -510,18 +531,71 @@ static void append_win_escaped_arg(smart_str *str, zend_string *arg)
510531
num_bs = num_bs * 2 + 1;
511532
}
512533
append_backslashes(str, num_bs);
534+
if (has_special_character && strchr(special_chars, c) != NULL) {
535+
/* Escape special chars with ^ if executed by cmd.exe. */
536+
smart_str_appendc(str, '^');
537+
}
513538
smart_str_appendc(str, c);
514539
num_bs = 0;
515540
}
516541
append_backslashes(str, num_bs * 2);
542+
if (has_special_character) {
543+
/* Escape double quote with ^ if executed by cmd.exe. */
544+
smart_str_appendc(str, '^');
545+
}
517546
smart_str_appendc(str, '"');
518547
}
519548

549+
static inline int stricmp_end(const char* suffix, const char* str) {
550+
size_t suffix_len = strlen(suffix);
551+
size_t str_len = strlen(str);
552+
553+
if (suffix_len > str_len) {
554+
return -1; /* Suffix is longer than string, cannot match. */
555+
}
556+
557+
/* Compare the end of the string with the suffix, ignoring case. */
558+
return _stricmp(str + (str_len - suffix_len), suffix);
559+
}
560+
561+
static bool is_executed_by_cmd(const char *prog_name)
562+
{
563+
/* If program name is cmd.exe, then return true. */
564+
if (_stricmp("cmd.exe", prog_name) == 0 || _stricmp("cmd", prog_name) == 0
565+
|| stricmp_end("\\cmd.exe", prog_name) == 0 || stricmp_end("\\cmd", prog_name) == 0) {
566+
return true;
567+
}
568+
569+
/* Find the last occurrence of the directory separator (backslash or forward slash). */
570+
char *last_separator = strrchr(prog_name, '\\');
571+
char *last_separator_fwd = strrchr(prog_name, '/');
572+
if (last_separator_fwd && (!last_separator || last_separator < last_separator_fwd)) {
573+
last_separator = last_separator_fwd;
574+
}
575+
576+
/* Find the last dot in the filename after the last directory separator. */
577+
char *extension = NULL;
578+
if (last_separator != NULL) {
579+
extension = strrchr(last_separator, '.');
580+
} else {
581+
extension = strrchr(prog_name, '.');
582+
}
583+
584+
if (extension == NULL || extension == prog_name) {
585+
/* No file extension found, it is not batch file. */
586+
return false;
587+
}
588+
589+
/* Check if the file extension is ".bat" or ".cmd" which is always executed by cmd.exe. */
590+
return _stricmp(extension, ".bat") == 0 || _stricmp(extension, ".cmd") == 0;
591+
}
592+
520593
static zend_string *create_win_command_from_args(HashTable *args)
521594
{
522595
smart_str str = {0};
523596
zval *arg_zv;
524-
bool is_prog_name = 1;
597+
bool is_prog_name = true;
598+
bool is_cmd_execution = false;
525599
int elem_num = 0;
526600

527601
ZEND_HASH_FOREACH_VAL(args, arg_zv) {
@@ -531,11 +605,13 @@ static zend_string *create_win_command_from_args(HashTable *args)
531605
return NULL;
532606
}
533607

534-
if (!is_prog_name) {
608+
if (is_prog_name) {
609+
is_cmd_execution = is_executed_by_cmd(ZSTR_VAL(arg_str));
610+
} else {
535611
smart_str_appendc(&str, ' ');
536612
}
537613

538-
append_win_escaped_arg(&str, arg_str);
614+
append_win_escaped_arg(&str, arg_str, !is_prog_name && is_cmd_execution);
539615

540616
is_prog_name = 0;
541617
zend_string_release(arg_str);

‎ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_1.phpt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--TEST--
2+
GHSA-54hq-v5wp-fqgv - proc_open does not correctly escape args for bat files
3+
--SKIPIF--
4+
<?php
5+
if( substr(PHP_OS, 0, 3) != "WIN" )
6+
die('skip Run only on Windows');
7+
?>
8+
--FILE--
9+
<?php
10+
11+
$batch_file_content = <<<EOT
12+
@echo off
13+
powershell -Command "Write-Output '%1%'"
14+
EOT;
15+
$batch_file_path = __DIR__ . '/ghsa-54hq-v5wp-fqgv.bat';
16+
17+
file_put_contents($batch_file_path, $batch_file_content);
18+
19+
$descriptorspec = [STDIN, STDOUT, STDOUT];
20+
$proc = proc_open([$batch_file_path, "\"&notepad.exe"], $descriptorspec, $pipes);
21+
proc_close($proc);
22+
23+
?>
24+
--EXPECT--
25+
"&notepad.exe
26+
--CLEAN--
27+
<?php
28+
@unlink(__DIR__ . '/ghsa-54hq-v5wp-fqgv.bat');
29+
?>

‎ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_2.phpt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--TEST--
2+
GHSA-54hq-v5wp-fqgv - proc_open does not correctly escape args for cmd files
3+
--SKIPIF--
4+
<?php
5+
if( substr(PHP_OS, 0, 3) != "WIN" )
6+
die('skip Run only on Windows');
7+
?>
8+
--FILE--
9+
<?php
10+
11+
$batch_file_content = <<<EOT
12+
@echo off
13+
powershell -Command "Write-Output '%1%'"
14+
EOT;
15+
$batch_file_path = __DIR__ . '/ghsa-54hq-v5wp-fqgv.cmd';
16+
17+
file_put_contents($batch_file_path, $batch_file_content);
18+
19+
$descriptorspec = [STDIN, STDOUT, STDOUT];
20+
$proc = proc_open([$batch_file_path, "\"&notepad<>^()!.exe"], $descriptorspec, $pipes);
21+
proc_close($proc);
22+
23+
?>
24+
--EXPECT--
25+
"&notepad<>^()!.exe
26+
--CLEAN--
27+
<?php
28+
@unlink(__DIR__ . '/ghsa-54hq-v5wp-fqgv.cmd');
29+
?>

‎ext/standard/tests/general_functions/ghsa-pc52-254m-w9w7_3.phpt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
--TEST--
2+
GHSA-54hq-v5wp-fqgv - proc_open does not correctly escape args for cmd executing batch files
3+
--SKIPIF--
4+
<?php
5+
if( substr(PHP_OS, 0, 3) != "WIN" )
6+
die('skip Run only on Windows');
7+
?>
8+
--FILE--
9+
<?php
10+
11+
$batch_file_content = <<<EOT
12+
@echo off
13+
powershell -Command "Write-Output '%1%'"
14+
EOT;
15+
$batch_file_path = __DIR__ . '/ghsa-54hq-v5wp-fqgv.bat';
16+
17+
file_put_contents($batch_file_path, $batch_file_content);
18+
19+
$descriptorspec = [STDIN, STDOUT, STDOUT];
20+
$proc = proc_open(["cmd.exe", "/c", $batch_file_path, "\"&notepad.exe"], $descriptorspec, $pipes);
21+
proc_close($proc);
22+
23+
?>
24+
--EXPECT--
25+
"&notepad.exe
26+
--CLEAN--
27+
<?php
28+
@unlink(__DIR__ . '/ghsa-54hq-v5wp-fqgv.bat');
29+
?>

‎ext/standard/tests/ghsa-wpj3-hf5j-x4v4.phpt

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
--TEST--
2+
ghsa-wpj3-hf5j-x4v4 (__Host-/__Secure- cookie bypass due to partial CVE-2022-31629 fix)
3+
--COOKIE--
4+
..Host-test=ignore_1;
5+
._Host-test=ignore_2;
6+
.[Host-test=ignore_3;
7+
_.Host-test=ignore_4;
8+
__Host-test=ignore_5;
9+
_[Host-test=ignore_6;
10+
[.Host-test=ignore_7;
11+
[_Host-test=ignore_8;
12+
[[Host-test=ignore_9;
13+
..Host-test[]=ignore_10;
14+
._Host-test[]=ignore_11;
15+
.[Host-test[]=ignore_12;
16+
_.Host-test[]=ignore_13;
17+
__Host-test[]=legitimate_14;
18+
_[Host-test[]=legitimate_15;
19+
[.Host-test[]=ignore_16;
20+
[_Host-test[]=ignore_17;
21+
[[Host-test[]=ignore_18;
22+
..Secure-test=ignore_1;
23+
._Secure-test=ignore_2;
24+
.[Secure-test=ignore_3;
25+
_.Secure-test=ignore_4;
26+
__Secure-test=ignore_5;
27+
_[Secure-test=ignore_6;
28+
[.Secure-test=ignore_7;
29+
[_Secure-test=ignore_8;
30+
[[Secure-test=ignore_9;
31+
..Secure-test[]=ignore_10;
32+
._Secure-test[]=ignore_11;
33+
.[Secure-test[]=ignore_12;
34+
_.Secure-test[]=ignore_13;
35+
__Secure-test[]=legitimate_14;
36+
_[Secure-test[]=legitimate_15;
37+
[.Secure-test[]=ignore_16;
38+
[_Secure-test[]=ignore_17;
39+
[[Secure-test[]=ignore_18;
40+
--FILE--
41+
<?php
42+
var_dump($_COOKIE);
43+
?>
44+
--EXPECT--
45+
array(3) {
46+
["__Host-test"]=>
47+
array(1) {
48+
[0]=>
49+
string(13) "legitimate_14"
50+
}
51+
["_"]=>
52+
array(2) {
53+
["Host-test["]=>
54+
string(13) "legitimate_15"
55+
["Secure-test["]=>
56+
string(13) "legitimate_15"
57+
}
58+
["__Secure-test"]=>
59+
array(1) {
60+
[0]=>
61+
string(13) "legitimate_14"
62+
}
63+
}

‎ext/standard/tests/password/password_bcrypt_errors.phpt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,14 @@ try {
1414
} catch (ValueError $exception) {
1515
echo $exception->getMessage() . "\n";
1616
}
17+
18+
try {
19+
var_dump(password_hash("null\0password", PASSWORD_BCRYPT));
20+
} catch (ValueError $e) {
21+
echo $e->getMessage(), "\n";
22+
}
1723
?>
1824
--EXPECT--
1925
Invalid bcrypt cost parameter specified: 3
2026
Invalid bcrypt cost parameter specified: 32
27+
Bcrypt password must not contain null character

‎main/php_variables.c

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,21 @@ PHPAPI void php_register_known_variable(const char *var_name, size_t var_name_le
8989
php_register_variable_quick(var_name, var_name_len, value, symbol_table);
9090
}
9191

92+
/* Discard variable if mangling made it start with __Host-, where pre-mangling it did not start with __Host-
93+
* Discard variable if mangling made it start with __Secure-, where pre-mangling it did not start with __Secure- */
94+
static bool php_is_forbidden_variable_name(const char *mangled_name, size_t mangled_name_len, const char *pre_mangled_name)
95+
{
96+
if (mangled_name_len >= sizeof("__Host-")-1 && strncmp(mangled_name, "__Host-", sizeof("__Host-")-1) == 0 && strncmp(pre_mangled_name, "__Host-", sizeof("__Host-")-1) != 0) {
97+
return true;
98+
}
99+
100+
if (mangled_name_len >= sizeof("__Secure-")-1 && strncmp(mangled_name, "__Secure-", sizeof("__Secure-")-1) == 0 && strncmp(pre_mangled_name, "__Secure-", sizeof("__Secure-")-1) != 0) {
101+
return true;
102+
}
103+
104+
return false;
105+
}
106+
92107
PHPAPI void php_register_variable_ex(const char *var_name, zval *val, zval *track_vars_array)
93108
{
94109
char *p = NULL;
@@ -139,20 +154,6 @@ PHPAPI void php_register_variable_ex(const char *var_name, zval *val, zval *trac
139154
}
140155
var_len = p - var;
141156

142-
/* Discard variable if mangling made it start with __Host-, where pre-mangling it did not start with __Host- */
143-
if (strncmp(var, "__Host-", sizeof("__Host-")-1) == 0 && strncmp(var_name, "__Host-", sizeof("__Host-")-1) != 0) {
144-
zval_ptr_dtor_nogc(val);
145-
free_alloca(var_orig, use_heap);
146-
return;
147-
}
148-
149-
/* Discard variable if mangling made it start with __Secure-, where pre-mangling it did not start with __Secure- */
150-
if (strncmp(var, "__Secure-", sizeof("__Secure-")-1) == 0 && strncmp(var_name, "__Secure-", sizeof("__Secure-")-1) != 0) {
151-
zval_ptr_dtor_nogc(val);
152-
free_alloca(var_orig, use_heap);
153-
return;
154-
}
155-
156157
if (var_len==0) { /* empty variable name, or variable name with a space in it */
157158
zval_ptr_dtor_nogc(val);
158159
free_alloca(var_orig, use_heap);
@@ -256,6 +257,12 @@ PHPAPI void php_register_variable_ex(const char *var_name, zval *val, zval *trac
256257
return;
257258
}
258259
} else {
260+
if (php_is_forbidden_variable_name(index, index_len, var_name)) {
261+
zval_ptr_dtor_nogc(val);
262+
free_alloca(var_orig, use_heap);
263+
return;
264+
}
265+
259266
gpc_element_p = zend_symtable_str_find(symtable1, index, index_len);
260267
if (!gpc_element_p) {
261268
zval tmp;
@@ -293,6 +300,12 @@ PHPAPI void php_register_variable_ex(const char *var_name, zval *val, zval *trac
293300
zval_ptr_dtor_nogc(val);
294301
}
295302
} else {
303+
if (php_is_forbidden_variable_name(index, index_len, var_name)) {
304+
zval_ptr_dtor_nogc(val);
305+
free_alloca(var_orig, use_heap);
306+
return;
307+
}
308+
296309
zend_ulong idx;
297310

298311
/*

0 commit comments

Comments
 (0)