Skip to content

Commit 3c0e6c6

Browse files
committed
Bug#27675699 - FAILED AUTHENTICATION AT X PLUGIN ALWAYS RETURNS ER_ACCESS_DENIED_ERROR
Description =========== X Plugin always overwrites error code at authentication failure to ER_ACCESS_DENIED, still the error description is specific for the case: Mysqlx.Error{ code:ER_ACCESS_DENIED msg:"Account is locked."} Mysqlx.Error{ code:ER_ACCESS_DENIED msg:"Your password has expired. To log in you " "must change it using a client that supports " "expired password."} Mysqlx.Error{ code:ER_ACCESS_DENIED msg:"Invalid user or password"} Mysqlx.Error{ code:ER_ACCESS_DENIED msg:"Secure transport required. To log in you must " "use TCP+SSL or UNIX socket connection."} Fix === X Plugin must reuse error codes and error messages from the server. From now on it is going to return following error codes: ER_ACCOUNT_HAS_BEEN_LOCKED, ER_MUST_CHANGE_PASSWORD_LOGIN, ER_ACCESS_DENIED, ER_SECURE_TRANSPORT_REQUIRED. RB: 19138 Reviewed-by: Tomasz Stepniak <[email protected]> Reviewed-by: Grzegorz Szwarc <[email protected]>
1 parent 1fbe219 commit 3c0e6c6

File tree

75 files changed

+827
-871
lines changed

Some content is hidden

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

75 files changed

+827
-871
lines changed

mysql-test/suite/x/include/connection_skip_grant_table.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@ exec $MYSQLXTEST
6868
--echo # Enable back the "grant-tables", mysqlx client
6969
--echo # that uses invalid passord must be disconnected
7070
FLUSH PRIVILEGES;
71-
--let $expected_error_msg= Invalid user or password \(code 1045\)
72-
--source ../include/mysqlxtest_expected_error.inc
7371
exec $MYSQLXTEST $USER_CIPHER
72+
--expect-error ER_ACCESS_DENIED_ERROR
7473
--socket=$MASTER_X_MYSOCK
7574
--user nonblank
7675
--password='invalid'

mysql-test/suite/x/include/connection_ssl.inc

Lines changed: 22 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
# MYSQLXTEST argument setting unix socket or must be empty)
1111
# $USER_AUTH_PLUGIN - defines MySQL Servers account types that is going to
1212
# be tested
13-
# $ERROR_IF_CHANNEL_UNSECURE - defined expected error message for MYSQLXTEST
14-
# connection when verifying the "require_secure_transport"
15-
# system variable.
13+
# $ERROR_IF_CHANNEL_UNSECURE - defined expected error code for MYSQLXTEST
14+
# default connection when test verifies X Plugin logic that
15+
# handles "require_secure_transport" system variable.
1616
#
1717
# Usage:
1818
#
1919
# --let $INCREMENT=0|1
2020
# --let $USER_AUTH_PLUGIN=mysql_native_password|sha256_password|caching_sha2_password
2121
# --let $ERROR_IF_CHANNEL_UNSECURE=EXPECTED_ERROR_MESSAGE
2222
# --let $USE_SOCKET=UNIX_SOCKET_CONFIGURATION
23-
# --source connection_ssl.inc
23+
# --source ../include/connection_ssl.inc
2424
#
2525

2626
--echo
@@ -174,6 +174,7 @@ callmacro Assert_status_variable
174174
%VAR_SSL_ACCEPTS%;
175175
EOF
176176

177+
177178
--write_file $MYSQL_TMP_DIR/verify-non-ssl-connection-info.tmp
178179
-->import assert_select.macro
179180
-->import assert_status_variable.macro
@@ -206,7 +207,6 @@ callmacro Assert_status_variable
206207
EOF
207208

208209

209-
210210
# Using "connect-expired-password" Option to allow expired password.
211211

