faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reply with status invalid instead of bad length on invalid command

Browse source
This commit is contained in:
Miroslav Lichvar 2011-01-19 14:44:10 +01:00
parent 9d35b5deac
commit bc4d5df94e
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.c
View file

@ -1309,6 +1309,8 @@ submit_request(CMD_Request *request, CMD_Reply *reply, int *reply_auth_ok)
} }
command_length = PKL_CommandLength(request); command_length = PKL_CommandLength(request);
assert(command_length > 0);
#if 0 #if 0
printf("Sent command length=%d bytes\n", command_length); printf("Sent command length=%d bytes\n", command_length);
#endif #endif

20
cmdmon.c
View file

@ -1784,6 +1784,7 @@ read_from_cmd_socket(void *anything)
read_length = status; read_length = status;
expected_length = PKL_CommandLength(&rx_message); expected_length = PKL_CommandLength(&rx_message);
rx_command = ntohs(rx_message.command);
LCL_ReadRawTime(&now); LCL_ReadRawTime(&now);
LCL_CookTime(&now, &cooked_now, NULL); LCL_CookTime(&now, &cooked_now, NULL);
@ -1858,6 +1859,18 @@ read_from_cmd_socket(void *anything)
return; return;
} }
if (rx_command >= N_REQUEST_TYPES) {
if (!LOG_RateLimited()) {
LOG(LOGS_WARN, LOGF_CmdMon, "Read command packet with invalid command %d from %s:%hu", rx_command, UTI_IPToString(&remote_ip), remote_port);
}
if (allowed)
CLG_LogCommandAccess(&remote_ip, CLG_CMD_BAD_PKT, cooked_now.tv_sec);
tx_message.status = htons(STT_INVALID);
transmit_reply(&tx_message, &where_from);
return;
}
if (read_length != expected_length) { if (read_length != expected_length) {
if (!LOG_RateLimited()) { if (!LOG_RateLimited()) {
LOG(LOGS_WARN, LOGF_CmdMon, "Read incorrectly sized command packet from %s:%hu", UTI_IPToString(&remote_ip), remote_port); LOG(LOGS_WARN, LOGF_CmdMon, "Read incorrectly sized command packet from %s:%hu", UTI_IPToString(&remote_ip), remote_port);
@ -1888,8 +1901,6 @@ read_from_cmd_socket(void *anything)
return; return;
} }
rx_command = ntohs(rx_message.command);
/* OK, we have a valid message. Now dispatch on message type and process it. */ /* OK, we have a valid message. Now dispatch on message type and process it. */
/* Do authentication stuff and command tokens here. Well-behaved /* Do authentication stuff and command tokens here. Well-behaved
@ -2015,10 +2026,9 @@ read_from_cmd_socket(void *anything)
tx_message.token = htonl(tx_message_token); tx_message.token = htonl(tx_message_token);
/* If command type is invalid, send back reply */
if (rx_command >= N_REQUEST_TYPES) { if (rx_command >= N_REQUEST_TYPES) {
tx_message.status = htons(STT_INVALID); /* This should be already handled */
tx_message.reply = htons(RPY_NULL); assert(0);
} else { } else {
allowed = 0; allowed = 0;