Skip to content

Commit be5035b

Browse files
cvicentiucvicentiu
committed
Added tests for MDEV-7937
1 parent 4ef7497 commit be5035b

File tree

6 files changed

+72
-0
lines changed

6 files changed

+72
-0
lines changed

‎mysql-test/include/have_ssl_disabled.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-- require r/have_ssl_disabled.require
2+
disable_query_log;
3+
show variables like 'have_ssl';
4+
enable_query_log;

‎mysql-test/r/have_ssl_disabled.require

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Variable_name Value
2+
have_ssl DISABLED

‎mysql-test/r/ssl_7937.result

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
2+
Variable_name Value
3+
Ssl_cipher DHE-RSA-AES256-GCM-SHA384
4+
#
5+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
6+
Variable_name Value
7+
Ssl_cipher DHE-RSA-AES256-GCM-SHA384
8+
#
9+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
10+
ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate
11+
#
12+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
13+
ERROR 2026 (HY000): SSL connection error: Failed to verify the server certificate

‎mysql-test/r/ssl_without_7937.result

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
2+
Variable_name Value
3+
Ssl_cipher
4+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl-key=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-key.pem --ssl-cert=/home/vicentiu/Workspace/MariaDB/server/mysql-test/std_data/client-cert.pem --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
5+
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it
6+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
7+
Variable_name Value
8+
Ssl_cipher
9+
/home/vicentiu/Workspace/MariaDB/server/client/mysql --defaults-file=/home/vicentiu/Workspace/MariaDB/server/mysql-test/var/my.cnf --ssl --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
10+
ERROR 2026 (HY000): SSL connection error: SSL is required, but the server does not support it

‎mysql-test/t/ssl_7937.test

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
source include/have_ssl_communication.inc;
2+
3+
let $mysql_ssl_cert=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
4+
let $mysql_ssl_no_cert=$MYSQL --ssl -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
5+
let $mysql_ssl_no_cert_ver=$MYSQL --ssl --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
6+
let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl-verify-server-cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
7+
8+
--echo $mysql_ssl_cert;
9+
--exec $mysql_ssl_cert;
10+
--echo #
11+
--echo $mysql_ssl_no_cert;
12+
--exec $mysql_ssl_no_cert;
13+
--echo #
14+
--echo $mysql_ssl_no_cert_ver;
15+
--error 1
16+
--exec $mysql_ssl_no_cert_ver;
17+
--echo #
18+
--echo $mysql_ssl_cert_ver;
19+
--error 1
20+
--exec $mysql_ssl_cert_ver;
21+

‎mysql-test/t/ssl_without_7937.test

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
source include/have_ssl_disabled.inc;
2+
3+
# SSL not mandatory here.
4+
let $mysql_ssl_cert=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
5+
# SSL mandatory with verify server cert
6+
let $mysql_ssl_cert_ver=$MYSQL --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
7+
--echo $mysql_ssl_cert;
8+
--exec $mysql_ssl_cert;
9+
--echo $mysql_ssl_cert_ver;
10+
--error 1
11+
--exec $mysql_ssl_cert_ver;
12+
13+
# SSL not mandatory again
14+
let $mysql_no_ssl_but_ver=$MYSQL --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
15+
--echo $mysql_no_ssl_but_ver;
16+
--exec $mysql_no_ssl_but_ver;
17+
18+
# SSL mandatory but no specifications for ssl parameters
19+
let $mysql_ssl_no_spec_ver=$MYSQL --ssl --ssl_verify_server_cert -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1;
20+
--echo $mysql_ssl_no_spec_ver
21+
--error 1
22+
--exec $mysql_ssl_no_spec_ver

0 commit comments

Comments
 (0)