hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated test_mysql_users

Browse Source 
Updated test_mysql_users
This commit is contained in:
MassimilianoPinto
2014-10-14 12:33:56 +02:00
parent 915ce0aaa2
commit a194c47b07
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/core/test/test_mysql_users.c
View File

@ -78,6 +78,7 @@ int set_and_get_single_mysql_users_ipv4(char *username, unsigned long ipv4, char
/* add user@host as key and passwd as value in the MySQL users hash table */ /* add user@host as key and passwd as value in the MySQL users hash table */
if (!mysql_users_add(mysql_users, &key, password)) { if (!mysql_users_add(mysql_users, &key, password)) {
fprintf(stderr, "Failed adding %s@%s(%lu)\n", username, ret_ip, fix_ipv4); fprintf(stderr, "Failed adding %s@%s(%lu)\n", username, ret_ip, fix_ipv4);
users_free(mysql_users);
return 1; return 1;
} }
@ -108,6 +109,7 @@ int set_and_get_single_mysql_users(char *username, char *hostname, char *passwor
char *fetch_data; char *fetch_data;
mysql_users = mysql_users_alloc(); mysql_users = mysql_users_alloc();
/* prepare the user@host data struct */ /* prepare the user@host data struct */
memset(&serv_addr, 0, sizeof(serv_addr)); memset(&serv_addr, 0, sizeof(serv_addr));
memset(&key, 0, sizeof(key)); memset(&key, 0, sizeof(key));
@ -116,6 +118,7 @@ int set_and_get_single_mysql_users(char *username, char *hostname, char *passwor
if (hostname) if (hostname)
if(!setipaddress(&serv_addr.sin_addr, hostname)) { if(!setipaddress(&serv_addr.sin_addr, hostname)) {
fprintf(stderr, "setipaddress failed for host [%s]\n", hostname); fprintf(stderr, "setipaddress failed for host [%s]\n", hostname);
users_free(mysql_users);
return 1; return 1;
} }
if (username) if (username)
@ -130,6 +133,7 @@ int set_and_get_single_mysql_users(char *username, char *hostname, char *passwor
/* add user@host as key and passwd as value in the MySQL users hash table */ /* add user@host as key and passwd as value in the MySQL users hash table */
if (!mysql_users_add(mysql_users, &key, password)) { if (!mysql_users_add(mysql_users, &key, password)) {
fprintf(stderr, "mysql_users_add() failed for %s@%s\n", username, hostname); fprintf(stderr, "mysql_users_add() failed for %s@%s\n", username, hostname);
users_free(mysql_users);
return 1; return 1;
} }
@ -139,6 +143,7 @@ int set_and_get_single_mysql_users(char *username, char *hostname, char *passwor
if (hostname) if (hostname)
if(!setipaddress(&serv_addr.sin_addr, hostname)) { if(!setipaddress(&serv_addr.sin_addr, hostname)) {
fprintf(stderr, "setipaddress failed for host [%s]\n", hostname); fprintf(stderr, "setipaddress failed for host [%s]\n", hostname);
users_free(mysql_users);
return 1; return 1;
} }
key.user = username; key.user = username;
@ -169,6 +174,7 @@ int set_and_get_mysql_users_wildcards(char *username, char *hostname, char *pass
} }
if ((service = (SERVICE *)calloc(1, sizeof(SERVICE))) == NULL) { if ((service = (SERVICE *)calloc(1, sizeof(SERVICE))) == NULL) {
fprintf(stderr, "service_alloc() failed\n"); fprintf(stderr, "service_alloc() failed\n");
dcb_free(dcb);
return 1; return 1;
} }
@ -177,6 +183,8 @@ int set_and_get_mysql_users_wildcards(char *username, char *hostname, char *pass
if (hostname) { if (hostname) {
if(!setipaddress(&client_addr.sin_addr, from)) { if(!setipaddress(&client_addr.sin_addr, from)) {
fprintf(stderr, "setipaddress failed for host [%s]\n", from); fprintf(stderr, "setipaddress failed for host [%s]\n", from);
free(service);
dcb_free(dcb);
return 1; return 1;
} }
} }
@ -195,6 +203,10 @@ int set_and_get_mysql_users_wildcards(char *username, char *hostname, char *pass
ret = add_mysql_users_with_host_ipv4(mysql_users, username, hostname, password); ret = add_mysql_users_with_host_ipv4(mysql_users, username, hostname, password);
if (!ret) { if (!ret) {
fprintf(stderr, "add_mysql_users_with_host_ipv4 passed(%s@%s, %s) FAILED\n", username, hostname, password); fprintf(stderr, "add_mysql_users_with_host_ipv4 passed(%s@%s, %s) FAILED\n", username, hostname, password);
users_free(mysql_users);
free(service);
dcb_free(dcb);
return 1; return 1;
} else { } else {
char db_passwd[100]=""; char db_passwd[100]="";
@ -208,6 +220,10 @@ int set_and_get_mysql_users_wildcards(char *username, char *hostname, char *pass
ret = gw_find_mysql_user_password_sha1(username, db_passwd, dcb); ret = gw_find_mysql_user_password_sha1(username, db_passwd, dcb);
} }
users_free(mysql_users);
free(service);
dcb_free(dcb);
return ret; return ret;
} }
@ -223,7 +239,6 @@ int main() {
fprintf(stderr, "%s\n", asctime(localtime(&t))); fprintf(stderr, "%s\n", asctime(localtime(&t)));
fprintf(stderr, ">>> Started MySQL load, set & get users@host\n"); fprintf(stderr, ">>> Started MySQL load, set & get users@host\n");
ret = set_and_get_single_mysql_users("pippo", "localhost", "xyz"); ret = set_and_get_single_mysql_users("pippo", "localhost", "xyz");
assert(ret == 0); assert(ret == 0);
ret = set_and_get_single_mysql_users("pippo", "127.0.0.2", "xyz"); ret = set_and_get_single_mysql_users("pippo", "127.0.0.2", "xyz");
@ -238,6 +253,7 @@ int main() {
assert(ret == 1); assert(ret == 1);
ret = set_and_get_single_mysql_users(NULL, NULL, NULL); ret = set_and_get_single_mysql_users(NULL, NULL, NULL);
assert(ret == 1); assert(ret == 1);
ret = set_and_get_single_mysql_users_ipv4("negative", -467295, "_ncd"); ret = set_and_get_single_mysql_users_ipv4("negative", -467295, "_ncd");
assert(ret == 1); assert(ret == 1);
ret = set_and_get_single_mysql_users_ipv4("extra", 0xFFFFFFFFFUL * 100, "JJcd"); ret = set_and_get_single_mysql_users_ipv4("extra", 0xFFFFFFFFFUL * 100, "JJcd");
@ -247,6 +263,7 @@ int main() {
ret = set_and_get_single_mysql_users_ipv4(NULL, '\0', "JJcd"); ret = set_and_get_single_mysql_users_ipv4(NULL, '\0', "JJcd");
assert(ret == 1); assert(ret == 1);
for (i = 256*256*256; i <= 256*256*256 + 5; i++) { for (i = 256*256*256; i <= 256*256*256 + 5; i++) {
char user[129] = ""; char user[129] = "";
snprintf(user, 128, "user_%i", k); snprintf(user, 128, "user_%i", k);
@ -295,19 +312,19 @@ int main() {
if (ret) fprintf(stderr, "\t-- Expecting no match\n"); if (ret) fprintf(stderr, "\t-- Expecting no match\n");
assert(ret == 1); assert(ret == 1);
ret = set_and_get_mysql_users_wildcards("pippo", "192.0.0.%", "foo", "192.3.2.1"); ret = set_and_get_mysql_users_wildcards("pippo", "192.0.0.%", "y78764o", "192.3.2.1");
if (ret) fprintf(stderr, "\t-- Expecting no match\n"); if (ret) fprintf(stderr, "\t-- Expecting no match\n");
assert(ret == 1); assert(ret == 1);
ret = set_and_get_mysql_users_wildcards("pippo", "192.0.%.%", "foo", "192.3.2.1"); ret = set_and_get_mysql_users_wildcards("pippo", "192.0.%.%", "1234567890123456789012345678901234567890", "192.3.2.1");
if (ret) fprintf(stderr, "\t-- Expecting no match\n"); if (ret) fprintf(stderr, "\t-- Expecting no match\n");
assert(ret == 1); assert(ret == 1);
ret = set_and_get_mysql_users_wildcards("pippo", "192.%.%.%", "foo", "192.3.2.1"); ret = set_and_get_mysql_users_wildcards("pippo", "192.%.%.%", "1234567890123456789012345678901234567890f8__uuo5", "192.3.2.1");
if (!ret) fprintf(stderr, "\t-- Expecting ok\n"); if (!ret) fprintf(stderr, "\t-- Expecting ok\n");
assert(ret == 0); assert(ret == 0);
ret = set_and_get_mysql_users_wildcards("pippo", "192.0.0.%", "foo", "192.134.0.2"); ret = set_and_get_mysql_users_wildcards("pippo", "192.0.0.%", "fo887778o", "192.134.0.2");
if (ret) fprintf(stderr, "\t-- Expecting no match\n"); if (ret) fprintf(stderr, "\t-- Expecting no match\n");
assert(ret == 1); assert(ret == 1);

8
server/modules/protocol/mysql_common.c
View File

@ -1450,9 +1450,11 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
* The gateway_password represents the SHA1(SHA1(real_password)). * The gateway_password represents the SHA1(SHA1(real_password)).
* Please note: the real_password is unknown and SHA1(real_password) is unknown as well * Please note: the real_password is unknown and SHA1(real_password) is unknown as well
*/ */
int passwd_len=strlen(user_password);
if (strlen(user_password)) if (passwd_len) {
gw_hex2bin(gateway_password, user_password, SHA_DIGEST_LENGTH * 2); passwd_len = (passwd_len <= (SHA_DIGEST_LENGTH * 2)) ? passwd_len : (SHA_DIGEST_LENGTH * 2);
gw_hex2bin(gateway_password, user_password, passwd_len);
}
return 0; return 0;
} else { } else {