212212
--write_file $MYSQL_TMP_DIR/mysqlx-alter-pwd.tmp
@@ -215,6 +215,7 @@ ALTER USER USER() IDENTIFIED BY 'alter-new-auth';
215215
-->endsql
216216
EOF
217217

218+
218219
--write_file $MYSQL_TMP_DIR/mysqlx-set-pwd.tmp
219220
-->sql
220221
SET PASSWORD='set-new-auth';
@@ -331,14 +332,12 @@ exec $MYSQLXTEST -u x_root --password='' -h127.0.0.1
331332
--echo #
332333
--echo # III.1
333334
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
334-
let $expected_error_msg= Your password has expired. To log in you must change it using a client that supports expired passwords. \(code 1045\);
335-
--source ../include/mysqlxtest_expected_error.inc
336-
exec $MYSQLXTEST_VERIFY_SSL -u user2_mysqlx --password='auth_string2' --plain-auth 2>&1;
335+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_MUST_CHANGE_PASSWORD_LOGIN -u user2_mysqlx --password='auth_string2' --plain-auth 2>&1;
337336

338337
--echo # III.2
339338
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
340339
exec $MYSQLXTEST -u user2_mysqlx --password='auth_string2'
341-
--connect-expired-password --ssl-mode=REQUIRED
340+
--connect-expired-password --ssl-mode=REQUIRED
342341
--file=$MYSQL_TMP_DIR/mysqlx-alter-pwd.tmp 2>&1;
343342

344343
--echo # III.3
@@ -378,28 +377,20 @@ exec $MYSQLXTEST_VERIFY_SSL -u user3_mysqlx --password='auth_string3'
378377

379378
--echo # IV.2
380379
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
381-
let $expected_error_msg= Current user certificate subject is not valid. \(code 1045\);
382-
--source ../include/mysqlxtest_expected_error.inc
383-
exec $MYSQLXTEST_VERIFY_SSL -u user3_mysqlx --password='auth_string3' --cached-auth
380+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user3_mysqlx --password='auth_string3' --cached-auth
384381
--ssl-cipher='AES256-SHA' --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem 2>&1;
385382

386383
--echo # IV.3
387384
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
388-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
389-
--source ../include/mysqlxtest_expected_error.inc
390-
exec $MYSQLXTEST_VERIFY_SSL -u user3_mysqlx --password='auth_string3' --cached-auth 2>&1;
385+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user3_mysqlx --password='auth_string3' --cached-auth 2>&1;
391386

392387
--echo # IV.4
393388
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
394-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
395-
--source ../include/mysqlxtest_expected_error.inc
396-
exec $MYSQLXTEST_VERIFY_SSL -u user3_mysqlx --password='auth_string3' --cached-auth 2>&1;
389+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user3_mysqlx --password='auth_string3' 2>&1;
397390

398391
--echo # IV.5
399392
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
400-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
401-
--source ../include/mysqlxtest_expected_error.inc
402-
exec $MYSQLXTEST_VERIFY_SSL -u user3_mysqlx --password='auth_string3' --cached-auth
393+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user3_mysqlx --password='auth_string3' --cached-auth
403394
--ssl-cipher='AES256-SHA' 2>&1;
404395

405396

@@ -412,9 +403,7 @@ exec $MYSQLXTEST_VERIFY_SSL -u user3_mysqlx --password='auth_string3' --cached-a
412403
--echo #
413404
--echo # V.1
414405
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
415-
let $expected_error_msg= Account is locked. \(code 1045\);
416-
--source ../include/mysqlxtest_expected_error.inc
417-
exec $MYSQLXTEST_VERIFY_SSL -u user4_mysqlx --password=''
406+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCOUNT_HAS_BEEN_LOCKED -u user4_mysqlx --password=''
418407
$CLIENT_SSL_KEY $CLIENT_SSL_CERT 2>&1;
419408

