X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frpcd.git;a=blobdiff_plain;f=file.c;h=9a3dfd8b3d60b0992a1fc3a86db78462034b8356;hp=ddbd61b8a114575677d8b236af674066341c4cac;hb=b65f6a844f920eb19f7d05d2ee93819b72021057;hpb=dfa1d802b23e802e66d14ea4a2008866a801839b

diff --git a/file.c b/file.c
index ddbd61b..9a3dfd8 100644
--- a/file.c
+++ b/file.c
@@ -1,7 +1,7 @@
 /*
- * luci-rpcd - LuCI UBUS RPC server
+ * rpcd - UBUS RPC server
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -25,20 +25,67 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <libubus.h>
+#include <libubox/blobmsg.h>
+#include <libubox/ustream.h>
+
+#include <rpcd/plugin.h>
+
+/* limit of sys & proc files */
+#define RPC_FILE_MIN_SIZE		(128)
+
+/* limit of regular files and command output data */
+#define RPC_FILE_MAX_SIZE		(4096 * 64)
+#define RPC_FILE_MAX_RUNTIME	(3 * 1000)
+
+#define ustream_for_each_read_buffer(stream, ptr, len) \
+	for (ptr = ustream_get_read_buf(stream, &len);     \
+	     ptr != NULL && len > 0;                       \
+	     ustream_consume(stream, len), ptr = ustream_get_read_buf(stream, &len))
+
+#define ustream_declare(us, fd, name)                     \
+	us.stream.string_data   = true;                       \
+	us.stream.r.buffer_len  = 4096;                       \
+	us.stream.r.max_buffers = RPC_FILE_MAX_SIZE / 4096;   \
+	us.stream.notify_read   = rpc_file_##name##_read_cb;  \
+	us.stream.notify_state  = rpc_file_##name##_state_cb; \
+	ustream_fd_init(&us, fd);
+
+struct rpc_file_exec_context {
+	struct ubus_context *context;
+	struct ubus_request_data request;
+	struct uloop_timeout timeout;
+	struct uloop_process process;
+	struct ustream_fd opipe;
+	struct ustream_fd epipe;
+	int outlen;
+	char *out;
+	int errlen;
+	char *err;
+	int stat;
+};
 
-#include "file.h"
 
 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_RW_PATH,
+	RPC_F_RW_DATA,
+	__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 },
 };
 
 enum {
@@ -49,7 +96,7 @@ enum {
 };
 
 static const struct blobmsg_policy rpc_exec_policy[__RPC_E_MAX] = {
-	[RPC_E_CMD] = { .name = "command", .type = BLOBMSG_TYPE_STRING },
+	[RPC_E_CMD]  = { .name = "command", .type = BLOBMSG_TYPE_STRING },
 	[RPC_E_PARM] = { .name = "params",  .type = BLOBMSG_TYPE_ARRAY  },
 	[RPC_E_ENV]  = { .name = "env",     .type = BLOBMSG_TYPE_TABLE  },
 };
@@ -91,17 +138,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,6 +199,7 @@ rpc_file_read(struct ubus_context *ctx, struct ubus_object *obj,
 	blobmsg_add_string_buffer(&buf);
 
 	ubus_send_reply(ctx, req, buf.head);
+	blob_buf_free(&buf);
 	rv = UBUS_STATUS_OK;
 
 out:
@@ -165,21 +213,25 @@ rpc_file_write(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
 	int fd;
-	char *path;
-	struct stat s;
-	struct blob_attr **tb;
+	struct blob_attr *tb[__RPC_F_RW_MAX];
 
-	if (!(tb = rpc_check_path(msg, &path, &s)))
-		return rpc_errno_status();
+	blobmsg_parse(rpc_file_rw_policy, __RPC_F_RW_MAX, tb,
+	              blob_data(msg), blob_len(msg));
 
-	if (!tb[RPC_F_DATA])
+	if (!tb[RPC_F_RW_PATH] || !tb[RPC_F_RW_DATA])
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	if ((fd = open(path, O_WRONLY)) < 0)
+	if ((fd = open(blobmsg_data(tb[RPC_F_RW_PATH]), O_CREAT | O_TRUNC | O_WRONLY)) < 0)
+		return rpc_errno_status();
+
+	if (write(fd, blobmsg_data(tb[RPC_F_RW_DATA]), blobmsg_data_len(tb[RPC_F_RW_DATA])) < 0)
+		return rpc_errno_status();
+
+	if (fsync(fd) < 0)
 		return rpc_errno_status();
 
-	write(fd, blobmsg_data(tb[RPC_F_DATA]), blobmsg_data_len(tb[RPC_F_DATA]));
 	close(fd);
+	sync();
 
 	return 0;
 }
@@ -217,6 +269,7 @@ rpc_file_list(struct ubus_context *ctx, struct ubus_object *obj,
 
 	blobmsg_close_array(&buf, c);
 	ubus_send_reply(ctx, req, buf.head);
+	blob_buf_free(&buf);
 
 	return 0;
 }
@@ -256,6 +309,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;
 }
@@ -342,6 +396,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);
@@ -381,7 +436,7 @@ static void
 rpc_file_exec_opipe_read_cb(struct ustream *s, int bytes)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, opipe);
