database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

[TODO-5373] add github action

Browse Source
This commit is contained in:
rusher
2025-06-16 19:43:16 +02:00
parent b3adb24128
commit 1bf3571146
4 changed files with 203 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unittest/libmariadb/misc.c
View File

@@ -1663,8 +1663,13 @@ int display_extended_field_attribute(MYSQL *mysql)
static int test_ext_field_attr(MYSQL *mysql)
{
if (!is_mariadb)
{
diag("feature not supported by MySQL server");
return SKIP;
}
display_extended_field_attribute(mysql);
return OK;
}

4
unittest/libmariadb/my_test.h
View File

@@ -99,6 +99,10 @@ if (IS_MAXSCALE()) \
return SKIP; \
}
#define IS_ENTERPRISE()\
((mysql_default && strstr(mysql_get_server_info(mysql_default), "enterprise")) ||\
(getenv("srv")!=NULL && (strcmp(getenv("srv"), "enterprise"))))
#define IS_XPAND()\
((mysql_default && strstr(mysql_get_server_info(mysql_default), "Xpand")) ||\
(getenv("srv")!=NULL && strcmp(getenv("srv"), "xpand") == 0))

26
unittest/libmariadb/tls.c.in
View File

@@ -458,8 +458,12 @@ static int test_pw_check(MYSQL *my)
char query[1024];
int ret= FAIL;
sprintf(query, "DROP USER IF EXISTS '%s'@'%s'", "tlsuser", this_host);
rc= mysql_query(my, query);
check_mysql_rc(rc, my);
/* connect with password */
sprintf(query, "CREATE OR REPLACE USER '%s'@'%s' IDENTIFIED BY '%s'", "tlsuser", this_host, strong_pwd);
sprintf(query, "CREATE USER '%s'@'%s' IDENTIFIED BY '%s'", "tlsuser", this_host, strong_pwd);
rc= mysql_query(my, query);
check_mysql_rc(rc, my);
@@ -480,9 +484,13 @@ static int test_pw_check(MYSQL *my)
mysql= mysql_init(NULL);
/* connect without pasword */
if (!local_safe_connection)
if (!IS_ENTERPRISE() && !local_safe_connection)
{
sprintf(query, "CREATE OR REPLACE USER '%s'@'%s'", "tlsuser", this_host);
sprintf(query, "DROP USER '%s'@'%s'", "tlsuser", this_host);
rc= mysql_query(my, query);
check_mysql_rc(rc, my);
sprintf(query, "CREATE USER '%s'@'%s'", "tlsuser", this_host);
rc= mysql_query(my, query);
check_mysql_rc(rc, my);
@@ -499,8 +507,11 @@ static int test_pw_check(MYSQL *my)
mysql_optionsv(mysql, MARIADB_OPT_RESTRICTED_AUTH, "mysql_native_password, mysql_old_password");
diag("expected to fail with old_password plugin");
sprintf(query, "DROP USER '%s'@'%s'", "tlsuser", this_host);
rc= mysql_query(my, query);
check_mysql_rc(rc, my);
/* Test with an authentication plugin, which doesn't support hashing */
sprintf(query, "CREATE OR REPLACE USER '%s'@'%s' IDENTIFIED VIA mysql_old_password USING '7c786c222596437b'", "tlsuser", this_host);
sprintf(query, "CREATE USER '%s'@'%s' IDENTIFIED VIA mysql_old_password USING '7c786c222596437b'", "tlsuser", this_host);
rc= mysql_query(my, query);
check_mysql_rc(rc, my);
rc= mysql_query(my, "SET GLOBAL secure_auth=0");
@@ -719,6 +730,13 @@ static int test_env_var(MYSQL *my __attribute__((unused)))
MYSQL *mysql= mysql_init(NULL);
int rc= FAIL;
if (mysql_get_server_version(my) < 110400)
{
diag("skipping for MySQL / mariadb before 11.4, because might not have ssl on");
rc = SKIP;
goto end;
}
#ifdef _WIN32
_putenv_s("MARIADB_TLS_DISABLE_PEER_VERIFICATION", "1");
#else