Skip to content

logsrvd_json_log_cb: don't let client info override server-set keys #594

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

Open
iefa-m wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −0
Open

logsrvd_json_log_cb: don't let client info override server-set keys #594

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
33 changes: 33 additions & 0 deletions logsrvd/logsrvd_local.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,33 @@ struct logsrvd_info_closure {
size_t infolen;
};

/*
* Keys that format_json() writes itself for accept and reject events.
* These must not be overridden by the client.
*/
static const char *reserved_json_keys[] = {
"iolog_offset",
"iolog_path",
"peeraddr",
"reason",
"server_time",
"submit_time",
"uuid",
NULL
};

static bool
reserved_json_key(const char *key)
{
const char **kp;

for (kp = reserved_json_keys; *kp != NULL; kp++) {
if (strcmp(key, *kp) == 0)
return true;
}
return false;
}

static bool
logsrvd_json_log_cb(struct json_container *jsonc, void *v)
{
Expand All @@ -75,6 +102,12 @@ logsrvd_json_log_cb(struct json_container *jsonc, void *v)
for (idx = 0; idx < closure->infolen; idx++) {
InfoMessage *info = closure->info_msgs[idx];

if (reserved_json_key(info->key)) {
sudo_warnx(U_("%s: protocol error: reserved key %s"),
"local", info->key);
continue;
}

switch (info->value_case) {
case INFO_MESSAGE__VALUE_NUMVAL:
json_value.type = JSON_NUMBER;
Expand Down
Loading