github
/
mysql-audit
mirror of https://github.com/mcafee-enterprise/mysql-audit
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

change skip_cmds to whitelist_cmds for consistent naming as we use with whitelist_users. issue #86 .

pull/103/head
Guy Lichtman 2014-07-27 21:52:00 +03:00
parent 2ffe26a9cd
commit 01d938ad00
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/audit_plugin.cc
View File

@ -809,8 +809,8 @@ static char * checksum_string = NULL;
static int delay_ms_val =0; static int delay_ms_val =0;
static char *delay_cmds_string = NULL; static char *delay_cmds_string = NULL;
static char delay_cmds_buff[4096] = {0}; static char delay_cmds_buff[4096] = {0};
static char *skip_cmds_string = NULL; static char *whitelist_cmds_string = NULL;
static char skip_cmds_buff[4096] = {0}; static char whitelist_cmds_buff[4096] = {0};
static char *record_cmds_string = NULL; static char *record_cmds_string = NULL;
static char record_cmds_buff[4096] = {0}; static char record_cmds_buff[4096] = {0};
static char *password_masking_cmds_string = NULL; static char *password_masking_cmds_string = NULL;
@ -821,14 +821,14 @@ static char *whitelist_users_string = NULL;
static char whitelist_users_buff[4096] = {0}; static char whitelist_users_buff[4096] = {0};
static char delay_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}}; static char delay_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}};
static char skip_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}}; static char whitelist_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}};
static char record_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}}; static char record_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}};
static char password_masking_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}}; static char password_masking_cmds_array [SQLCOM_END + 2][MAX_COMMAND_CHAR_NUMBERS] = {{0}};
static char record_objs_array [MAX_NUM_OBJECT_ELEM + 2][MAX_OBJECT_CHAR_NUMBERS] = {{0}}; static char record_objs_array [MAX_NUM_OBJECT_ELEM + 2][MAX_OBJECT_CHAR_NUMBERS] = {{0}};
static char whitelist_users_array [MAX_NUM_USER_ELEM + 2][MAX_USER_CHAR_NUMBERS] = {{0}}; static char whitelist_users_array [MAX_NUM_USER_ELEM + 2][MAX_USER_CHAR_NUMBERS] = {{0}};
static bool record_empty_objs_set = true; static bool record_empty_objs_set = true;
static int num_delay_cmds = 0; static int num_delay_cmds = 0;
static int num_skip_cmds = 0; static int num_whitelist_cmds = 0;
static int num_record_cmds = 0; static int num_record_cmds = 0;
static int num_password_masking_cmds = 0; static int num_password_masking_cmds = 0;
static int num_record_objs = 0; static int num_record_objs = 0;
@ -962,12 +962,12 @@ static void password_masking_regex_compile()
static void audit(ThdSesData *pThdData) static void audit(ThdSesData *pThdData)
{ {
THDPRINTED *pThdPrintedList = GetThdPrintedList (pThdData->getTHD()); THDPRINTED *pThdPrintedList = GetThdPrintedList (pThdData->getTHD());
if (num_skip_cmds > 0) { if (num_whitelist_cmds > 0) {
const char * cmd = pThdData->getCmdName(); const char * cmd = pThdData->getCmdName();
const char *cmds[2]; const char *cmds[2];
cmds[0] = cmd; cmds[0] = cmd;
cmds[1] = NULL; cmds[1] = NULL;
if (check_array(cmds, (char *) skip_cmds_array, MAX_COMMAND_CHAR_NUMBERS)) { if (check_array(cmds, (char *) whitelist_cmds_array, MAX_COMMAND_CHAR_NUMBERS)) {
return; return;
} }
} }
@ -1923,7 +1923,7 @@ static void NAME ## _string_update(THD *thd, struct st_mysql_sys_var *var, void
} }
DECLARE_STRING_ARR_UPDATE_FUNC(delay_cmds) DECLARE_STRING_ARR_UPDATE_FUNC(delay_cmds)
DECLARE_STRING_ARR_UPDATE_FUNC(skip_cmds) DECLARE_STRING_ARR_UPDATE_FUNC(whitelist_cmds)
DECLARE_STRING_ARR_UPDATE_FUNC(record_cmds) DECLARE_STRING_ARR_UPDATE_FUNC(record_cmds)
DECLARE_STRING_ARR_UPDATE_FUNC(password_masking_cmds) DECLARE_STRING_ARR_UPDATE_FUNC(password_masking_cmds)
DECLARE_STRING_ARR_UPDATE_FUNC(whitelist_users) DECLARE_STRING_ARR_UPDATE_FUNC(whitelist_users)
@ -2019,8 +2019,8 @@ static void record_objs_string_update_extended(THD *thd, struct st_mysql_sys_var
if (delay_cmds_string != NULL) { if (delay_cmds_string != NULL) {
delay_cmds_string_update(NULL, NULL, NULL, &delay_cmds_string); delay_cmds_string_update(NULL, NULL, NULL, &delay_cmds_string);
} }
if (skip_cmds_string != NULL) { if (whitelist_cmds_string != NULL) {
skip_cmds_string_update(NULL, NULL, NULL, &skip_cmds_string); whitelist_cmds_string_update(NULL, NULL, NULL, &whitelist_cmds_string);
} }
if (record_cmds_string != NULL) { if (record_cmds_string != NULL) {
record_cmds_string_update(NULL, NULL, NULL, &record_cmds_string); record_cmds_string_update(NULL, NULL, NULL, &record_cmds_string);
@ -2329,13 +2329,13 @@ static MYSQL_SYSVAR_STR(delay_cmds, delay_cmds_string,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"AUDIT plugin delay commands to match against comma separated. If empty then delay is disabled.", "AUDIT plugin delay commands to match against comma separated. If empty then delay is disabled.",
NULL, delay_cmds_string_update, NULL); NULL, delay_cmds_string_update, NULL);
static MYSQL_SYSVAR_STR(skip_cmds, skip_cmds_string, static MYSQL_SYSVAR_STR(whitelist_cmds, whitelist_cmds_string,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"AUDIT plugin commands to skip, comma separated", "AUDIT plugin commands to skip, comma separated",
NULL, skip_cmds_string_update, NULL); NULL, whitelist_cmds_string_update, NULL);
static MYSQL_SYSVAR_STR(record_cmds, record_cmds_string, static MYSQL_SYSVAR_STR(record_cmds, record_cmds_string,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"AUDIT plugin commands to record, comma separated", "AUDIT plugin whitelisted commands for which queries are not recorded, comma separated",
NULL, record_cmds_string_update, NULL); NULL, record_cmds_string_update, NULL);
static MYSQL_SYSVAR_STR(password_masking_cmds, password_masking_cmds_string, static MYSQL_SYSVAR_STR(password_masking_cmds, password_masking_cmds_string,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
@ -2345,7 +2345,7 @@ static MYSQL_SYSVAR_STR(password_masking_cmds, password_masking_cmds_string,
"CREATE_USER,GRANT,SET_OPTION,SLAVE_START,CREATE_SERVER,ALTER_SERVER,CHANGE_MASTER"); "CREATE_USER,GRANT,SET_OPTION,SLAVE_START,CREATE_SERVER,ALTER_SERVER,CHANGE_MASTER");
static MYSQL_SYSVAR_STR(whitelist_users, whitelist_users_string, static MYSQL_SYSVAR_STR(whitelist_users, whitelist_users_string,
PLUGIN_VAR_RQCMDARG, PLUGIN_VAR_RQCMDARG,
"AUDIT plugin whitelisted users whose queries are not to recorded, comma separated", "AUDIT plugin whitelisted users whose queries are not recorded, comma separated",
NULL, whitelist_users_string_update, NULL); NULL, whitelist_users_string_update, NULL);
static MYSQL_SYSVAR_STR(record_objs, record_objs_string, static MYSQL_SYSVAR_STR(record_objs, record_objs_string,
@ -2374,7 +2374,7 @@ static struct st_mysql_sys_var* audit_system_variables[] =
MYSQL_SYSVAR(is_thd_printed_list), MYSQL_SYSVAR(is_thd_printed_list),
MYSQL_SYSVAR(delay_ms), MYSQL_SYSVAR(delay_ms),
MYSQL_SYSVAR(delay_cmds), MYSQL_SYSVAR(delay_cmds),
MYSQL_SYSVAR(skip_cmds), MYSQL_SYSVAR(whitelist_cmds),
MYSQL_SYSVAR(record_cmds), MYSQL_SYSVAR(record_cmds),
MYSQL_SYSVAR(password_masking_cmds), MYSQL_SYSVAR(password_masking_cmds),
MYSQL_SYSVAR(whitelist_users), MYSQL_SYSVAR(whitelist_users),