commit 2c018a4667e129b9343f78279b0d41d13f85d346
parent 437048de92df16339967a5889aa464b3de1a48a3
Author: lash <dev@holbrook.no>
Date: Sun, 2 Mar 2025 22:01:05 +0000
Add filesystem store
Diffstat:
12 files changed, 195 insertions(+), 14 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -12,6 +12,7 @@ asn1:
dummy:
make -C crypto dummy
make -C mem std
+ make -C io std
make -C store dummy
test: all
diff --git a/src/io/Makefile b/src/io/Makefile
@@ -0,0 +1,7 @@
+std:
+ $(CC) $(CFLAGS) -g3 -c std.c
+
+clean:
+ rm -vf *.o
+
+.PHONY: clean
diff --git a/src/io/std.c b/src/io/std.c
@@ -0,0 +1,5 @@
+#include <stdlib.h>
+
+char *mktempdir(char *s) {
+ return mkdtemp(s);
+}
diff --git a/src/lq/err.h b/src/lq/err.h
@@ -12,6 +12,8 @@ enum err_e {
ERR_ENCODING, ///< Failure in serialization and data transformation
ERR_REQUEST, ///< Error related to certificate request messages
ERR_RESPONSE, ///< Error related to certificate response messages
+ ERR_NOENT, ///< Not found
+ ERR_COMPAT, ///< Incompatible data or format
};
typedef enum err_e LQErr;
diff --git a/src/lq/io.h b/src/lq/io.h
@@ -0,0 +1,6 @@
+#ifndef LIBQAEDA_IO_H_
+#define LIBQAEDA_IO_H_
+
+char* mktempdir(char *s);
+
+#endif // LIBQAEDA_IO_H_
diff --git a/src/lq/msg.c b/src/lq/msg.c
@@ -100,7 +100,7 @@ int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len, LQResolve *resolve)
resolve_active = resolve;
while (resolve_active != NULL) {
- r = resolve->store->put(LQ_CONTENT_MSG, tmp, &c, msg->data, msg->len);
+ r = resolve_active->store->put(LQ_CONTENT_MSG, resolve_active->store, tmp, &c, msg->data, msg->len);
if (r != ERR_OK) {
return r;
}
@@ -191,7 +191,7 @@ int lq_msg_deserialize(LQMsg **msg, const char *in, size_t in_len, LQResolve *re
c = 1024;
resolve_active = resolve;
while (resolve_active != NULL) {
- r = resolve->store->get(LQ_CONTENT_MSG, z, LQ_DIGEST_LEN, tmp, &c);
+ r = resolve_active->store->get(LQ_CONTENT_MSG, resolve_active->store, z, LQ_DIGEST_LEN, tmp, &c);
if (r != ERR_OK) {
return r;
}
diff --git a/src/lq/store.h b/src/lq/store.h
@@ -10,15 +10,18 @@ enum payload_e {
LQ_CONTENT_KEY,
};
+typedef struct lq_store_t LQStore;
struct lq_store_t {
- int (*get)(enum payload_e typ, const char *key, size_t key_len, char *value, size_t *value_len);
- int (*put)(enum payload_e typ, const char *key, size_t *key_len, char *value, size_t value_len);
+ int store_typ;
+ void *userdata;
+ int (*get)(enum payload_e typ, LQStore *store, const char *key, size_t key_len, char *value, size_t *value_len);
+ int (*put)(enum payload_e typ, LQStore *store, const char *key, size_t *key_len, char *value, size_t value_len);
};
typedef struct lq_resolve_t LQResolve;
struct lq_resolve_t {
- struct lq_store_t *store;
+ LQStore *store;
LQResolve *next;
};
diff --git a/src/store/Makefile b/src/store/Makefile
@@ -1,8 +1,11 @@
INCLUDES := -I.. -I../aux/include
CFLAGS += $(INCLUDES) -Wall
-dummy:
- $(CC) $(CFLAGS) -g3 -c dummy.c
+all:
+ $(CC) $(CFLAGS) -c file.c
+
+dummy: all
+ $(CC) $(CFLAGS) -c dummy.c
clean:
rm -vf *.o
diff --git a/src/store/dummy.c b/src/store/dummy.c
@@ -2,23 +2,34 @@
#include <stdio.h>
#include "lq/store.h"
+#include "lq/err.h"
#include "hex.h"
+static const int store_typ_dummy = 1;
+
static char buf[4096];
-int lq_dummy_content_get(enum payload_e typ, const char *key, size_t key_len, char *value, size_t *value_len) {
+int lq_dummy_content_get(enum payload_e typ, LQStore *store, const char *key, size_t key_len, char *value, size_t *value_len) {
+ if (store_typ_dummy != store->store_typ) {
+ return ERR_COMPAT;
+ }
b2h((const unsigned char*)key, (int)key_len, (unsigned char*)buf);
fprintf(stderr, "pretend get %d: %s\n", typ, buf);
return 0;
}
-int lq_dummy_content_put(enum payload_e typ, const char *key, size_t *key_len, char *value, size_t value_len) {
+int lq_dummy_content_put(enum payload_e typ, LQStore *store, const char *key, size_t *key_len, char *value, size_t value_len) {
+ if (store_typ_dummy != store->store_typ) {
+ return ERR_COMPAT;
+ }
b2h((const unsigned char*)key, (int)*key_len, (unsigned char*)buf);
fprintf(stderr, "pretend put %d: %s -> %s\n", typ, buf, value);
return 0;
}
struct lq_store_t LQDummyContent = {
+ .store_typ = store_typ_dummy,
+ .userdata = NULL,
.get = lq_dummy_content_get,
.put = lq_dummy_content_put,
};
diff --git a/src/store/file.c b/src/store/file.c
@@ -0,0 +1,130 @@
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "lq/crypto.h"
+#include "lq/store.h"
+#include "lq/err.h"
+#include "lq/mem.h"
+#include "hex.h"
+
+static const int store_typ_file = 2;
+
+int lq_file_content_get(enum payload_e typ, LQStore *store, const char *key, size_t key_len, char *value, size_t *value_len) {
+ int f;
+ int r;
+ size_t l;
+ size_t c;
+ char buf[LQ_DIGEST_LEN * 2 + 1];
+ char path[1024];
+ char *p;
+
+ if (store->store_typ != store_typ_file) {
+ return ERR_COMPAT;
+ }
+
+ // \todo dry
+ p = (char*)store->userdata;
+ lq_cpy(path, p, strlen(p) + 1);
+ p = path + strlen(path);
+ b2h((const unsigned char*)key, (int)key_len, (unsigned char*)buf);
+ r = sprintf(p, "/%s", buf);
+
+ if (r < 0) {
+ return ERR_READ;
+ }
+ f = open(path, O_RDONLY, S_IRUSR);
+ if (f < 0) {
+ return ERR_READ;
+ }
+
+ p = value;
+ l = 0;
+ while (1) {
+ c = read(f, p, *value_len - l);
+ if (c == 0) {
+ break;
+ }
+ l += c;
+ if (l > *value_len) {
+ close(f);
+ return ERR_OVERFLOW;
+ }
+ p += c;
+ }
+ close(f);
+
+ *value_len = l;
+
+ return ERR_OK;
+
+}
+
+int lq_file_content_put(enum payload_e typ, LQStore *store, const char *key, size_t *key_len, char *value, size_t value_len) {
+ int r;
+ size_t c;
+ size_t l;
+ char buf[LQ_DIGEST_LEN * 2 + 1];
+ char path[1024];
+ char *p;
+ int f;
+
+ if (store->store_typ != store_typ_file) {
+ return ERR_COMPAT;
+ }
+ p = (char*)store->userdata;
+ lq_cpy(path, p, strlen(p) + 1);
+ p = path + strlen(path);
+ b2h((const unsigned char*)key, (int)*key_len, (unsigned char*)buf);
+ r = sprintf(p, "/%s", buf);
+ if (r < 0) {
+ return ERR_WRITE;
+ }
+ f = open(path, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR);
+ if (f < 0) {
+ return ERR_WRITE;
+ }
+ l = value_len;
+ p = value;
+ while (l > 0) {
+ c = write(f, p, l);
+ if (c < 0) {
+ close(f);
+ return ERR_WRITE;
+ }
+ if (c == 0) {
+ break;
+ }
+ l -= c;
+ p += c;
+ }
+ close(f);
+ return ERR_OK;
+}
+
+struct lq_store_t LQFileContent = {
+ .store_typ = store_typ_file,
+ .userdata = "",
+ .get = lq_file_content_get,
+ .put = lq_file_content_put,
+};
+
+//LQStore* lq_file_content_new(const char *dir) {
+// char path[1024];
+// LQStore *store;
+//
+// store = lq_alloc(sizeof(LQStore));
+// if (store == NULL) {
+// return NULL;
+// }
+// store->get = lq_file_content_get;
+// store->put = lq_file_content_put;
+//
+// return store;
+//}
+//
+//void lq_file_content_free(LQStore *store) {
+// lq_free(store->userdata);
+//}
diff --git a/src/test/Makefile b/src/test/Makefile
@@ -13,8 +13,8 @@ test: all
build:
$(CC) $(CFLAGS) $(LDFLAGS) test_crypto.c -o test_crypto_bin ../crypto/dummy.o ../mem/std.o -lcheck
- $(CC) $(CFLAGS) $(LDFLAGS) test_msg.c -o test_msg_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../lq/msg.o -lcheck
- $(CC) $(CFLAGS) $(LDFLAGS) test_cert.c -o test_cert_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../lq/msg.o ../lq/cert.o -lcheck
+ $(CC) $(CFLAGS) $(LDFLAGS) test_msg.c -o test_msg_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o -lcheck
+ $(CC) $(CFLAGS) $(LDFLAGS) test_cert.c -o test_cert_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o ../lq/cert.o -lcheck
clean:
rm -vf test_*_bin
diff --git a/src/test/test_msg.c b/src/test/test_msg.c
@@ -4,8 +4,11 @@
#include "lq/msg.h"
#include "lq/crypto.h"
+#include "lq/io.h"
+#include "lq/mem.h"
-extern struct lq_store_t LQDummyContent;
+extern LQStore LQDummyContent;
+extern LQStore LQFileContent;
const char *data = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
@@ -13,11 +16,21 @@ START_TEST(check_msg_symmetric) {
int r;
size_t c;
char buf[4096];
+ char path[1024];
LQMsg *msg;
LQResolve resolve;
+ LQResolve resolve_dummy;
+ LQStore store;
- resolve.store = &LQDummyContent;
- resolve.next = NULL;
+ lq_cpy(&store, &LQFileContent, sizeof(LQStore));
+ lq_cpy(path, "/tmp/lqstore_file_XXXXXX", 25);
+ store.userdata = (void*)mktempdir(path);
+ ck_assert_ptr_nonnull(store.userdata);
+
+ resolve_dummy.store = &LQDummyContent;
+ resolve_dummy.next = NULL;
+ resolve.store = &store;
+ resolve.next = &resolve_dummy;
msg = lq_msg_new(data, strlen(data) + 1);
msg->pubkey = lq_publickey_new(data);
