mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
8b4fcf6e3b
- WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS; BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Delete: mysql-test/t/im_options_set.imtest BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Delete: mysql-test/r/im_options_set.result BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Delete: mysql-test/t/im_options_unset.imtest BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Delete: mysql-test/r/im_options_unset.result client/get_password.c: Change prototype to avoid casting when using C-strings (char *). include/m_string.h: Moved LEX_STRING to global header from sql/ to be accessible from all components (IM for one). include/my_sys.h: Added constants for modify_defaults_file(). include/mysql_com.h: Removed duplicated declarations. my_sys.h should be used instead. libmysql/get_password.c: Change prototype to avoid casting when using C-strings (char *). mysql-test/mysql-test-run.pl: Added environment variables to be used from tests. mysql-test/r/im_daemon_life_cycle.result: Column name has been changed in SHOW INSTANCES. mysql-test/r/im_life_cycle.result: 1. Column name has been changed in SHOW INSTANCES. 2. Removed redundant SHOW INSTANCE STATUS statements. mysql-test/r/im_utils.result: Updated the result file. mysql-test/t/im_daemon_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_daemon_life_cycle.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysql-test/t/im_life_cycle.imtest: 1. Polishing; 2. Fixed a test error in 1.1.2. mysql-test/t/im_utils.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysys/default.c: Pass the name of the section to the handler function as well. mysys/default_modify.c: Added REMOVE_SECTION functionality. server-tools/instance-manager/IMService.cpp: Polishing: be more verbose. server-tools/instance-manager/IMService.h: Polishing: added copyright. server-tools/instance-manager/Makefile.am: Added new files. server-tools/instance-manager/WindowsService.cpp: Polishing: according to The Coding Style, TRUE/FALSE must be used instead of true/false. server-tools/instance-manager/WindowsService.h: Polishing: added copyright. server-tools/instance-manager/command.h: Polishing: provide a comment for the main operation of "Command" class. server-tools/instance-manager/commands.cc: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/commands.h: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/guardian.cc: Added operations to retrieve state of managed instances. server-tools/instance-manager/guardian.h: Added operations to retrieve state of managed instances. server-tools/instance-manager/instance.cc: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance.h: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance_map.cc: 1. Used the operation to check validity of instance name; 2. Added operations to manage instances. server-tools/instance-manager/instance_map.h: Added operations to manage instances. server-tools/instance-manager/instance_options.cc: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/instance_options.h: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/listener.cc: 1. Remove reference to the instance of Options; 2. Use new Options naming scheme. server-tools/instance-manager/listener.h: Remove reference to the instance of Options; server-tools/instance-manager/log.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/manager.cc: Added a common for IM operation to work with configuration file. server-tools/instance-manager/manager.h: Added a common for IM operation to work with configuration file. server-tools/instance-manager/messages.cc: Added messages for new errors. server-tools/instance-manager/mysql_connection.cc: 1. Move a constant to common place. 2. Polishing. server-tools/instance-manager/mysql_manager_error.h: Added new errors. server-tools/instance-manager/mysqlmanager.cc: 1. Use error code from Options::load(); 2. Eliminate type-casting warning on Windows. server-tools/instance-manager/options.cc: Added support for user-management command-line options. server-tools/instance-manager/options.h: Added support for user-management command-line options. server-tools/instance-manager/parse.cc: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse.h: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse_output.cc: Sorted out header files. server-tools/instance-manager/parse_output.h: Sorted out header files. server-tools/instance-manager/portability.h: 1. Added constants for Windows. 2. Moved system-dependent defines from instance_options.cc. server-tools/instance-manager/priv.cc: Updated version. server-tools/instance-manager/priv.h: Added some global constants. server-tools/instance-manager/protocol.cc: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/protocol.h: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/thread_registry.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/user_map.cc: Added support for managing password database. server-tools/instance-manager/user_map.h: Added support for managing password database. sql/sp.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/sp_head.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/spatial.cc: Removed LEX_STRING_WITH_INIT. sql/spatial.h: Removed LEX_STRING_WITH_INIT. sql/sql_string.h: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/sql_trigger.cc: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/structs.h: Removed LEX_STRING_WITH_INIT. support-files/mysql.server.sh: Instruct Instance Manager to work in mysqld-safe compatible mode for backward compatibility. mysql-test/r/im_cmd_line.result: Added result file. mysql-test/r/im_instance_conf.result: Added result file. mysql-test/r/im_options.result: Added result file. mysql-test/t/im_cmd_line.imtest: IM command-line options test. mysql-test/t/im_instance_conf-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_instance_conf.imtest: Added a new test case for checking instance-management. mysql-test/t/im_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_options.imtest: Join im_options_set and im_options_unset and add new tests. mysql-test/t/im_utils-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. server-tools/instance-manager/exit_codes.h: New file for defining exit codes for user-management mode. server-tools/instance-manager/user_management_commands.cc: User-management commands implementation. server-tools/instance-manager/user_management_commands.h: User-management command declarations.
408 lines
8.4 KiB
C++
408 lines
8.4 KiB
C++
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
|
#pragma implementation
|
|
#endif
|
|
|
|
#include "user_management_commands.h"
|
|
|
|
#include "exit_codes.h"
|
|
#include "options.h"
|
|
#include "user_map.h"
|
|
|
|
/*************************************************************************
|
|
Module-specific (internal) functions.
|
|
*************************************************************************/
|
|
|
|
/*
|
|
The function returns user name. The user name is retrieved from command-line
|
|
options (if specified) or from console.
|
|
|
|
NOTE
|
|
This function must not be used in user-management command implementations.
|
|
Use get_user_name() instead.
|
|
|
|
SYNOPSYS
|
|
get_user_name_impl()
|
|
|
|
RETURN
|
|
NULL on error
|
|
valid pointer on success
|
|
*/
|
|
|
|
static char *get_user_name_impl()
|
|
{
|
|
static char user_name_buf[1024];
|
|
char *ptr;
|
|
|
|
if (Options::User_management::user_name)
|
|
return Options::User_management::user_name;
|
|
|
|
printf("Enter user name: ");
|
|
fflush(stdout);
|
|
|
|
if (!fgets(user_name_buf, sizeof (user_name_buf), stdin))
|
|
return NULL;
|
|
|
|
if ((ptr= strchr(user_name_buf, '\n')))
|
|
*ptr= 0;
|
|
|
|
if ((ptr= strchr(user_name_buf, '\r')))
|
|
*ptr= 0;
|
|
|
|
return user_name_buf;
|
|
}
|
|
|
|
|
|
/*
|
|
The function is intended to provide user name for user-management
|
|
operations. It also checks that length of the specified user name is correct
|
|
(not empty, not exceeds USERNAME_LENGTH). Report to stderr if something is
|
|
wrong.
|
|
|
|
SYNOPSYS
|
|
get_user_name()
|
|
user_name [OUT] on success contains user name
|
|
|
|
RETURN
|
|
TRUE on error
|
|
FALSE on success
|
|
*/
|
|
|
|
static bool get_user_name(LEX_STRING *user_name)
|
|
{
|
|
char *user_name_str= get_user_name_impl();
|
|
|
|
if (!user_name_str)
|
|
{
|
|
fprintf(stderr, "Error: unable to read user name from stdin.\n");
|
|
return TRUE;
|
|
}
|
|
|
|
user_name->str= user_name_str;
|
|
user_name->length= strlen(user_name->str);
|
|
|
|
if (user_name->length == 0)
|
|
{
|
|
fprintf(stderr, "Error: user name can not be empty.\n");
|
|
return TRUE;
|
|
}
|
|
|
|
if (user_name->length > USERNAME_LENGTH)
|
|
{
|
|
fprintf(stderr, "Error: user name must not exceed %d characters.\n",
|
|
(int) USERNAME_LENGTH);
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/*
|
|
The function is intended to provide password for user-management operations.
|
|
The password is retrieved from command-line options (if specified) or from
|
|
console.
|
|
|
|
SYNOPSYS
|
|
get_password()
|
|
|
|
RETURN
|
|
NULL on error
|
|
valid pointer on success
|
|
*/
|
|
|
|
static const char *get_password()
|
|
{
|
|
if (Options::User_management::password)
|
|
return Options::User_management::password;
|
|
|
|
const char *passwd1= get_tty_password("Enter password: ");
|
|
const char *passwd2= get_tty_password("Re-type password: ");
|
|
|
|
if (strcmp(passwd1, passwd2))
|
|
{
|
|
fprintf(stderr, "Error: passwords do not match.\n");
|
|
return 0;
|
|
}
|
|
|
|
return passwd1;
|
|
}
|
|
|
|
|
|
/*
|
|
Load password file into user map.
|
|
|
|
SYNOPSYS
|
|
load_password_file()
|
|
user_map target user map
|
|
|
|
RETURN
|
|
See exit_codes.h for possible values.
|
|
*/
|
|
|
|
static int load_password_file(User_map *user_map)
|
|
{
|
|
int err_code;
|
|
const char *err_msg;
|
|
|
|
if (user_map->init())
|
|
{
|
|
fprintf(stderr, "Error: can not initialize user map.\n");
|
|
return ERR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
if ((err_code= user_map->load(Options::Main::password_file_name, &err_msg)))
|
|
fprintf(stderr, "Error: %s.\n", (const char *) err_msg);
|
|
|
|
return err_code;
|
|
}
|
|
|
|
|
|
/*
|
|
Save user map into password file.
|
|
|
|
SYNOPSYS
|
|
save_password_file()
|
|
user_map user map
|
|
|
|
RETURN
|
|
See exit_codes.h for possible values.
|
|
*/
|
|
|
|
static int save_password_file(User_map *user_map)
|
|
{
|
|
int err_code;
|
|
const char *err_msg;
|
|
|
|
if ((err_code= user_map->save(Options::Main::password_file_name, &err_msg)))
|
|
fprintf(stderr, "Error: %s.\n", (const char *) err_msg);
|
|
|
|
return err_code;
|
|
}
|
|
|
|
/*************************************************************************
|
|
Passwd_cmd
|
|
*************************************************************************/
|
|
|
|
int Passwd_cmd::execute()
|
|
{
|
|
LEX_STRING user_name;
|
|
const char *password;
|
|
|
|
printf("Creating record for new user.\n");
|
|
|
|
if (get_user_name(&user_name))
|
|
return ERR_CAN_NOT_READ_USER_NAME;
|
|
|
|
if (!(password= get_password()))
|
|
return ERR_CAN_NOT_READ_PASSWORD;
|
|
|
|
{
|
|
User user(&user_name, password);
|
|
|
|
printf("%s:%s\n",
|
|
(const char *) user.user,
|
|
(const char *) user.scrambled_password);
|
|
}
|
|
|
|
return ERR_OK;
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
Add_user_cmd
|
|
*************************************************************************/
|
|
|
|
int Add_user_cmd::execute()
|
|
{
|
|
LEX_STRING user_name;
|
|
const char *password;
|
|
char scrambled_password_buf[SCRAMBLED_PASSWORD_CHAR_LENGTH + 1];
|
|
|
|
User_map user_map;
|
|
User *new_user;
|
|
|
|
int err_code;
|
|
|
|
if (get_user_name(&user_name))
|
|
return ERR_CAN_NOT_READ_USER_NAME;
|
|
|
|
/* Load the password file. */
|
|
|
|
if ((err_code= load_password_file(&user_map)) != ERR_OK)
|
|
return err_code;
|
|
|
|
/* Check that the user does not exist. */
|
|
|
|
if (user_map.find_user(&user_name))
|
|
{
|
|
fprintf(stderr, "Error: user '%s' already exists.\n",
|
|
(const char *) user_name.str);
|
|
return ERR_USER_ALREADY_EXISTS;
|
|
}
|
|
|
|
/* Add the user. */
|
|
|
|
if (!(password= get_password()))
|
|
return ERR_CAN_NOT_READ_PASSWORD;
|
|
|
|
if (!(new_user= new User(&user_name, password)))
|
|
return ERR_OUT_OF_MEMORY;
|
|
|
|
if (user_map.add_user(new_user))
|
|
{
|
|
delete new_user;
|
|
return ERR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
/* Save the password file. */
|
|
|
|
return save_password_file(&user_map);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
Drop_user_cmd
|
|
*************************************************************************/
|
|
|
|
int Drop_user_cmd::execute()
|
|
{
|
|
LEX_STRING user_name;
|
|
|
|
User_map user_map;
|
|
User *user;
|
|
|
|
int err_code;
|
|
|
|
if (get_user_name(&user_name))
|
|
return ERR_CAN_NOT_READ_USER_NAME;
|
|
|
|
/* Load the password file. */
|
|
|
|
if ((err_code= load_password_file(&user_map)) != ERR_OK)
|
|
return err_code;
|
|
|
|
/* Find the user. */
|
|
|
|
user= user_map.find_user(&user_name);
|
|
|
|
if (!user)
|
|
{
|
|
fprintf(stderr, "Error: user '%s' does not exist.\n",
|
|
(const char *) user_name.str);
|
|
return ERR_USER_NOT_FOUND;
|
|
}
|
|
|
|
/* Remove the user (ignore possible errors). */
|
|
|
|
user_map.remove_user(user);
|
|
|
|
/* Save the password file. */
|
|
|
|
return save_password_file(&user_map);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
Edit_user_cmd
|
|
*************************************************************************/
|
|
|
|
int Edit_user_cmd::execute()
|
|
{
|
|
LEX_STRING user_name;
|
|
const char *password;
|
|
char scrambled_password_buf[SCRAMBLED_PASSWORD_CHAR_LENGTH + 1];
|
|
|
|
User_map user_map;
|
|
User *user;
|
|
|
|
int err_code;
|
|
|
|
if (get_user_name(&user_name))
|
|
return ERR_CAN_NOT_READ_USER_NAME;
|
|
|
|
/* Load the password file. */
|
|
|
|
if ((err_code= load_password_file(&user_map)) != ERR_OK)
|
|
return err_code;
|
|
|
|
/* Find the user. */
|
|
|
|
user= user_map.find_user(&user_name);
|
|
|
|
if (!user)
|
|
{
|
|
fprintf(stderr, "Error: user '%s' does not exist.\n",
|
|
(const char *) user_name.str);
|
|
return ERR_USER_NOT_FOUND;
|
|
}
|
|
|
|
/* Modify user's password. */
|
|
|
|
if (!(password= get_password()))
|
|
return ERR_CAN_NOT_READ_PASSWORD;
|
|
|
|
user->set_password(password);
|
|
|
|
/* Save the password file. */
|
|
|
|
return save_password_file(&user_map);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
Clean_db_cmd
|
|
*************************************************************************/
|
|
|
|
int Clean_db_cmd::execute()
|
|
{
|
|
User_map user_map;
|
|
|
|
if (user_map.init())
|
|
{
|
|
fprintf(stderr, "Error: can not initialize user map.\n");
|
|
return ERR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
return save_password_file(&user_map);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
Check_db_cmd
|
|
*************************************************************************/
|
|
|
|
int Check_db_cmd::execute()
|
|
{
|
|
User_map user_map;
|
|
|
|
return load_password_file(&user_map);
|
|
}
|
|
|
|
|
|
/*************************************************************************
|
|
List_users_cmd
|
|
*************************************************************************/
|
|
|
|
int List_users_cmd::execute()
|
|
{
|
|
User_map user_map;
|
|
|
|
int err_code;
|
|
|
|
/* Load the password file. */
|
|
|
|
if ((err_code= load_password_file(&user_map)))
|
|
return err_code;
|
|
|
|
/* Print out registered users. */
|
|
|
|
{
|
|
User_map::Iterator it(&user_map);
|
|
User *user;
|
|
|
|
while ((user= it.next()))
|
|
fprintf(stderr, "%s\n", (const char *) user->user);
|
|
}
|
|
|
|
return ERR_OK;
|
|
}
|