Skip to content

Commit 5168a2f

Browse files
bukkabukka
committed
Merge branch 'PHP-8.2' into PHP-8.3
2 parents 612a34c + d18768e commit 5168a2f

16 files changed

+72
-72
lines changed

‎ext/mysqli/tests/fake_server.inc

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -615,19 +615,30 @@ class my_mysqli_fake_server_conn
615615

616616
class my_mysqli_fake_server_process
617617
{
618+
private int $port;
619+
618620
public function __construct(private $process, private array $pipes) {}
619621

620-
public function terminate(bool $wait = false)
622+
public function terminate(bool $wait = false): void
621623
{
622624
if ($wait) {
623625
$this->wait();
624626
}
625627
proc_terminate($this->process);
626628
}
627629

628-
public function wait()
630+
public function wait(): void
629631
{
630-
echo fgets($this->pipes[1]);
632+
$line = fgets($this->pipes[1]);
633+
if (preg_match('/\[\*\] Server started on \d+\.\d+\.\d+\.\d+:(\d+)/', $line, $matches)) {
634+
$this->port = (int)$matches[1];
635+
}
636+
echo $line;
637+
}
638+
639+
public function getPort(): int
640+
{
641+
return $this->port ?? throw new RuntimeException("Port not set");
631642
}
632643
}
633644

@@ -807,15 +818,20 @@ function my_mysqli_test_query_response_row_read_two_fields(my_mysqli_fake_server
807818
}
808819
}
809820