420409
--echo # V.2
@@ -468,22 +457,16 @@ exec $MYSQLXTEST_VERIFY_SSL -u user6_mysqlx --password='dwh@#ghd' --plain-auth
468457
-v%VAR_SSL_ACCEPTS%=$SSL_CONNECTION_MADE 2>&1;
469458

470459
--echo # VII.2
471-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
472-
--source ../include/mysqlxtest_expected_error.inc
473-
exec $MYSQLXTEST_VERIFY_NON_SSL -u user6_mysqlx --password='dwh@#ghd' 2>&1 --cached-auth;
460+
exec $MYSQLXTEST_VERIFY_NON_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user6_mysqlx --password='dwh@#ghd' 2>&1 --cached-auth;
474461

475462
--echo # VII.3
476463
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
477-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
478-
--source ../include/mysqlxtest_expected_error.inc
479-
exec $MYSQLXTEST_VERIFY_SSL -u user6_mysqlx --password='dwh@#ghd' --cached-auth
464+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user6_mysqlx --password='dwh@#ghd' --cached-auth
480465
$CLIENT_SSL_CA 2>&1;
481466

482467
--echo # VII.4
483468
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
484-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
485-
--source ../include/mysqlxtest_expected_error.inc
486-
exec $MYSQLXTEST_VERIFY_SSL -u user6_mysqlx --password='dwh@#ghd' --plain-auth 2>&1;
469+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user6_mysqlx --password='dwh@#ghd' --plain-auth 2>&1;
487470

488471
--echo
489472
--echo
@@ -504,29 +487,20 @@ exec $MYSQLXTEST_VERIFY_SSL -u user7_mysqlx
504487

505488
--echo # VIII.2
506489
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
507-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
508-
--source ../include/mysqlxtest_expected_error.inc
509-
exec $MYSQLXTEST_VERIFY_SSL -u user7_mysqlx --cached-auth
490+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user7_mysqlx --cached-auth
510491
--ssl-cipher="AES256-SHA" 2>&1;
511492

512493
--echo # VIII.3
513-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
514-
let $expected_error_extra= /in main, line 0:ERROR: (Invalid user or password \(code 1045\))/Application terminated with expected error: \1/;
515-
--source ../include/mysqlxtest_expected_error.inc
516-
exec $MYSQLXTEST_VERIFY_NON_SSL -u user7_mysqlx --cached-auth 2>&1;
494+
let $expected_error_msg= Access denied for user 'user7_mysqlx'@'localhost' \(using password: YES\) \(code 1045\);
495+
exec $MYSQLXTEST_VERIFY_NON_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user7_mysqlx --cached-auth 2>&1;
517496

518497
--echo # VIII.4
519498
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
520-
let $expected_error_msg= Current account requires TLS to be activate. \(code 1045\);
521-
let $expected_error_extra= /in main, line 0:ERROR: (Invalid user or password \(code 1045\))/Application terminated with expected error: \1/;
522-
--source ../include/mysqlxtest_expected_error.inc
523-
exec $MYSQLXTEST_VERIFY_SSL -u user7_mysqlx --plain-auth 2>&1;
499+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user7_mysqlx --cached-auth 2>&1;
524500

525501
--echo # VIII.5
526502
expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
527-
let $expected_error_msg= Current user cipher isn.t allowed. \(code 1045\);
528-
--source ../include/mysqlxtest_expected_error.inc
529-
exec $MYSQLXTEST_VERIFY_SSL -u user7_mysqlx --cached-auth
503+
exec $MYSQLXTEST_VERIFY_SSL --expect-error ER_ACCESS_DENIED_ERROR -u user7_mysqlx --cached-auth
530504
--ssl-cipher='DHE-RSA-AES256-SHA' $CLIENT_SSL_CA $CLIENT_SSL_KEY $CLIENT_SSL_CERT 2>&1;
531505

