X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/656d2e182686fed6d5b84ee711f2c771df3b14a7..2f1b865faa5a6fbd809caa7c70f9b4dddfa35947:/keydb_db3.c

diff --git a/keydb_db3.c b/keydb_db3.c
index 0ccaec3..7ca5312 100644
--- a/keydb_db3.c
+++ b/keydb_db3.c
@@ -25,6 +25,7 @@
 #include "decodekey.h"
 #include "keystructs.h"
 #include "mem.h"
+#include "log.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 
@@ -107,28 +108,44 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
  */
 void initdb(void)
 {
-	char buf[1024];
 	int ret = 0;
 
 	ret = db_env_create(&dbenv, 0);
 	if (ret != 0) {
-		fprintf(stderr, "db_env_create: %s\n", db_strerror(ret));
+		logthing(LOGTHING_CRITICAL,
+			"db_env_create: %s", db_strerror(ret));
+		exit(1);
+	}
+
+	/*
+	 * Enable deadlock detection so that we don't block indefinitely on
+	 * anything. What we really want is simple 2 state locks, but I'm not
+	 * sure how to make the standard DB functions do that yet.
+	 */
+	ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT);
+	if (ret != 0) {
+		logthing(LOGTHING_CRITICAL,
+			"db_env_create: %s", db_strerror(ret));
 		exit(1);
 	}
 
 	ret = dbenv->open(dbenv, config.db_dir,
 			DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_LOCK |
 			DB_INIT_TXN |
-			DB_RECOVER | DB_CREATE,
+			DB_CREATE,
 			0);
 	if (ret != 0) {
-		dbenv->err(dbenv, ret, "%s", config.db_dir);
+		logthing(LOGTHING_CRITICAL,
+				"Erroring opening db environment: %s (%s)",
+				config.db_dir,
+				db_strerror(ret));
 		exit(1);
 	}
 
 	ret = db_create(&dbconn, dbenv, 0);
 	if (ret != 0) {
-		fprintf(stderr, "db_create: %s\n", db_strerror(ret));
+		logthing(LOGTHING_CRITICAL,
+				"db_create: %s", db_strerror(ret));
 		exit(1);
 	}
 
@@ -138,13 +155,16 @@ void initdb(void)
 			DB_CREATE,
 			0664);
 	if (ret != 0) {
-		dbconn->err(dbconn, ret, "keydb.db");
+		logthing(LOGTHING_CRITICAL,
+				"Error opening key database: %s (%s)",
+				"keydb.db",
+				db_strerror(ret));
 		exit(1);
 	}
 
 	ret = db_create(&worddb, dbenv, 0);
 	if (ret != 0) {
-		fprintf(stderr, "db_create: %s\n", db_strerror(ret));
+		logthing(LOGTHING_CRITICAL, "db_create: %s", db_strerror(ret));
 		exit(1);
 	}
 	ret = worddb->set_flags(worddb, DB_DUP);
@@ -153,7 +173,10 @@ void initdb(void)
 			DB_CREATE,
 			0664);
 	if (ret != 0) {
-		worddb->err(worddb, ret, "worddb");
+		logthing(LOGTHING_CRITICAL,
+				"Error opening word database: %s (%s)",
+				"worddb",
+				db_strerror(ret));
 		exit(1);
 	}
 	
