discover/discover-server: Restrict clients based on uid

[petitboot] / discover / boot.c

diff --git a/discover/boot.c b/discover/boot.c
index 3de7d28e3310979d2003c2f23078e7f7826cd9b9..91fc46d642ebbc11cea7e35291c9189cddd18267 100644 (file)
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -46,6 +46,7 @@ static void __attribute__((format(__printf__, 4, 5))) update_status(
 
        status.type = type;
        status.backlog = false;
+       status.boot_active = type == STATUS_INFO;
 
        pb_debug("boot status: [%d] %s\n", type, status.message);
 
@@ -525,25 +526,31 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
        update_status(status_fn, status_arg, STATUS_INFO,
                        _("Booting %s"), boot_desc);
 
+       boot_task = talloc_zero(ctx, struct boot_task);
+       boot_task->dry_run = dry_run;
+       boot_task->status_fn = status_fn;
+       boot_task->status_arg = status_arg;
+
        if (cmd && cmd->boot_image_file) {
-               image = pb_url_parse(opt, cmd->boot_image_file);
+               image = pb_url_parse(boot_task, cmd->boot_image_file);
        } else if (opt && opt->boot_image) {
                image = opt->boot_image->url;
        } else {
                pb_log_fn("no image specified\n");
-               update_status(status_fn, status_arg, STATUS_INFO,
+               update_status(status_fn, status_arg, STATUS_ERROR,
                                _("Boot failed: no image specified"));
+               talloc_free(boot_task);
                return NULL;
        }
 
        if (cmd && cmd->initrd_file) {
-               initrd = pb_url_parse(opt, cmd->initrd_file);
+               initrd = pb_url_parse(boot_task, cmd->initrd_file);
        } else if (opt && opt->initrd) {
                initrd = opt->initrd->url;
        }
 
        if (cmd && cmd->dtb_file) {
-               dtb = pb_url_parse(opt, cmd->dtb_file);
+               dtb = pb_url_parse(boot_task, cmd->dtb_file);
        } else if (opt && opt->dtb) {
                dtb = opt->dtb->url;
        }
@@ -553,10 +560,6 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
                setenv("https_proxy", opt->proxy, 1);
        }
 
-       boot_task = talloc_zero(ctx, struct boot_task);
-       boot_task->dry_run = dry_run;
-       boot_task->status_fn = status_fn;
-       boot_task->status_arg = status_arg;
        list_init(&boot_task->resources);
 
        lockdown_type = lockdown_status();
@@ -585,7 +588,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
                } else {
                        pb_log("%s: no command line signature file"
                                " specified\n", __func__);
-                       update_status(status_fn, status_arg, STATUS_INFO,
+                       update_status(status_fn, status_arg, STATUS_ERROR,
                                        _("Boot failed: no command line"
                                                " signature file specified"));
                        talloc_free(boot_task);
@@ -654,7 +657,7 @@ void boot_cancel(struct boot_task *task)
 {
        task->cancelled = true;
 
-       update_status(task->status_fn, task->status_arg, STATUS_INFO,
+       update_status(task->status_fn, task->status_arg, STATUS_ERROR,
                        _("Boot cancelled"));
 
        cleanup_cancellations(task, NULL);