Explicitly use 32 bits for keyd socket commands

[onak.git] / keydb_fs.c

diff --git a/keydb_fs.c b/keydb_fs.c
index 7e739d834623c1193bdf283c70362efbe9d1467d..db188b176684e492291f3f3ec0408c9c06942e63 100644 (file)
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -4,8 +4,6 @@
  * Daniel Silverstone <dsilvers@digital-scurf.org>
  *
  * Copyright 2004 Daniel Silverstone and Project Purple
  * Daniel Silverstone <dsilvers@digital-scurf.org>
  *
  * Copyright 2004 Daniel Silverstone and Project Purple

- *
- * $Id: keydb_fs.c,v 1.1 2004/05/27 03:37:58 noodles Exp $

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>


@@ -21,6 +19,7 @@
 #include <dirent.h>
 
 #include "charfuncs.h"
 #include <dirent.h>
 
 #include "charfuncs.h"

+#include "decodekey.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"


@@ -45,7 +44,7 @@ static uint32_t calchash(uint8_t * ptr)
 {
        register uint32_t h = FNV_offset_basis;
        register uint32_t p = FNV_mixing_prime;
 {
        register uint32_t h = FNV_offset_basis;
        register uint32_t p = FNV_mixing_prime;

-       register uint32_t n = strlen(ptr);
+       register uint32_t n = strlen((char *) ptr);

        register uint8_t *c = ptr;
        while (n--) {
                h *= p;
        register uint8_t *c = ptr;
        while (n--) {
                h *= p;


@@ -55,25 +54,25 @@ static uint32_t calchash(uint8_t * ptr)
 }
 
 
 }
 
 

-void keypath(char *buffer, uint64_t _keyid)
+static void keypath(char *buffer, uint64_t _keyid)

 {
        uint64_t keyid = _keyid << 32;
 {
        uint64_t keyid = _keyid << 32;

-       snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08lX/%016llX",
+       snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016" PRIX64,

                 config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF),
                 (uint8_t) ((keyid >> 48) & 0xFF),
                 (uint32_t) (keyid >> 32), _keyid);
 }
 
                 config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF),
                 (uint8_t) ((keyid >> 48) & 0xFF),
                 (uint32_t) (keyid >> 32), _keyid);
 }
 

-void keydir(char *buffer, uint64_t _keyid)
+static void keydir(char *buffer, uint64_t _keyid)

 {
        uint64_t keyid = _keyid << 32;
 {
        uint64_t keyid = _keyid << 32;

-       snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08lX", config.db_dir,
+       snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X", config.db_dir,

                 (uint8_t) ((keyid >> 56) & 0xFF),
                 (uint8_t) ((keyid >> 48) & 0xFF),
                 (uint32_t) (keyid >> 32));
 }
 
                 (uint8_t) ((keyid >> 56) & 0xFF),
                 (uint8_t) ((keyid >> 48) & 0xFF),
                 (uint32_t) (keyid >> 32));
 }
 

-void prove_path_to(uint64_t keyid, char *what)
+static void prove_path_to(uint64_t keyid, char *what)

 {
        static char buffer[1024];
        snprintf(buffer, PATH_MAX, "%s/%s", config.db_dir, what);
 {
        static char buffer[1024];
        snprintf(buffer, PATH_MAX, "%s/%s", config.db_dir, what);


@@ -88,32 +87,51 @@ void prove_path_to(uint64_t keyid, char *what)
                 (uint8_t) ((keyid >> 16) & 0xFF));
        mkdir(buffer, 0777);
 
                 (uint8_t) ((keyid >> 16) & 0xFF));
        mkdir(buffer, 0777);
 

-       snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X/%08lX", config.db_dir, what,
+       snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X/%08X", config.db_dir, what,

                 (uint8_t) ((keyid >> 24) & 0xFF),
                 (uint8_t) ((keyid >> 16) & 0xFF), (uint32_t) (keyid));
        mkdir(buffer, 0777);
 }
 
                 (uint8_t) ((keyid >> 24) & 0xFF),
                 (uint8_t) ((keyid >> 16) & 0xFF), (uint32_t) (keyid));
        mkdir(buffer, 0777);
 }
 