@@ -168,6 +191,7 @@ void initdb(void)
  */
 void cleanupdb(void)
 {
+	txn_checkpoint(dbenv, 0, 0, 0);
 	worddb->close(worddb, 0);
 	worddb = NULL;
 	dbconn->close(dbconn, 0);
@@ -187,6 +211,7 @@ bool starttrans(void)
 {
 	int ret;
 
+	assert(dbenv != NULL);
 	assert(txn == NULL);
 
 	ret = txn_begin(dbenv,
@@ -194,7 +219,9 @@ bool starttrans(void)
 		&txn,
 		0);
 	if (ret != 0) {
-		dbenv->err(dbenv, ret, "starttrans():");
+		logthing(LOGTHING_CRITICAL,
+				"Error starting transaction: %s",
+				db_strerror(ret));
 		exit(1);
 	}
 
@@ -210,12 +237,15 @@ void endtrans(void)
 {
 	int ret;
 
+	assert(dbenv != NULL);
 	assert(txn != NULL);
 
 	ret = txn_commit(txn,
 		0);
 	if (ret != 0) {
-		dbenv->err(dbenv, ret, "endtrans():");
+		logthing(LOGTHING_CRITICAL,
+				"Error ending transaction: %s",
+				db_strerror(ret));
 		exit(1);
 	}
 	txn = NULL;
@@ -275,7 +305,9 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 		packets = NULL;
 		numkeys++;
 	} else if (ret != DB_NOTFOUND) {
-		dbconn->err(dbconn, ret, "Problem retrieving key");
+		logthing(LOGTHING_ERROR,
+				"Problem retrieving key: %s",
+				db_strerror(ret));
 	}
 
 	if (!intrans) {
@@ -424,6 +456,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 	unsigned char worddb_data[12];
 	struct ll *wordlist = NULL;
 	struct ll *curword  = NULL;
+	bool       deadlock = false;
 
 	keyid = get_keyid(publickey);
 
@@ -440,61 +473,71 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 	 * it definitely needs updated.
 	 */
 	if (update) {
-		delete_key(keyid, true);
+		deadlock = (delete_key(keyid, true) == -1);
 	}
 
 	/*
 	 * Convert the key to a flat set of binary data.
 	 */
-	next = publickey->next;
-	publickey->next = NULL;
-	flatten_publickey(publickey, &packets, &list_end);
-	publickey->next = next;
-
-	storebuf.offset = 0; 
-	storebuf.size = 8192;
-	storebuf.buffer = malloc(8192);
+	if (!deadlock) {
+		next = publickey->next;
+		publickey->next = NULL;
+		flatten_publickey(publickey, &packets, &list_end);
+		publickey->next = next;
+
+		storebuf.offset = 0; 
+		storebuf.size = 8192;
+		storebuf.buffer = malloc(8192);
 	
-	write_openpgp_stream(buffer_putchar, &storebuf, packets);
+		write_openpgp_stream(buffer_putchar, &storebuf, packets);
 
-	/*
-	 * Now we have the key data store it in the DB; the keyid is the key.
-	 */
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-	key.data = &keyid;
-	key.size = sizeof(keyid);
-	keyid &= 0xFFFFFFFF;
-	data.size = storebuf.offset;
-	data.data = storebuf.buffer;
-
-	ret = dbconn->put(dbconn,
-			txn,
-			&key,
-			&data,
-			0); /* flags*/
-	if (ret != 0) {
-		dbconn->err(dbconn, ret, "Problem storing key");
-	}
+		/*
+		 * Now we have the key data store it in the DB; the keyid is
+		 * the key.
+		 */
+		memset(&key, 0, sizeof(key));
+		memset(&data, 0, sizeof(data));
+		key.data = &keyid;
+		key.size = sizeof(keyid);
+		keyid &= 0xFFFFFFFF;
+		data.size = storebuf.offset;
+		data.data = storebuf.buffer;
 
-	free(storebuf.buffer);
-	storebuf.buffer = NULL;
-	storebuf.size = 0;
-	storebuf.offset = 0; 
+		ret = dbconn->put(dbconn,
+				txn,
+				&key,
+				&data,
+				0); /* flags*/
+		if (ret != 0) {
+			logthing(LOGTHING_ERROR,
+					"Problem storing key: %s",
+					db_strerror(ret));
+			if (ret == DB_LOCK_DEADLOCK) {
+				deadlock = true;
+			}
+		}
 
-	free_packet_list(packets);
-	packets = NULL;
+		free(storebuf.buffer);
+		storebuf.buffer = NULL;
+		storebuf.size = 0;
+		storebuf.offset = 0; 
+	
+		free_packet_list(packets);
+		packets = NULL;
+	}
 
 	/*
 	 * Walk through our uids storing the words into the db with the keyid.
 	 */
-	uids = keyuids(publickey, &primary);
+	if (!deadlock) {
+		uids = keyuids(publickey, &primary);
+	}
 	if (uids != NULL) {
 		for (i = 0; ret == 0 && uids[i] != NULL; i++) {
 			wordlist = makewordlist(wordlist, uids[i]);
 		}
 
-		for (curword = wordlist; curword != NULL;
+		for (curword = wordlist; curword != NULL && !deadlock;
 				curword = curword->next) {
 			memset(&key, 0, sizeof(key));
 			memset(&data, 0, sizeof(data));
@@ -525,8 +568,12 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 				&data,
 				0);
 			if (ret != 0) {
-				worddb->err(worddb, ret,
-					"Problem storing key");
+				logthing(LOGTHING_ERROR,
+					"Problem storing word: %s",
+					db_strerror(ret));
+				if (ret == DB_LOCK_DEADLOCK) {
+					deadlock = true;
+				}
 			}
 		}
 
@@ -546,7 +593,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		endtrans();
 	}
 
-	return 0;
+	return deadlock ? -1 : 0 ;
 }
 
 /**
@@ -569,6 +616,7 @@ int delete_key(uint64_t keyid, bool intrans)
 	unsigned char worddb_data[12];
 	struct ll *wordlist = NULL;
 	struct ll *curword  = NULL;
+	bool deadlock = false;
 
 	keyid &= 0xFFFFFFFF;
 
@@ -594,7 +642,7 @@ int delete_key(uint64_t keyid, bool intrans)
 			&cursor,
 			0);   /* flags */
 
-		for (curword = wordlist; curword != NULL;
+		for (curword = wordlist; curword != NULL && !deadlock;
 				curword = curword->next) {
 			memset(&key, 0, sizeof(key));
 			memset(&data, 0, sizeof(data));
@@ -628,14 +676,19 @@ int delete_key(uint64_t keyid, bool intrans)
 			if (ret == 0) {
 				ret = cursor->c_del(cursor, 0);
 				if (ret != 0) {
-					worddb->err(worddb, ret,
-						"Problem deleting word.");
+					logthing(LOGTHING_ERROR,
+						"Problem deleting word: %s",
+						db_strerror(ret));
 				}
 			}
 
 			if (ret != 0) {
-				worddb->err(worddb, ret,
-					"Problem deleting word.");
+				logthing(LOGTHING_ERROR,
+					"Problem deleting word: %s",
+					db_strerror(ret));
+				if (ret == DB_LOCK_DEADLOCK) {
+					deadlock = true;
+				}
 			}
 		}
 		ret = cursor->c_close(cursor);
@@ -655,19 +708,70 @@ int delete_key(uint64_t keyid, bool intrans)
 		publickey = NULL;
 	}
 
-	key.data = &keyid;
-	key.size = sizeof(keyid);
+	if (!deadlock) {
+		key.data = &keyid;
+		key.size = sizeof(keyid);
 
-	dbconn->del(dbconn,
-			txn,
-			&key,
-			0); /* flags */
+		dbconn->del(dbconn,
+				txn,
+				&key,
+				0); /* flags */
+	}
 
 	if (!intrans) {
 		endtrans();
 	}
 
-	return (ret == DB_NOTFOUND);
+	return deadlock ? (-1) : (ret == DB_NOTFOUND);
+}
+
+/**
+ *	dumpdb - dump the key database
+ *	@filenamebase: The base filename to use for the dump.
+ *
+ *	Dumps the database into one or more files, which contain pure OpenPGP
+ *	that can be reimported into onak or gpg. filenamebase provides a base
+ *	file name for the dump; several files may be created, all of which will
+ *	begin with this string and then have a unique number and a .pgp
+ *	extension.
+ */
+int dumpdb(char *filenamebase)
+{
+	DBT key, data;
+	DBC *cursor = NULL;
+	int ret = 0;
+	int fd = -1;
+
+	starttrans();
+	
+	ret = dbconn->cursor(dbconn,
+		txn,
+		&cursor,
+		0);   /* flags */
+
+	fd = open(filenamebase, O_CREAT | O_WRONLY | O_TRUNC, 0640);
+	memset(&key, 0, sizeof(key));
+	memset(&data, 0, sizeof(data));
+	ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
+	while (ret == 0) {
+		write(fd, data.data, data.size);
+		memset(&key, 0, sizeof(key));
+		memset(&data, 0, sizeof(data));
+		ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
+	}
+	if (ret != DB_NOTFOUND) {
+		logthing(LOGTHING_ERROR, "Problem reading key: %s",
+				db_strerror(ret));
+	}
+
+	close(fd);
+
+	ret = cursor->c_close(cursor);
+	cursor = NULL;
+	
+	endtrans();
+	
+	return 0;
 }
 
 /*