Give Brett some credit.

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index 1eb9deff1edd1846d68993bb389ba6a375fbdb16..339450bda290f1d0c99166836dbb6f86800696c1 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -3,9 +3,7 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
  *
  * Jonathan McDowell <noodles@earth.li>
  *

- * Copyright 2002 Project Purple
- *
- * $Id: keydb.c,v 1.10 2003/06/08 21:11:00 noodles Exp $
+ * Copyright 2002-2004 Project Purple

  */
 
 /**
  */
 
 /**


@@ -24,21 +22,24 @@
 #include "keyid.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "mem.h"

+#include "merge.h"

 #include "parsekey.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.
  */
 
 #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;
 {
        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) {
                curuid = publickey->uids;
                while (curuid != NULL && buf[0] == 0) {
                        if (curuid->packet->tag == 13) {


@@ -69,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.
  */
  *     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;
 
 {
        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) {
        
        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);
        }
                }
                free_publickey(publickey);
        }


@@ -99,7 +100,7 @@ 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.
  */
  *     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 stats_key *key = NULL;
        struct stats_key *signedkey = NULL;


@@ -113,7 +114,7 @@ struct ll *cached_getkeysigs(uint64_t keyid)
        key = createandaddtohash(keyid);
 
        if (key->gotsigs == false) {
        key = createandaddtohash(keyid);
 
        if (key->gotsigs == false) {

-               key->sigs = getkeysigs(key->keyid, &revoked);
+               key->sigs = config.dbbackend->getkeysigs(key->keyid, &revoked);

                key->revoked = revoked;
                for (cursig = key->sigs; cursig != NULL;
                                cursig = cursig->next) {
                key->revoked = revoked;
                for (cursig = key->sigs; cursig != NULL;
                                cursig = cursig->next) {


@@ -134,12 +135,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.
  */
  *     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) {
 {
        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);
                if (publickey != NULL) {
                        keyid = get_keyid(publickey);
                        free_publickey(publickey);


@@ -152,3 +153,76 @@ uint64_t getfullkeyid(uint64_t keyid)
        return keyid;
 }
 #endif
        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.
+ *     @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
+ *     update to contain the minimum set of updates required to get from what
+ *     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 generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
+{
+       struct openpgp_publickey *curkey = NULL;
+       struct openpgp_publickey *oldkey = NULL;
+       struct openpgp_publickey *prev = NULL;
+       int newkeys = 0;
+       bool intrans;
+
+       for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
+               intrans = config.dbbackend->starttrans();
+               logthing(LOGTHING_INFO,
+                       "Fetching key 0x%llX, result: %d",
+                       get_keyid(curkey),
+                       config.dbbackend->fetch_key(get_keyid(curkey), &oldkey,
+                                       intrans));
+
+               /*
+                * If we already have the key stored in the DB then merge it
+                * with the new one that's been supplied. Otherwise the key
+                * we've just got is the one that goes in the DB and also the
+                * 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;
+                               }
+                       } else {
+                               prev = curkey;
+                               logthing(LOGTHING_INFO,
+                                       "Merged key; storing updated key.");
+                               store_key(oldkey, intrans, true);
+                       }
+                       free_publickey(oldkey);
+                       oldkey = NULL;
+               } else {
+                       logthing(LOGTHING_INFO,
+                               "Storing completely new key.");
+                       config.dbbackend->store_key(curkey, intrans, false);
+                       newkeys++;
+               }
+               config.dbbackend->endtrans();
+               intrans = false;
+       }
+
+       if (sendsync && keys != NULL) {
+               sendkeysync(*keys);
+       }
+
+       return newkeys;
+}
+#endif /* NEED_UPDATEKEYS */