osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

vty: Return error if cmd returns CMD_WARNING while reading cfg file 

Otherwise bad configurations can easily sneak in and produce unexpected
behavior.

Change-Id: Ic9c1b566ec4a459f03e6319cf369691903cf9d00
This commit is contained in:
Pau Espin 2019-10-22 18:38:01 +02:00 committed by laforge
parent ea2afb21d6
commit a0c8195ad3
5 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/vty/command.c
View File

@ -2631,8 +2631,7 @@ int config_from_file(struct vty *vty, FILE * fp)
ret = cmd_execute_command_strict(vline, vty, NULL);
cmd_free_strvec(vline);
if (ret != CMD_SUCCESS && ret != CMD_WARNING
&& ret != CMD_ERR_NOTHING_TODO) {
if (ret != CMD_SUCCESS && ret != CMD_ERR_NOTHING_TODO) {
if (indent) {
talloc_free(indent);
indent = NULL;

1
tests/Makefile.am
View File

@ -293,6 +293,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \
vty/fail_not_de-indented.cfg \
vty/fail_tabs_and_spaces.cfg \
vty/fail_too_much_indent.cfg \
vty/fail_cmd_ret_warning.cfg \
vty/ok.cfg \
vty/ok_empty_parent.cfg \
vty/ok_ignore_blank.cfg \

3
tests/vty/fail_cmd_ret_warning.cfg Normal file
View File

@ -0,0 +1,3 @@
return-success
return-warning
return-success

20
tests/vty/vty_test.c
View File

@ -421,8 +421,27 @@ DEFUN(cfg_ambiguous_str_2, cfg_ambiguous_str_2_cmd,
return CMD_SUCCESS;
}
DEFUN(cfg_ret_success, cfg_ret_success_cmd,
"return-success",
"testing return success\n")
{
printf("Called: 'return-success'\n");
return CMD_SUCCESS;
}
DEFUN(cfg_ret_warning, cfg_ret_warning_cmd,
"return-warning",
"testing return warning\n")
{
printf("Called: 'return-warning'\n");
return CMD_WARNING;
}
void test_vty_add_cmds()
{
install_element(CONFIG_NODE, &cfg_ret_warning_cmd);
install_element(CONFIG_NODE, &cfg_ret_success_cmd);
install_element(CONFIG_NODE, &cfg_level1_cmd);
install_node(&level1_node, NULL);
install_element(LEVEL1_NODE, &cfg_level1_child_cmd);
@ -524,6 +543,7 @@ int main(int argc, char **argv)
test_exit_by_indent("fail_tabs_and_spaces.cfg", -EINVAL);
test_exit_by_indent("ok_indented_root.cfg", 0);
test_exit_by_indent("ok_empty_parent.cfg", 0);
test_exit_by_indent("fail_cmd_ret_warning.cfg", -EINVAL);
test_is_cmd_ambiguous();

4
tests/vty/vty_test.ok
View File

@ -286,6 +286,10 @@ called level2 node k
called level3 node k
called level1 child cmd k
got rc=0
reading file fail_cmd_ret_warning.cfg, expecting rc=-22
Called: 'return-success'
Called: 'return-warning'
got rc=-22
Going to test is_cmd_ambiguous()
Going to execute 'ambiguous_nr'
Called: 'ambiguous_nr [<0-23>]' (argc=0)