-void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)
+static void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)

 {
 {

-       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08lX/%s/%016llX",
+       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016" PRIX64,

                 config.db_dir, (uint8_t) ((hash >> 24) & 0xFF),
                 (uint8_t) ((hash >> 16) & 0xFF), hash, word, keyid);
 }
 
                 config.db_dir, (uint8_t) ((hash >> 24) & 0xFF),
                 (uint8_t) ((hash >> 16) & 0xFF), hash, word, keyid);
 }
 

-void worddir(char *buffer, char *word, uint32_t hash)
+static void worddir(char *buffer, char *word, uint32_t hash)

 {
 {

-       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08lX/%s", config.db_dir,
+       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s", config.db_dir,

                 (uint8_t) ((hash >> 24) & 0xFF),
                 (uint8_t) ((hash >> 16) & 0xFF), hash, word);
 }
 
                 (uint8_t) ((hash >> 24) & 0xFF),
                 (uint8_t) ((hash >> 16) & 0xFF), hash, word);
 }
 

+static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
+{
+       snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016" PRIX64,
+                config.db_dir,
+                (uint8_t) ((subkey >> 24) & 0xFF),
+                (uint8_t) ((subkey >> 16) & 0xFF),
+                (uint32_t) (subkey & 0xFFFFFFFF),
+                keyid);
+}
+
+static void subkeydir(char *buffer, uint64_t subkey)
+{
+       snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X",
+                config.db_dir,
+                (uint8_t) ((subkey >> 24) & 0xFF),
+                (uint8_t) ((subkey >> 16) & 0xFF),
+                (uint32_t) (subkey & 0xFFFFFFFF));
+}
+

 /*****************************************************************************/
 
 /**
  *     initdb - Initialize the key database.
  */
 /*****************************************************************************/
 
 /**
  *     initdb - Initialize the key database.
  */

