aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ctrl/ctrl_test.c
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-09-26 14:21:44 +0200
committerHarald Welte <laforge@gnumonks.org>2017-12-20 15:50:24 +0000
commit3da9aa6b6792407d57816ec4a4cdfd0b4b3434b8 (patch)
tree1bcb71940b90c2f3a1e27e0aab5a777c0f52489e /tests/ctrl/ctrl_test.c
parent6cb9e7d8981e127161f14f22ad9271252c531aec (diff)
ctrl: tighten CTRL input parsing
Validate that incoming CTRL commands... - have decimal IDs, - return error on trailing characters, - have invalid characters in variable identifiers, - send detailed error messages as reply to the requestor. Adjust ctrl_test.{c,ok}, which best show the change in behavior. Message handling causes log messages on stderr; previously, stderr was empty. Add '[ignore]' in testsuite.at so that the nonempty stderr doesn't cause test failures. Change-Id: I96a9b6b6a3a5e0b80513aa9eaa727ae8c9c7d7a1
Diffstat (limited to 'tests/ctrl/ctrl_test.c')
-rw-r--r--tests/ctrl/ctrl_test.c110
1 files changed, 46 insertions, 64 deletions
diff --git a/tests/ctrl/ctrl_test.c b/tests/ctrl/ctrl_test.c
index 39ec61a8..a38591f3 100644
--- a/tests/ctrl/ctrl_test.c
+++ b/tests/ctrl/ctrl_test.c
@@ -79,14 +79,19 @@ static void assert_test(struct ctrl_handle *ctrl, struct ctrl_connection *ccon,
cmd = ctrl_cmd_parse2(ctx, msg);
OSMO_ASSERT(cmd);
- OSMO_ASSERT(t->expect_parsed.type == cmd->type);
+ if (t->expect_parsed.type != cmd->type) {
+ printf("type mismatch: got %s\n", get_value_string(ctrl_type_vals, cmd->type));
+ OSMO_ASSERT(t->expect_parsed.type == cmd->type);
+ }
#define ASSERT_SAME_STR(field) \
assert_same_str(#field, t->expect_parsed.field, cmd->field)
ASSERT_SAME_STR(id);
- ASSERT_SAME_STR(variable);
- ASSERT_SAME_STR(value);
+ if (t->expect_parsed.type != CTRL_TYPE_ERROR) {
+ ASSERT_SAME_STR(variable);
+ ASSERT_SAME_STR(value);
+ }
ASSERT_SAME_STR(reply);
talloc_free(cmd);
@@ -140,75 +145,66 @@ static const struct one_test test_messages_list[] = {
{
.type = CTRL_TYPE_GET,
.id = "1",
- .variable = "variable\n", /* current bug */
+ .variable = "variable",
},
"ERROR 1 Command not found",
},
{ "GET 1 var\ni\nable",
{
- .type = CTRL_TYPE_GET,
+ .type = CTRL_TYPE_ERROR,
.id = "1",
- .variable = "var\ni\nable", /* current bug */
+ .reply = "GET with trailing characters",
},
- "ERROR 1 Command not found",
-
+ "ERROR 1 GET with trailing characters",
},
{ "GET 1 var\ti\table",
{
- .type = CTRL_TYPE_GET,
+ .type = CTRL_TYPE_ERROR,
.id = "1",
- .variable = "var\ti\table", /* current bug */
+ .reply = "GET variable contains invalid characters",
},
- "ERROR 1 Command not found",
+ "ERROR 1 GET variable contains invalid characters",
},
{ "GET 1 var\ri\rable",
{
- .type = CTRL_TYPE_GET,
+ .type = CTRL_TYPE_ERROR,
.id = "1",
- .variable = "var\ri\rable", /* current bug */
+ .reply = "GET variable contains invalid characters",
},
- "ERROR 1 Command not found",
+ "ERROR 1 GET variable contains invalid characters",
},
{ "GET 1 variable value",
{
- .type = CTRL_TYPE_GET,
+ .type = CTRL_TYPE_ERROR,
.id = "1",
- .variable = "variable",
- .value = NULL,
+ .reply = "GET with trailing characters",
},
- "ERROR 1 Command not found",
-
+ "ERROR 1 GET with trailing characters",
},
{ "GET 1 variable value\n",
{
- .type = CTRL_TYPE_GET,
+ .type = CTRL_TYPE_ERROR,
.id = "1",
- .variable = "variable",
- .value = NULL,
+ .reply = "GET with trailing characters",
},
- "ERROR 1 Command not found",
-
+ "ERROR 1 GET with trailing characters",
},
{ "GET 1 variable multiple value tokens",
{
- .type = CTRL_TYPE_GET,
+ .type = CTRL_TYPE_ERROR,
.id = "1",
- .variable = "variable",
- .value = NULL,
+ .reply = "GET with trailing characters",
},
- "ERROR 1 Command not found",
-
+ "ERROR 1 GET with trailing characters",
},
{ "GET 1 variable multiple value tokens\n",
{
- .type = CTRL_TYPE_GET,
+ .type = CTRL_TYPE_ERROR,
.id = "1",
- .variable = "variable",
- .value = NULL,
+ .reply = "GET with trailing characters",
},
- "ERROR 1 Command not found",
-
+ "ERROR 1 GET with trailing characters",
},
{ "SET 1 variable value",
{
@@ -218,7 +214,6 @@ static const struct one_test test_messages_list[] = {
.value = "value",
},
"ERROR 1 Command not found",
-
},
{ "SET 1 variable value\n",
{
@@ -228,27 +223,22 @@ static const struct one_test test_messages_list[] = {
.value = "value",
},
"ERROR 1 Command not found",
-
},
{ "SET weird_id variable value",
{
- .type = CTRL_TYPE_SET,
- .id = "weird_id",
- .variable = "variable",
- .value = "value",
+ .type = CTRL_TYPE_ERROR,
+ .id = "err",
+ .reply = "Invalid message ID number",
},
- "ERROR weird_id Command not found",
-
+ "ERROR err Invalid message ID number",
},
{ "SET weird_id variable value\n",
{
- .type = CTRL_TYPE_SET,
- .id = "weird_id",
- .variable = "variable",
- .value = "value",
+ .type = CTRL_TYPE_ERROR,
+ .id = "err",
+ .reply = "Invalid message ID number",
},
- "ERROR weird_id Command not found",
-
+ "ERROR err Invalid message ID number",
},
{ "SET 1 variable multiple value tokens",
{
@@ -278,7 +268,6 @@ static const struct one_test test_messages_list[] = {
.value = "value_with_trailing_spaces ",
},
"ERROR 1 Command not found",
-
},
{ "SET 1 variable value_with_trailing_spaces \n",
{
@@ -288,27 +277,22 @@ static const struct one_test test_messages_list[] = {
.value = "value_with_trailing_spaces ",
},
"ERROR 1 Command not found",
-
},
{ "SET \n special_char_id value",
{
- .type = CTRL_TYPE_SET,
- .id = "\n",
- .variable = "special_char_id",
- .value = "value",
+ .type = CTRL_TYPE_ERROR,
+ .id = "err",
+ .reply = "Invalid message ID number",
},
- "ERROR \n Command not found",
-
+ "ERROR err Invalid message ID number",
},
{ "SET \t special_char_id value",
{
- .type = CTRL_TYPE_SET,
- .id = "\t",
- .variable = "special_char_id",
- .value = "value",
+ .type = CTRL_TYPE_ERROR,
+ .id = "err",
+ .reply = "Invalid message ID number",
},
- "ERROR \t Command not found",
-
+ "ERROR err Invalid message ID number",
},
{ "GET_REPLY 1 variable OK",
{
@@ -317,7 +301,6 @@ static const struct one_test test_messages_list[] = {
.variable = "variable",
.reply = "OK",
},
- .reply_str = NULL,
},
{ "SET_REPLY 1 variable OK",
{
@@ -326,7 +309,6 @@ static const struct one_test test_messages_list[] = {
.variable = "variable",
.reply = "OK",
},
- .reply_str = NULL,
},
};