532506
--echo
@@ -558,9 +532,7 @@ exec $MYSQLXTEST -u x_root
558532
--echo #
559533
--echo # X.1
560534
SET GLOBAL require_secure_transport:=1;
561-
let $expected_error_msg= $ERROR_IF_CHANNEL_UNSECURE;
562-
--source ../include/mysqlxtest_expected_error.inc
563-
exec $MYSQLXTEST_VERIFY_NON_SSL -ux_root --password=''
535+
exec $MYSQLXTEST_VERIFY_NON_SSL --expect-error $ERROR_IF_CHANNEL_UNSECURE -ux_root --password=''
564536
-v%VAR_SSL_ACCEPTS%=$SSL_CONNECTION_MADE 2>&1;
565537

566538
--echo # X.2

mysql-test/suite/x/include/connection_tls_version.inc

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ EOF
2929
# 1: for openssl 1.0
3030
# 2: for openssl 1.1
3131
# 3: for wolfSSL
32-
--let $ERROR1= /in main, line 0:ERROR: error:00000001:lib\(0\):func\(0\):reason\(1\)/Application terminated with expected error: protocol version mismatch/ /in main, line 0:ERROR: record layer version error/Application terminated with expected error: protocol version mismatch/
33-
--let $ERROR5= /in main, line 0:ERROR: error:00000005:lib\(0\):func\(0\):DH lib/Application terminated with expected error: socket layer receive error/ /in main, line 0:ERROR: error:00000001:lib\(0\):func\(0\):reason\(1\)/Application terminated with expected error: socket layer receive error/ /in main, line 0:ERROR: error state on socket/Application terminated with expected error: socket layer receive error/
32+
--let $ERROR1= /Application terminated with expected error: error:00000001:lib\(0\):func\(0\):reason\(1\)/Application terminated with expected error: protocol version mismatch/ /Application terminated with expected error: record layer version error/Application terminated with expected error: protocol version mismatch/
33+
--let $ERROR5= /Application terminated with expected error: error:00000005:lib\(0\):func\(0\):DH lib/Application terminated with expected error: socket layer receive error/ /Application terminated with expected error: error:00000001:lib\(0\):func\(0\):reason\(1\)/Application terminated with expected error: socket layer receive error/ /Application terminated with expected error: error state on socket/Application terminated with expected error: socket layer receive error/
3434

3535
--exec $MYSQLXTEST $XTESTPARAMS 2>&1
3636
--exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
@@ -40,9 +40,7 @@ EOF
4040
--exec $MYSQLXTEST --tls-version=TLSv1 $XTESTPARAMS 2>&1
4141
--exec $MYSQLXTEST --tls-version=TLSv1.1 $XTESTPARAMS 2>&1
4242

43-
--let $expected_error_msg= TLS version is invalid \(code 2026\)
44-
--source ../include/mysqlxtest_expected_error.inc
45-
--exec $MYSQLXTEST --tls-version=TLSv3 $XTESTPARAMS 2>&1
43+
--exec $MYSQLXTEST --expect-error CR_SSL_CONNECTION_ERROR --tls-version=TLSv3 $XTESTPARAMS 2>&1
4644

4745

4846
--let $restart_parameters = restart: --tls-version=TLSv1
@@ -53,21 +51,15 @@ EOF
5351
--exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.1 $XTESTPARAMS 2>&1
5452
--exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.2 $XTESTPARAMS 2>&1
5553

56-
--let $expected_error_extra= $ERROR1
57-
--let $expected_error_msg= protocol version mismatch \(code 2026\)
58-
--source ../include/mysqlxtest_expected_error.inc
59-
--exec $MYSQLXTEST --tls-version=TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
54+
--replace_regex $ERROR1
55+
--exec $MYSQLXTEST --expect-error CR_SSL_CONNECTION_ERROR --tls-version=TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
6056

61-
--exec $MYSQLXTEST --tls-version=TLSv1 $XTESTPARAMS 2>&1
57+
--exec $MYSQLXTEST --tls-version=TLSv1 $XTESTPARAMS 2>&1
6258

