Add support for GPG signature enforcement on booted

[petitboot] / discover / user-event.c

diff --git a/discover/user-event.c b/discover/user-event.c
index 1f7004509041123091ff85b9234c7e8b08133fed..6ea754fea808de474368b887a43278aef8248fbb 100644 (file)
--- a/discover/user-event.c
+++ b/discover/user-event.c
@@ -54,8 +54,14 @@ static const char *event_action_name(enum event_action action)
                return "add";
        case EVENT_ACTION_REMOVE:
                return "remove";
                return "add";
        case EVENT_ACTION_REMOVE:
                return "remove";

+       case EVENT_ACTION_URL:
+               return "url";

        case EVENT_ACTION_DHCP:
                return "dhcp";
        case EVENT_ACTION_DHCP:
                return "dhcp";

+       case EVENT_ACTION_BOOT:
+               return "boot";
+       case EVENT_ACTION_SYNC:
+               return "sync";

        default:
                break;
        }
        default:
                break;
        }


@@ -76,7 +82,7 @@ static void user_event_print_event(struct event __attribute__((unused)) *event)
 }
 
 static struct resource *user_event_resource(struct discover_boot_option *opt,
 }
 
 static struct resource *user_event_resource(struct discover_boot_option *opt,

-               struct event *event)
+               struct event *event, bool gen_boot_args_sigfile)

 {
        const char *siaddr, *boot_file;
        struct resource *res;
 {
        const char *siaddr, *boot_file;
        struct resource *res;


@@ -95,7 +101,16 @@ static struct resource *user_event_resource(struct discover_boot_option *opt,
                return NULL;
        }
 
                return NULL;
        }
 

-       url_str = talloc_asprintf(opt, "%s%s/%s", "tftp://", siaddr, boot_file);
+       if (gen_boot_args_sigfile) {
+               char* args_sigfile_default = talloc_asprintf(opt,
+                       "%s.cmdline.sig", boot_file);
+               url_str = talloc_asprintf(opt, "%s%s/%s", "tftp://", siaddr,
+                       args_sigfile_default);
+               talloc_free(args_sigfile_default);
+       }
+       else
+               url_str = talloc_asprintf(opt, "%s%s/%s", "tftp://", siaddr,
+                       boot_file);

        url = pb_url_parse(opt, url_str);
        talloc_free(url_str);
 
        url = pb_url_parse(opt, url_str);
        talloc_free(url_str);
 


@@ -137,12 +152,13 @@ static int parse_user_event(struct discover_context *ctx, struct event *event)
        opt->id = talloc_asprintf(opt, "%s#%s", dev->id, val);
        opt->name = talloc_strdup(opt, val);
 
        opt->id = talloc_asprintf(opt, "%s#%s", dev->id, val);
        opt->name = talloc_strdup(opt, val);
 

-       d_opt->boot_image = user_event_resource(d_opt, event);
+       d_opt->boot_image = user_event_resource(d_opt, event, false);

        if (!d_opt->boot_image) {
                pb_log("%s: no boot image found for %s!\n", __func__,
                                opt->name);
                goto fail_opt;
        }
        if (!d_opt->boot_image) {
                pb_log("%s: no boot image found for %s!\n", __func__,
                                opt->name);
                goto fail_opt;
        }

+       d_opt->args_sig_file = user_event_resource(d_opt, event, true);

 
        val = event_get_param(event, "rootpath");
        if (val) {
 
        val = event_get_param(event, "rootpath");
        if (val) {


@@ -430,6 +446,48 @@ static int user_event_remove(struct user_event *uev, struct event *event)
        return 0;
 }
 
        return 0;
 }
 

+static int user_event_url(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       const char *url;
+
+       url = event_get_param(event, "url");
+       if (url)
+               device_handler_process_url(handler, url, NULL, NULL);
+
+       return 0;
+}
+
+static int user_event_boot(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+       struct boot_command *cmd = talloc(handler, struct boot_command);
+
+       cmd->option_id = talloc_strdup(cmd, event_get_param(event, "id"));
+       cmd->boot_image_file = talloc_strdup(cmd, event_get_param(event, "image"));
+       cmd->initrd_file = talloc_strdup(cmd, event_get_param(event, "initrd"));
+       cmd->dtb_file = talloc_strdup(cmd, event_get_param(event, "dtb"));
+       cmd->boot_args = talloc_strdup(cmd, event_get_param(event, "args"));
+
+       device_handler_boot(handler, cmd);
+
+       talloc_free(cmd);
+
+       return 0;
+}
+
+static int user_event_sync(struct user_event *uev, struct event *event)
+{
+       struct device_handler *handler = uev->handler;
+
+       if (strncasecmp(event->device, "all", strlen("all")) != 0)
+               device_sync_snapshots(handler, event->device);
+       else
+               device_sync_snapshots(handler, NULL);
+
+       return 0;
+}
+

 static void user_event_handle_message(struct user_event *uev, char *buf,
        int len)
 {
 static void user_event_handle_message(struct user_event *uev, char *buf,
        int len)
 {


@@ -453,12 +511,21 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
        case EVENT_ACTION_REMOVE:
                result = user_event_remove(uev, event);
                break;
        case EVENT_ACTION_REMOVE:
                result = user_event_remove(uev, event);
                break;

+       case EVENT_ACTION_URL:
+               result = user_event_url(uev, event);
+               break;

        case EVENT_ACTION_CONF:
                result = user_event_conf(uev, event);
                break;
        case EVENT_ACTION_DHCP:
                result = user_event_dhcp(uev, event);
                break;
        case EVENT_ACTION_CONF:
                result = user_event_conf(uev, event);
                break;
        case EVENT_ACTION_DHCP:
                result = user_event_dhcp(uev, event);
                break;

+       case EVENT_ACTION_BOOT:
+               result = user_event_boot(uev, event);
+               break;
+       case EVENT_ACTION_SYNC:
+               result = user_event_sync(uev, event);
+               break;

        default:
                break;
        }
        default:
                break;
        }


@@ -471,10 +538,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf,
 static int user_event_process(void *arg)
 {
        struct user_event *uev = arg;
 static int user_event_process(void *arg)
 {
        struct user_event *uev = arg;

-       char buf[PBOOT_USER_EVENT_SIZE];
+       char buf[PBOOT_USER_EVENT_SIZE + 1];

        int len;
 
        int len;
 

-       len = recvfrom(uev->socket, buf, sizeof(buf), 0, NULL, NULL);
+       len = recvfrom(uev->socket, buf, PBOOT_USER_EVENT_SIZE, 0, NULL, NULL);

 
        if (len < 0) {
                pb_log("%s: socket read failed: %s", __func__, strerror(errno));
 
        if (len < 0) {
                pb_log("%s: socket read failed: %s", __func__, strerror(errno));


@@ -486,6 +553,8 @@ static int user_event_process(void *arg)
                return 0;
        }
 
                return 0;
        }
 

+       buf[len] = '\0';
+

        pb_debug("%s: %u bytes\n", __func__, len);
 
        user_event_handle_message(uev, buf, len);
        pb_debug("%s: %u bytes\n", __func__, len);
 
        user_event_handle_message(uev, buf, len);