add instance file attribute with md5 hash checks

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

6 files changed, 349 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0b951b..ac88616 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ IF(APPLE)
   LINK_DIRECTORIES(/opt/local/lib)
 ENDIF()
 
-SET(SOURCES main.c ubus.c service.c instance.c utils.c)
+SET(SOURCES main.c ubus.c service.c instance.c utils.c md5.c)
 
 SET(LIBS ubox ubus)
 
diff --git a/instance.c b/instance.c
index a25f91a..112db6f 100644
--- a/instance.c
+++ b/instance.c
@@ -3,16 +3,20 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <unistd.h>
+#include <stdint.h>
+#include <fcntl.h>
 
 #include "procd.h"
 #include "service.h"
 #include "instance.h"
+#include "md5.h"
 
 enum {
 	INSTANCE_ATTR_COMMAND,
 	INSTANCE_ATTR_ENV,
 	INSTANCE_ATTR_DATA,
 	INSTANCE_ATTR_NETDEV,
+	INSTANCE_ATTR_FILE,
 	INSTANCE_ATTR_NICE,
 	__INSTANCE_ATTR_MAX
 };
@@ -22,6 +26,7 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
 	[INSTANCE_ATTR_ENV] = { "env", BLOBMSG_TYPE_TABLE },
 	[INSTANCE_ATTR_DATA] = { "data", BLOBMSG_TYPE_TABLE },
 	[INSTANCE_ATTR_NETDEV] = { "netdev", BLOBMSG_TYPE_ARRAY },
+	[INSTANCE_ATTR_FILE] = { "file", BLOBMSG_TYPE_ARRAY },
 	[INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
 };
 
@@ -30,6 +35,11 @@ struct instance_netdev {
 	int ifindex;
 };
 
+struct instance_file {
+	struct blobmsg_list_node node;
+	uint32_t md5[4];
+};
+
 static void
 instance_run(struct service_instance *in)
 {
@@ -135,6 +145,9 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
 	if (!blobmsg_list_equal(&in->netdev, &in_new->netdev))
 		return true;
 
+	if (!blobmsg_list_equal(&in->file, &in_new->file))
+		return true;
+
 	if (in->nice != in_new->nice)
 		return true;
 
@@ -159,6 +172,67 @@ instance_netdev_update(struct blobmsg_list_node *l)
 }
 
 static bool
+instance_file_cmp(struct blobmsg_list_node *l1, struct blobmsg_list_node *l2)
+{
+	struct instance_file *f1 = container_of(l1, struct instance_file, node);
+	struct instance_file *f2 = container_of(l2, struct instance_file, node);
+
+	return !memcmp(f1->md5, f2->md5, sizeof(f1->md5));
+}
+
+static void
+instance_file_update(struct blobmsg_list_node *l)
+{
+	struct instance_file *f = container_of(l, struct instance_file, node);
+	md5_ctx_t md5;
+	char buf[256];
+	int len, fd;
+
+	memset(f->md5, 0, sizeof(f->md5));
+
+	fd = open(l->avl.key, O_RDONLY);
+	if (fd < 0)
+		return;
+
+	md5_begin(&md5);
+	do {
+		len = read(fd, buf, sizeof(buf));
+		if (len < 0) {
+			if (errno == EINTR)
+				continue;
+
+			break;
+		}
+		if (!len)
+			break;
+
+		md5_hash(buf, len, &md5);
+	} while(1);
+
+	md5_end(f->md5, &md5);
+	close(fd);
+}
+
+static bool
+instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_update_cb cb, bool array)
+{
+	struct blobmsg_list_node *node;
+
+	if (!cur)
+		return true;
+
+	if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
+		return false;
+
+	blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), array);
+	if (cb) {
+		blobmsg_list_for_each(l, node)
+			cb(node);
+	}
+	return true;
+}
+
+static bool
 instance_config_parse(struct service_instance *in)
 {
 	struct blob_attr *tb[__INSTANCE_ATTR_MAX];
@@ -191,30 +265,17 @@ instance_config_parse(struct service_instance *in)
 			return false;
 	}
 
-	if ((cur = tb[INSTANCE_ATTR_ENV])) {
-		if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
-			return false;
-
-		blobmsg_list_fill(&in->env, blobmsg_data(cur), blobmsg_data_len(cur), false);
-	}
-
-	if ((cur = tb[INSTANCE_ATTR_DATA])) {
-		if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
-			return false;
-
-		blobmsg_list_fill(&in->data, blobmsg_data(cur), blobmsg_data_len(cur), false);
-	}
+	if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
+		return false;
 
-	if ((cur = tb[INSTANCE_ATTR_NETDEV])) {
-		struct blobmsg_list_node *ndev;
+	if (!instance_fill_array(&in->data, tb[INSTANCE_ATTR_DATA], NULL, false))
+		return false;
 
-		if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
-			return false;
+	if (!instance_fill_array(&in->netdev, tb[INSTANCE_ATTR_NETDEV], instance_netdev_update, true))
+		return false;
 
-		blobmsg_list_fill(&in->netdev, blobmsg_data(cur), blobmsg_data_len(cur), true);
-		blobmsg_list_for_each(&in->netdev, ndev)
-			instance_netdev_update(ndev);
-	}
+	if (!instance_fill_array(&in->file, tb[INSTANCE_ATTR_FILE], instance_file_update, true))
+		return false;
 
 	return true;
 }