810-
function run_fake_server(string $test_function, $port = 33305): void
821+
function run_fake_server(string $test_function, int|string $port = 0): int
811822
{
812-
$address = '127.0.0.1';
823+
$host = '127.0.0.1';
813824

814-
$socket = @stream_socket_server("tcp://$address:$port", $errno, $errstr);
825+
$socket = @stream_socket_server("tcp://$host:$port", $errno, $errstr);
815826
if (!$socket) {
816827
die("Failed to create socket: $errstr ($errno)\n");
817828
}
818-
echo "[*] Server started\n";
829+
if (intval($port) === 0) {
830+
$address = stream_socket_get_name($socket, false);
831+
list($host, $port) = explode(":", $address);
832+
}
833+
834+
echo "[*] Server started on $host:$port\n";
819835

820836
try {
821837
$conn = new my_mysqli_fake_server_conn($socket);
@@ -832,7 +848,7 @@ function run_fake_server(string $test_function, $port = 33305): void
832848
}
833849

834850

835-
function run_fake_server_in_background($test_function, $port = 33305): my_mysqli_fake_server_process
851+
function run_fake_server_in_background($test_function, $port = 0): my_mysqli_fake_server_process
836852
{
837853
$command = [PHP_BINARY, '-n', __FILE__, 'mysqli_fake_server', $test_function, $port];
838854

@@ -852,5 +868,5 @@ function run_fake_server_in_background($test_function, $port = 33305): my_mysqli
852868
}
853869

854870
if (isset($argv) && $argc > 2 && $argv[1] == 'mysqli_fake_server') {
855-
run_fake_server($argv[2], $argv[3] ?? '33305');
871+
run_fake_server($argv[2], $argv[3] ?? 0);
856872
}

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-auth-message.phpt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('auth_response_message_over_read', $port);
13+
$process = run_fake_server_in_background('auth_response_message_over_read');
1514
$process->wait();
1615

1716
try {
18-
$conn = new mysqli( $servername, $username, $password, "", $port );
17+
$conn = new mysqli( $servername, $username, $password, "", $process->getPort());
1918
$info = mysqli_info($conn);
2019
var_dump($info);
2120
} catch (Exception $e) {
@@ -27,12 +26,12 @@ $process->terminate();
2726
print "done!";
2827
?>
2928
--EXPECTF--
30-
[*] Server started
29+
[*] Server started on 127.0.0.1:%d
3130
[*] Connection established
3231
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
3332
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31
3433
[*] Sending - Malicious OK Auth Response [Extract heap through buffer over-read]: 0900000200000002000000fcff
3534

3635
Warning: mysqli::__construct(): OK packet message length is past the packet size in %s on line %d
37-
Unknown error while trying to connect via tcp://127.0.0.1:33305
36+
Unknown error while trying to connect via tcp://127.0.0.1:%d
3837
done!

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-def.phpt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
10-
$port = 33305;
119
$servername = "127.0.0.1";
1210
$username = "root";
1311
$password = "";
1412

15-
$process = run_fake_server_in_background('tabular_response_def_over_read', $port);
13+
$process = run_fake_server_in_background('tabular_response_def_over_read');
1614
$process->wait();
1715

18-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1917

2018
echo "[*] Running query on the fake server...\n";
2119

@@ -34,7 +32,7 @@ $process->terminate();
3432
print "done!";
3533
?>
3634
--EXPECTF--
37-
[*] Server started
35+
[*] Server started on 127.0.0.1:%d
3836
[*] Connection established
3937
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4038
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-filename.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('upsert_response_filename_over_read', $port);
13+
$process = run_fake_server_in_background('upsert_response_filename_over_read');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817
echo "[*] Running query on the fake server...\n";
1918

2019
$result = $conn->query("SELECT * from users");
@@ -27,7 +26,7 @@ $process->terminate();
2726
print "done!";
2827
?>
2928
--EXPECTF--
30-
[*] Server started
29+
[*] Server started on 127.0.0.1:%d
3130
[*] Connection established
3231
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
3332
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-query-len-overflow.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('query_response_row_length_overflow', $port);
13+
$process = run_fake_server_in_background('query_response_row_length_overflow');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Query the fake server...\n";
2019
$sql = "SELECT strval, strval FROM data";
@@ -33,7 +32,7 @@ $process->terminate(true);
3332
print "done!";
3433
?>
3534
--EXPECTF--
36-
[*] Server started
35+
[*] Server started on 127.0.0.1:%d
3736
[*] Connection established
3837
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
3938
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-bit.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('stmt_response_row_over_read_bit', $port);
13+
$process = run_fake_server_in_background('stmt_response_row_over_read_bit');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Preparing statement on the fake server...\n";
2019
$stmt = $conn->prepare("SELECT bitval, timval FROM data");
@@ -36,7 +35,7 @@ $process->terminate(true);
3635
print "done!";
3736
?>
3837
--EXPECTF--
39-
[*] Server started
38+
[*] Server started on 127.0.0.1:%d
4039
[*] Connection established
4140
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4241
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-date.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('stmt_response_row_over_read_date', $port);
13+
$process = run_fake_server_in_background('stmt_response_row_over_read_date');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Preparing statement on the fake server...\n";
2019
$stmt = $conn->prepare("SELECT strval, datval FROM data");
@@ -36,7 +35,7 @@ $process->terminate(true);
3635
print "done!";
3736
?>
3837
--EXPECTF--
39-
[*] Server started
38+
[*] Server started on 127.0.0.1:%d
4039
[*] Connection established
4140
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4241
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-datetime.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('stmt_response_row_over_read_datetime', $port);
13+
$process = run_fake_server_in_background('stmt_response_row_over_read_datetime');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Preparing statement on the fake server...\n";
2019
$stmt = $conn->prepare("SELECT strval, dtival FROM data");
@@ -36,7 +35,7 @@ $process->terminate(true);
3635
print "done!";
3736
?>
3837
--EXPECTF--
39-
[*] Server started
38+
[*] Server started on 127.0.0.1:%d
4039
[*] Connection established
4140
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4241
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-double.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('stmt_response_row_over_read_double', $port);
13+
$process = run_fake_server_in_background('stmt_response_row_over_read_double');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Preparing statement on the fake server...\n";
2019
$stmt = $conn->prepare("SELECT strval, dblval FROM data");
@@ -36,7 +35,7 @@ $process->terminate(true);
3635
print "done!";
3736
?>
3837
--EXPECTF--
39-
[*] Server started
38+
[*] Server started on 127.0.0.1:%d
4039
[*] Connection established
4140
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4241
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-float.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('stmt_response_row_over_read_float', $port);
13+
$process = run_fake_server_in_background('stmt_response_row_over_read_float');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Preparing statement on the fake server...\n";
2019
$stmt = $conn->prepare("SELECT strval, fltval FROM data");
@@ -36,7 +35,7 @@ $process->terminate(true);
3635
print "done!";
3736
?>
3837
--EXPECTF--
39-
[*] Server started
38+
[*] Server started on 127.0.0.1:%d
4039
[*] Connection established
4140
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4241
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-int.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('stmt_response_row_over_read_int', $port);
13+
$process = run_fake_server_in_background('stmt_response_row_over_read_int');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Preparing statement on the fake server...\n";
2019
$stmt = $conn->prepare("SELECT strval, intval FROM data");
@@ -36,7 +35,7 @@ $process->terminate(true);
3635
print "done!";
3736
?>
3837
--EXPECTF--
39-
[*] Server started
38+
[*] Server started on 127.0.0.1:%d
4039
[*] Connection established
4140
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4241
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

‎ext/mysqli/tests/ghsa-h35g-vwh6-m678-stmt-row-no-space.phpt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ mysqli
66
<?php
77
require_once 'fake_server.inc';
88

9-
$port = 33305;
109
$servername = "127.0.0.1";
1110
$username = "root";
1211
$password = "";
1312

14-
$process = run_fake_server_in_background('stmt_response_row_no_space', $port);
13+
$process = run_fake_server_in_background('stmt_response_row_no_space');
1514
$process->wait();
1615

17-
$conn = new mysqli($servername, $username, $password, "", $port);
16+
$conn = new mysqli($servername, $username, $password, "", $process->getPort());
1817

1918
echo "[*] Preparing statement on the fake server...\n";
2019
$stmt = $conn->prepare("SELECT strval, strval FROM data");
@@ -36,7 +35,7 @@ $process->terminate(true);
3635
print "done!";
3736
?>
3837
--EXPECTF--
39-
[*] Server started
38+
[*] Server started on 127.0.0.1:%d
4039
[*] Connection established
4140
[*] Sending - Server Greeting: 580000000a352e352e352d31302e352e31382d4d6172696144420003000000473e3f6047257c6700fef7080200ff81150000000000000f0000006c6b55463f49335f686c6431006d7973716c5f6e61746976655f70617373776f7264
4241
[*] Received: 6900000185a21a00000000c0080000000000000000000000000000000000000000000000726f6f7400006d7973716c5f6e61746976655f70617373776f7264002c0c5f636c69656e745f6e616d65076d7973716c6e640c5f7365727665725f686f7374093132372e302e302e31

0 commit comments

Comments
 (0)