X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/a57a146ebc3f15f1ba2dfe8ecb9b59702fb8f799..8d14d66b84cc370cefe54b33de1b95bb49c90bf6:/keydb.c?ds=sidebyside

diff --git a/keydb.c b/keydb.c
index 1621782..42eebfe 100644
--- a/keydb.c
+++ b/keydb.c
@@ -24,20 +24,22 @@
 #include "mem.h"
 #include "merge.h"
 #include "parsekey.h"
+#include "sendsync.h"
 
 #ifdef NEED_KEYID2UID
 /**
  *	keyid2uid - Takes a keyid and returns the primary UID for it.
  *	@keyid: The keyid to lookup.
  */
-char *keyid2uid(uint64_t keyid)
+char *generic_keyid2uid(uint64_t keyid)
 {
 	struct openpgp_publickey *publickey = NULL;
 	struct openpgp_signedpacket_list *curuid = NULL;
 	char buf[1024];
 
 	buf[0]=0;
-	if (fetch_key(keyid, &publickey, false) && publickey != NULL) {
+	if (config.dbbackend->fetch_key(keyid, &publickey, false) &&
+			publickey != NULL) {
 		curuid = publickey->uids;
 		while (curuid != NULL && buf[0] == 0) {
 			if (curuid->packet->tag == 13) {
@@ -68,20 +70,20 @@ char *keyid2uid(uint64_t keyid)
  *	indexing and doing stats bits. If revoked is non-NULL then if the key
  *	is revoked it's set to true.
  */
-struct ll *getkeysigs(uint64_t keyid, bool *revoked)
+struct ll *generic_getkeysigs(uint64_t keyid, bool *revoked)
 {
 	struct ll *sigs = NULL;
 	struct openpgp_signedpacket_list *uids = NULL;
 	struct openpgp_publickey *publickey = NULL;
 
-	fetch_key(keyid, &publickey, false);
+	config.dbbackend->fetch_key(keyid, &publickey, false);
 	
 	if (publickey != NULL) {
 		for (uids = publickey->uids; uids != NULL; uids = uids->next) {
 			sigs = keysigs(sigs, uids->sigs);
 		}
 		if (revoked != NULL) {
-			*revoked = (publickey->revocations != NULL);
+			*revoked = publickey->revoked;
 		}
 		free_publickey(publickey);
 	}
@@ -98,21 +100,29 @@ struct ll *getkeysigs(uint64_t keyid, bool *revoked)
  *	getkeysigs function above except we use the hash module to cache the
  *	data so if we need it again it's already loaded.
  */
-struct ll *cached_getkeysigs(uint64_t keyid)
+struct ll *generic_cached_getkeysigs(uint64_t keyid)
 {
 	struct stats_key *key = NULL;
 	struct stats_key *signedkey = NULL;
 	struct ll        *cursig = NULL;
+	struct ll	 *sigs = NULL;
 	bool		  revoked = false;
 
 	if (keyid == 0)  {
 		return NULL;
 	}
 
-	key = createandaddtohash(keyid);
+	key = findinhash(keyid);
 
-	if (key->gotsigs == false) {
-		key->sigs = getkeysigs(key->keyid, &revoked);
+	if (key == NULL || key->gotsigs == false) {
+		sigs = config.dbbackend->getkeysigs(keyid, &revoked);
+		if (sigs == NULL) {
+			return NULL;
+		}
+		if (key == NULL) {
+			key = createandaddtohash(keyid);
+		}
+		key->sigs = sigs;
 		key->revoked = revoked;
 		for (cursig = key->sigs; cursig != NULL;
 				cursig = cursig->next) {
@@ -133,12 +143,12 @@ struct ll *cached_getkeysigs(uint64_t keyid)
  *	This function maps a 32bit key id to the full 64bit one. It returns the
  *	full keyid. If the key isn't found a keyid of 0 is returned.
  */
-uint64_t getfullkeyid(uint64_t keyid)
+uint64_t generic_getfullkeyid(uint64_t keyid)
 {
 	struct openpgp_publickey *publickey = NULL;
 
 	if (keyid < 0x100000000LL) {
-		fetch_key(keyid, &publickey, false);
+		config.dbbackend->fetch_key(keyid, &publickey, false);
 		if (publickey != NULL) {
 			keyid = get_keyid(publickey);
 			free_publickey(publickey);
@@ -156,6 +166,7 @@ uint64_t getfullkeyid(uint64_t keyid)
 /**
  *	update_keys - Takes a list of public keys and updates them in the DB.
  *	@keys: The keys to update in the DB.
+ *	@sendsync: Should we send a sync mail to our peers.
  *
  *	Takes a list of keys and adds them to the database, merging them with
  *	the key in the database if it's already present there. The key list is
@@ -163,7 +174,7 @@ uint64_t getfullkeyid(uint64_t keyid)
  *	we had before to what we have now (ie the set of data that was added to
  *	the DB). Returns the number of entirely new keys added.
  */
-int update_keys(struct openpgp_publickey **keys)
+int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
 {
 	struct openpgp_publickey *curkey = NULL;
 	struct openpgp_publickey *oldkey = NULL;
@@ -172,11 +183,12 @@ int update_keys(struct openpgp_publickey **keys)
 	bool intrans;
 
 	for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
-		intrans = starttrans();
+		intrans = config.dbbackend->starttrans();
 		logthing(LOGTHING_INFO,
 			"Fetching key 0x%llX, result: %d",
 			get_keyid(curkey),
-			fetch_key(get_keyid(curkey), &oldkey, intrans));
+			config.dbbackend->fetch_key(get_keyid(curkey), &oldkey,
+					intrans));
 
 		/*
 		 * If we already have the key stored in the DB then merge it
@@ -186,7 +198,7 @@ int update_keys(struct openpgp_publickey **keys)
 		 */
 		if (oldkey != NULL) {
 			merge_keys(oldkey, curkey);
-			if (curkey->revocations == NULL &&
+			if (curkey->sigs == NULL &&
 					curkey->uids == NULL &&
 					curkey->subkeys == NULL) {
 				if (prev == NULL) {
@@ -201,20 +213,25 @@ int update_keys(struct openpgp_publickey **keys)
 				prev = curkey;
 				logthing(LOGTHING_INFO,
 					"Merged key; storing updated key.");
-				store_key(oldkey, intrans, true);
+				config.dbbackend->store_key(oldkey, intrans,
+					true);
 			}
 			free_publickey(oldkey);
 			oldkey = NULL;
 		} else {
 			logthing(LOGTHING_INFO,
 				"Storing completely new key.");
-			store_key(curkey, intrans, false);
+			config.dbbackend->store_key(curkey, intrans, false);
 			newkeys++;
 		}
-		endtrans();
+		config.dbbackend->endtrans();
 		intrans = false;
 	}
 
+	if (sendsync && keys != NULL) {
+		sendkeysync(*keys);
+	}
+
 	return newkeys;
 }
 #endif /* NEED_UPDATEKEYS */