patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: lwm2m: check content-format and respond with error if not support

Browse source 
Currently, we always set the content-format as "plain/text" when
it is unrecognized. This is wrong for it's possible that payload
is actually something else.

For example, we don't support JSON as incoming format right now.
But if I send a PUT request to /1/0/1 (server objectinstance/lifetime
resource) with value 3200 in JSON format: {"e":[{"n":"","v":3200}]}.
The client will still handle the request and respond with changed (2.04)
except the lifetime resource is updated incorrectly due to parsing
error.

Correct the behavior by not setting a default format and respond with
content-format-not-support error code (4.15)

Signed-off-by: Robert Chou <robert.ch.chou@acer.com>
This commit is contained in:
Robert Chou 2018-01-30 15:18:57 +08:00 committed by Jukka Rissanen
parent 2251ea04a8
commit 54d7207e09
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
subsys/net/lib/lwm2m/lwm2m_engine.c
View file

@ -1170,7 +1170,7 @@ static u16_t select_writer(struct lwm2m_output_context *out, u16_t accept)
return accept;
}
static u16_t select_reader(struct lwm2m_input_context *in, u16_t format)
static int select_reader(struct lwm2m_input_context *in, u16_t format)
{
switch (format) {
@ -1186,12 +1186,8 @@ static u16_t select_reader(struct lwm2m_input_context *in, u16_t format)
break;
default:
SYS_LOG_ERR("Unknown content type %u, using LWM2M plain text",
format);
in->reader = &plain_text_reader;
format = LWM2M_FORMAT_PLAIN_TEXT;
break;
SYS_LOG_WRN("Unknown content type %u", format);
return -ENOMSG;
}
return format;
@ -2967,7 +2963,7 @@ static int do_write_op(struct lwm2m_engine_obj *obj,
default:
SYS_LOG_ERR("Unsupported format: %u", format);
return -EINVAL;
return -ENOMSG;
}
}
@ -3053,8 +3049,11 @@ static int handle_request(struct coap_packet *request,
r = coap_find_options(in.in_cpkt, COAP_OPTION_CONTENT_FORMAT,
options, 1);
if (r > 0) {
format = select_reader(
&in, coap_option_value_to_int(&options[0]));
format = coap_option_value_to_int(&options[0]);
r = select_reader(&in, format);
if (r < 0) {
goto error;
}
}
/* read Accept */
@ -3278,6 +3277,8 @@ error:
msg->code = COAP_RESPONSE_CODE_REQUEST_TOO_LARGE;
} else if (r == -ENOTSUP) {
msg->code = COAP_RESPONSE_CODE_NOT_IMPLEMENTED;
} else if (r == -ENOMSG) {
msg->code = COAP_RESPONSE_CODE_UNSUPPORTED_CONTENT_FORMAT;
} else {
/* Failed to handle the request */
msg->code = COAP_RESPONSE_CODE_INTERNAL_ERROR;