X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5b3f77c7fbafb036d20a1577ed74f475e94ed821..03ac5c0515ce60eb416b574fbe8594469122b515:/keydb_fs.c

diff --git a/keydb_fs.c b/keydb_fs.c
index bc3c890..41d55cf 100644
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -30,6 +30,11 @@
 #include "log.h"
 #include "wordlist.h"
 
+/* Hack: We should really dynamically allocate our path buffers */
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 static int keydb_lockfile_fd = -1;
 static bool keydb_lockfile_readonly;
 
@@ -54,19 +59,19 @@ static uint32_t calchash(uint8_t * ptr)
 }
 
 
-static void keypath(char *buffer, uint64_t _keyid)
+static void keypath(char *buffer, size_t length, uint64_t _keyid)
 {
 	uint64_t keyid = _keyid << 32;
-	snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX",
+	snprintf(buffer, length, "%s/key/%02X/%02X/%08X/%016" PRIX64,
 		 config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF),
 		 (uint8_t) ((keyid >> 48) & 0xFF),
 		 (uint32_t) (keyid >> 32), _keyid);
 }
 
-static void keydir(char *buffer, uint64_t _keyid)
+static void keydir(char *buffer, size_t length, uint64_t _keyid)
 {
 	uint64_t keyid = _keyid << 32;
-	snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X", config.db_dir,
+	snprintf(buffer, length, "%s/key/%02X/%02X/%08X", config.db_dir,
 		 (uint8_t) ((keyid >> 56) & 0xFF),
 		 (uint8_t) ((keyid >> 48) & 0xFF),
 		 (uint32_t) (keyid >> 32));
@@ -74,42 +79,46 @@ static void keydir(char *buffer, uint64_t _keyid)
 
 static void prove_path_to(uint64_t keyid, char *what)
 {
-	static char buffer[1024];
-	snprintf(buffer, PATH_MAX, "%s/%s", config.db_dir, what);
+	static char buffer[PATH_MAX];
+	snprintf(buffer, sizeof(buffer), "%s/%s", config.db_dir, what);
 	mkdir(buffer, 0777);
 
-	snprintf(buffer, PATH_MAX, "%s/%s/%02X", config.db_dir, what,
+	snprintf(buffer, sizeof(buffer), "%s/%s/%02X", config.db_dir, what,
 		 (uint8_t) ((keyid >> 24) & 0xFF));
 	mkdir(buffer, 0777);
 
-	snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X", config.db_dir, what,
+	snprintf(buffer, sizeof(buffer), "%s/%s/%02X/%02X", config.db_dir,
+		 what,
 		 (uint8_t) ((keyid >> 24) & 0xFF),
 		 (uint8_t) ((keyid >> 16) & 0xFF));
 	mkdir(buffer, 0777);
 
-	snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X/%08X", config.db_dir, what,
+	snprintf(buffer, sizeof(buffer), "%s/%s/%02X/%02X/%08X", config.db_dir,
+		 what,
 		 (uint8_t) ((keyid >> 24) & 0xFF),
 		 (uint8_t) ((keyid >> 16) & 0xFF), (uint32_t) (keyid));
 	mkdir(buffer, 0777);
 }
 
-static void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)
+static void wordpath(char *buffer, size_t length, char *word, uint32_t hash,
+		uint64_t keyid)
 {
-	snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016llX",
+	snprintf(buffer, length, "%s/words/%02X/%02X/%08X/%s/%016" PRIX64,
 		 config.db_dir, (uint8_t) ((hash >> 24) & 0xFF),
 		 (uint8_t) ((hash >> 16) & 0xFF), hash, word, keyid);
 }
 
-static void worddir(char *buffer, char *word, uint32_t hash)
+static void worddir(char *buffer, size_t length, char *word, uint32_t hash)
 {
-	snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s", config.db_dir,
+	snprintf(buffer, length, "%s/words/%02X/%02X/%08X/%s", config.db_dir,
 		 (uint8_t) ((hash >> 24) & 0xFF),
 		 (uint8_t) ((hash >> 16) & 0xFF), hash, word);
 }
 
-static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
+static void subkeypath(char *buffer, size_t length, uint64_t subkey,
+		uint64_t keyid)
 {
-	snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
+	snprintf(buffer, length, "%s/subkeys/%02X/%02X/%08X/%016" PRIX64,
 		 config.db_dir,
 		 (uint8_t) ((subkey >> 24) & 0xFF),
 		 (uint8_t) ((subkey >> 16) & 0xFF),
@@ -117,9 +126,9 @@ static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
 		 keyid);
 }
 
-static void subkeydir(char *buffer, uint64_t subkey)
+static void subkeydir(char *buffer, size_t length, uint64_t subkey)
 {
-	snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X",
+	snprintf(buffer, length, "%s/subkeys/%02X/%02X/%08X",
 		 config.db_dir,
 		 (uint8_t) ((subkey >> 24) & 0xFF),
 		 (uint8_t) ((subkey >> 16) & 0xFF),
@@ -137,7 +146,7 @@ static void fs_initdb(bool readonly)
 
 	keydb_lockfile_readonly = readonly;
 
-	snprintf(buffer, PATH_MAX, "%s/.lock", config.db_dir);
+	snprintf(buffer, sizeof(buffer), "%s/.lock", config.db_dir);
 
 	if (access(config.db_dir, R_OK | W_OK | X_OK) == -1) {
 		if (errno != ENOENT) {
@@ -208,6 +217,44 @@ static void fs_endtrans(void)
 	fcntl(keydb_lockfile_fd, F_SETLK, &lockstruct);
 }
 
+static uint64_t fs_getfullkeyid(uint64_t keyid)
+{
+	static char buffer[PATH_MAX];
+	DIR *d = NULL;
+	struct dirent *de = NULL;
+	uint64_t ret = 0;
+
+	keydir(buffer, sizeof(buffer), keyid);
+
+	d = opendir(buffer);
+	if (d) {
+		do {
+			de = readdir(d);
+			if (de && de->d_name[0] != '.') {
+				ret = strtoull(de->d_name, NULL, 16);
+			}
+		} while (de && de->d_name[0] == '.');
+		closedir(d);	
+	}
+
+	if (ret == 0) {
+		subkeydir(buffer, sizeof(buffer), keyid);
+
+		d = opendir(buffer);
+		if (d) {
+			do {
+				de = readdir(d);
+				if (de && de->d_name[0] != '.') {
+					ret = strtoull(de->d_name, NULL, 16);
+				}
+			} while (de && de->d_name[0] == '.');
+			closedir(d);
+		}
+	}
+
+	return ret;
+}
+
 /**
  *	fetch_key - Given a keyid fetch the key from storage.
  *	@keyid: The keyid to fetch.
@@ -222,12 +269,12 @@ static int fs_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	struct openpgp_packet_list *packets = NULL;
 
 	if (!intrans)
-		starttrans();
+		fs_starttrans();
 
 	if ((keyid >> 32) == 0)
-		keyid = getfullkeyid(keyid);
+		keyid = fs_getfullkeyid(keyid);
 
-	keypath(buffer, keyid);
+	keypath(buffer, sizeof(buffer), keyid);
 	if ((fd = open(buffer, O_RDONLY)) != -1) {
 		/* File is present, load it in... */
 		read_openpgp_stream(file_fetchchar, &fd, &packets, 0);
@@ -239,7 +286,7 @@ static int fs_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	}
 
 	if (!intrans)
-		endtrans();
+		fs_endtrans();
 	return ret;
 }
 
@@ -265,10 +312,10 @@ static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
 
 
 	if (!intrans)
-		starttrans();
+		fs_starttrans();
 
 	prove_path_to(keyid, "key");
-	keypath(buffer, keyid);
+	keypath(buffer, sizeof(buffer), keyid);
 
 	if ((fd =
 	     open(buffer, O_WRONLY | (update ? O_TRUNC : O_CREAT),
@@ -291,9 +338,10 @@ static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
 			uint32_t hash = calchash((uint8_t *) (wl->object));
 			prove_path_to(hash, "words");
 
-			worddir(wbuffer, wl->object, hash);
+			worddir(wbuffer, sizeof(wbuffer), wl->object, hash);
 			mkdir(wbuffer, 0777);
-			wordpath(wbuffer, wl->object, hash, keyid);
+			wordpath(wbuffer, sizeof(wbuffer), wl->object, hash,
+				keyid);
 			link(buffer, wbuffer);
 
 			wl = wl->next;
@@ -305,9 +353,10 @@ static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
 		while (subkeyids != NULL && subkeyids[i] != 0) {
 			prove_path_to(subkeyids[i], "subkeys");
 
-			subkeydir(wbuffer, subkeyids[i]);
+			subkeydir(wbuffer, sizeof(wbuffer), subkeyids[i]);
 			mkdir(wbuffer, 0777);
-			subkeypath(wbuffer, subkeyids[i], keyid);
+			subkeypath(wbuffer, sizeof(wbuffer), subkeyids[i],
+				keyid);
 			link(buffer, wbuffer);
 
 			i++;
@@ -319,7 +368,7 @@ static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
 	}
 
 	if (!intrans)
-		endtrans();
+		fs_endtrans();
 	return ret;
 }
 
@@ -338,24 +387,25 @@ static int fs_delete_key(uint64_t keyid, bool intrans)
 	int i = 0;
 
 	if ((keyid >> 32) == 0)
-		keyid = getfullkeyid(keyid);
+		keyid = fs_getfullkeyid(keyid);
 
 	if (!intrans)
-		starttrans();
+		fs_starttrans();
 
-	ret = fetch_key(keyid, &pk, true);
+	ret = fs_fetch_key(keyid, &pk, true);
 
 	if (ret) {
-		logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",
+		logthing(LOGTHING_DEBUG, "Wordlist for key %016" PRIX64,
 			 keyid);
 		wl = wordlist = makewordlistfromkey(wordlist, pk);
 		logthing(LOGTHING_DEBUG,
-			 "Wordlist for key %016llX done", keyid);
+			 "Wordlist for key %016" PRIX64 " done", keyid);
 		while (wl) {
 			uint32_t hash = calchash((uint8_t *) (wl->object));
 			prove_path_to(hash, "words");
 
-			wordpath(buffer, wl->object, hash, keyid);
+			wordpath(buffer, sizeof(buffer), wl->object, hash,
+				keyid);
 			unlink(buffer);
 
 			wl = wl->next;
@@ -366,7 +416,8 @@ static int fs_delete_key(uint64_t keyid, bool intrans)
 		while (subkeyids != NULL && subkeyids[i] != 0) {
 			prove_path_to(subkeyids[i], "subkeys");
 
-			subkeypath(buffer, subkeyids[i], keyid);
+			subkeypath(buffer, sizeof(buffer), subkeyids[i],
+				keyid);
 			unlink(buffer);
 
 			i++;
@@ -378,11 +429,11 @@ static int fs_delete_key(uint64_t keyid, bool intrans)
 
 	}
 
-	keypath(buffer, keyid);
+	keypath(buffer, sizeof(buffer), keyid);
 	unlink(buffer);
 
 	if (!intrans)
-		endtrans();
+		fs_endtrans();
 	return 1;
 }
 
@@ -394,7 +445,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
 	uint32_t hash = calchash((uint8_t *) (word));
 	struct dirent *de;
 
-	worddir(buffer, word, hash);
+	worddir(buffer, sizeof(buffer), word, hash);
 	d = opendir(buffer);
 	logthing(LOGTHING_DEBUG, "Scanning for word %s in dir %s", word,
 		 buffer);
@@ -471,7 +522,7 @@ static int fs_fetch_key_text(const char *search,
 	while (wl) {
 		logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);
 		addedkeys +=
-		    fetch_key(strtoull(wl->object, NULL, 16), publickey,
+		    fs_fetch_key(strtoull(wl->object, NULL, 16), publickey,
 			      false);
 		if (addedkeys >= config.maxkeys)
 			break;
@@ -485,44 +536,6 @@ static int fs_fetch_key_text(const char *search,
 	return addedkeys;
 }
 
-static uint64_t fs_getfullkeyid(uint64_t keyid)
-{
-	static char buffer[PATH_MAX];
-	DIR *d = NULL;
-	struct dirent *de = NULL;
-	uint64_t ret = 0;
-
-	keydir(buffer, keyid);
-
-	d = opendir(buffer);
-	if (d) {
-		do {
-			de = readdir(d);
-			if (de && de->d_name[0] != '.') {
-				ret = strtoull(de->d_name, NULL, 16);
-			}
-		} while (de && de->d_name[0] == '.');
-		closedir(d);	
-	}
-
-	if (ret == 0) {
-		subkeydir(buffer, keyid);
-
-		d = opendir(buffer);
-		if (d) {
-			do {
-				de = readdir(d);
-				if (de && de->d_name[0] != '.') {
-					ret = strtoull(de->d_name, NULL, 16);
-				}
-			} while (de && de->d_name[0] == '.');
-			closedir(d);
-		}
-	}
-	
-	return ret;
-}
-
 /**
  *	iterate_keys - call a function once for each key in the db.
  *	@iterfunc: The function to call.