X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fuser-event.c;h=cc03ffd3bfb091aeed9245f9246d4d7d00325e1f;hb=9e869ebe3a5127575105d82c4d289d95cbed2db9;hp=128186beb0468be9f17c321e4d61199ac1746693;hpb=3ac4c8727c54c020014f0731549c80400476a138;p=petitboot diff --git a/discover/user-event.c b/discover/user-event.c index 128186b..cc03ffd 100644 --- a/discover/user-event.c +++ b/discover/user-event.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -94,13 +95,13 @@ static struct resource *user_event_resource(struct discover_boot_option *opt, siaddr = event_get_param(event, "siaddr"); if (!siaddr) { - pb_log("%s: next server option not found\n", __func__); + pb_log_fn("next server option not found\n"); return NULL; } boot_file = event_get_param(event, "bootfile"); if (!boot_file) { - pb_log("%s: bootfile not found\n", __func__); + pb_log_fn("bootfile not found\n"); return NULL; } @@ -148,7 +149,7 @@ static int parse_user_event(struct discover_context *ctx, struct event *event) val = event_get_param(event, "name"); if (!val) { - pb_log("%s: no name found\n", __func__); + pb_log_fn("no name found\n"); goto fail_opt; } @@ -157,7 +158,7 @@ static int parse_user_event(struct discover_context *ctx, struct event *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__, + pb_log_fn("no boot image found for %s!\n", opt->name); goto fail_opt; } @@ -288,7 +289,7 @@ struct pb_url *user_event_parse_conf_url(struct discover_context *ctx, host = parse_host_addr(event); if (!host) { - pb_log("%s: host address not found\n", __func__); + pb_log_fn("host address not found\n"); /* No full URLs and no host address? Check for DHCPv6 options */ if (bootfile_url && is_url(bootfile_url)) { @@ -362,7 +363,7 @@ char **user_event_parse_conf_filenames( } if (!mac_addr && !ip_hex) { - pb_log("%s: neither mac nor ip parameter found\n", __func__); + pb_log_fn("neither mac nor ip parameter found\n"); return NULL; } @@ -482,15 +483,32 @@ static int user_event_url(struct user_event *uev, struct event *event) 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); + struct boot_command *cmd = talloc_zero(handler, struct boot_command); + struct discover_boot_option *opt; + const char *name; + + name = event_get_param(event, "name"); + if (name) { + pb_log("Finding boot option %s @ %s\n", name, event->device); + opt = device_handler_find_option_by_name(handler, + event->device, name); + if (!opt) { + pb_log("No option with name %s\n", name); + return -1; + } - 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")); + pb_log("Found option with id %s!\n", opt->option->id); + cmd->option_id = talloc_strdup(cmd, opt->option->id); + } else { + pb_log("Booting based on full boot command\n"); + 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); + device_handler_boot(handler, false, cmd); talloc_free(cmd); @@ -639,10 +657,10 @@ static void user_event_handle_message(struct user_event *uev, char *buf, break; case EVENT_ACTION_URL: result = user_event_url(uev, event); - goto out; + break; case EVENT_ACTION_DHCP: result = user_event_dhcp(uev, event); - goto out; + break; case EVENT_ACTION_BOOT: result = user_event_boot(uev, event); break; @@ -653,13 +671,17 @@ static void user_event_handle_message(struct user_event *uev, char *buf, result = user_event_plugin(uev, event); break; default: + result = -1; break; } + if (result) + pb_log_fn("failed to handle action %d\n", event->action); + /* user_event_url() and user_event_dhcp() will steal the event context, * but all others still need to free */ - talloc_free(event); -out: + if (talloc_parent(event) == uev) + talloc_free(event); return; } @@ -672,12 +694,12 @@ static int user_event_process(void *arg) 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)); + pb_log_fn("socket read failed: %s\n", strerror(errno)); return 0; } if (len == 0) { - pb_log("%s: empty", __func__); + pb_log_fn("empty\n"); return 0; } @@ -732,6 +754,13 @@ struct user_event *user_event_init(struct device_handler *handler, strerror(errno)); } + /* Don't allow events from non-priviledged users */ + if (chown(PBOOT_USER_EVENT_SOCKET, 0, 0)) + pb_log_fn("Error setting socket ownership: %m\n"); + errno = 0; + if (chmod(PBOOT_USER_EVENT_SOCKET, 0660)) + pb_log_fn("Error setting socket permissions: %m\n"); + waiter_register_io(waitset, uev->socket, WAIT_IN, user_event_process, uev);