Don't add a key to the stats hash if it doesn't have any sigs

[onak.git] / keydb.c

diff --git a/keydb.c b/keydb.c
index 300e9b9a42690654e37b4649b1d06fbc70033c73..42eebfe3a34c8b1e0ee4bc0c6b1c9ed9bafa0914 100644 (file)
--- a/keydb.c
+++ b/keydb.c
@@ -31,14 +31,15 @@
  *     keyid2uid - Takes a keyid and returns the primary UID for it.
  *     @keyid: The keyid to lookup.
  */
  *     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,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.
  */
  *     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 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;
        }
 
        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) {
                key->revoked = revoked;
                for (cursig = key->sigs; cursig != NULL;
                                cursig = cursig->next) {


@@ -134,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.
  */
  *     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);


@@ -165,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.
  */
  *     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, bool sendsync)
+int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)

 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;
 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;


@@ -174,11 +183,12 @@ int update_keys(struct openpgp_publickey **keys, bool sendsync)
        bool intrans;
 
        for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
        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),
                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
 
                /*
                 * If we already have the key stored in the DB then merge it


@@ -188,7 +198,7 @@ int update_keys(struct openpgp_publickey **keys, bool sendsync)
                 */
                if (oldkey != NULL) {
                        merge_keys(oldkey, curkey);
                 */
                if (oldkey != NULL) {
                        merge_keys(oldkey, curkey);

-                       if (curkey->revocations == NULL &&
+                       if (curkey->sigs == NULL &&

                                        curkey->uids == NULL &&
                                        curkey->subkeys == NULL) {
                                if (prev == NULL) {
                                        curkey->uids == NULL &&
                                        curkey->subkeys == NULL) {
                                if (prev == NULL) {


@@ -203,17 +213,18 @@ int update_keys(struct openpgp_publickey **keys, bool sendsync)
                                prev = curkey;
                                logthing(LOGTHING_INFO,
                                        "Merged key; storing updated key.");
                                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.");
                        }
                        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++;
                }
                        newkeys++;
                }

-               endtrans();
+               config.dbbackend->endtrans();

                intrans = false;
        }
 
                intrans = false;
        }