Skip to content

Commit abcd23a

Browse files
committed
MDEV-31857 enable --ssl-verify-server-cert by default in the internal client
enable ssl + ssl_verify_server_cert in the internal client too * fix replication tests to disable master_ssl_verify_server_cert because accounts are passwordless - except rpl.rpl_ssl1 * fix federated/federatedx/connect to disable SSL_VERIFY_SERVER_CERT because they cannot configure an ssl connection * fix spider to disable ssl_verify_server_cert, if configuration says so, as spider _can_ configure an ssl connection * memory leak in embedded test-connect
1 parent e0c3039 commit abcd23a

File tree

132 files changed

+277
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+277
-260
lines changed

include/sql_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct st_mysql_options_extention {
4141
uint proc_info_length);
4242
HASH connection_attributes;
4343
size_t connection_attributes_length;
44-
my_bool tls_verify_server_cert;
44+
my_bool tls_allow_invalid_server_cert;
4545
};
4646

4747
typedef struct st_mysql_methods

mysql-test/include/check-testcase.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if ($tmp)
4747
--echo Until_Condition #
4848
--echo Until_Log_File #
4949
--echo Until_Log_Pos #
50-
--echo Master_SSL_Allowed No
50+
--echo Master_SSL_Allowed Yes
5151
--echo Master_SSL_CA_File
5252
--echo Master_SSL_CA_Path
5353
--echo Master_SSL_Cert

mysql-test/include/rpl_change_topology.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,11 @@ if (!$rpl_skip_change_master)
235235
}
236236
if ($rpl_master_log_file)
237237
{
238-
eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_LOG_FILE = '$_rpl_master_log_file'$_rpl_master_log_pos, MASTER_CONNECT_RETRY = 1, MASTER_USE_GTID=NO;
238+
eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_LOG_FILE = '$_rpl_master_log_file'$_rpl_master_log_pos, MASTER_CONNECT_RETRY = 1, MASTER_SSL_VERIFY_SERVER_CERT=0, MASTER_USE_GTID=NO;
239239
}
240240
if (!$rpl_master_log_file)
241241
{
242-
eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_CONNECT_RETRY=1;
242+
eval CHANGE MASTER TO MASTER_HOST = '127.0.0.1', MASTER_PORT = $_rpl_port, MASTER_USER = 'root', MASTER_CONNECT_RETRY=1, MASTER_SSL_VERIFY_SERVER_CERT=0;
243243
}
244244
}
245245
if ($_rpl_master == '')

mysql-test/main/ps_change_master.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ EXECUTE stmt;
1818
DEALLOCATE PREPARE stmt;
1919
# Master_Host : host2
2020
# Master_User : user2
21-
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
21+
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_SSL_VERIFY_SERVER_CERT=0;
2222
# End of test

mysql-test/main/ps_change_master.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ let $master_user= query_get_value(SHOW SLAVE STATUS, Master_User, 1);
4040

4141

4242
# Reset
43-
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';
43+
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root', MASTER_SSL_VERIFY_SERVER_CERT=0;
4444

4545
--echo # End of test

mysql-test/suite/binlog_encryption/multisource.result

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ ERROR HY000: Incorrect arguments to MASTER_HOST
66
change master 'master1' to
77
master_port=MYPORT_1,
88
master_host='127.0.0.1',
9-
master_user='root';
9+
master_user='root',
10+
master_ssl_verify_server_cert=0;
1011
start slave 'master1';
1112
set default_master_connection = 'master1';
1213
include/wait_for_slave_to_start.inc
@@ -100,6 +101,7 @@ change master to
100101
master_port=MYPORT_2,
101102
master_host='127.0.0.1',
102103
master_user='root',
104+
master_ssl_verify_server_cert=0,
103105
master_use_gtid=no;
104106
start slave;
105107
include/wait_for_slave_to_start.inc

mysql-test/suite/binlog_encryption/rpl_ssl.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ connection slave;
5151
include/stop_slave.inc
5252
CHANGE MASTER TO
5353
master_user = 'root',
54-
master_ssl = 0,
54+
master_ssl = 1,
5555
master_ssl_ca = '',
5656
master_ssl_cert = '',
5757
master_ssl_key = '';

mysql-test/suite/engines/funcs/r/rpl_000010.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ n
1616
connection master;
1717
drop table t1;
1818
connection slave;
19+
include/wait_for_slave_to_start.inc
1920
include/rpl_end.inc

mysql-test/suite/engines/funcs/r/rpl_dual_pos_advance.result

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include/master-slave.inc
33
connection slave;
44
reset master;
55
connection master;
6-
change master to master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root";
6+
change master to master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root",master_ssl_verify_server_cert=0;
77
include/start_slave.inc
88
connection slave;
99
create table t1 (n int);
@@ -25,4 +25,5 @@ include/stop_slave.inc
2525
reset slave;
2626
drop table t1,t4,t5,t6;
2727
connection slave;
28+
include/wait_for_slave_to_start.inc
2829
include/rpl_end.inc

mysql-test/suite/engines/funcs/r/rpl_flushlog_loop.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ include/master-slave.inc
33
connection slave;
44
include/stop_slave.inc
55
change master to master_host='127.0.0.1',master_user='root',
6-
master_password='',master_port=MASTER_PORT;
6+
master_password='',master_port=MASTER_PORT, master_ssl_verify_server_cert=0;
77
include/start_slave.inc
88
connection master;
99
change master to master_host='127.0.0.1',master_user='root',
10-
master_password='',master_port=SLAVE_PORT;
10+
master_password='',master_port=SLAVE_PORT, master_ssl_verify_server_cert=0;
1111
include/start_slave.inc
1212
flush logs;
1313
include/stop_slave.inc

0 commit comments

Comments
 (0)