-void initdb(bool readonly)
+static void fs_initdb(bool readonly)

 {
        char buffer[PATH_MAX];
 
 {
        char buffer[PATH_MAX];
 


@@ -149,7 +167,7 @@ void initdb(bool readonly)
 /**
  *     cleanupdb - De-initialize the key database.
  */
 /**
  *     cleanupdb - De-initialize the key database.
  */

-void cleanupdb(void)
+static void fs_cleanupdb(void)

 {
        /* Mmmm nothing to do here? */
        close(keydb_lockfile_fd);
 {
        /* Mmmm nothing to do here? */
        close(keydb_lockfile_fd);


@@ -158,7 +176,7 @@ void cleanupdb(void)
 /**
  *     starttrans - Start a transaction.
  */
 /**
  *     starttrans - Start a transaction.
  */

-bool starttrans(void)
+static bool fs_starttrans(void)

 {
        struct flock lockstruct;
        int remaining = 20;
 {
        struct flock lockstruct;
        int remaining = 20;


@@ -179,7 +197,7 @@ bool starttrans(void)
 /**
  *     endtrans - End a transaction.
  */
 /**
  *     endtrans - End a transaction.
  */

-void endtrans(void)
+static void fs_endtrans(void)

 {
        struct flock lockstruct;
 
 {
        struct flock lockstruct;
 


@@ -190,13 +208,51 @@ void endtrans(void)
        fcntl(keydb_lockfile_fd, F_SETLK, &lockstruct);
 }
 
        fcntl(keydb_lockfile_fd, F_SETLK, &lockstruct);
 }
 

+static uint64_t fs_getfullkeyid(uint64_t keyid)
+{
+       static char buffer[PATH_MAX];
+       DIR *d = NULL;
+       struct dirent *de = NULL;
+       uint64_t ret = 0;
+
+       keydir(buffer, keyid);
+
+       d = opendir(buffer);
+       if (d) {
+               do {
+                       de = readdir(d);
+                       if (de && de->d_name[0] != '.') {
+                               ret = strtoull(de->d_name, NULL, 16);
+                       }
+               } while (de && de->d_name[0] == '.');
+               closedir(d);    
+       }
+
+       if (ret == 0) {
+               subkeydir(buffer, keyid);
+
+               d = opendir(buffer);
+               if (d) {
+                       do {
+                               de = readdir(d);
+                               if (de && de->d_name[0] != '.') {
+                                       ret = strtoull(de->d_name, NULL, 16);
+                               }
+                       } while (de && de->d_name[0] == '.');
+                       closedir(d);
+               }
+       }
+
+       return ret;
+}
+

 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.
  *     @intrans: If we're already in a transaction.
  */
 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.
  *     @intrans: If we're already in a transaction.
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int fs_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,

              bool intrans)
 {
        static char buffer[PATH_MAX];
              bool intrans)
 {
        static char buffer[PATH_MAX];


@@ -204,10 +260,10 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        struct openpgp_packet_list *packets = NULL;
 
        if (!intrans)
        struct openpgp_packet_list *packets = NULL;
 
        if (!intrans)

-               starttrans();
+               fs_starttrans();

 
        if ((keyid >> 32) == 0)
 
        if ((keyid >> 32) == 0)

-               keyid = getfullkeyid(keyid);
+               keyid = fs_getfullkeyid(keyid);

 
        keypath(buffer, keyid);
        if ((fd = open(buffer, O_RDONLY)) != -1) {
 
        keypath(buffer, keyid);
        if ((fd = open(buffer, O_RDONLY)) != -1) {


@@ -221,7 +277,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        }
 
        if (!intrans)
        }
 
        if (!intrans)

-               endtrans();
+               fs_endtrans();

        return ret;
 }
 
        return ret;
 }
 


@@ -231,7 +287,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
  *     @intrans: If we're already in a transaction.
  *     @update: If true the key exists and should be updated.
  */
  *     @intrans: If we're already in a transaction.
  *     @update: If true the key exists and should be updated.
  */

-int store_key(struct openpgp_publickey *publickey, bool intrans,
+static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,

              bool update)
 {
        static char buffer[PATH_MAX];
              bool update)
 {
        static char buffer[PATH_MAX];


@@ -242,10 +298,12 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
        struct openpgp_publickey *next = NULL;
        uint64_t keyid = get_keyid(publickey);
        struct ll *wordlist = NULL, *wl = NULL;
        struct openpgp_publickey *next = NULL;
        uint64_t keyid = get_keyid(publickey);
        struct ll *wordlist = NULL, *wl = NULL;

+       uint64_t *subkeyids = NULL;
+       int i = 0;

 
 
        if (!intrans)
 
 
        if (!intrans)

-               starttrans();
+               fs_starttrans();

 
        prove_path_to(keyid, "key");
        keypath(buffer, keyid);
 
        prove_path_to(keyid, "key");
        keypath(buffer, keyid);


@@ -278,14 +336,28 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
 
                        wl = wl->next;
                }
 
                        wl = wl->next;
                }

+               llfree(wordlist, free);
+               
+               subkeyids = keysubkeys(publickey);
+               i = 0;
+               while (subkeyids != NULL && subkeyids[i] != 0) {
+                       prove_path_to(subkeyids[i], "subkeys");
+
+                       subkeydir(wbuffer, subkeyids[i]);
+                       mkdir(wbuffer, 0777);
+                       subkeypath(wbuffer, subkeyids[i], keyid);
+                       link(buffer, wbuffer);

 
 

-
-
-               llfree(wordlist, NULL);
+                       i++;
+               }
+               if (subkeyids != NULL) {
+                       free(subkeyids);
+                       subkeyids = NULL;
+               }

        }
 
        if (!intrans)
        }
 
        if (!intrans)

-               endtrans();
+               fs_endtrans();

        return ret;
 }
 
        return ret;
 }
 


@@ -294,27 +366,29 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
  *     @keyid: The keyid to delete.
  *     @intrans: If we're already in a transaction.
  */
  *     @keyid: The keyid to delete.
  *     @intrans: If we're already in a transaction.
  */

