caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sentinel: don't log auth-pass value for better security (#9652)

Browse Source
This commit is contained in:
Wen Hui 2021-10-26 06:13:12 -04:00 committed by GitHub
parent 37559ca79f
commit 43b22f17dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sentinel.c
View File

@ -4156,6 +4156,7 @@ void sentinelSetCommand(client *c) {
int j, changes = 0; int j, changes = 0;
int badarg = 0; /* Bad argument position for error reporting. */ int badarg = 0; /* Bad argument position for error reporting. */
char *option; char *option;
int redacted;
if ((ri = sentinelGetMasterByNameOrReplyError(c,c->argv[2])) if ((ri = sentinelGetMasterByNameOrReplyError(c,c->argv[2]))
== NULL) return; == NULL) return;
@ -4166,6 +4167,7 @@ void sentinelSetCommand(client *c) {
option = c->argv[j]->ptr; option = c->argv[j]->ptr;
long long ll; long long ll;
int old_j = j; /* Used to know what to log as an event. */ int old_j = j; /* Used to know what to log as an event. */
redacted = 0;
if (!strcasecmp(option,"down-after-milliseconds") && moreargs > 0) { if (!strcasecmp(option,"down-after-milliseconds") && moreargs > 0) {
/* down-after-milliseconds <milliseconds> */ /* down-after-milliseconds <milliseconds> */
@ -4240,6 +4242,7 @@ void sentinelSetCommand(client *c) {
sdsfree(ri->auth_pass); sdsfree(ri->auth_pass);
ri->auth_pass = strlen(value) ? sdsnew(value) : NULL; ri->auth_pass = strlen(value) ? sdsnew(value) : NULL;
changes++; changes++;
redacted = 1;
} else if (!strcasecmp(option,"auth-user") && moreargs > 0) { } else if (!strcasecmp(option,"auth-user") && moreargs > 0) {
/* auth-user <username> */ /* auth-user <username> */
char *value = c->argv[++j]->ptr; char *value = c->argv[++j]->ptr;
@ -4287,7 +4290,7 @@ void sentinelSetCommand(client *c) {
switch(numargs) { switch(numargs) {
case 2: case 2:
sentinelEvent(LL_WARNING,"+set",ri,"%@ %s %s",(char*)c->argv[old_j]->ptr, sentinelEvent(LL_WARNING,"+set",ri,"%@ %s %s",(char*)c->argv[old_j]->ptr,
(char*)c->argv[old_j+1]->ptr); redacted ? "******" : (char*)c->argv[old_j+1]->ptr);
break; break;
case 3: case 3:
sentinelEvent(LL_WARNING,"+set",ri,"%@ %s %s %s",(char*)c->argv[old_j]->ptr, sentinelEvent(LL_WARNING,"+set",ri,"%@ %s %s %s",(char*)c->argv[old_j]->ptr,