X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fuser-event.c;h=d3d4a5e8ad8962e35f0c29ebc75877e79e173146;hp=77d28c116e635fb74698e49f0c59dfb1cb193335;hb=336f4eb17fb50526ea9fda82262356581e1b9ae0;hpb=8b46ab92aeff52b7354bf4f250835f75b4bd824c diff --git a/discover/user-event.c b/discover/user-event.c index 77d28c1..d3d4a5e 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; } @@ -251,13 +252,14 @@ static char *parse_ip_addr(struct discover_context *ctx, const char *ip) struct pb_url *user_event_parse_conf_url(struct discover_context *ctx, struct event *event, bool *is_complete) { - const char *conffile, *pathprefix, *host, *bootfile; + const char *conffile, *pathprefix, *host, *bootfile, *bootfile_url; char *p, *basedir, *url_str; struct pb_url *url; conffile = event_get_param(event, "pxeconffile"); pathprefix = event_get_param(event, "pxepathprefix"); bootfile = event_get_param(event, "bootfile"); + bootfile_url = event_get_param(event, "bootfile_url"); /* If we're given a conf file, we're able to generate a complete URL to * the configuration file, and the parser doesn't need to do any @@ -287,7 +289,13 @@ 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)) { + *is_complete = true; + return pb_url_parse(ctx, bootfile_url); + } return NULL; } @@ -355,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; } @@ -390,13 +398,22 @@ static int user_event_dhcp(struct user_event *uev, struct event *event) uint8_t hwaddr[MAC_ADDR_SIZE]; + if (!event_get_param(event, "mac")) + return -1; + if (!event_get_param(event, "ip") && !event_get_param(event, "ipv6")) + return -1; + sscanf(event_get_param(event, "mac"), "%hhX:%hhX:%hhX:%hhX:%hhX:%hhX", hwaddr, hwaddr + 1, hwaddr + 2, hwaddr + 3, hwaddr + 4, hwaddr + 5); - system_info_set_interface_address(sizeof(hwaddr), hwaddr, - event_get_param(event, "ip")); + if (event_get_param(event, "ipv6")) + system_info_set_interface_address(sizeof(hwaddr), hwaddr, + event_get_param(event, "ipv6")); + else + system_info_set_interface_address(sizeof(hwaddr), hwaddr, + event_get_param(event, "ip")); dev = discover_device_create(handler, event_get_param(event, "mac"), event->device); @@ -411,6 +428,7 @@ static int user_event_add(struct user_event *uev, struct event *event) struct device_handler *handler = uev->handler; struct discover_context *ctx; struct discover_device *dev; + int rc; /* In case this is a network interface, try to refer to it by UUID */ dev = discover_device_create(handler, event_get_param(event, "mac"), @@ -418,7 +436,11 @@ static int user_event_add(struct user_event *uev, struct event *event) dev->device->id = talloc_strdup(dev, event->device); ctx = device_handler_discover_context_create(handler, dev); - parse_user_event(ctx, event); + rc = parse_user_event(ctx, event); + if (rc) { + pb_log("parse_user_event returned %d\n", rc); + return rc; + } device_handler_discover_context_commit(handler, ctx); @@ -461,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); @@ -651,12 +690,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; } @@ -711,6 +750,10 @@ struct user_event *user_event_init(struct device_handler *handler, strerror(errno)); } + /* Don't allow events from non-priviledged users */ + chown(PBOOT_USER_EVENT_SOCKET, 0, 0); + chmod(PBOOT_USER_EVENT_SOCKET, 0660); + waiter_register_io(waitset, uev->socket, WAIT_IN, user_event_process, uev);