LuoGe
/
openGauss-server
forked from huawei/openGauss-server
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix the bug that mask password fails when stmt is truncated 

Offering: openGaussDev

More detail: fix the bug that mask password fails when stmt is truncated

Signed-off-by: HeRui <herui30@huawei.com>

Match-id-d32724bb606ac2ebae17c2900b160b35c4033a24
This commit is contained in:
openGaussDev 2022-03-07 16:58:00 +08:00 committed by yanghao
parent 5852d1949f
commit 06e43a8f9b
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/backend/utils/error/elog.cpp
View File

@ -3945,6 +3945,10 @@ void getElevelAndSqlstate(int* eLevel, int* sqlState)
*sqlState = t_thrd.log_cxt.errordata[t_thrd.log_cxt.errordata_stack_depth].sqlerrcode;
}
/*
* When the SQL statement is truncated, this function cannot perform normal password masking.
* maskPassword will return null if the statement does not need to be masked or any error occurs.
*/
char* maskPassword(const char* query_string)
{
char* mask_string = NULL;

26
src/gausskernel/process/postmaster/pgstat.cpp
View File

@ -3532,9 +3532,29 @@ void pgstat_report_activity(BackendState state, const char* cmd_str)
beentry->st_state_start_timestamp = current_timestamp;
if (cmd_str != NULL) {
rc = memcpy_s(
(char*)beentry->st_activity, g_instance.attr.attr_common.pgstat_track_activity_query_size, cmd_str, len);
securec_check(rc, "\0", "\0");
char *mask_string = NULL;
if (len == g_instance.attr.attr_common.pgstat_track_activity_query_size - 1 &&
t_thrd.mem_cxt.mask_password_mem_cxt != NULL) {
/* mask the cmd_str when the cmd_str is truncated. */
mask_string = maskPassword(cmd_str);
}
/* If mask successfully, store the mask_string. Otherwise, the cmd_str is recorded. */
if (mask_string == NULL) {
rc = memcpy_s((char*)beentry->st_activity, g_instance.attr.attr_common.pgstat_track_activity_query_size,
cmd_str, len);
securec_check(rc, "\0", "\0");
} else {
int copy_len = strlen(mask_string);
if (len < copy_len) {
copy_len = len;
}
rc = memcpy_s((char*)beentry->st_activity, g_instance.attr.attr_common.pgstat_track_activity_query_size,
mask_string, copy_len);
securec_check(rc, "\0", "\0");
pfree(mask_string);
}
beentry->st_activity[len] = '\0';
beentry->st_activity_start_timestamp = start_timestamp;
}