system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-07 00:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

keyfile: disable permission checks of keyfile for tests

Browse source 
The tests were checking that the keyfiles had permission
0600 and there was a check-local target to prepare the permissons
of the tests.

That is inconvenient, and it is unexpected to have a check-local
target for such a case.

Also, the tests were not testing that keyfile reader would
bail out on invalid permissions. So just skip the check for
testing.
This commit is contained in:
Thomas Haller 2016-10-16 21:14:07 +02:00
parent 068dd41df9
commit 5424e3a063
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/settings/plugins/keyfile/nms-keyfile-reader.c
View file

@ -102,14 +102,14 @@ nms_keyfile_reader_from_file (const char *filename, GError **error)
return NULL;
}
if (statbuf.st_mode & 0077) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"File permissions (%o) were insecure",
statbuf.st_mode);
return NULL;
}
if (!NM_FLAGS_HAS (nm_utils_get_testing (), NM_UTILS_TEST_NO_KEYFILE_OWNER_CHECK)) {
if (statbuf.st_mode & 0077) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"File permissions (%o) were insecure",
statbuf.st_mode);
return NULL;
}
if (statbuf.st_uid != 0) {
g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION,
"File owner (%o) is insecure",

5
src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
View file

@ -39,8 +39,3 @@ CERTS = \
EXTRA_DIST = $(KEYFILES) $(CERTS)
check-local:
@for f in $(KEYFILES); do \
chmod 0600 $(abs_srcdir)/$$f; \
done

3
src/settings/plugins/keyfile/tests/test-keyfile.c
View file

@ -204,7 +204,8 @@ test_read_valid_wired_connection (void)
"*ipv6.routes*semicolon at the end*routes1*");
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO,
"*ipv6.route*semicolon at the end*route6*");
connection = nms_keyfile_reader_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection", NULL);
connection = nms_keyfile_reader_from_file (TEST_KEYFILES_DIR "/Test_Wired_Connection", &error);
g_assert_no_error (error);
g_test_assert_expected_messages ();
g_assert (connection);