@@ -278,6 +339,7 @@ instance_init(struct service_instance *in, struct service *s, struct blob_attr *
 	in->proc.cb = instance_exit;
 
 	blobmsg_list_init(&in->netdev, struct instance_netdev, node, instance_netdev_cmp);
+	blobmsg_list_init(&in->file, struct instance_file, node, instance_file_cmp);
 	blobmsg_list_simple_init(&in->env);
 	blobmsg_list_simple_init(&in->data);
 	in->valid = instance_config_parse(in);
diff --git a/instance.h b/instance.h
index 484c856..097f73c 100644
--- a/instance.h
+++ b/instance.h
@@ -22,6 +22,7 @@ struct service_instance {
 	struct blobmsg_list env;
 	struct blobmsg_list data;
 	struct blobmsg_list netdev;
+	struct blobmsg_list file;
 };
 
 void instance_start(struct service_instance *in);
diff --git a/md5.c b/md5.c
new file mode 100644
index 0000000..ec24dd2
--- /dev/null
+++ b/md5.c
@@ -0,0 +1,242 @@
+/*
+ *  md5.c - Compute MD5 checksum of strings according to the
+ *          definition of MD5 in RFC 1321 from April 1992.
+ *
+ *  Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+ *
+ *  Copyright (C) 1995-1999 Free Software Foundation, Inc.
+ *  Copyright (C) 2001 Manuel Novoa III
+ *  Copyright (C) 2003 Glenn L. McGrath
+ *  Copyright (C) 2003 Erik Andersen
+ *
+ *  Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ */
+
+#include <libubox/blob.h> /* TODO: better include for bswap_32 compat */
+#include "md5.h"
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define SWAP_LE32(x) (x)
+#else
+#define SWAP_LE32(x) bswap_32(x)
+#endif
+
+/* Initialize structure containing state of computation.
+ * (RFC 1321, 3.3: Step 3)
+ */
+void md5_begin(md5_ctx_t *ctx)
+{
+	ctx->A = 0x67452301;
+	ctx->B = 0xefcdab89;
+	ctx->C = 0x98badcfe;
+	ctx->D = 0x10325476;
+
+	ctx->total = 0;
+	ctx->buflen = 0;
+}
+
+/* These are the four functions used in the four steps of the MD5 algorithm
+ * and defined in the RFC 1321.  The first function is a little bit optimized
+ * (as found in Colin Plumbs public domain implementation).
+ * #define FF(b, c, d) ((b & c) | (~b & d))
+ */
+# define FF(b, c, d) (d ^ (b & (c ^ d)))
+# define FG(b, c, d) FF (d, b, c)
+# define FH(b, c, d) (b ^ c ^ d)
+# define FI(b, c, d) (c ^ (b | ~d))
+
+/* Hash a single block, 64 bytes long and 4-byte aligned. */
+static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
+{
+	uint32_t correct_words[16];
+	const uint32_t *words = buffer;
+
+	static const uint32_t C_array[] = {
+		/* round 1 */
+		0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+		0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+		0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+		0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+		/* round 2 */
+		0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+		0xd62f105d, 0x2441453, 0xd8a1e681, 0xe7d3fbc8,
+		0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+		0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+		/* round 3 */
+		0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+		0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+		0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x4881d05,
+		0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+		/* round 4 */
+		0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+		0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+		0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+		0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
+	};
+
+	static const char P_array[] = {
+		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,	/* 1 */
+		1, 6, 11, 0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12,	/* 2 */
+		5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2,	/* 3 */
+		0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9	/* 4 */
+	};
+
+	static const char S_array[] = {
+		7, 12, 17, 22,
+		5, 9, 14, 20,
+		4, 11, 16, 23,
+		6, 10, 15, 21
+	};
+
+	uint32_t A = ctx->A;
+	uint32_t B = ctx->B;
+	uint32_t C = ctx->C;
+	uint32_t D = ctx->D;
+
+	uint32_t *cwp = correct_words;
+
+#  define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
+
+	const uint32_t *pc;
+	const char *pp;
+	const char *ps;
+	int i;
+	uint32_t temp;
+
+	for (i = 0; i < 16; i++) {
+		cwp[i] = SWAP_LE32(words[i]);
+	}
+	words += 16;
+
+	pc = C_array;
+	pp = P_array;
+	ps = S_array;
+
+	for (i = 0; i < 16; i++) {
+		temp = A + FF(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+		CYCLIC(temp, ps[i & 3]);
+		temp += B;
+		A = D;
+		D = C;
+		C = B;
+		B = temp;
+	}
+
+	ps += 4;
+	for (i = 0; i < 16; i++) {
+		temp = A + FG(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+		CYCLIC(temp, ps[i & 3]);
+		temp += B;
+		A = D;
+		D = C;
+		C = B;
+		B = temp;
+	}
+	ps += 4;
+	for (i = 0; i < 16; i++) {
+		temp = A + FH(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+		CYCLIC(temp, ps[i & 3]);
+		temp += B;
+		A = D;
+		D = C;
+		C = B;
+		B = temp;
+	}
+	ps += 4;
+	for (i = 0; i < 16; i++) {
+		temp = A + FI(B, C, D) + cwp[(int) (*pp++)] + *pc++;
+		CYCLIC(temp, ps[i & 3]);
+		temp += B;
+		A = D;
+		D = C;
+		C = B;
+		B = temp;
+	}
+
+
+	ctx->A += A;
+	ctx->B += B;
+	ctx->C += C;
+	ctx->D += D;
+}
+
+/* Feed data through a temporary buffer to call md5_hash_aligned_block()
+ * with chunks of data that are 4-byte aligned and a multiple of 64 bytes.
+ * This function's internal buffer remembers previous data until it has 64
+ * bytes worth to pass on.  Call md5_end() to flush this buffer. */
+
+void md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx)
+{
+	char *buf = (char *)buffer;
+
+	/* RFC 1321 specifies the possible length of the file up to 2^64 bits,
+	 * Here we only track the number of bytes.  */
+
+	ctx->total += len;
+
+	// Process all input.
+
+	while (len) {
+		unsigned i = 64 - ctx->buflen;
+
+		// Copy data into aligned buffer.
+
+		if (i > len)
+			i = len;
+		memcpy(ctx->buffer + ctx->buflen, buf, i);
+		len -= i;
+		ctx->buflen += i;
+		buf += i;
+
+		// When buffer fills up, process it.
+
+		if (ctx->buflen == 64) {
+			md5_hash_block(ctx->buffer, ctx);
+			ctx->buflen = 0;
+		}
+	}
+}
+
+/* Process the remaining bytes in the buffer and put result from CTX
+ * in first 16 bytes following RESBUF.  The result is always in little
+ * endian byte order, so that a byte-wise output yields to the wanted
+ * ASCII representation of the message digest.
+ *
+ * IMPORTANT: On some systems it is required that RESBUF is correctly
+ * aligned for a 32 bits value.
+ */
+void md5_end(void *resbuf, md5_ctx_t *ctx)
+{
+	char *buf = ctx->buffer;
+	int i;
+
+	/* Pad data to block size.  */
+
+	buf[ctx->buflen++] = 0x80;
+	memset(buf + ctx->buflen, 0, 128 - ctx->buflen);
+
+	/* Put the 64-bit file length in *bits* at the end of the buffer.  */
+	ctx->total <<= 3;
+	if (ctx->buflen > 56)
+		buf += 64;
+
+	for (i = 0; i < 8; i++)
+		buf[56 + i] = ctx->total >> (i*8);
+
+	/* Process last bytes.  */
+	if (buf != ctx->buffer)
+		md5_hash_block(ctx->buffer, ctx);
+	md5_hash_block(buf, ctx);
+
+	/* Put result from CTX in first 16 bytes following RESBUF.  The result is
+	 * always in little endian byte order, so that a byte-wise output yields
+	 * to the wanted ASCII representation of the message digest.
+	 *
+	 * IMPORTANT: On some systems it is required that RESBUF is correctly
+	 * aligned for a 32 bits value.
+	 */
+	((uint32_t *) resbuf)[0] = SWAP_LE32(ctx->A);
+	((uint32_t *) resbuf)[1] = SWAP_LE32(ctx->B);
+	((uint32_t *) resbuf)[2] = SWAP_LE32(ctx->C);
+	((uint32_t *) resbuf)[3] = SWAP_LE32(ctx->D);
+}
diff --git a/md5.h b/md5.h
new file mode 100644
index 0000000..2b9081e
--- /dev/null
+++ b/md5.h
@@ -0,0 +1,21 @@
+#ifndef __PROCD_MD5_H
+#define __PROCD_MD5_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+typedef struct md5_ctx {
+	uint32_t A;
+	uint32_t B;
+	uint32_t C;
+	uint32_t D;
+	uint64_t total;
+	uint32_t buflen;
+	char buffer[128];
+} md5_ctx_t;
+
+void md5_begin(md5_ctx_t *ctx);
+void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
+void md5_end(void *resbuf, md5_ctx_t *ctx);
+
+#endif
diff --git a/utils.h b/utils.h
index 360f9f1..fba7417 100644
--- a/utils.h
+++ b/utils.h
@@ -11,6 +11,7 @@ struct blobmsg_list_node {
 };
 
 typedef bool (*blobmsg_list_cmp)(struct blobmsg_list_node *l1, struct blobmsg_list_node *l2);
+typedef void (*blobmsg_update_cb)(struct blobmsg_list_node *n);
 
 struct blobmsg_list {
 	struct avl_tree avl;