X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=system.c;h=0fb98f1e36221f262a55712aaf81924aaa4249bb;hb=4625350465744c2446ac0b0dc821699fa1695c81;hp=4bbceee7bdf0cfb2a11d8e96817373cdb0864e98;hpb=79bbe6daf70feb27ec0e2060b86852015cd04465;p=project%2Fprocd.git diff --git a/system.c b/system.c index 4bbceee..0fb98f1 100644 --- a/system.c +++ b/system.c @@ -25,6 +25,8 @@ #include #include +#include +#include #include #include "procd.h" @@ -35,6 +37,12 @@ static struct blob_buf b; static int notify; static struct ubus_context *_ctx; +enum vjson_state { + VJSON_ERROR, + VJSON_CONTINUE, + VJSON_SUCCESS, +}; + static int system_board(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) @@ -65,6 +73,7 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj, if (!strcasecmp(key, "system type") || !strcasecmp(key, "processor") || + !strcasecmp(key, "cpu") || !strcasecmp(key, "model name")) { strtoul(val + 2, &key, 0); @@ -80,7 +89,7 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj, fclose(f); } - if ((f = fopen("/tmp/sysinfo/board_name", "r")) != NULL || + if ((f = fopen("/tmp/sysinfo/model", "r")) != NULL || (f = fopen("/proc/device-tree/model", "r")) != NULL) { if (fgets(line, sizeof(line), f)) @@ -114,6 +123,40 @@ static int system_board(struct ubus_context *ctx, struct ubus_object *obj, fclose(f); } + if ((f = fopen("/tmp/sysinfo/board_name", "r")) != NULL) + { + if (fgets(line, sizeof(line), f)) + { + val = strtok(line, "\t\n"); + + if (val) + blobmsg_add_string(&b, "board_name", val); + } + + fclose(f); + } + else if ((f = fopen("/proc/device-tree/compatible", "r")) != NULL) + { + if (fgets(line, sizeof(line), f)) + { + val = strtok(line, "\t\n"); + + if (val) + { + next = val; + while ((next = strchr(next, ',')) != NULL) + { + *next = '-'; + next++; + } + + blobmsg_add_string(&b, "board_name", val); + } + } + + fclose(f); + } + if ((f = fopen("/etc/openwrt_release", "r")) != NULL) { c = blobmsg_open_table(&b, "release"); @@ -193,9 +236,36 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj, #ifdef linux struct sysinfo info; void *c; + char line[256]; + char *key, *val; + unsigned long long available, cached; + FILE *f; if (sysinfo(&info)) return UBUS_STATUS_UNKNOWN_ERROR; + + if ((f = fopen("/proc/meminfo", "r")) == NULL) + return UBUS_STATUS_UNKNOWN_ERROR; + + /* if linux < 3.14 MemAvailable is not in meminfo */ + available = 0; + cached = 0; + + while (fgets(line, sizeof(line), f)) + { + key = strtok(line, " :"); + val = strtok(NULL, " "); + + if (!key || !val) + continue; + + if (!strcasecmp(key, "MemAvailable")) + available = 1024 * atoll(val); + else if (!strcasecmp(key, "Cached")) + cached = 1024 * atoll(val); + } + + fclose(f); #endif now = time(NULL); @@ -217,15 +287,23 @@ static int system_info(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_close_array(&b, c); c = blobmsg_open_table(&b, "memory"); - blobmsg_add_u64(&b, "total", info.mem_unit * info.totalram); - blobmsg_add_u64(&b, "free", info.mem_unit * info.freeram); - blobmsg_add_u64(&b, "shared", info.mem_unit * info.sharedram); - blobmsg_add_u64(&b, "buffered", info.mem_unit * info.bufferram); + blobmsg_add_u64(&b, "total", + (uint64_t)info.mem_unit * (uint64_t)info.totalram); + blobmsg_add_u64(&b, "free", + (uint64_t)info.mem_unit * (uint64_t)info.freeram); + blobmsg_add_u64(&b, "shared", + (uint64_t)info.mem_unit * (uint64_t)info.sharedram); + blobmsg_add_u64(&b, "buffered", + (uint64_t)info.mem_unit * (uint64_t)info.bufferram); + blobmsg_add_u64(&b, "available", available); + blobmsg_add_u64(&b, "cached", cached); blobmsg_close_table(&b, c); c = blobmsg_open_table(&b, "swap"); - blobmsg_add_u64(&b, "total", info.mem_unit * info.totalswap); - blobmsg_add_u64(&b, "free", info.mem_unit * info.freeswap); + blobmsg_add_u64(&b, "total", + (uint64_t)info.mem_unit * (uint64_t)info.totalswap); + blobmsg_add_u64(&b, "free", + (uint64_t)info.mem_unit * (uint64_t)info.freeswap); blobmsg_close_table(&b, c); #endif @@ -245,6 +323,7 @@ static int system_reboot(struct ubus_context *ctx, struct ubus_object *obj, enum { WDT_FREQUENCY, WDT_TIMEOUT, + WDT_MAGICCLOSE, WDT_STOP, __WDT_MAX }; @@ -252,6 +331,7 @@ enum { static const struct blobmsg_policy watchdog_policy[__WDT_MAX] = { [WDT_FREQUENCY] = { .name = "frequency", .type = BLOBMSG_TYPE_INT32 }, [WDT_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 }, + [WDT_MAGICCLOSE] = { .name = "magicclose", .type = BLOBMSG_TYPE_BOOL }, [WDT_STOP] = { .name = "stop", .type = BLOBMSG_TYPE_BOOL }, }; @@ -267,7 +347,8 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_parse(watchdog_policy, __WDT_MAX, tb, blob_data(msg), blob_len(msg)); if (tb[WDT_FREQUENCY]) { - unsigned int timeout = watchdog_timeout(0); + unsigned int timeout = tb[WDT_TIMEOUT] ? blobmsg_get_u32(tb[WDT_TIMEOUT]) : + watchdog_timeout(0); unsigned int freq = blobmsg_get_u32(tb[WDT_FREQUENCY]); if (freq) { @@ -283,9 +364,12 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj, if (timeout <= frequency) timeout = frequency * 2; - watchdog_timeout(timeout); + watchdog_timeout(timeout); } + if (tb[WDT_MAGICCLOSE]) + watchdog_set_magicclose(blobmsg_get_bool(tb[WDT_MAGICCLOSE])); + if (tb[WDT_STOP]) watchdog_set_stopped(blobmsg_get_bool(tb[WDT_STOP])); @@ -300,6 +384,7 @@ static int watchdog_set(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_string(&b, "status", status); blobmsg_add_u32(&b, "timeout", watchdog_timeout(0)); blobmsg_add_u32(&b, "frequency", watchdog_frequency(0)); + blobmsg_add_u8(&b, "magicclose", watchdog_get_magicclose()); ubus_send_reply(ctx, req, b.head); return 0; @@ -334,24 +419,243 @@ static int proc_signal(struct ubus_context *ctx, struct ubus_object *obj, return 0; } +__attribute__((format (printf, 2, 3))) +static enum vjson_state vjson_error(char **b, const char *fmt, ...) +{ + static char buf[256] = { 0 }; + const char *pfx = "Firmware image couldn't be validated: "; + va_list va; + int r; + + r = snprintf(buf, sizeof(buf), "%s", pfx); + if (r < 0) { + *b = "vjson_error() snprintf failed"; + return VJSON_ERROR; + } + + va_start(va, fmt); + r = vsnprintf(buf+r, sizeof(buf)-r, fmt, va); + if (r < 0) { + *b = "vjson_error() vsnprintf failed"; + return VJSON_ERROR; + } + va_end(va); + + *b = buf; + return VJSON_ERROR; +} + +static enum vjson_state vjson_parse_token(json_tokener *tok, char *buf, ssize_t len, char **err) +{ + json_object *jsobj = NULL; + + jsobj = json_tokener_parse_ex(tok, buf, len); + if (json_tokener_get_error(tok) == json_tokener_continue) + return VJSON_CONTINUE; + + if (json_tokener_get_error(tok) == json_tokener_success) { + if (json_object_get_type(jsobj) != json_type_object) { + json_object_put(jsobj); + return vjson_error(err, "result is not an JSON object"); + } + + blobmsg_add_object(&b, jsobj); + json_object_put(jsobj); + return VJSON_SUCCESS; + } + + return vjson_error(err, "failed to parse JSON: %s (%d)", + json_tokener_error_desc(json_tokener_get_error(tok)), + json_tokener_get_error(tok)); +} + +static enum vjson_state vjson_parse(int fd, char **err) +{ + enum vjson_state r = VJSON_ERROR; + size_t read_count = 0; + char buf[64] = { 0 }; + json_tokener *tok; + ssize_t len; + int _errno; + + tok = json_tokener_new(); + if (!tok) + return vjson_error(err, "json_tokener_new() failed"); + + vjson_error(err, "incomplete JSON input"); + + while ((len = read(fd, buf, sizeof(buf)))) { + if (len < 0 && errno == EINTR) + continue; + + if (len < 0) { + _errno = errno; + json_tokener_free(tok); + return vjson_error(err, "read() failed: %s (%d)", + strerror(_errno), _errno); + } + + read_count += len; + r = vjson_parse_token(tok, buf, len, err); + if (r != VJSON_CONTINUE) + break; + + memset(buf, 0, sizeof(buf)); + } + + if (read_count == 0) + vjson_error(err, "no JSON input"); + + json_tokener_free(tok); + return r; +} + +/** + * validate_firmware_image_call - perform validation & store result in global b + * + * @file: firmware image path + */ +static enum vjson_state validate_firmware_image_call(const char *file, char **err) +{ + const char *path = "/usr/libexec/validate_firmware_image"; + enum vjson_state ret = VJSON_ERROR; + int _errno; + int fds[2]; + int fd; + + blob_buf_init(&b, 0); + vjson_error(err, "unhandled error"); + + if (pipe(fds)) { + _errno = errno; + return vjson_error(err, "pipe() failed: %s (%d)", + strerror(_errno), _errno); + } + + switch (fork()) { + case -1: + _errno = errno; + + close(fds[0]); + close(fds[1]); + + return vjson_error(err, "fork() failed: %s (%d)", + strerror(_errno), _errno); + case 0: + /* Set stdin & stderr to /dev/null */ + fd = open("/dev/null", O_RDWR); + if (fd >= 0) { + dup2(fd, 0); + dup2(fd, 2); + close(fd); + } + + /* Set stdout to the shared pipe */ + dup2(fds[1], 1); + close(fds[0]); + close(fds[1]); + + execl(path, path, file, NULL); + exit(errno); + } + + /* Parent process */ + close(fds[1]); + + ret = vjson_parse(fds[0], err); + close(fds[0]); + + return ret; +} + +enum { + VALIDATE_FIRMWARE_IMAGE_PATH, + __VALIDATE_FIRMWARE_IMAGE_MAX, +}; + +static const struct blobmsg_policy validate_firmware_image_policy[__VALIDATE_FIRMWARE_IMAGE_MAX] = { + [VALIDATE_FIRMWARE_IMAGE_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, +}; + +static int validate_firmware_image(struct ubus_context *ctx, + struct ubus_object *obj, + struct ubus_request_data *req, + const char *method, struct blob_attr *msg) +{ + struct blob_attr *tb[__VALIDATE_FIRMWARE_IMAGE_MAX]; + enum vjson_state ret = VJSON_ERROR; + char *err; + + if (!msg) + return UBUS_STATUS_INVALID_ARGUMENT; + + blobmsg_parse(validate_firmware_image_policy, __VALIDATE_FIRMWARE_IMAGE_MAX, tb, blob_data(msg), blob_len(msg)); + if (!tb[VALIDATE_FIRMWARE_IMAGE_PATH]) + return UBUS_STATUS_INVALID_ARGUMENT; + + ret = validate_firmware_image_call(blobmsg_get_string(tb[VALIDATE_FIRMWARE_IMAGE_PATH]), &err); + if (ret != VJSON_SUCCESS) + return UBUS_STATUS_UNKNOWN_ERROR; + + ubus_send_reply(ctx, req, b.head); + + return UBUS_STATUS_OK; +} + enum { SYSUPGRADE_PATH, + SYSUPGRADE_FORCE, + SYSUPGRADE_BACKUP, SYSUPGRADE_PREFIX, SYSUPGRADE_COMMAND, + SYSUPGRADE_OPTIONS, __SYSUPGRADE_MAX }; static const struct blobmsg_policy sysupgrade_policy[__SYSUPGRADE_MAX] = { [SYSUPGRADE_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, + [SYSUPGRADE_FORCE] = { .name = "force", .type = BLOBMSG_TYPE_BOOL }, + [SYSUPGRADE_BACKUP] = { .name = "backup", .type = BLOBMSG_TYPE_STRING }, [SYSUPGRADE_PREFIX] = { .name = "prefix", .type = BLOBMSG_TYPE_STRING }, [SYSUPGRADE_COMMAND] = { .name = "command", .type = BLOBMSG_TYPE_STRING }, + [SYSUPGRADE_OPTIONS] = { .name = "options", .type = BLOBMSG_TYPE_TABLE }, }; +static void sysupgrade_error(struct ubus_context *ctx, + struct ubus_request_data *req, + const char *message) +{ + void *c; + + blob_buf_init(&b, 0); + + c = blobmsg_open_table(&b, "error"); + blobmsg_add_string(&b, "message", message); + blobmsg_close_table(&b, c); + + ubus_send_reply(ctx, req, b.head); +} + static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { + enum { + VALIDATION_VALID, + VALIDATION_FORCEABLE, + VALIDATION_ALLOW_BACKUP, + __VALIDATION_MAX + }; + static const struct blobmsg_policy validation_policy[__VALIDATION_MAX] = { + [VALIDATION_VALID] = { .name = "valid", .type = BLOBMSG_TYPE_BOOL }, + [VALIDATION_FORCEABLE] = { .name = "forceable", .type = BLOBMSG_TYPE_BOOL }, + [VALIDATION_ALLOW_BACKUP] = { .name = "allow_backup", .type = BLOBMSG_TYPE_BOOL }, + }; + struct blob_attr *validation[__VALIDATION_MAX]; struct blob_attr *tb[__SYSUPGRADE_MAX]; + bool valid, forceable, allow_backup; + enum vjson_state ret = VJSON_ERROR; + char *err; if (!msg) return UBUS_STATUS_INVALID_ARGUMENT; @@ -360,10 +664,45 @@ static int sysupgrade(struct ubus_context *ctx, struct ubus_object *obj, if (!tb[SYSUPGRADE_PATH] || !tb[SYSUPGRADE_PREFIX]) return UBUS_STATUS_INVALID_ARGUMENT; + ret = validate_firmware_image_call(blobmsg_get_string(tb[SYSUPGRADE_PATH]), &err); + if (ret != VJSON_SUCCESS) { + sysupgrade_error(ctx, req, err); + return UBUS_STATUS_UNKNOWN_ERROR; + } + + blobmsg_parse(validation_policy, __VALIDATION_MAX, validation, blob_data(b.head), blob_len(b.head)); + + if (!validation[VALIDATION_VALID] || !validation[VALIDATION_FORCEABLE] || + !validation[VALIDATION_ALLOW_BACKUP]) { + sysupgrade_error(ctx, req, "Validation script provided invalid input"); + return UBUS_STATUS_INVALID_ARGUMENT; + } + + valid = validation[VALIDATION_VALID] && blobmsg_get_bool(validation[VALIDATION_VALID]); + forceable = validation[VALIDATION_FORCEABLE] && blobmsg_get_bool(validation[VALIDATION_FORCEABLE]); + allow_backup = validation[VALIDATION_ALLOW_BACKUP] && blobmsg_get_bool(validation[VALIDATION_ALLOW_BACKUP]); + + if (!valid) { + if (!forceable) { + sysupgrade_error(ctx, req, "Firmware image is broken and cannot be installed"); + return UBUS_STATUS_NOT_SUPPORTED; + } else if (!tb[SYSUPGRADE_FORCE] || !blobmsg_get_bool(tb[SYSUPGRADE_FORCE])) { + sysupgrade_error(ctx, req, "Firmware image is invalid"); + return UBUS_STATUS_NOT_SUPPORTED; + } + } else if (!allow_backup && tb[SYSUPGRADE_BACKUP]) { + sysupgrade_error(ctx, req, "Firmware image doesn't allow preserving a backup"); + return UBUS_STATUS_NOT_SUPPORTED; + } + sysupgrade_exec_upgraded(blobmsg_get_string(tb[SYSUPGRADE_PREFIX]), blobmsg_get_string(tb[SYSUPGRADE_PATH]), - tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL); - return 0; + tb[SYSUPGRADE_BACKUP] ? blobmsg_get_string(tb[SYSUPGRADE_BACKUP]) : NULL, + tb[SYSUPGRADE_COMMAND] ? blobmsg_get_string(tb[SYSUPGRADE_COMMAND]) : NULL, + tb[SYSUPGRADE_OPTIONS]); + + /* sysupgrade_exec_upgraded() will never return unless something has gone wrong */ + return UBUS_STATUS_UNKNOWN_ERROR; } static void @@ -379,6 +718,7 @@ static const struct ubus_method system_methods[] = { UBUS_METHOD_NOARG("reboot", system_reboot), UBUS_METHOD("watchdog", watchdog_set, watchdog_policy), UBUS_METHOD("signal", proc_signal, signal_policy), + UBUS_METHOD("validate_firmware_image", validate_firmware_image, validate_firmware_image_policy), UBUS_METHOD("sysupgrade", sysupgrade, sysupgrade_policy), };