isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Append errstr to reason for alert and reject events if specified.

Browse Source 
Previously, we logged the error string separately but this is
not consistent with how it is logged in other formats.
This commit is contained in:
Todd C. Miller
2020-11-06 13:09:21 -07:00
parent f8a708dae3
commit 444ca3789e
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/eventlog/eventlog.c
View File

@@ -800,18 +800,24 @@ format_json(int event_type, const char *reason, const char *errstr,
if (!sudo_json_open_object(&json, type_str))
goto bad;
/* Reject and Alert events include a reason */
/* Reject and Alert events include a reason and optional error string. */
if (reason != NULL) {
char *ereason = NULL;
if (errstr != NULL) {
if (asprintf(&ereason, _("%s: %s"), reason, errstr) == -1) {
sudo_warnx(U_("%s: %s"), __func__,
U_("unable to allocate memory"));
goto bad;
}
}
json_value.type = JSON_STRING;
json_value.u.string = reason;
if (!sudo_json_add_value(&json, "reason", &json_value))
goto bad;
}
if (errstr != NULL) {
json_value.type = JSON_STRING;
json_value.u.string = errstr;
if (!sudo_json_add_value(&json, "error", &json_value))
json_value.u.string = ereason ? ereason : reason;
if (!sudo_json_add_value(&json, "reason", &json_value)) {
free(ereason);
goto bad;
}
free(ereason);
}
/* XXX - create and log uuid? */