63-
--let $expected_error_extra= $ERROR1
64-
--let $expected_error_msg= protocol version mismatch \(code 2026\)
65-
--source ../include/mysqlxtest_expected_error.inc
66-
--exec $MYSQLXTEST --tls-version=TLSv1.1 $XTESTPARAMS 2>&1
59+
--replace_regex $ERROR1
60+
--exec $MYSQLXTEST --expect-error CR_SSL_CONNECTION_ERROR --tls-version=TLSv1.1 $XTESTPARAMS 2>&1
6761

68-
--let $expected_error_msg= TLS version is invalid \(code 2026\)
69-
--source ../include/mysqlxtest_expected_error.inc
70-
--exec $MYSQLXTEST --tls-version=TLSv3 $XTESTPARAMS 2>&1
62+
--exec $MYSQLXTEST --expect-error CR_SSL_CONNECTION_ERROR --tls-version=TLSv3 $XTESTPARAMS 2>&1
7163

7264

7365
--let $restart_parameters = restart: --tls-version=TLSv1.1
@@ -77,22 +69,16 @@ EOF
7769
--exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
7870
--exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.1 $XTESTPARAMS 2>&1
7971

80-
--let $expected_error_extra= $ERROR5
81-
--let $expected_error_msg= socket layer receive error \(code 2026\)
82-
--source ../include/mysqlxtest_expected_error.inc
83-
--exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.2 $XTESTPARAMS 2>&1
84-
--exec $MYSQLXTEST --tls-version=TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
72+
--replace_regex $ERROR5
73+
--exec $MYSQLXTEST --expect-error CR_SSL_CONNECTION_ERROR --tls-version=TLSv1,TLSv1.2 $XTESTPARAMS 2>&1
74+
--exec $MYSQLXTEST --tls-version=TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
8575

86-
--let $expected_error_extra= $ERROR5
87-
--let $expected_error_msg= socket layer receive error \(code 2026\)
88-
--source ../include/mysqlxtest_expected_error.inc
89-
--exec $MYSQLXTEST --tls-version=TLSv1 $XTESTPARAMS 2>&1
76+
--replace_regex $ERROR5
77+
--exec $MYSQLXTEST --expect-error CR_SSL_CONNECTION_ERROR --tls-version=TLSv1 $XTESTPARAMS 2>&1
9078

91-
--exec $MYSQLXTEST --tls-version=TLSv1.1 $XTESTPARAMS 2>&1
79+
--exec $MYSQLXTEST --tls-version=TLSv1.1 $XTESTPARAMS 2>&1
9280

93-
--let $expected_error_msg= TLS version is invalid \(code 2026\)
94-
--source ../include/mysqlxtest_expected_error.inc
95-
--exec $MYSQLXTEST --tls-version=TLSv3 $XTESTPARAMS 2>&1
81+
--exec $MYSQLXTEST --expect-error CR_SSL_CONNECTION_ERROR --tls-version=TLSv3 $XTESTPARAMS 2>&1
9682

9783

9884
# Postamble

mysql-test/suite/x/include/mysqlxtest_expected_error.inc

Lines changed: 0 additions & 22 deletions
This file was deleted.

mysql-test/suite/x/include/mysqlxtest_mode_ssl.inc

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,11 @@
88

99
--exec $MYSQLXTEST_SSLCA_TEST $USE_SOCKET -v%EXPECT%=OFF --ssl-mode=preferred 2>&1
1010

11-
--let $expected_error_msg= .* \(code 5001\)
12-
--source mysqlxtest_expected_error.inc
13-
--exec $MYSQLXTEST_SSLCA_TEST $USE_SOCKET -v%EXPECT%=OFF --ssl-mode=required 2>&1
11+
--exec $MYSQLXTEST_SSLCA_TEST --expect-error ER_X_CAPABILITIES_PREPARE_FAILED $USE_SOCKET -v%EXPECT%=OFF --ssl-mode=required 2>&1
1412

