]> git.sommitrealweird.co.uk Git - onak.git/blobdiff - keydb_fs.c
Make compare_packet follow memcmp semantics and export to other modules
[onak.git] / keydb_fs.c
index 01101f0eaeca4683a077e71fbc7ed45c651ce8ca..41d55cf07677c531bb004f591e7162916b4d3f0d 100644 (file)
@@ -19,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"
 #include "log.h"
 #include "wordlist.h"
 
 #include "log.h"
 #include "wordlist.h"
 
+/* Hack: We should really dynamically allocate our path buffers */
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 static int keydb_lockfile_fd = -1;
 static bool keydb_lockfile_readonly;
 
 static int keydb_lockfile_fd = -1;
 static bool keydb_lockfile_readonly;
 
@@ -53,71 +59,94 @@ static uint32_t calchash(uint8_t * ptr)
 }
 
 
 }
 
 
-void keypath(char *buffer, uint64_t _keyid)
+static void keypath(char *buffer, size_t length, uint64_t _keyid)
 {
        uint64_t keyid = _keyid << 32;
 {
        uint64_t keyid = _keyid << 32;
-       snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX",
+       snprintf(buffer, length, "%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, size_t length, uint64_t _keyid)
 {
        uint64_t keyid = _keyid << 32;
 {
        uint64_t keyid = _keyid << 32;
-       snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X", config.db_dir,
+       snprintf(buffer, length, "%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[PATH_MAX];
+       snprintf(buffer, sizeof(buffer), "%s/%s", config.db_dir, what);
        mkdir(buffer, 0777);
 
        mkdir(buffer, 0777);
 
-       snprintf(buffer, PATH_MAX, "%s/%s/%02X", config.db_dir, what,
+       snprintf(buffer, sizeof(buffer), "%s/%s/%02X", config.db_dir, what,
                 (uint8_t) ((keyid >> 24) & 0xFF));
        mkdir(buffer, 0777);
 
                 (uint8_t) ((keyid >> 24) & 0xFF));
        mkdir(buffer, 0777);
 
-       snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X", config.db_dir, what,
+       snprintf(buffer, sizeof(buffer), "%s/%s/%02X/%02X", config.db_dir,
+                what,
                 (uint8_t) ((keyid >> 24) & 0xFF),
                 (uint8_t) ((keyid >> 16) & 0xFF));
        mkdir(buffer, 0777);
 
                 (uint8_t) ((keyid >> 24) & 0xFF),
                 (uint8_t) ((keyid >> 16) & 0xFF));
        mkdir(buffer, 0777);
 
-       snprintf(buffer, PATH_MAX, "%s/%s/%02X/%02X/%08X", config.db_dir, what,
+       snprintf(buffer, sizeof(buffer), "%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, size_t length, char *word, uint32_t hash,
+               uint64_t keyid)
 {
 {
-       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016llX",
+       snprintf(buffer, length, "%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, size_t length, char *word, uint32_t hash)
 {
 {
-       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s", config.db_dir,
+       snprintf(buffer, length, "%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, size_t length, uint64_t subkey,
+               uint64_t keyid)
+{
+       snprintf(buffer, length, "%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, size_t length, uint64_t subkey)
+{
+       snprintf(buffer, length, "%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];
 
        keydb_lockfile_readonly = readonly;
 
 {
        char buffer[PATH_MAX];
 
        keydb_lockfile_readonly = readonly;
 
-       snprintf(buffer, PATH_MAX, "%s/.lock", config.db_dir);
+       snprintf(buffer, sizeof(buffer), "%s/.lock", config.db_dir);
 
        if (access(config.db_dir, R_OK | W_OK | X_OK) == -1) {
                if (errno != ENOENT) {
 
        if (access(config.db_dir, R_OK | W_OK | X_OK) == -1) {
                if (errno != ENOENT) {
@@ -147,7 +176,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);
@@ -156,7 +185,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;
@@ -177,7 +206,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;
 
@@ -188,13 +217,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, sizeof(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, sizeof(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];
@@ -202,12 +269,12 @@ 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);
+       keypath(buffer, sizeof(buffer), keyid);
        if ((fd = open(buffer, O_RDONLY)) != -1) {
                /* File is present, load it in... */
                read_openpgp_stream(file_fetchchar, &fd, &packets, 0);
        if ((fd = open(buffer, O_RDONLY)) != -1) {
                /* File is present, load it in... */
                read_openpgp_stream(file_fetchchar, &fd, &packets, 0);
@@ -219,7 +286,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        }
 
        if (!intrans)
        }
 
        if (!intrans)
-               endtrans();
+               fs_endtrans();
        return ret;
 }
 
        return ret;
 }
 
@@ -229,7 +296,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];
@@ -240,13 +307,15 @@ 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");
 
        prove_path_to(keyid, "key");
-       keypath(buffer, keyid);
+       keypath(buffer, sizeof(buffer), keyid);
 
        if ((fd =
             open(buffer, O_WRONLY | (update ? O_TRUNC : O_CREAT),
 
        if ((fd =
             open(buffer, O_WRONLY | (update ? O_TRUNC : O_CREAT),
@@ -269,19 +338,37 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
                        uint32_t hash = calchash((uint8_t *) (wl->object));
                        prove_path_to(hash, "words");
 
                        uint32_t hash = calchash((uint8_t *) (wl->object));
                        prove_path_to(hash, "words");
 
-                       worddir(wbuffer, wl->object, hash);
+                       worddir(wbuffer, sizeof(wbuffer), wl->object, hash);
                        mkdir(wbuffer, 0777);
                        mkdir(wbuffer, 0777);
-                       wordpath(wbuffer, wl->object, hash, keyid);
+                       wordpath(wbuffer, sizeof(wbuffer), wl->object, hash,
+                               keyid);
                        link(buffer, wbuffer);
 
                        wl = wl->next;
                }
                        link(buffer, wbuffer);
 
                        wl = wl->next;
                }
-
                llfree(wordlist, free);
                llfree(wordlist, free);
+               
+               subkeyids = keysubkeys(publickey);
+               i = 0;
+               while (subkeyids != NULL && subkeyids[i] != 0) {
+                       prove_path_to(subkeyids[i], "subkeys");
+
+                       subkeydir(wbuffer, sizeof(wbuffer), subkeyids[i]);
+                       mkdir(wbuffer, 0777);
+                       subkeypath(wbuffer, sizeof(wbuffer), subkeyids[i],
+                               keyid);
+                       link(buffer, wbuffer);
+
+                       i++;
+               }
+               if (subkeyids != NULL) {
+                       free(subkeyids);
+                       subkeyids = NULL;
+               }
        }
 
        if (!intrans)
        }
 
        if (!intrans)
-               endtrans();
+               fs_endtrans();
        return ret;
 }
 
        return ret;
 }
 
@@ -290,43 +377,63 @@ 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");
 
-                       wordpath(buffer, wl->object, hash, keyid);
+                       wordpath(buffer, sizeof(buffer), wl->object, hash,
+                               keyid);
                        unlink(buffer);
 
                        wl = wl->next;
                }
                        unlink(buffer);
 
                        wl = wl->next;
                }
+
+               subkeyids = keysubkeys(pk);
+               i = 0;
+               while (subkeyids != NULL && subkeyids[i] != 0) {
+                       prove_path_to(subkeyids[i], "subkeys");
+
+                       subkeypath(buffer, sizeof(buffer), subkeyids[i],
+                               keyid);
+                       unlink(buffer);
+
+                       i++;
+               }
+               if (subkeyids != NULL) {
+                       free(subkeyids);
+                       subkeyids = NULL;
+               }
+
        }
 
        }
 
-       keypath(buffer, keyid);
+       keypath(buffer, sizeof(buffer), keyid);
        unlink(buffer);
 
        if (!intrans)
        unlink(buffer);
 
        if (!intrans)
-               endtrans();
+               fs_endtrans();
        return 1;
 }
 
        return 1;
 }
 
@@ -338,9 +445,9 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
        uint32_t hash = calchash((uint8_t *) (word));
        struct dirent *de;
 
        uint32_t hash = calchash((uint8_t *) (word));
        struct dirent *de;
 
-       worddir(buffer, word, hash);
+       worddir(buffer, sizeof(buffer), word, hash);
        d = opendir(buffer);
        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 {
                 buffer);
        if (d)
                do {
@@ -351,7 +458,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
                                        (int (*)(const void *, const void *))
                                                    strcmp) !=
                                        NULL)) {
                                        (int (*)(const void *, const void *))
                                                    strcmp) !=
                                        NULL)) {
-                                       logthing(LOGTHING_CRITICAL,
+                                       logthing(LOGTHING_DEBUG,
                                                 "Found %s // %s", word,
                                                 de->d_name);
                                        keys =
                                                 "Found %s // %s", word,
                                                 de->d_name);
                                        keys =
@@ -370,7 +477,7 @@ 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 openpgp_publickey **publickey)
 {
        struct ll *wordlist = NULL, *wl = NULL;
@@ -378,7 +485,7 @@ int fetch_key_text(const char *search,
        char      *searchtext = NULL;
        int addedkeys = 0;
 
        char      *searchtext = NULL;
        int addedkeys = 0;
 
-       logthing(LOGTHING_CRITICAL, "Search was '%s'", search);
+       logthing(LOGTHING_DEBUG, "Search was '%s'", search);
 
        searchtext = strdup(search);
        wl = wordlist = makewordlist(wordlist, searchtext);
 
        searchtext = strdup(search);
        wl = wordlist = makewordlist(wordlist, searchtext);
@@ -413,9 +520,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;
@@ -429,39 +536,44 @@ int fetch_key_text(const char *search,
        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,
+};