X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=f6b9682f2d4b4ade0db0494fbf4c4b312a80171e;hb=dfab9e96ee1fa4a10acf9c1cf644d7a4366a5af6;hp=f92c252667a95eeb23bed61d76f763d69031e6a7;hpb=357fbc65bfab230bbf12313e8b458d8325a6174f;p=onak.git

diff --git a/keydb.c b/keydb.c
index f92c252..f6b9682 100644
--- a/keydb.c
+++ b/keydb.c
@@ -155,37 +155,12 @@ struct ll *generic_cached_getkeysigs(struct onak_dbctx *dbctx, uint64_t keyid)
 	return key->sigs;
 }
 
-#ifdef NEED_GETFULLKEYID
-/**
- *	getfullkeyid - Maps a 32bit key id to a 64bit one.
- *	@keyid: The 32bit 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 generic_getfullkeyid(struct onak_dbctx *dbctx, uint64_t keyid)
-{
-	struct openpgp_publickey *publickey = NULL;
-
-	if (keyid < 0x100000000LL) {
-		dbctx->fetch_key_id(dbctx, keyid, &publickey, false);
-		if (publickey != NULL) {
-			get_keyid(publickey, &keyid);
-			free_publickey(publickey);
-			publickey = NULL;
-		} else {
-			keyid = 0;
-		}
-	}
-	
-	return keyid;
-}
-#endif
-
 #ifdef NEED_UPDATEKEYS
 /**
  *	update_keys - Takes a list of public keys and updates them in the DB.
  *	@keys: The keys to update in the DB.
+ *	@blacklist: A keyarray of key fingerprints not to accept.
+ *	@updateonly: Only update existing keys, don't add new ones.
  *	@sendsync: Should we send a sync mail to our peers.
  *
  *	Takes a list of keys and adds them to the database, merging them with
@@ -195,23 +170,38 @@ uint64_t generic_getfullkeyid(struct onak_dbctx *dbctx, uint64_t keyid)
  *	the DB). Returns the number of entirely new keys added.
  */
 int generic_update_keys(struct onak_dbctx *dbctx,
-		struct openpgp_publickey **keys, bool sendsync)
+		struct openpgp_publickey **keys,
+		struct keyarray *blacklist,
+		bool updateonly,
+		bool sendsync)
 {
-	struct openpgp_publickey *curkey = NULL;
+	struct openpgp_publickey **curkey, *tmp = NULL;
 	struct openpgp_publickey *oldkey = NULL;
-	struct openpgp_publickey *prev = NULL;
-	int newkeys = 0;
+	struct openpgp_fingerprint fp;
+	int newkeys = 0, ret;
 	bool intrans;
-	uint64_t keyid;
 
-	for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
+	curkey = keys;
+	while (*curkey != NULL) {
+		get_fingerprint((*curkey)->publickey, &fp);
+		if (blacklist && array_find(blacklist, &fp)) {
+			logthing(LOGTHING_INFO, "Ignoring blacklisted key.");
+			tmp = *curkey;
+			*curkey = (*curkey)->next;
+			tmp->next = NULL;
+			free_publickey(tmp);
+			continue;
+		}
+
 		intrans = dbctx->starttrans(dbctx);
-		get_keyid(curkey, &keyid);
-		logthing(LOGTHING_INFO,
-			"Fetching key 0x%" PRIX64 ", result: %d",
-			keyid,
-			dbctx->fetch_key_id(dbctx, keyid, &oldkey,
-					intrans));
+
+		ret = dbctx->fetch_key_fp(dbctx, &fp, &oldkey, intrans);
+		if (ret == 0 && updateonly) {
+			logthing(LOGTHING_INFO,
+				"Skipping new key as update only set.");
+			curkey = &(*curkey)->next;
+			goto next;
+		}
 
 		/*
 		 * If we already have the key stored in the DB then merge it
@@ -220,37 +210,35 @@ int generic_update_keys(struct onak_dbctx *dbctx,
 		 * one that we send out.
 		 */
 		if (oldkey != NULL) {
-			merge_keys(oldkey, curkey);
-			if (curkey->sigs == NULL &&
-					curkey->uids == NULL &&
-					curkey->subkeys == NULL) {
-				if (prev == NULL) {
-					*keys = curkey->next;
-				} else {
-					prev->next = curkey->next;
-					curkey->next = NULL;
-					free_publickey(curkey);
-					curkey = prev;
-				}
+			merge_keys(oldkey, *curkey);
+			if ((*curkey)->sigs == NULL &&
+					(*curkey)->uids == NULL &&
+					(*curkey)->subkeys == NULL) {
+				tmp = *curkey;
+				*curkey = (*curkey)->next;
+				tmp->next = NULL;
+				free_publickey(tmp);
 			} else {
-				prev = curkey;
 				logthing(LOGTHING_INFO,
 					"Merged key; storing updated key.");
 				dbctx->store_key(dbctx, oldkey, intrans,
 					true);
+				curkey = &(*curkey)->next;
 			}
 			free_publickey(oldkey);
 			oldkey = NULL;
 		} else {
 			logthing(LOGTHING_INFO,
 				"Storing completely new key.");
-			dbctx->store_key(dbctx, curkey, intrans, false);
+			dbctx->store_key(dbctx, *curkey, intrans, false);
 			newkeys++;
+			curkey = &(*curkey)->next;
 		}
+next:
 		dbctx->endtrans(dbctx);
 	}
 
-	if (sendsync && keys != NULL) {
+	if (sendsync && keys != NULL && *keys != NULL) {
 		sendkeysync(*keys);
 	}
 
@@ -273,13 +261,23 @@ static int generic_fetch_key_fp(struct onak_dbctx *dbctx,
 	/*
 	 * We assume if the backend is using this function it's not storing
 	 * anything bigger than the 64 bit key ID and just truncate the
-	 * fingerprint to get that value. This doesn't work for v3 keys,
+	 * fingerprint to get that value. v4 keys want the lowest 64 bits, v5
+	 * keys need the top 64 bits.  This doesn't work for v3 keys,
 	 * but there's no way to map from v3 fingerprint to v3 key ID so
 	 * if the backend can't do it we're going to fail anyway.
 	 */
 	keyid = 0;
-	for (i = (fingerprint->length - 8); i < fingerprint->length; i++) {
-		keyid = (keyid << 8) + fingerprint->fp[i];
+	if (fingerprint->length == 20) {
+		/* v4 */
+		for (i = (fingerprint->length - 8); i < fingerprint->length;
+				i++) {
+			keyid = (keyid << 8) + fingerprint->fp[i];
+		}
+	} else {
+		/* v5 */
+		for (i = 0; i < 8; i++) {
+			keyid = (keyid << 8) + fingerprint->fp[i];
+		}
 	}
 
 	return dbctx->fetch_key_id(dbctx, keyid, publickey, intrans);