-int delete_key(uint64_t keyid, bool intrans)
+static int fs_delete_key(uint64_t keyid, bool intrans)

 {
        static char buffer[PATH_MAX];
        int ret;
        struct openpgp_publickey *pk = NULL;
        struct ll *wordlist = NULL, *wl = NULL;
 {
        static char buffer[PATH_MAX];
        int ret;
        struct openpgp_publickey *pk = NULL;
        struct ll *wordlist = NULL, *wl = NULL;

+       uint64_t *subkeyids = NULL;
+       int i = 0;

 
        if ((keyid >> 32) == 0)
 
        if ((keyid >> 32) == 0)

-               keyid = getfullkeyid(keyid);
+               keyid = fs_getfullkeyid(keyid);

 
        if (!intrans)
 
        if (!intrans)

-               starttrans();
+               fs_starttrans();

 
 

-       ret = fetch_key(keyid, &pk, true);
+       ret = fs_fetch_key(keyid, &pk, true);

 
        if (ret) {
 
        if (ret) {

-               logthing(LOGTHING_CRITICAL, "Wordlist for key %016llX",
+               logthing(LOGTHING_DEBUG, "Wordlist for key %016" PRIX64,

                         keyid);
                wl = wordlist = makewordlistfromkey(wordlist, pk);
                         keyid);
                wl = wordlist = makewordlistfromkey(wordlist, pk);

-               logthing(LOGTHING_CRITICAL,
-                        "Wordlist for key %016llX done", keyid);
+               logthing(LOGTHING_DEBUG,
+                        "Wordlist for key %016" PRIX64 " done", keyid);

                while (wl) {
                        uint32_t hash = calchash((uint8_t *) (wl->object));
                        prove_path_to(hash, "words");
                while (wl) {
                        uint32_t hash = calchash((uint8_t *) (wl->object));
                        prove_path_to(hash, "words");


@@ -324,13 +398,29 @@ int delete_key(uint64_t keyid, bool intrans)
 
                        wl = wl->next;
                }
 
                        wl = wl->next;
                }

+
+               subkeyids = keysubkeys(pk);
+               i = 0;
+               while (subkeyids != NULL && subkeyids[i] != 0) {
+                       prove_path_to(subkeyids[i], "subkeys");
+
+                       subkeypath(buffer, subkeyids[i], keyid);
+                       unlink(buffer);
+
+                       i++;
+               }
+               if (subkeyids != NULL) {
+                       free(subkeyids);
+                       subkeyids = NULL;
+               }
+

        }
 
        keypath(buffer, keyid);
        unlink(buffer);
 
        if (!intrans)
        }
 
        keypath(buffer, keyid);
        unlink(buffer);
 
        if (!intrans)

-               endtrans();
+               fs_endtrans();

        return 1;
 }
 
        return 1;
 }
 


@@ -344,16 +434,18 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
 
        worddir(buffer, word, hash);
        d = opendir(buffer);
 
        worddir(buffer, word, hash);
        d = opendir(buffer);

