Skip to content

Avoid send close in ssl connections #5096

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
wants to merge 1 commit into
base: v3.0
Choose a base branch
from
Open

Avoid send close in ssl connections #5096

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
2 changes: 1 addition & 1 deletion lib/MySQL_Monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static int wait_for_mysql(MYSQL *mysql, int status) {
}

static void close_mysql(MYSQL *my) {
if (my->net.pvio) {
if (my->net.pvio && !my->options.use_ssl) {
Copy link

@gemini-code-assist gemini-code-assist bot Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This change correctly avoids sending an unencrypted COM_QUIT packet over an SSL connection. To make this more robust, you could also check if compression is enabled, as sending an uncompressed packet on a compressed connection would also be incorrect. This would be consistent with a similar FIXME comment in lib/mysql_connection.cpp.

	if (my->net.pvio && !my->options.use_ssl && !my->options.compress) {

Copy link
Author

@Gonlo2 Gonlo2 Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the comment that it does not work with compression this change would be fine but, since I have not tested it, I did not want to introduce it. If you can check it and it solves this issue, I see no problem in extending the patch.

char buff[5];
mysql_hdr myhdr;
myhdr.pkt_id=0;
Expand Down
2 changes: 1 addition & 1 deletion lib/mysql_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2958,7 +2958,7 @@ void MySQL_Connection::optimize() {
// if avoids that a QUIT command stops forever
// FIXME: currently doesn't support encryption and compression
void MySQL_Connection::close_mysql() {
if ((send_quit) && (mysql->net.pvio) && ret_mysql) {
if ((send_quit) && (mysql->net.pvio) && ret_mysql && !mysql->options.use_ssl) {
Copy link

@gemini-code-assist gemini-code-assist bot Sep 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This change correctly avoids sending an unencrypted COM_QUIT packet over an SSL connection, which addresses part of the FIXME on line 2959. To further address the FIXME, you could also add a check to prevent sending an uncompressed packet when compression is enabled.

	if ((send_quit) && (mysql->net.pvio) && ret_mysql && !mysql->options.use_ssl && !mysql->options.compress) {

Copy link
Author

@Gonlo2 Gonlo2 Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the comment that it does not work with compression this change would be fine but, since I have not tested it, I did not want to introduce it. If you can check it and it solves this issue, I see no problem in extending the patch.

char buff[5];
mysql_hdr myhdr;
myhdr.pkt_id=0;
Expand Down