Skip to content

Improve upsd debug log #3023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 1 commit into from
Jul 17, 2025
Merged

Improve upsd debug log #3023

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions server/upsd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,28 @@ int ups_available(const upstype_t *ups, nut_ctype_t *client)
static void check_command(int cmdnum, nut_ctype_t *client, size_t numarg,
const char **arg)
{
upsdebugx(6, "Entering %s: %s", __func__, numarg > 0 ? arg[0] : "<>");
char *cmdstr = (numarg > 0 ? (char*)arg[0] : "<>");
int cmdstr_allocated = 0;

if (nut_debug_level > 5 && numarg > 1
&& (nut_debug_level > 9 || strcmp(arg[0], "PASSWORD")) /* Do not log credentials by default */
) {
/* Not xcalloc() here, not too fatal if we fail */
char *s = calloc(LARGEBUF, sizeof(char));
if (s) {
size_t i;

snprintf(s, LARGEBUF, "%s", arg[0]);
for (i = 1; i < numarg; i++) {
snprintfcat(s, LARGEBUF, " [%s]", arg[i]);
}

cmdstr = s;
cmdstr_allocated = 1;
}
}

upsdebugx(6, "Entering %s: %s", __func__, cmdstr);

if (netcmds[cmdnum].flags & FLAG_USER) {
/* command requires previous authentication */
Expand All @@ -716,12 +737,16 @@ static void check_command(int cmdnum, nut_ctype_t *client, size_t numarg,
if (!client->username) {
upsdebugx(1, "%s: client not logged in yet", __func__);
send_err(client, NUT_ERR_USERNAME_REQUIRED);
if (cmdstr_allocated)
free(cmdstr);
return;
}

if (!client->password) {
upsdebugx(1, "%s: client not logged in yet", __func__);
send_err(client, NUT_ERR_PASSWORD_REQUIRED);
if (cmdstr_allocated)
free(cmdstr);
return;
}

Expand All @@ -735,12 +760,17 @@ static void check_command(int cmdnum, nut_ctype_t *client, size_t numarg,
"tcp-wrappers says access should be denied",
__func__, client->username);
send_err(client, NUT_ERR_ACCESS_DENIED);
if (cmdstr_allocated)
free(cmdstr);
return;
}
#endif /* HAVE_WRAP */
}

upsdebugx(6, "%s: Calling command handler for %s", __func__, numarg > 0 ? arg[0] : "<>");
upsdebugx(6, "%s: Calling command handler for %s", __func__, cmdstr);

if (cmdstr_allocated)
free(cmdstr);

/* looks good - call the command */
netcmds[cmdnum].func(client, (numarg < 2) ? 0 : (numarg - 1), (numarg > 1) ? &arg[1] : NULL);
Expand Down