From 939660528bf1568c55b6dcf982cc9020c1dbcdd2 Mon Sep 17 00:00:00 2001 From: Alan Dunn Date: Wed, 24 Feb 2016 08:12:25 -0800 Subject: Change parser interface to allow stat Currently, the GRUB2 parser incorrectly reports "[ -f ]" as false if the size of the file is above 1 MB. This patch changes the parser interface to allow stating files (with parser_stat_file). Then in the implementation of "[ -f ]", we can use parser_stat_file instead of parser_request_file which has the size limitation. I eliminate parser_check_dir in lieu of this new interface, which has the side effect of making "[ -d ]" work (the error code for stat was not checked correctly before). I add a basic test for the test file operations -f, -s, and -d (to show that my changes to test file operations do not break them) and minorly modify the test framework to ensure it has enough fidelity to cause the expected results. Unfortunately the test wouldn't have caught the issue with -d, since the test framework stubs out the parser interface itself. Nor can the test framework catch the initial problem with -f because the imposed limit is (transitively) in function parser_request_file. Note that -f and -d follow symlinks despite the fact that GRUB does not (see http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00142.html discussing GRUB's behavior). This is not a change to Petitboot's behavior though. Tested: The test test-grub2-test-file-ops passes. I booted Petitboot against a GRUB snippet: status=success if [ ! -f /large_file -a $status = success ] then status=fail_large_file fi if [ ! -d /a_directory -a $status = success ] then status=fail_dir fi menuentry $status { linux /vmlinux } (after making /large_file a file of size > 1 MiB and /a_directory a directory) and the menuentry had title "success", as desired. Signed-off-by: Alan Dunn Signed-off-by: Sam Mendoza-Jonas --- test/parser/Makefile.am | 1 + test/parser/parser-test.h | 5 +++ test/parser/test-grub2-test-file-ops.c | 63 ++++++++++++++++++++++++++++++++++ test/parser/utils.c | 29 ++++++++++++---- 4 files changed, 92 insertions(+), 6 deletions(-) create mode 100644 test/parser/test-grub2-test-file-ops.c (limited to 'test') diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am index dddb472..e4f9b9c 100644 --- a/test/parser/Makefile.am +++ b/test/parser/Makefile.am @@ -37,6 +37,7 @@ parser_TESTS = \ test/parser/test-grub2-sles-btrfs-snapshot \ test/parser/test-grub2-lexer-error \ test/parser/test-grub2-parser-error \ + test/parser/test-grub2-test-file-ops \ test/parser/test-kboot-single \ test/parser/test-yaboot-empty \ test/parser/test-yaboot-single \ diff --git a/test/parser/parser-test.h b/test/parser/parser-test.h index 21b5b9c..383680f 100644 --- a/test/parser/parser-test.h +++ b/test/parser/parser-test.h @@ -33,10 +33,15 @@ int test_run_parser(struct parser_test *test, const char *parser_name); void test_hotplug_device(struct parser_test *test, struct discover_device *dev); void test_remove_device(struct parser_test *test, struct discover_device *dev); +/* Note that the testing filesystem will only reflect files and + * directories that you explicitly add, so it is possible for a test + * to inconsistently believe that a file exists but that its parent + * directory does not. */ void test_add_file_data(struct parser_test *test, struct discover_device *dev, const char *filename, const void *data, int size); void test_add_dir(struct parser_test *test, struct discover_device *dev, const char *dirname); + void test_set_event_source(struct parser_test *test); void test_set_event_param(struct event *event, const char *name, const char *value); diff --git a/test/parser/test-grub2-test-file-ops.c b/test/parser/test-grub2-test-file-ops.c new file mode 100644 index 0000000..b614fc1 --- /dev/null +++ b/test/parser/test-grub2-test-file-ops.c @@ -0,0 +1,63 @@ + +#include "parser-test.h" + +#if 0 /* PARSER_EMBEDDED_CONFIG */ +status=success + +if [ -f /file_that_does_not_exist -a $status = success ] +then status=fail_f_1 +fi +if [ -f /dir -a $status = success ] +then status=fail_f_2 +fi +if [ ! -f /empty_file -a $status = success ] +then status=fail_f_3 +fi + +if [ -s /file_that_does_not_exist -a $status = success ] +then status=fail_s_1 +fi +if [ ! -s /dir -a $status = success ] +then status=fail_s_2 +fi +if [ -s /empty_file -a $status = success ] +then status=fail_s_3 +fi +if [ ! -s /non_empty_file -a $status = success ] +then status=fail_s_4 +fi + +if [ -d /file_that_does_not_exist -a $status = success ] +then status=fail_d_1 +fi +if [ ! -d /dir -a $status = success ] +then status=fail_d_2 +fi +if [ -d /empty_file -a $status = success ] +then status=fail_d_3 +fi + +menuentry $status { + linux /vmlinux +} +#endif + +void run_test(struct parser_test *test) +{ + struct discover_boot_option *opt; + struct discover_context *ctx; + + ctx = test->ctx; + + test_read_conf_embedded(test, "/grub2/grub.cfg"); + test_add_file_data(test, ctx->device, "/empty_file", "", 0); + test_add_file_data(test, ctx->device, "/non_empty_file", "1", 1); + test_add_dir(test, ctx->device, "/dir"); + + test_run_parser(test, "grub2"); + + check_boot_option_count(ctx, 1); + opt = get_boot_option(ctx, 0); + + check_name(opt, "success"); +} diff --git a/test/parser/utils.c b/test/parser/utils.c index 0050d13..2891969 100644 --- a/test/parser/utils.c +++ b/test/parser/utils.c @@ -193,6 +193,9 @@ void test_add_dir(struct parser_test *test, struct discover_device *dev, file->type = TEST_DIR; file->dev = dev; file->name = dirname; + /* Pick a non-zero size for directories so that "[ -s ]" sees that the file has non-zero size. */ + file->size = 1; list_add(&test->files, &file->list); } @@ -241,20 +244,34 @@ int parser_request_file(struct discover_context *ctx, return -1; } -int parser_check_dir(struct discover_context *ctx, - struct discover_device *dev, const char *dirname) +int parser_stat_path(struct discover_context *ctx, + struct discover_device *dev, const char *path, + struct stat *statbuf) { struct parser_test *test = ctx->test_data; struct test_file *file; - printf("%s: %s\n", __func__, dirname); - list_for_each_entry(&test->files, file, list) { if (file->dev != dev) continue; - if (strcmp(file->name, dirname)) + if (strcmp(file->name, path)) continue; - return file->type == TEST_DIR ? 0 : -1; + + statbuf->st_size = (off_t)file->size; + switch (file->type) { + case TEST_FILE: + statbuf->st_mode = S_IFREG; + break; + case TEST_DIR: + statbuf->st_mode = S_IFDIR; + break; + default: + fprintf(stderr, "%s: bad test file mode %d!", __func__, + file->type); + exit(EXIT_FAILURE); + } + + return 0; } return -1; -- cgit v1.1