Skip to content

Fix GH-23956: Regression with MySQL 4.1 after mysqlnd security fix #24432

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

Open
jeroenvdkolff wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+110 −2
Open

Fix GH-23956: Regression with MySQL 4.1 after mysqlnd security fix #24432

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
30 changes: 30 additions & 0 deletions ext/mysqli/tests/fake_server.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,6 +1445,36 @@ function my_mysqli_test_stmt_response_field_len_premature(my_mysqli_fake_server_
$conn->read(65536);
}

function my_mysqli_test_query_response_eof_one_byte(my_mysqli_fake_server_conn $conn): void
{
$rh = $conn->packet_generator->server_query_execute_data_response('strval');
// MySQL 4.1 can send a 1-byte EOF packet (no warning count and status) after the metadata
$rh[3]->packet_length = '010000';
$rh[3]->warnings = '';
$rh[3]->server_status = '';

$conn->send_server_greetings();
$conn->read();
$conn->send_server_ok();
$conn->read();
$conn->send($conn->packets_to_bytes($rh), "Query Response [1-byte EOF packet]");
$conn->read(65536);
}

function my_mysqli_test_auth_response_old_password(my_mysqli_fake_server_conn $conn): void
{
$p = new my_mysqli_fake_packet();
$p->packet_length = "010000";
$p->packet_number = "02";
// MySQL 4.1+ sends a single 0xFE byte when the account still uses an old password hash
$p->response_code = "fe";

$conn->send_server_greetings();
$conn->read();
$conn->send($p->to_bytes(), "Auth Response [old password]");
$conn->read(65536);
}

function run_fake_server(string $test_function, int|string $port = 0): void
{
$host = '127.0.0.1';
Expand Down
45 changes: 45 additions & 0 deletions ext/mysqli/tests/gh23956.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
--TEST--
GH-23956 (Regression with MySQL 4.1 after mysqlnd security fix - 1-byte EOF packet)
--EXTENSIONS--
mysqli
--FILE--
<?php
require_once 'fake_server.inc';

$servername = "127.0.0.1";
$username = "root";
$password = "";

$process = run_fake_server_in_background('query_response_eof_one_byte');
$process->wait();

$conn = new mysqli($servername, $username, $password, "", $process->getPort());

echo "[*] Query the fake server...\n";
$result = $conn->query("SELECT strval, strval FROM data");

while ($row = $result->fetch_row()) {
var_dump($row);
}
$conn->close();

$process->terminate();

print "done!";
?>
--EXPECTF--
[*] Server started on 127.0.0.1:%d
[*] Connection established
[*] Sending - Server Greeting: %s
[*] Received: %s
[*] Sending - Server OK: %s
[*] Query the fake server...
[*] Received: %s
[*] Sending - Query Response [1-byte EOF packet]: %s
array(2) {
[0]=>
string(4) "test"
[1]=>
string(4) "test"
}
done!
33 changes: 33 additions & 0 deletions ext/mysqli/tests/gh23956_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
GH-23956 (Regression with MySQL 4.1 after mysqlnd security fix - 1-byte old password auth response)
--EXTENSIONS--
mysqli
--FILE--
<?php
require_once 'fake_server.inc';

$servername = "127.0.0.1";
$username = "root";
$password = "";

$process = run_fake_server_in_background('auth_response_old_password');
$process->wait();

try {
new mysqli($servername, $username, $password, "", $process->getPort());
} catch (mysqli_sql_exception $e) {
echo $e->getMessage(), "\n";
}

$process->terminate();

print "done!";
?>
--EXPECTF--
[*] Server started on 127.0.0.1:%d
[*] Connection established
[*] Sending - Server Greeting: %s
[*] Received: %s
[*] Sending - Auth Response [old password]: 01000002fe
mysqlnd cannot connect to MySQL 4.1+ using the old insecure authentication.%s
done!
4 changes: 2 additions & 2 deletions ext/mysqlnd/mysqlnd_wireprotocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,9 +740,9 @@ php_mysqlnd_auth_response_read(MYSQLND_CONN_DATA * conn, void * _packet)
/* Should be always 0x0 or ERROR_MARKER for error */
packet->response_code = uint1korr(p);
p++;
BAIL_IF_NOT_ENOUGH_DATA;

if (ERROR_MARKER == packet->response_code) {
BAIL_IF_NOT_ENOUGH_DATA;
php_mysqlnd_read_error_from_line(p, packet->header.size - 1,
packet->error, sizeof(packet->error),
&packet->error_no, packet->sqlstate
Expand Down Expand Up @@ -1015,9 +1015,9 @@ php_mysqlnd_eof_read(MYSQLND_CONN_DATA * conn, void * _packet)
/* Should be always EODATA_MARKER */
packet->field_count = uint1korr(p);
p++;
BAIL_IF_NOT_ENOUGH_DATA;

if (ERROR_MARKER == packet->field_count) {
BAIL_IF_NOT_ENOUGH_DATA;
php_mysqlnd_read_error_from_line(p, packet->header.size - 1,
packet->error, sizeof(packet->error),
&packet->error_no, packet->sqlstate
Expand Down
Loading