summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-03-28 10:37:08 +0200
committerThomas Haller <thaller@redhat.com>2022-03-28 10:40:00 +0200
commitb1b1ee8cc41af4f57902560f6769daf15852311e (patch)
treed2c75dbb5f1799d38dc40b2f5039af8efeb22b29
parent6235815248314c0bd3deb485692881620a859cf9 (diff)
libnm/tests: test that nm_vpn_service_plugin_read_vpn_details() does not consume "QUIT" command
-rw-r--r--src/libnm-client-impl/tests/test-libnm.c95
1 files changed, 88 insertions, 7 deletions
diff --git a/src/libnm-client-impl/tests/test-libnm.c b/src/libnm-client-impl/tests/test-libnm.c
index f24828f57e..1810e139e9 100644
--- a/src/libnm-client-impl/tests/test-libnm.c
+++ b/src/libnm-client-impl/tests/test-libnm.c
@@ -2272,6 +2272,12 @@ _memfd_create(const char *name)
return -1;
}
+typedef enum {
+ READ_VPN_DETAIL_TYPE_GOOD,
+ READ_VPN_DETAIL_TYPE_NO_DONE,
+ READ_VPN_DETAIL_TYPE_BROKEN,
+} ReadVpnDetailType;
+
typedef struct {
const char *key;
const char *val;
@@ -2285,6 +2291,7 @@ _do_read_vpn_details_impl1(const char *file,
int memfd,
char *mem,
gsize len,
+ ReadVpnDetailType detail_type,
const ReadVpnDetailData *expected_data,
guint expected_data_len,
const ReadVpnDetailData *expected_secrets,
@@ -2294,10 +2301,27 @@ _do_read_vpn_details_impl1(const char *file,
off_t lseeked;
gs_unref_hashtable GHashTable *data = NULL;
gs_unref_hashtable GHashTable *secrets = NULL;
+ char ch;
+ gboolean append_quit;
+ char read_buf[1024];
+ gssize n_read;
+ gssize i;
written = write(memfd, mem, len);
g_assert_cmpint(written, ==, (gssize) len);
+ append_quit = nmtst_get_rand_bool();
+
+ if (append_quit) {
+ if (len > 0 && mem[len - 1] != '\n') {
+ ch = '\n';
+ written = write(memfd, &ch, 1);
+ g_assert_cmpint(written, ==, 1);
+ }
+ written = write(memfd, "QUIT", 4);
+ g_assert_cmpint(written, ==, 4);
+ }
+
lseeked = lseek(memfd, 0, SEEK_SET);
g_assert_cmpint(lseeked, ==, 0);
@@ -2365,10 +2389,58 @@ _do_read_vpn_details_impl1(const char *file,
NM_PRAGMA_WARNING_REENABLE
#undef _assert_hash
+
+ n_read = read(memfd, read_buf, sizeof(read_buf));
+
+ if (0) {
+ gs_free char *ss = NULL;
+
+ g_print(">>>> n_read=%zd; \"%s\"",
+ n_read,
+ n_read > 0 ? (
+ ss = nm_utils_buf_utf8safe_escape_cp(read_buf,
+ n_read,
+ NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL))
+ : "");
+ }
+
+ g_assert_cmpint(n_read, >=, 0);
+ g_assert_cmpint(n_read, <, sizeof(read_buf));
+
+ i = read(memfd, &ch, 1);
+ g_assert_cmpint(i, ==, 0);
+
+ switch (detail_type) {
+ case READ_VPN_DETAIL_TYPE_GOOD:
+ g_assert_cmpint(n_read, >=, 0);
+ i = 0;
+ while (i < n_read && NM_IN_SET(read_buf[i], '\n'))
+ i++;
+ if (append_quit)
+ g_assert_cmpmem("QUIT", 4, &read_buf[i], n_read - i);
+ else
+ g_assert_cmpint(n_read - i, ==, 0);
+ break;
+ case READ_VPN_DETAIL_TYPE_NO_DONE:
+ g_assert_cmpint(n_read, ==, 0);
+ break;
+ case READ_VPN_DETAIL_TYPE_BROKEN:
+ g_assert_cmpint(n_read, >, 0);
+ if (append_quit) {
+ g_assert_cmpint(n_read, >, 4);
+ g_assert(memmem(&read_buf[i], n_read + i, "QUIT", 4));
+ }
+ break;
+ default:
+ g_assert_not_reached();
+ break;
+ }
+
return TRUE;
}
#define _do_read_vpn_details_impl0(str, \
+ detail_type, \
expected_data, \
expected_data_len, \
expected_secrets, \
@@ -2389,6 +2461,7 @@ _do_read_vpn_details_impl1(const char *file,
_memfd, \
"" str "", \
NM_STRLEN(str), \
+ (detail_type), \
expected_data, \
expected_data_len, \
expected_secrets, \
@@ -2397,14 +2470,16 @@ _do_read_vpn_details_impl1(const char *file,
} \
G_STMT_END
-#define _do_read_vpn_details_empty(str) _do_read_vpn_details_impl0(str, NULL, 0, NULL, 0, {})
+#define _do_read_vpn_details_empty(str) \
+ _do_read_vpn_details_impl0(str, READ_VPN_DETAIL_TYPE_GOOD, NULL, 0, NULL, 0, {})
-#define _do_read_vpn_details(str, expected_data, expected_secrets, pre_setup_cmd) \
- _do_read_vpn_details_impl0(str, \
- expected_data, \
- G_N_ELEMENTS(expected_data), \
- expected_secrets, \
- G_N_ELEMENTS(expected_secrets), \
+#define _do_read_vpn_details(str, detail_type, expected_data, expected_secrets, pre_setup_cmd) \
+ _do_read_vpn_details_impl0(str, \
+ detail_type, \
+ expected_data, \
+ G_N_ELEMENTS(expected_data), \
+ expected_secrets, \
+ G_N_ELEMENTS(expected_secrets), \
pre_setup_cmd)
static void
@@ -2430,6 +2505,7 @@ test_nm_vpn_service_plugin_read_vpn_details(void)
"DONE\n"
"\n"
"",
+ READ_VPN_DETAIL_TYPE_GOOD,
READ_VPN_DETAIL_DATA({"some-key", "string"}, {"some-other-key", "val2"}, ),
READ_VPN_DETAIL_DATA({"some-secret", "val3"}, ), );
@@ -2437,6 +2513,7 @@ test_nm_vpn_service_plugin_read_vpn_details(void)
"DATA_KEY=some-key\n"
"DATA_VAL=string\n"
"DONE\n",
+ READ_VPN_DETAIL_TYPE_GOOD,
READ_VPN_DETAIL_DATA({"some-key", "string"}, ),
READ_VPN_DETAIL_DATA(), );
@@ -2465,6 +2542,7 @@ test_nm_vpn_service_plugin_read_vpn_details(void)
"\n"
"DONE\n"
"",
+ READ_VPN_DETAIL_TYPE_BROKEN,
READ_VPN_DETAIL_DATA({"some-key", "string\ncontinued after a line break"}, ),
READ_VPN_DETAIL_DATA({"key names\ncan have\ncontinuations too", "value"}, ), );
@@ -2478,6 +2556,7 @@ test_nm_vpn_service_plugin_read_vpn_details(void)
"=continuations too\n"
"SECRET_VAL=value\n"
"",
+ READ_VPN_DETAIL_TYPE_NO_DONE,
READ_VPN_DETAIL_DATA({"some-key", "string\ncontinued after a line break"}, ),
READ_VPN_DETAIL_DATA({"key names\ncan have\ncontinuations too", "value"}, ), );
@@ -2511,6 +2590,7 @@ test_nm_vpn_service_plugin_read_vpn_details(void)
"DONE\n"
"\n"
"",
+ READ_VPN_DETAIL_TYPE_GOOD,
READ_VPN_DETAIL_DATA({"some\nkey-2", "val2"},
{"some-key", "string"},
{"key3\nkey-2", "val3"}, ),
@@ -2550,6 +2630,7 @@ test_nm_vpn_service_plugin_read_vpn_details(void)
"DONE\n"
"\n"
"",
+ READ_VPN_DETAIL_TYPE_GOOD,
READ_VPN_DETAIL_DATA({"some\nkey-2", "val2"},
{"some-key", "string"},
{"key3\nkey-2", "val3"}, ),