save pwds to config file

zhuchao-hit · zhuchao-hit · commit ffc18c194971 · 2014-11-13T15:20:45.000+08:00
diff --git a/plugins/proxy/proxy-plugin.c b/plugins/proxy/proxy-plugin.c
@@ -2596,6 +2596,7 @@ int network_mysqld_proxy_plugin_apply_config(chassis *chas, chassis_plugin_confi
 				GString* hashed_password = g_string_new(NULL);
 				network_mysqld_proto_password_hash(hashed_password, raw_pwd, strlen(raw_pwd));
 				g_hash_table_insert(config->pwd_table[config->pwd_table_index], g_strdup(user), hashed_password);
+				g_hash_table_insert(chas->backends->raw_pwds, g_strdup(user), raw_pwd);
 			} else {
 				g_critical("password decrypt failed");
 				return -1;
diff --git a/src/network-backend.c b/src/network-backend.c
@@ -73,6 +73,7 @@ network_backends_t *network_backends_new(guint event_thread_count, gchar *defaul
 	bs->global_wrr = g_wrr_poll_new();
 	bs->event_thread_count = event_thread_count;
 	bs->default_file = g_strdup(default_file);
+	bs->raw_pwds = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 
 	return bs;
 }
@@ -112,6 +113,9 @@ void network_backends_free(network_backends_t *bs) {
 	g_wrr_poll_free(bs->global_wrr);
 	g_free(bs->default_file);
 
+	g_hash_table_remove_all(bs->raw_pwds);
+	g_hash_table_destroy(bs->raw_pwds);
+
 	g_free(bs);
 }
 
@@ -182,6 +186,8 @@ int network_backends_addpwd(network_backends_t *bs, gchar *address) {
 	g_hash_table_insert(new_table, g_strdup(user), hashed_password);
 	g_atomic_int_set(bs->pwd_table_index, 1-index);
 
+	g_hash_table_insert(bs->raw_pwds, g_strdup(user), g_strdup(pwd));
+
 	return 0;
 }
 
@@ -212,6 +218,7 @@ int network_backends_removepwd(network_backends_t *bs, gchar *address) {
 	g_hash_table_foreach(old_table, copy_pwd, new_table);
 	g_hash_table_remove(new_table, address);
 	g_atomic_int_set(bs->pwd_table_index, 1-index);
+	g_hash_table_remove(bs->raw_pwds, address);
 
 	return 0;
 }
@@ -286,6 +293,23 @@ int network_backends_save(network_backends_t *bs) {
 
 	g_string_free(client_ips, TRUE);
 
+	GHashTableIter iter;
+	g_hash_table_iter_init(&iter, bs->raw_pwds);
+	gchar *user = NULL, *pwd = NULL;
+
+	GString *pwds = g_string_new(NULL);
+	while (g_hash_table_iter_next(&iter, &user, &pwd)) {
+		g_string_append_printf(pwds, ",%s:%s", user, pwd);
+	}
+
+	if (pwds->len != 0) {
+		g_key_file_set_value(keyfile, "mysql-proxy", "pwds", pwds->str+1);
+	} else {
+		g_key_file_set_value(keyfile, "mysql-proxy", "pwds", "");
+	}
+
+	g_string_free(pwds, TRUE);
+
 	gsize file_size = 0;
 	gchar *file_buf = g_key_file_to_data(keyfile, &file_size, NULL);
 	if (FALSE == g_file_set_contents(bs->default_file, file_buf, file_size, &gerr)) {
diff --git a/src/network-backend.h b/src/network-backend.h
@@ -79,6 +79,7 @@ typedef struct {
 	gint *ip_table_index;
 	GHashTable **pwd_table;
 	gint *pwd_table_index;
+	GHashTable *raw_pwds;
 } network_backends_t;
 
 NETWORK_API network_backends_t *network_backends_new(guint event_thread_count, gchar *default_file);
