Skip to content

parser cbor BUGFIX check characters of text strings #2602

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
affan-arch wants to merge 1 commit into
base: devel
Choose a base branch
from
+32 −0
Open

parser cbor BUGFIX check characters of text strings #2602

Show file tree
Hide file tree
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
26 changes: 26 additions & 0 deletions src/parser_cbor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,30 @@ lydcbor_value_type_hint(struct lyd_cbor_ctx *lydctx, const cbor_item_t *item, ui
return LY_SUCCESS;
}

/**
* @brief Check that a CBOR string contains only valid YANG string characters.
*
* @param[in] str String to check.
* @param[in] str_len Length of @p str.
* @return LY_ERR value.
*/
static LY_ERR
lydcbor_check_string(const char *str, size_t str_len)
{
size_t parsed = 0;
uint32_t len;

while (parsed < str_len) {
if (ly_checkutf8(str + parsed, str_len - parsed, &len)) {
LOGVAL(NULL, NULL, LY_VCODE_INCHAR, str[parsed]);
return LY_EVALID;
}
parsed += len;
}

return LY_SUCCESS;
}

/**
* @brief Convert a CBOR item to a string representation.
*
Expand Down Expand Up @@ -399,13 +423,15 @@ lydcbor_item_to_string(const cbor_item_t *item, char **str_val, size_t *str_len)
LY_CHECK_ERR_RET(!*str_val, LOGMEM(NULL), LY_EMEM);
memcpy(*str_val, cbor_bytestring_handle(item), *str_len);
(*str_val)[*str_len] = '\0';
LY_CHECK_ERR_RET(lydcbor_check_string(*str_val, *str_len), free(*str_val); *str_val = NULL, LY_EVALID);
break;
case CBOR_TYPE_STRING:
*str_len = cbor_string_length(item);
*str_val = malloc(*str_len + 1);
LY_CHECK_ERR_RET(!*str_val, LOGMEM(NULL), LY_EMEM);
memcpy(*str_val, cbor_string_handle(item), *str_len);
(*str_val)[*str_len] = '\0';
LY_CHECK_ERR_RET(lydcbor_check_string(*str_val, *str_len), free(*str_val); *str_val = NULL, LY_EVALID);
break;
case CBOR_TYPE_FLOAT_CTRL:
if (cbor_float_ctrl_is_ctrl(item)) {
Expand Down
6 changes: 6 additions & 0 deletions tests/utests/data/test_cbor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,12 @@ test_invalid_input(void **state)
CHECK_PARSE_LYD_PARAM_LEN("\xa1", 1, LYD_CBOR, 0, 0, LY_EVALID, tree);
CHECK_LOG_CTX("Failed to parse CBOR data (not enough data).", NULL, 1);

/* text strings must be checked for invalid characters like in JSON and XML */
CHECK_PARSE_LYD_PARAM_LEN("\xa1\x70" "cbor-test:lf-str" "\x65" "ab\0cd", 24, LYD_CBOR, LYD_PARSE_ONLY, 0,
LY_EVALID, tree);
CHECK_PARSE_LYD_PARAM_LEN("\xa1\x70" "cbor-test:lf-str" "\x62" "a\xff", 21, LYD_CBOR, LYD_PARSE_ONLY, 0,
LY_EVALID, tree);

assert_int_equal(LY_EVALID, lyd_new_path(NULL, UTEST_LYCTX, "/cbor-test:lf-intg8", "1000", 0, &tree));
CHECK_LOG_CTX("Value \"1000\" is out of type int8 min/max bounds.", "/cbor-test:lf-intg8", 0);
}
Expand Down
Loading