X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=file.c;h=a09e9de7a44e846c0e3d0bcabf89ba56ce7a1f92;hp=e4c957eef291fa355ab1b4a7b43c851c61057853;hb=cfe1e75c91bc1bac82e6caab3e652b0ebee59524;hpb=4cc6a9deb8eb65c8771ed56ae9fc950f3efa99c6 diff --git a/file.c b/file.c index e4c957e..a09e9de 100644 --- a/file.c +++ b/file.c @@ -2,6 +2,7 @@ * rpcd - UBUS RPC server * * Copyright (C) 2013-2014 Jo-Philipp Wich + * Copyright (C) 2016 Luka Perkov * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -27,7 +28,9 @@ #include #include #include +#include #include +#include #include @@ -69,14 +72,40 @@ struct rpc_file_exec_context { static struct blob_buf buf; enum { - RPC_F_PATH, - RPC_F_DATA, - __RPC_F_MAX, + RPC_F_R_PATH, + __RPC_F_R_MAX, }; -static const struct blobmsg_policy rpc_file_policy[__RPC_F_MAX] = { - [RPC_F_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, - [RPC_F_DATA] = { .name = "data", .type = BLOBMSG_TYPE_STRING }, +static const struct blobmsg_policy rpc_file_r_policy[__RPC_F_R_MAX] = { + [RPC_F_R_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, +}; + +enum { + RPC_F_RB_PATH, + RPC_F_RB_BASE64, + __RPC_F_RB_MAX, +}; + +static const struct blobmsg_policy rpc_file_rb_policy[__RPC_F_RB_MAX] = { + [RPC_F_RB_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, + [RPC_F_RB_BASE64] = { .name = "base64", .type = BLOBMSG_TYPE_BOOL }, +}; + +enum { + RPC_F_RW_PATH, + RPC_F_RW_DATA, + RPC_F_RW_APPEND, + RPC_F_RW_MODE, + RPC_F_RW_BASE64, + __RPC_F_RW_MAX, +}; + +static const struct blobmsg_policy rpc_file_rw_policy[__RPC_F_RW_MAX] = { + [RPC_F_RW_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING }, + [RPC_F_RW_DATA] = { .name = "data", .type = BLOBMSG_TYPE_STRING }, + [RPC_F_RW_APPEND] = { .name = "append", .type = BLOBMSG_TYPE_BOOL }, + [RPC_F_RW_MODE] = { .name = "mode", .type = BLOBMSG_TYPE_INT32 }, + [RPC_F_RW_BASE64] = { .name = "base64", .type = BLOBMSG_TYPE_BOOL }, }; enum { @@ -129,17 +158,17 @@ rpc_errno_status(void) static struct blob_attr ** rpc_check_path(struct blob_attr *msg, char **path, struct stat *s) { - static struct blob_attr *tb[__RPC_F_MAX]; + static struct blob_attr *tb[__RPC_F_R_MAX]; - blobmsg_parse(rpc_file_policy, __RPC_F_MAX, tb, blob_data(msg), blob_len(msg)); + blobmsg_parse(rpc_file_r_policy, __RPC_F_R_MAX, tb, blob_data(msg), blob_len(msg)); - if (!tb[RPC_F_PATH]) + if (!tb[RPC_F_R_PATH]) { errno = EINVAL; return NULL; } - *path = blobmsg_data(tb[RPC_F_PATH]); + *path = blobmsg_data(tb[RPC_F_R_PATH]); if (stat(*path, s)) return NULL; @@ -152,12 +181,22 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { - int fd, rv, len; + static struct blob_attr *tb[__RPC_F_RB_MAX]; + bool base64 = false; + int fd, rv; + ssize_t len; char *path; struct stat s; char *wbuf; - if (!rpc_check_path(msg, &path, &s)) + blobmsg_parse(rpc_file_rb_policy, __RPC_F_RB_MAX, tb, blob_data(msg), blob_len(msg)); + + if (!tb[RPC_F_RB_PATH]) + return rpc_errno_status(); + + path = blobmsg_data(tb[RPC_F_RB_PATH]); + + if (stat(path, &s)) return rpc_errno_status(); if (s.st_size >= RPC_FILE_MAX_SIZE) @@ -172,7 +211,13 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj, blob_buf_init(&buf, 0); - wbuf = blobmsg_alloc_string_buffer(&buf, "data", s.st_size + 1); + if (tb[RPC_F_RB_BASE64]) + base64 = blobmsg_get_bool(tb[RPC_F_RB_BASE64]); + + len = s.st_size + 1; + if (base64) + len = B64_ENCODE_LEN(s.st_size); + wbuf = blobmsg_alloc_string_buffer(&buf, "data", len); if (!wbuf) { @@ -186,13 +231,33 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj, goto out; } - *(wbuf + len) = 0; + if (base64) + { + uint8_t *data = calloc(len, sizeof(uint8_t)); + if (!data) + { + rv = UBUS_STATUS_UNKNOWN_ERROR; + goto out; + } + memcpy(data, wbuf, len); + + len = b64_encode(data, len, wbuf, B64_ENCODE_LEN(len)); + free(data); + if (len < 0) + { + rv = UBUS_STATUS_UNKNOWN_ERROR; + goto out; + } + } + + *(wbuf + len) = '\0'; blobmsg_add_string_buffer(&buf); ubus_send_reply(ctx, req, buf.head); rv = UBUS_STATUS_OK; out: + blob_buf_free(&buf); close(fd); return rv; } @@ -202,31 +267,94 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { - int fd; - struct blob_attr *tb[__RPC_F_MAX]; - - blobmsg_parse(rpc_file_policy, __RPC_F_MAX, tb, + struct blob_attr *tb[__RPC_F_RW_MAX]; + int append = O_TRUNC; + mode_t prev_mode, mode = 0666; + int fd, rv = 0; + void *data = NULL; + ssize_t data_len = 0; + + blobmsg_parse(rpc_file_rw_policy, __RPC_F_RW_MAX, tb, blob_data(msg), blob_len(msg)); - if (!tb[RPC_F_PATH] || !tb[RPC_F_DATA]) + if (!tb[RPC_F_RW_PATH] || !tb[RPC_F_RW_DATA]) return UBUS_STATUS_INVALID_ARGUMENT; - if ((fd = open(blobmsg_data(tb[RPC_F_PATH]), O_CREAT | O_TRUNC | O_WRONLY)) < 0) - return rpc_errno_status(); + data = blobmsg_data(tb[RPC_F_RW_DATA]); + data_len = blobmsg_data_len(tb[RPC_F_RW_DATA]) - 1; + + if (tb[RPC_F_RW_APPEND] && blobmsg_get_bool(tb[RPC_F_RW_APPEND])) + append = O_APPEND; - if (write(fd, blobmsg_data(tb[RPC_F_DATA]), blobmsg_data_len(tb[RPC_F_DATA])) < 0) + if (tb[RPC_F_RW_MODE]) + mode = blobmsg_get_u32(tb[RPC_F_RW_MODE]); + + prev_mode = umask(0); + fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_WRONLY | append, mode); + umask(prev_mode); + if (fd < 0) return rpc_errno_status(); + if (tb[RPC_F_RW_BASE64] && blobmsg_get_bool(tb[RPC_F_RW_BASE64])) + { + data_len = b64_decode(data, data, data_len); + if (data_len < 0) + { + rv = UBUS_STATUS_UNKNOWN_ERROR; + goto out; + } + } + + if (write(fd, data, data_len) < 0) + rv = -1; + +out: if (fsync(fd) < 0) - return rpc_errno_status(); + rv = -1; close(fd); sync(); + if (rv) + return rpc_errno_status(); + return 0; } static int +rpc_file_md5(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + int rv, i; + char *path; + struct stat s; + uint8_t md5[16]; + char *wbuf; + + if (!rpc_check_path(msg, &path, &s)) + return rpc_errno_status(); + + if (!S_ISREG(s.st_mode)) + return UBUS_STATUS_NOT_SUPPORTED; + + if ((rv = md5sum(path, md5)) <= 0) + return rpc_errno_status(); + + blob_buf_init(&buf, 0); + wbuf = blobmsg_alloc_string_buffer(&buf, "md5", 33); + + for (i = 0; i < 16; i++) + sprintf(wbuf + (i * 2), "%02x", (uint8_t) md5[i]); + + blobmsg_add_string_buffer(&buf); + ubus_send_reply(ctx, req, buf.head); + blob_buf_free(&buf); + + return UBUS_STATUS_OK; +} + +static int rpc_file_list(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) @@ -257,8 +385,11 @@ rpc_file_list(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_close_table(&buf, d); } + closedir(fd); + blobmsg_close_array(&buf, c); ubus_send_reply(ctx, req, buf.head); + blob_buf_free(&buf); return 0; } @@ -298,6 +429,7 @@ rpc_file_stat(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_u32(&buf, "gid", s.st_gid); ubus_send_reply(ctx, req, buf.head); + blob_buf_free(&buf); return 0; } @@ -384,6 +516,7 @@ rpc_file_exec_reply(struct rpc_file_exec_context *c, int rv) rpc_ustream_to_blobmsg(&c->epipe.stream, "stderr"); ubus_send_reply(c->context, &c->request, buf.head); + blob_buf_free(&buf); } ubus_complete_deferred_request(c->context, &c->request, rv); @@ -592,10 +725,11 @@ static int rpc_file_api_init(const struct rpc_daemon_ops *o, struct ubus_context *ctx) { static const struct ubus_method file_methods[] = { - UBUS_METHOD("read", rpc_file_read, rpc_file_policy), - UBUS_METHOD("write", rpc_file_write, rpc_file_policy), - UBUS_METHOD("list", rpc_file_list, rpc_file_policy), - UBUS_METHOD("stat", rpc_file_stat, rpc_file_policy), + UBUS_METHOD("read", rpc_file_read, rpc_file_rb_policy), + UBUS_METHOD("write", rpc_file_write, rpc_file_rw_policy), + UBUS_METHOD("list", rpc_file_list, rpc_file_r_policy), + UBUS_METHOD("stat", rpc_file_stat, rpc_file_r_policy), + UBUS_METHOD("md5", rpc_file_md5, rpc_file_r_policy), UBUS_METHOD("exec", rpc_file_exec, rpc_exec_policy), };