-       logthing(LOGTHING_CRITICAL, "Scanning for word %s in dir %s", word,
+       logthing(LOGTHING_DEBUG, "Scanning for word %s in dir %s", word,

                 buffer);
        if (d)
                do {
                        de = readdir(d);
                        if (de && de->d_name[0] != '.') {
                                if ((!mct)
                 buffer);
        if (d)
                do {
                        de = readdir(d);
                        if (de && de->d_name[0] != '.') {
                                if ((!mct)

-                                   || (llfind(mct, de->d_name, strcmp) !=
+                                   || (llfind(mct, de->d_name,
+                                       (int (*)(const void *, const void *))
+                                                   strcmp) !=

                                        NULL)) {
                                        NULL)) {

-                                       logthing(LOGTHING_CRITICAL,
+                                       logthing(LOGTHING_DEBUG,

                                                 "Found %s // %s", word,
                                                 de->d_name);
                                        keys =
                                                 "Found %s // %s", word,
                                                 de->d_name);
                                        keys =


@@ -372,21 +464,25 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
  *     @search: The text to search for.
  *     @publickey: A pointer to a structure to return the key in.
  */
  *     @search: The text to search for.
  *     @publickey: A pointer to a structure to return the key in.
  */

-int fetch_key_text(const char *search,
+static int fs_fetch_key_text(const char *search,

                   struct openpgp_publickey **publickey)
 {
        struct ll *wordlist = NULL, *wl = NULL;
        struct ll *keylist = NULL;
                   struct openpgp_publickey **publickey)
 {
        struct ll *wordlist = NULL, *wl = NULL;
        struct ll *keylist = NULL;

+       char      *searchtext = NULL;

        int addedkeys = 0;
 
        int addedkeys = 0;
 

-       logthing(LOGTHING_CRITICAL, "Search was '%s'", search);
+       logthing(LOGTHING_DEBUG, "Search was '%s'", search);

 
 

-       wl = wordlist = makewordlist(wordlist, search);
+       searchtext = strdup(search);
+       wl = wordlist = makewordlist(wordlist, searchtext);

 
        keylist = internal_get_key_by_word(wordlist->object, NULL);
 
        if (!keylist) {
                llfree(wordlist, NULL);
 
        keylist = internal_get_key_by_word(wordlist->object, NULL);
 
        if (!keylist) {
                llfree(wordlist, NULL);

+               free(searchtext);
+               searchtext = NULL;

                return 0;
        }
 
                return 0;
        }
 


@@ -397,6 +493,8 @@ int fetch_key_text(const char *search,
                if (!nkl) {
                        llfree(wordlist, NULL);
                        llfree(keylist, free);
                if (!nkl) {
                        llfree(wordlist, NULL);
                        llfree(keylist, free);

+                       free(searchtext);
+                       searchtext = NULL;

                        return 0;
                }
                llfree(keylist, free);
                        return 0;
                }
                llfree(keylist, free);


@@ -409,9 +507,9 @@ int fetch_key_text(const char *search,
        /* Now add the keys... */
        wl = keylist;
        while (wl) {
        /* Now add the keys... */
        wl = keylist;
        while (wl) {

-               logthing(LOGTHING_CRITICAL, "Adding key: %s", wl->object);
+               logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);

                addedkeys +=
                addedkeys +=

-                   fetch_key(strtoull(wl->object, NULL, 16), publickey,
+                   fs_fetch_key(strtoull(wl->object, NULL, 16), publickey,

                              false);
                if (addedkeys >= config.maxkeys)
                        break;
                              false);
                if (addedkeys >= config.maxkeys)
                        break;


@@ -419,43 +517,50 @@ int fetch_key_text(const char *search,
        }
 
        llfree(keylist, free);
        }
 
        llfree(keylist, free);

+       free(searchtext);
+       searchtext = NULL;

 
        return addedkeys;
 }
 
 
        return addedkeys;
 }
 

-/*
- *     dumpdb - dump the key database
- *     @filenamebase: The base filename to use for the dump.
+/**
+ *     iterate_keys - call a function once for each key in the db.
+ *     @iterfunc: The function to call.
+ *     @ctx: A context pointer
+ *
+ *     Calls iterfunc once for each key in the database. ctx is passed
+ *     unaltered to iterfunc. This function is intended to aid database dumps
+ *     and statistic calculations.
+ *
+ *     Returns the number of keys we iterated over.

  */
  */

-int dumpdb(char *filenamebase)
+static int fs_iterate_keys(void (*iterfunc)(void *ctx,
+               struct openpgp_publickey *key), void *ctx)

 {
        return 0;
 }
 
 {
        return 0;
 }
 

-uint64_t getfullkeyid(uint64_t keyid)
-{
-       static char buffer[PATH_MAX];
-       DIR *d;
-       struct dirent *de;
-       uint64_t ret = 0;
-
-       keydir(buffer, keyid);
-
-       d = opendir(buffer);
-       do {
-               de = readdir(d);
-               if (de)
-                       if (de && de->d_name[0] != '.') {
-                               ret = strtoull(de->d_name, NULL, 16);
-                       }
-       } while (de && de->d_name[0] == '.');
-       closedir(d);
-       return ret;
-}
-

 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1

+#define NEED_UPDATEKEYS 1

 #include "keydb.c"
 #include "keydb.c"

+
+struct dbfuncs keydb_fs_funcs = {
+       .initdb                 = fs_initdb,
+       .cleanupdb              = fs_cleanupdb,
+       .starttrans             = fs_starttrans,
+       .endtrans               = fs_endtrans,
+       .fetch_key              = fs_fetch_key,
+       .fetch_key_text         = fs_fetch_key_text,
+       .store_key              = fs_store_key,
+       .update_keys            = generic_update_keys,
+       .delete_key             = fs_delete_key,
+       .getkeysigs             = generic_getkeysigs,
+       .cached_getkeysigs      = generic_cached_getkeysigs,
+       .keyid2uid              = generic_keyid2uid,
+       .getfullkeyid           = fs_getfullkeyid,
+       .iterate_keys           = fs_iterate_keys,
+};