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%;
175175EOF
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
206207EOF
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
216216EOF
217217
218+
218219-- write_file $MYSQL_TMP_DIR/mysqlx-set-pwd.tmp
219220-- >sql
220221SET PASSWORD= ' set-new-auth' ;
@@ -331,14 +332,12 @@ exec $MYSQLXTEST -u x_root --password='' -h127.0.0.1
331332-- echo #
332333-- echo # III.1
333334expr $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
339338expr $SSL_CONNECTION_MADE= $SSL_CONNECTION_MADE + $INCREMENT;
340339exec $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
380379expr $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
387384expr $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
393388expr $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
399392expr $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
414405expr $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
476463expr $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
483468expr $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
506489expr $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
519498expr $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
526502expr $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
560534SET 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
0 commit comments