Skip to contentSkip to conversation

tests/file_contexts: refactor existing tests

PATCH Superseded Thiébaud Weksteen 2 participants 3 messages Jul 23 SELinux security module

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 tests/file_contexts: refactor existing tests

Change the logging format when reporting an error to better capture the location and context of the error.

Split tests into functions to better isolate the tested behaviour.

---
 tests/file_contexts/internal.c       | 16 ++---
 tests/file_contexts/internal.h       | 20 +++++-
 tests/file_contexts/test_lookup.c    | 60 ++++++++++++------
 tests/file_contexts/test_open.c      | 94 +++++++++++++++++-----------
 tests/file_contexts/test_open_base.c | 46 ++++++++++----
 tests/file_contexts/test_validate.c  | 37 ++++++-----
 6 files changed, 178 insertions(+), 95 deletions(-)
tests/file_contexts/internal.c +9 -7
index 22b5790..ba45dd6 100644
@@ -10,8 +10,8 @@
 
 #include "internal.h"
 
-void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
-			 size_t n)
+void assertContextsMatch(struct selabel_handle *hnd, const char *log_prefix,
+			 struct test_t *tests, size_t n)
 {
 	for (int i = 0; i < n; i++) {
 		char *context = NULL;
@@ -19,20 +19,22 @@ void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
 
 		if (selabel_lookup(hnd, &context, test.path, S_IFREG)) {
 			if (test.context) {
-				perror("file_contexts:selabel_lookup");
-				fprintf(stderr, "Lookup for %s failed\n", test.path);
+				log_errno("Lookup for %s from %s failed",
+					  test.path, log_prefix);
 				exit(2);
 			}
 			// Expected failure. Continue to the next test.
 			continue;
 		} else if (!test.context) {
-			fprintf(stderr, "Lookup for %s was supposed to failed\n", test.path);
+			log_err("Lookup for %s from %s was supposed to failed but got %s",
+				test.path, log_prefix, context);
 			exit(2);
 		}
 
 		if (strcmp(context, tests[i].context)) {
-			fprintf(stderr, "Lookup for %s returned %s, expected %s\n",
-				tests[i].path, context, tests[i].context);
+			log_err("Lookup for %s from %s returned %s, expected %s",
+				tests[i].path, log_prefix, context,
+				tests[i].context);
 			exit(2);
 		}
 
tests/file_contexts/internal.h +17 -3
index a07548f..c51bbc6 100644
@@ -1,8 +1,21 @@
+#include <errno.h>
+#include <string.h>
+
 #include <selinux/label.h>
 #include <selinux/selinux.h>
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+/* Log an error message with the file name, function name and line */
+#define log_err(fmt, ...)                                                    \
+	fprintf(stderr, "%s:%s:%d: " fmt "\n", __FILE__, __func__, __LINE__, \
+		##__VA_ARGS__)
+
+/* Log an error message as well as errno */
+#define log_errno(fmt, ...)                                            \
+	fprintf(stderr, "%s:%s:%d " fmt " (%s)\n", __FILE__, __func__, \
+		__LINE__, ##__VA_ARGS__, strerror(errno))
+
 /* Structure to capture a test. The |path| will be resolved and expected to
  * match the |context|. If |context| is NULL, the lookup is expected to fail. */
 struct test_t {
@@ -11,6 +24,7 @@ struct test_t {
 };
 
 /* Assert that all paths described in |tests| resolve appropriately. |hnd| must
- * be opened. |n| is the number of tests in |tests|. */
-void assertContextsMatch(struct selabel_handle *hnd, struct test_t *tests,
-			 size_t n);
+ * be opened. |n| is the number of tests in |tests|. |log_prefix| is added to
+ * any log message */
+void assertContextsMatch(struct selabel_handle *hnd, const char *log_prefix,
+			 struct test_t *tests, size_t n);
tests/file_contexts/test_lookup.c +40 -20

78 lines not on this page · raw message

tests/file_contexts/test_open.c +57 -37

138 lines not on this page · raw message

tests/file_contexts/test_open_base.c +33 -13

83 lines not on this page · raw message

tests/file_contexts/test_validate.c +22 -15
index 8abefed..aa71c22 100644
@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -10,47 +9,55 @@
 
 #include "internal.h"
 
-int main(int argc, char **argv)
+void test_validate_unknown_fails(const char *basedir)
 {
 	char *path;
-	struct selabel_handle *hnd;
-
-	if (argc != 2) {
-		fprintf(stderr, "basedir not provided\n");
-		exit(1);
-	}
-
-	asprintf(&path, "%s/f1.fc", argv[1]);
+	asprintf(&path, "%s/f1.fc", basedir);
 	struct selinux_opt f1_opts[] = {
 		{ .type = SELABEL_OPT_PATH, .value = path },
 		{ .type = SELABEL_OPT_VALIDATE, .value = "1" }
 	};
 
 	/* f1 types are not defined in the test policy. */
-	hnd = selabel_open(SELABEL_CTX_FILE, f1_opts, ARRAY_SIZE(f1_opts));
+	struct selabel_handle *hnd =
+		selabel_open(SELABEL_CTX_FILE, f1_opts, ARRAY_SIZE(f1_opts));
 	free(path);
 
 	if (hnd) {
-		fprintf(stderr, "The validation of f1 should have failed.\n");
+		log_err("The validation of f1 should have failed");
+		selabel_close(hnd);
 		exit(2);
 	}
+}
 
-	asprintf(&path, "%s/f2.fc", argv[1]);
+void test_validate_known_succeeds(const char *basedir)
+{
+	char *path;
+	asprintf(&path, "%s/f2.fc", basedir);
 	struct selinux_opt f2_opts[] = {
 		{ .type = SELABEL_OPT_PATH, .value = path },
 		{ .type = SELABEL_OPT_VALIDATE, .value = "1" }
 	};
 
 	/* f2 types are defined in the test policy. */
-	hnd = selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
+	struct selabel_handle *hnd =
+		selabel_open(SELABEL_CTX_FILE, f2_opts, ARRAY_SIZE(f2_opts));
 	free(path);
 
 	if (!hnd) {
-		perror("Unable to read valid file_contexts");
+		log_errno("Unable to read valid file_contexts");
 		exit(2);
 	}
 
 	selabel_close(hnd);
+}
+
+int main(int argc, char **argv)
+{
+	if (argc != 2) {
+		log_err("basedir not provided");
+		exit(1);
+	}
 
 	return 0;
 }
Signature · 1 line
2.55.0.229.g6434b31f56-goog
#1 lore raw

PATCH v2 2/2 tests/file_contexts: add tests for multiple SELABEL_OPT_PATH

Add unit tests in test_multiple.c to exercise opening the file contexts backend with multiple SELABEL_OPT_PATH options under various validation and path configuration scenarios.

The following test functions were added:
- Verifies opening multiple file contexts without validation.
- Verifies validation failure when contexts contain undefined types.
- Verifies extra files (.subs, .local, .homedirs) are processed only for the primary path.
- Verifies multiple files with the same definition, no error is raised.
- Verifies context lookups when providing three distinct SELABEL_OPT_PATH options.

---
 tests/file_contexts/Makefile        |   2 +-
 tests/file_contexts/test            |   5 +-
 tests/file_contexts/test_multiple.c | 233 ++++++++++++++++++++++++++++
 3 files changed, 238 insertions(+), 2 deletions(-)
 create mode 100644 tests/file_contexts/test_multiple.c
tests/file_contexts/Makefile +1 -1
index 592a65f..083ef25 100644
@@ -1,4 +1,4 @@
-TARGETS=test_open test_lookup test_open_base test_validate
+TARGETS=test_open test_lookup test_open_base test_validate test_multiple
 CFLAGS += -O2 -Werror -Wall
 LDLIBS += -lselinux
 
tests/file_contexts/test +4 -1
index 1534925..cd7849b 100755
@@ -5,7 +5,7 @@
 
 use Test;
 
-BEGIN { plan tests => 4; }
+BEGIN { plan tests => 5; }
 
 $basedir = $0;
 $basedir =~ s|(.*)/[^/]*|$1|;
@@ -22,4 +22,7 @@ ok( $result, 0 );
 $result = system "$basedir/test_validate $basedir 2>&1";
 ok( $result, 0 );
 
+$result = system "$basedir/test_multiple $basedir 2>&1";
+ok( $result, 0 );
+
 exit;
tests/file_contexts/test_multiple.c new file +233 -0

233 lines not on this page · raw message

Signature · 1 line
2.55.0.229.g6434b31f56-goog
maintainer
#2 lore raw

Re: [PATCH testsuite v2 2/2] tests/file_contexts: add tests for multiple SELABEL_OPT_PATH

Quoted 14 lines · Thiébaud Weksteen

Add unit tests in test_multiple.c to exercise opening the file contexts backend with multiple SELABEL_OPT_PATH options under various validation and path configuration scenarios.

The following test functions were added:
- Verifies opening multiple file contexts without validation.
- Verifies validation failure when contexts contain undefined types.
- Verifies extra files (.subs, .local, .homedirs) are processed only for the primary path.
- Verifies multiple files with the same definition, no error is raised.
- Verifies context lookups when providing three distinct SELABEL_OPT_PATH options.

Quoted 1 line

We need to avoid breaking the testsuite when it is run with older libselinux before
your patch too. Should just skip the multi-file tests when the system libselinux doesn't support it.

Quoted 280 lines
---
 tests/file_contexts/Makefile        |   2 +-
 tests/file_contexts/test            |   5 +-
 tests/file_contexts/test_multiple.c | 233 ++++++++++++++++++++++++++++
 3 files changed, 238 insertions(+), 2 deletions(-)
 create mode 100644 tests/file_contexts/test_multiple.c
tests/file_contexts/Makefile +1 -1
index 592a65f..083ef25 100644
@@ -1,4 +1,4 @@
-TARGETS=test_open test_lookup test_open_base test_validate
+TARGETS=test_open test_lookup test_open_base test_validate test_multiple
 CFLAGS += -O2 -Werror -Wall
 LDLIBS += -lselinux
 
tests/file_contexts/test +4 -1
index 1534925..cd7849b 100755
@@ -5,7 +5,7 @@
 
 use Test;
 
-BEGIN { plan tests => 4; }
+BEGIN { plan tests => 5; }
 
 $basedir = $0;
 $basedir =~ s|(.*)/[^/]*|$1|;
@@ -22,4 +22,7 @@ ok( $result, 0 );
 $result = system "$basedir/test_validate $basedir 2>&1";
 ok( $result, 0 );
 
+$result = system "$basedir/test_multiple $basedir 2>&1";
+ok( $result, 0 );
+
 exit;
tests/file_contexts/test_multiple.c new file +233 -1
new file mode 100644
index 0000000..65fb726
@@ -0,0 +1,233 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <selinux/label.h>
+#include <selinux/selinux.h>
+
+#include "internal.h"
+
+void test_multiple_no_validation(const char *basedir)
+{
+       struct selabel_handle *hnd;
+
+       /* f1.fc and f2.fc file */
+       char *f1_path, *f2_path;
+       asprintf(&f1_path, "%s/f1.fc", basedir);
+       asprintf(&f2_path, "%s/f2.fc", basedir);
+       struct selinux_opt opts[] = {
+               { .type = SELABEL_OPT_PATH, .value = f1_path },
+               { .type = SELABEL_OPT_PATH, .value = f2_path }
+       };
+
+       hnd = selabel_open(SELABEL_CTX_FILE, opts, ARRAY_SIZE(opts));
+       free(f1_path);
+       free(f2_path);
+
+       if (!hnd) {
+               log_errno("Unable to open file backend");
+               exit(2);
+       }
+
+       struct test_t tests[] = {
+               { .path = "/", .context = "system_u:object_r:rootfs:s0" },
+               {
+                       .path = "/base",
+                       .context = "system_u:object_r:test_base_t:s0"
+               },
+       };
+       assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
+
+       selabel_close(hnd);
+}
+
+void test_multiple_with_validation(const char *basedir)
+{
+       struct selabel_handle *hnd;
+
+       /* f1.fc and f2.fc file - f1 has undefined type rootfs in test policy */
+       char *f1_path, *f2_path;
+       asprintf(&f1_path, "%s/f1.fc", basedir);
+       asprintf(&f2_path, "%s/f2.fc", basedir);
+       struct selinux_opt opts[] = {
+               { .type = SELABEL_OPT_PATH, .value = f1_path },
+               { .type = SELABEL_OPT_PATH, .value = f2_path },
+               { .type = SELABEL_OPT_VALIDATE, .value = "1" }
+       };
+
+       hnd = selabel_open(SELABEL_CTX_FILE, opts, ARRAY_SIZE(opts));
+       free(f1_path);
+       free(f2_path);
+
+       if (hnd) {
+               log_err("Validation of f1 and f2 should have failed");
+               selabel_close(hnd);
+               exit(2);
+       }
+}
+
+void test_multiple_with_extras(const char *basedir)
+{
+       struct selabel_handle *hnd;
+       char *f2_path, *f3_path;
+       asprintf(&f2_path, "%s/f2.fc", basedir);
+       asprintf(&f3_path, "%s/f3.fc", basedir);
+
+       /* 1. f3.fc is the first path: extras (.subs, .local, .homedirs) of f3 ARE processed */
+       struct selinux_opt opts_f3_first[] = {
+               { .type = SELABEL_OPT_PATH, .value = f3_path },
+               { .type = SELABEL_OPT_PATH, .value = f2_path }
+       };
+       hnd = selabel_open(SELABEL_CTX_FILE, opts_f3_first,
+                          ARRAY_SIZE(opts_f3_first));
+       if (!hnd) {
+               log_errno("Unable to open file backend");
+               exit(2);
+       }
+
+       struct test_t tests_f3_first[] = {
+               { .path = "/", .context = "system_u:object_r:rootfs:s0" },
+               {
+                       .path = "/sub",
+                       .context = "system_u:object_r:test_subbed:s0"
+               },
+               {
+                       .path = "/local",
+                       .context = "system_u:object_r:test_local:s0"
+               },
+               {
+                       .path = "/homedirs",
+                       .context = "system_u:object_r:test_homedirs:s0"
+               },
+               {
+                       .path = "/base",
+                       .context = "system_u:object_r:test_base_t:s0"
+               },
+       };
+       assertContextsMatch(hnd, __func__, tests_f3_first,
+                           ARRAY_SIZE(tests_f3_first));
+       selabel_close(hnd);
+
+       /* 2. f2.fc is the first path, f3.fc is second: extras from f3 are NOT processed */
+       struct selinux_opt opts_f2_first[] = {
+               { .type = SELABEL_OPT_PATH, .value = f2_path },
+               { .type = SELABEL_OPT_PATH, .value = f3_path }
+       };
+       hnd = selabel_open(SELABEL_CTX_FILE, opts_f2_first,
+                          ARRAY_SIZE(opts_f2_first));
+       if (!hnd) {
+               log_errno("Unable to open file backend");
+               exit(2);
+       }
+
+       struct test_t tests_f2_first[] = {
+               {
+                       .path = "/base",
+                       .context = "system_u:object_r:test_base_t:s0"
+               },
+               { .path = "/", .context = "system_u:object_r:rootfs:s0" },
+               {
+                       .path = "/subbed",
+                       .context = "system_u:object_r:test_subbed:s0"
+               },
+               /* /sub, /local, /homedirs should NOT match the f3 extra contexts */
+               { .path = "/sub", .context = NULL },
+               { .path = "/local", .context = NULL },
+               { .path = "/homedirs", .context = NULL },
+       };
+       assertContextsMatch(hnd, __func__, tests_f2_first,
+                           ARRAY_SIZE(tests_f2_first));
+       selabel_close(hnd);
+
+       free(f2_path);
+       free(f3_path);
+}
+
+void test_multiple_three_paths(const char *basedir)
+{
+       struct selabel_handle *hnd;
+       char *f1_path, *f2_path, *f3_path;
+       asprintf(&f1_path, "%s/f1.fc", basedir);
+       asprintf(&f2_path, "%s/f2.fc", basedir);
+       asprintf(&f3_path, "%s/f3.fc", basedir);
+
+       struct selinux_opt opts[] = {
+               { .type = SELABEL_OPT_PATH, .value = f1_path },
+               { .type = SELABEL_OPT_PATH, .value = f2_path },
+               { .type = SELABEL_OPT_PATH, .value = f3_path }
+       };
+
+       hnd = selabel_open(SELABEL_CTX_FILE, opts, ARRAY_SIZE(opts));
+       free(f1_path);
+       free(f2_path);
+       free(f3_path);
+
+       if (!hnd) {
+               log_errno("Unable to open file backend");
+               exit(2);
+       }
+
+       struct test_t tests[] = {
+               { .path = "/", .context = "system_u:object_r:rootfs:s0" },
+               {
+                       .path = "/base",
+                       .context = "system_u:object_r:test_base_t:s0"
+               },
+               {
+                       .path = "/subbed",
+                       .context = "system_u:object_r:test_subbed:s0"
+               },
+       };
+       assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
+       selabel_close(hnd);
+}
+
+void test_multiple_duplicate_validation(const char *basedir)
+{
+       struct selabel_handle *hnd;
+
+       /* Two copies of f2.fc to provide duplicate specifications */
+       char *f2_path;
+       asprintf(&f2_path, "%s/f2.fc", basedir);
+       struct selinux_opt opts[] = {
+               { .type = SELABEL_OPT_PATH, .value = f2_path },
+               { .type = SELABEL_OPT_PATH, .value = f2_path },
+               { .type = SELABEL_OPT_VALIDATE, .value = "1" }
+       };
+
+       hnd = selabel_open(SELABEL_CTX_FILE, opts, ARRAY_SIZE(opts));
+       free(f2_path);
+
+       if (!hnd) {
+               log_errno("Unable to open file backend");
+               exit(2);
+       }
+
+       struct test_t tests[] = {
+               {
+                       .path = "/base",
+                       .context = "system_u:object_r:test_base_t:s0"
+               },
+       };
+       assertContextsMatch(hnd, __func__, tests, ARRAY_SIZE(tests));
+
+       selabel_close(hnd);
+}
+
+int main(int argc, char **argv)
+{
+       if (argc != 2) {
+               log_err("basedir not provided");
+               exit(1);
+       }
+
+       test_multiple_no_validation(argv[1]);
+       test_multiple_with_validation(argv[1]);
+       test_multiple_duplicate_validation(argv[1]);
+       test_multiple_with_extras(argv[1]);
+       test_multiple_three_paths(argv[1]);
+
+       return 0;
+}
--

2.55.0.229.g6434b31f56-goog