15-
--let $expected_error_msg= .* \(code 5001\)
16-
--source mysqlxtest_expected_error.inc
17-
--exec $MYSQLXTEST_SSLCA_TEST $USE_SOCKET -v%EXPECT%=OFF --ssl-mode=verify_ca 2>&1
13+
--exec $MYSQLXTEST_SSLCA_TEST --expect-error ER_X_CAPABILITIES_PREPARE_FAILED $USE_SOCKET -v%EXPECT%=OFF --ssl-mode=verify_ca 2>&1
1814

19-
--let $expected_error_msg= .* \(code 5001\)
20-
--source mysqlxtest_expected_error.inc
21-
--exec $MYSQLXTEST_SSLCA_TEST $USE_SOCKET -v%EXPECT%=OFF --ssl-mode=verify_identity 2>&1
15+
--exec $MYSQLXTEST_SSLCA_TEST --expect-error ER_X_CAPABILITIES_PREPARE_FAILED $USE_SOCKET -v%EXPECT%=OFF --ssl-mode=verify_identity 2>&1
2216

2317
--echo
2418
--echo ############################################################
@@ -46,9 +40,8 @@ let $restart_parameters=restart:
4640

4741
--exec $MYSQLXTEST_TEST $USE_SOCKET -v%EXPECT%=ON --ssl-mode=required 2>&1
4842

49-
--let $expected_error_msg= TLS was marked that requires "CA", but it was not configured \(code 2503\)
50-
--source mysqlxtest_expected_error.inc
51-
--exec $MYSQLXTEST_TEST $USE_SOCKET -v%EXPECT%=ON --ssl-mode=verify_ca 2>&1
43+
# Expect CR_X_TLS_WRONG_CONFIGURATION error
44+
--exec $MYSQLXTEST_TEST --expect-error 2503 $USE_SOCKET -v%EXPECT%=ON --ssl-mode=verify_ca 2>&1
5245

5346
--echo
5447
--echo ############################################################
@@ -72,14 +65,9 @@ let $restart_parameters=restart:
7265

7366
--exec $MYSQLXTEST_SSLCA_TEST $USE_SOCKET -v%EXPECT%=ON --ssl-mode=verify_ca 2>&1
7467

75-
--let $expected_error_msg= SSL certificate validation failure \(code 2026\)
76-
--source mysqlxtest_expected_error.inc
77-
--exec $MYSQLXTEST_SSLCA_TEST $USE_SOCKET -v%EXPECT%=ON --ssl-mode=verify_identity 2>&1
68+
--exec $MYSQLXTEST_SSLCA_TEST --expect-error CR_SSL_CONNECTION_ERROR $USE_SOCKET -v%EXPECT%=ON --ssl-mode=verify_identity 2>&1
7869

7970
--exec $MYSQLXTEST_TEST $USE_SOCKET -v%EXPECT%=ON --ssl-mode=required 2>&1
8071

81-
--let $expected_error_msg= TLS was marked that requires "CA", but it was not configured \(code 2503\)
82-
--source mysqlxtest_expected_error.inc
83-
--exec $MYSQLXTEST_TEST $USE_SOCKET -v%EXPECT%=ON --ssl-mode=verify_ca 2>&1
84-
85-
--let $expected_error_msg=
72+
# Expect CR_X_TLS_WRONG_CONFIGURATION error
73+
--exec $MYSQLXTEST_TEST --expect-error 2503 $USE_SOCKET -v%EXPECT%=ON --ssl-mode=verify_ca 2>&1

mysql-test/suite/x/r/client_close.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ switched to session default
432432
Connection failure by auth
433433
--------------------------
434434
connecting...
435-
Got expected error: Invalid user or password (code 1045)
435+
Got expected error: Access denied for user 'x_root'@'localhost' (using password: YES) (code 1045)
436436

437437
Other conditions
438438
################

0 commit comments

Comments
 (0)