+		container_of(s, struct rpc_file_exec_context, opipe.stream);
 
 	if (ustream_read_buf_full(s))
 		rpc_file_exec_reply(c, UBUS_STATUS_NOT_SUPPORTED);
@@ -391,7 +446,7 @@ static void
 rpc_file_exec_epipe_read_cb(struct ustream *s, int bytes)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, epipe);
+		container_of(s, struct rpc_file_exec_context, epipe.stream);
 
 	if (ustream_read_buf_full(s))
 		rpc_file_exec_reply(c, UBUS_STATUS_NOT_SUPPORTED);
@@ -401,7 +456,7 @@ static void
 rpc_file_exec_opipe_state_cb(struct ustream *s)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, opipe);
+		container_of(s, struct rpc_file_exec_context, opipe.stream);
 
 	if (c->opipe.stream.eof && c->epipe.stream.eof)
 		rpc_file_exec_reply(c, UBUS_STATUS_OK);
@@ -411,7 +466,7 @@ static void
 rpc_file_exec_epipe_state_cb(struct ustream *s)
 {
 	struct rpc_file_exec_context *c =
-		container_of(s, struct rpc_file_exec_context, epipe);
+		container_of(s, struct rpc_file_exec_context, epipe.stream);
 
 	if (c->opipe.stream.eof && c->epipe.stream.eof)
 		rpc_file_exec_reply(c, UBUS_STATUS_OK);
@@ -419,7 +474,7 @@ rpc_file_exec_epipe_state_cb(struct ustream *s)
 
 static int
 rpc_file_exec_run(const char *cmd,
-			      const struct blob_attr *arg, const struct blob_attr *env,
+                  const struct blob_attr *arg, const struct blob_attr *env,
                   struct ubus_context *ctx, struct ubus_request_data *req)
 {
 	pid_t pid;
@@ -542,17 +597,18 @@ rpc_file_exec(struct ubus_context *ctx, struct ubus_object *obj,
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
 	return rpc_file_exec_run(blobmsg_data(tb[RPC_E_CMD]),
-					         tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req);
+					      tb[RPC_E_PARM], tb[RPC_E_ENV], ctx, req);
 }
 
 
-int rpc_file_api_init(struct ubus_context *ctx)
+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_r_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("exec",    rpc_file_exec,  rpc_exec_policy),
 	};
 
@@ -568,3 +624,7 @@ int rpc_file_api_init(struct ubus_context *ctx)
 
 	return ubus_add_object(ctx, &obj);
 }
+
+struct rpc_plugin rpc_plugin = {
+	.init = rpc_file_api_init
+};