]> the.earth.li Git - onak.git/blobdiff - keydb_fs.c
Add ability to drop overly large packets
[onak.git] / keydb_fs.c
index 14a954f26381a6bcd7511851503fc604e936c90b..0bf922f1475a419781226b33dc22e154e4234c63 100644 (file)
@@ -1,9 +1,19 @@
 /*
- * keydb.h - Routines to store and fetch keys.
+ * keydb_fs.c - Routines to store and fetch keys in a filesystem hierarchy.
  *
- * Daniel Silverstone <dsilvers@digital-scurf.org>
+ * Copyright 2004 Daniel Silverstone <dsilvers@digital-scurf.org>
  *
- * Copyright 2004 Daniel Silverstone and Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <sys/types.h>
@@ -11,6 +21,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "keystructs.h"
 #include "ll.h"
 #include "mem.h"
+#include "onak.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "log.h"
 #include "wordlist.h"
 
-static int keydb_lockfile_fd = -1;
-static bool keydb_lockfile_readonly;
+/* Hack: We should really dynamically allocate our path buffers */
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
+struct onak_fs_dbctx {
+       int lockfile_fd;
+       bool lockfile_readonly;
+};
 
 /*****************************************************************************/
 
@@ -54,139 +74,117 @@ 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,
+               char *basepath)
 {
        uint64_t keyid = _keyid << 32;
-       snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX",
-                config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF),
+       snprintf(buffer, length, "%s/key/%02X/%02X/%08X/%016" PRIX64,
+                basepath, (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,
+               char *basepath)
 {
        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", basepath,
                 (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, char *basepath)
 {
-       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", basepath, what);
        mkdir(buffer, 0777);
 
-       snprintf(buffer, PATH_MAX, "%s/%s/%02X", config.db_dir, what,
+       snprintf(buffer, sizeof(buffer), "%s/%s/%02X", basepath, what,
                 (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", basepath,
+                what,
                 (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", basepath,
+                what,
                 (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, char *basepath)
 {
-       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016llX",
-                config.db_dir, (uint8_t) ((hash >> 24) & 0xFF),
+       snprintf(buffer, length, "%s/words/%02X/%02X/%08X/%s/%016" PRIX64,
+                basepath, (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,
+               char *basepath)
 {
-       snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s", config.db_dir,
+       snprintf(buffer, length, "%s/words/%02X/%02X/%08X/%s", basepath,
                 (uint8_t) ((hash >> 24) & 0xFF),
                 (uint8_t) ((hash >> 16) & 0xFF), hash, word);
 }
 
-void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
+static void subkeypath(char *buffer, size_t length, uint64_t subkey,
+               char *basepath)
 {
-       snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
-                config.db_dir,
+       snprintf(buffer, length, "%s/subkeys/%02X/%02X/%08X/%016" PRIX64,
+                basepath,
                 (uint8_t) ((subkey >> 24) & 0xFF),
                 (uint8_t) ((subkey >> 16) & 0xFF),
                 (uint32_t) (subkey & 0xFFFFFFFF),
-                keyid);
+                subkey);
 }
 
-void subkeydir(char *buffer, uint64_t subkey)
+static void subkeydir(char *buffer, size_t length, uint64_t subkey,
+               char *basepath)
 {
-       snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X",
-                config.db_dir,
+       snprintf(buffer, length, "%s/subkeys/%02X/%02X/%08X",
+                basepath,
                 (uint8_t) ((subkey >> 24) & 0xFF),
                 (uint8_t) ((subkey >> 16) & 0xFF),
                 (uint32_t) (subkey & 0xFFFFFFFF));
 }
 
-/*****************************************************************************/
-
-/**
- *     initdb - Initialize the key database.
- */
-void initdb(bool readonly)
+static void skshashpath(char *buffer, size_t length,
+               const struct skshash *hash, char *basepath)
 {
-       char buffer[PATH_MAX];
-
-       keydb_lockfile_readonly = readonly;
-
-       snprintf(buffer, PATH_MAX, "%s/.lock", config.db_dir);
-
-       if (access(config.db_dir, R_OK | W_OK | X_OK) == -1) {
-               if (errno != ENOENT) {
-                       logthing(LOGTHING_CRITICAL,
-                                "Unable to access keydb_fs root of '%s'. (%s)",
-                                config.db_dir, strerror(errno));
-                       exit(1);        /* Lacking rwx on the key dir */
-               }
-               mkdir(config.db_dir, 0777);
-               keydb_lockfile_fd = open(buffer, O_RDWR | O_CREAT, 0600);
-       }
-       chdir(config.db_dir);
-       if (keydb_lockfile_fd == -1)
-               keydb_lockfile_fd = open(buffer,
-                                        (keydb_lockfile_readonly) ?
-                                        O_RDONLY : O_RDWR);
-       if (keydb_lockfile_fd == -1)
-               keydb_lockfile_fd = open(buffer, O_RDWR | O_CREAT, 0600);
-       if (keydb_lockfile_fd == -1) {
-               logthing(LOGTHING_CRITICAL,
-                        "Unable to open lockfile '%s'. (%s)",
-                        buffer, strerror(errno));
-               exit(1);        /* Lacking rwx on the key dir */
-       }
+       snprintf(buffer, length, "%s/skshash/%02X/%02X/%02X%02X%02X%02X/"
+               "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
+                basepath,
+                hash->hash[0], hash->hash[1],
+                hash->hash[0], hash->hash[1], hash->hash[2], hash->hash[3],
+                hash->hash[4], hash->hash[5], hash->hash[6], hash->hash[7],
+                hash->hash[8], hash->hash[9], hash->hash[10], hash->hash[11],
+                hash->hash[12], hash->hash[13], hash->hash[14],
+                hash->hash[15]);
 }
 
-/**
- *     cleanupdb - De-initialize the key database.
- */
-void cleanupdb(void)
-{
-       /* Mmmm nothing to do here? */
-       close(keydb_lockfile_fd);
-}
+/*****************************************************************************/
 
 /**
  *     starttrans - Start a transaction.
  */
-bool starttrans(void)
+static bool fs_starttrans(struct onak_dbctx *dbctx)
 {
+       struct onak_fs_dbctx *privctx = (struct onak_fs_dbctx *) dbctx->priv;
        struct flock lockstruct;
        int remaining = 20;
        lockstruct.l_type =
-           F_RDLCK | ((keydb_lockfile_readonly) ? 0 : F_WRLCK);
+           F_RDLCK | ((privctx->lockfile_readonly) ? 0 : F_WRLCK);
        lockstruct.l_whence = SEEK_SET;
        lockstruct.l_start = 0;
        lockstruct.l_len = 1;
 
-       while (fcntl(keydb_lockfile_fd, F_SETLK, &lockstruct) == -1) {
+       while (fcntl(privctx->lockfile_fd, F_SETLK, &lockstruct) == -1) {
                if (remaining-- == 0)
                        return false;   /* Hope to hell that noodles DTRT */
                usleep(100);
@@ -197,15 +195,55 @@ bool starttrans(void)
 /**
  *     endtrans - End a transaction.
  */
-void endtrans(void)
+static void fs_endtrans(struct onak_dbctx *dbctx)
 {
+       struct onak_fs_dbctx *privctx = (struct onak_fs_dbctx *) dbctx->priv;
        struct flock lockstruct;
 
        lockstruct.l_type = F_UNLCK;
        lockstruct.l_whence = SEEK_SET;
        lockstruct.l_start = 0;
        lockstruct.l_len = 1;
-       fcntl(keydb_lockfile_fd, F_SETLK, &lockstruct);
+       fcntl(privctx->lockfile_fd, F_SETLK, &lockstruct);
+}
+
+static uint64_t fs_getfullkeyid(struct onak_dbctx *dbctx, uint64_t keyid)
+{
+       static char buffer[PATH_MAX];
+       DIR *d = NULL;
+       struct dirent *de = NULL;
+       uint64_t ret = 0;
+
+       keydir(buffer, sizeof(buffer), keyid, dbctx->config->location);
+
+       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,
+                       dbctx->config->location);
+
+               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;
 }
 
 /**
@@ -214,7 +252,9 @@ void endtrans(void)
  *     @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_id(struct onak_dbctx *dbctx,
+             uint64_t keyid,
+             struct openpgp_publickey **publickey,
              bool intrans)
 {
        static char buffer[PATH_MAX];
@@ -222,13 +262,20 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        struct openpgp_packet_list *packets = NULL;
 
        if (!intrans)
-               starttrans();
+               fs_starttrans(dbctx);
 
        if ((keyid >> 32) == 0)
-               keyid = getfullkeyid(keyid);
+               keyid = fs_getfullkeyid(dbctx, keyid);
+
+       keypath(buffer, sizeof(buffer), keyid, dbctx->config->location);
+       fd = open(buffer, O_RDONLY);
+       if (fd == -1 && errno == ENOENT) {
+               subkeypath(buffer, sizeof(buffer), keyid,
+                       dbctx->config->location);
+               fd = open(buffer, O_RDONLY);
+       }
 
-       keypath(buffer, keyid);
-       if ((fd = open(buffer, O_RDONLY)) != -1) {
+       if (fd != -1) {
                /* File is present, load it in... */
                read_openpgp_stream(file_fetchchar, &fd, &packets, 0);
                parse_keys(packets, publickey);
@@ -239,7 +286,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
        }
 
        if (!intrans)
-               endtrans();
+               fs_endtrans(dbctx);
        return ret;
 }
 
@@ -249,7 +296,8 @@ 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.
  */
-int store_key(struct openpgp_publickey *publickey, bool intrans,
+static int fs_store_key(struct onak_dbctx *dbctx,
+             struct openpgp_publickey *publickey, bool intrans,
              bool update)
 {
        static char buffer[PATH_MAX];
@@ -258,17 +306,23 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
        struct openpgp_publickey *next = NULL;
-       uint64_t keyid = get_keyid(publickey);
+       uint64_t keyid;
        struct ll *wordlist = NULL, *wl = NULL;
-       uint64_t *subkeyids = NULL;
+       struct skshash hash;
+       struct openpgp_fingerprint *subkeyids = NULL;
+       uint32_t hashid;
        int i = 0;
 
+       if (get_keyid(publickey, &keyid) != ONAK_E_OK) {
+               logthing(LOGTHING_ERROR, "Couldn't find key ID for key.");
+               return 0;
+       }
 
        if (!intrans)
-               starttrans();
+               fs_starttrans(dbctx);
 
-       prove_path_to(keyid, "key");
-       keypath(buffer, keyid);
+       prove_path_to(keyid, "key", dbctx->config->location);
+       keypath(buffer, sizeof(buffer), keyid, dbctx->config->location);
 
        if ((fd =
             open(buffer, O_WRONLY | (update ? O_TRUNC : O_CREAT),
@@ -289,11 +343,13 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
                wl = wordlist = makewordlistfromkey(wordlist, publickey);
                while (wl) {
                        uint32_t hash = calchash((uint8_t *) (wl->object));
-                       prove_path_to(hash, "words");
+                       prove_path_to(hash, "words", dbctx->config->location);
 
-                       worddir(wbuffer, wl->object, hash);
+                       worddir(wbuffer, sizeof(wbuffer), wl->object, hash,
+                               dbctx->config->location);
                        mkdir(wbuffer, 0777);
-                       wordpath(wbuffer, wl->object, hash, keyid);
+                       wordpath(wbuffer, sizeof(wbuffer), wl->object, hash,
+                               keyid, dbctx->config->location);
                        link(buffer, wbuffer);
 
                        wl = wl->next;
@@ -302,12 +358,17 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
                
                subkeyids = keysubkeys(publickey);
                i = 0;
-               while (subkeyids != NULL && subkeyids[i] != 0) {
-                       prove_path_to(subkeyids[i], "subkeys");
+               while (subkeyids != NULL && subkeyids[i].length != 0) {
+                       keyid = fingerprint2keyid(&subkeyids[i]);
+
+                       prove_path_to(keyid, "subkeys",
+                               dbctx->config->location);
 
-                       subkeydir(wbuffer, subkeyids[i]);
+                       subkeydir(wbuffer, sizeof(wbuffer), keyid,
+                               dbctx->config->location);
                        mkdir(wbuffer, 0777);
-                       subkeypath(wbuffer, subkeyids[i], keyid);
+                       subkeypath(wbuffer, sizeof(wbuffer), keyid,
+                               dbctx->config->location);
                        link(buffer, wbuffer);
 
                        i++;
@@ -316,10 +377,18 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
                        free(subkeyids);
                        subkeyids = NULL;
                }
+
+               get_skshash(publickey, &hash);
+               hashid = (hash.hash[0] << 24) + (hash.hash[1] << 16) +
+                               (hash.hash[2] << 8) + hash.hash[3];
+               prove_path_to(hashid, "skshash", dbctx->config->location);
+               skshashpath(wbuffer, sizeof(wbuffer), &hash,
+                       dbctx->config->location);
+               link(buffer, wbuffer);
        }
 
        if (!intrans)
-               endtrans();
+               fs_endtrans(dbctx);
        return ret;
 }
 
@@ -328,34 +397,37 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
  *     @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(struct onak_dbctx *dbctx, uint64_t keyid, bool intrans)
 {
        static char buffer[PATH_MAX];
        int ret;
        struct openpgp_publickey *pk = NULL;
+       struct skshash hash;
        struct ll *wordlist = NULL, *wl = NULL;
-       uint64_t *subkeyids = NULL;
+       struct openpgp_fingerprint *subkeyids = NULL;
+       uint64_t subkeyid;
        int i = 0;
 
        if ((keyid >> 32) == 0)
-               keyid = getfullkeyid(keyid);
+               keyid = fs_getfullkeyid(dbctx, keyid);
 
        if (!intrans)
-               starttrans();
+               fs_starttrans(dbctx);
 
-       ret = fetch_key(keyid, &pk, true);
+       ret = fs_fetch_key_id(dbctx, keyid, &pk, true);
 
        if (ret) {
-               logthing(LOGTHING_CRITICAL, "Wordlist for key %016llX",
+               logthing(LOGTHING_DEBUG, "Wordlist for key %016" PRIX64,
                         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");
+                       prove_path_to(hash, "words", dbctx->config->location);
 
-                       wordpath(buffer, wl->object, hash, keyid);
+                       wordpath(buffer, sizeof(buffer), wl->object, hash,
+                               keyid, dbctx->config->location);
                        unlink(buffer);
 
                        wl = wl->next;
@@ -363,10 +435,13 @@ int delete_key(uint64_t keyid, bool intrans)
 
                subkeyids = keysubkeys(pk);
                i = 0;
-               while (subkeyids != NULL && subkeyids[i] != 0) {
-                       prove_path_to(subkeyids[i], "subkeys");
+               while (subkeyids != NULL && subkeyids[i].length != 0) {
+                       subkeyid = fingerprint2keyid(&subkeyids[i]);
+                       prove_path_to(subkeyid, "subkeys",
+                               dbctx->config->location);
 
-                       subkeypath(buffer, subkeyids[i], keyid);
+                       subkeypath(buffer, sizeof(buffer), subkeyid,
+                               dbctx->config->location);
                        unlink(buffer);
 
                        i++;
@@ -376,17 +451,22 @@ int delete_key(uint64_t keyid, bool intrans)
                        subkeyids = NULL;
                }
 
+               get_skshash(pk, &hash);
+               skshashpath(buffer, sizeof(buffer), &hash,
+                       dbctx->config->location);
+               unlink(buffer);
        }
 
-       keypath(buffer, keyid);
+       keypath(buffer, sizeof(buffer), keyid, dbctx->config->location);
        unlink(buffer);
 
        if (!intrans)
-               endtrans();
+               fs_endtrans(dbctx);
        return 1;
 }
 
-static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
+static struct ll *internal_get_key_by_word(char *word, struct ll *mct,
+               char *basepath)
 {
        struct ll *keys = NULL;
        DIR *d = NULL;
@@ -394,11 +474,11 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
        uint32_t hash = calchash((uint8_t *) (word));
        struct dirent *de;
 
-       worddir(buffer, word, hash);
+       worddir(buffer, sizeof(buffer), word, hash, basepath);
        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)
+       if (d) {
                do {
                        de = readdir(d);
                        if (de && de->d_name[0] != '.') {
@@ -407,7 +487,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
                                        (int (*)(const void *, const void *))
                                                    strcmp) !=
                                        NULL)) {
-                                       logthing(LOGTHING_CRITICAL,
+                                       logthing(LOGTHING_DEBUG,
                                                 "Found %s // %s", word,
                                                 de->d_name);
                                        keys =
@@ -416,7 +496,8 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
                                }
                        }
                } while (de);
-       closedir(d);
+               closedir(d);
+       }
 
        return keys;
 }
@@ -426,7 +507,8 @@ 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.
  */
-int fetch_key_text(const char *search,
+static int fs_fetch_key_text(struct onak_dbctx *dbctx,
+                  const char *search,
                   struct openpgp_publickey **publickey)
 {
        struct ll *wordlist = NULL, *wl = NULL;
@@ -434,12 +516,13 @@ int fetch_key_text(const char *search,
        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);
 
-       keylist = internal_get_key_by_word(wordlist->object, NULL);
+       keylist = internal_get_key_by_word(wordlist->object, NULL,
+               dbctx->config->location);
 
        if (!keylist) {
                llfree(wordlist, NULL);
@@ -451,7 +534,8 @@ int fetch_key_text(const char *search,
        wl = wl->next;
        while (wl) {
                struct ll *nkl =
-                   internal_get_key_by_word(wl->object, keylist);
+                   internal_get_key_by_word(wl->object, keylist,
+                       dbctx->config->location);
                if (!nkl) {
                        llfree(wordlist, NULL);
                        llfree(keylist, free);
@@ -469,9 +553,10 @@ int fetch_key_text(const char *search,
        /* 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 +=
-                   fetch_key(strtoull(wl->object, NULL, 16), publickey,
+                   fs_fetch_key_id(dbctx,
+                             strtoull(wl->object, NULL, 16), publickey,
                              false);
                if (addedkeys >= config.maxkeys)
                        break;
@@ -485,56 +570,141 @@ int fetch_key_text(const char *search,
        return addedkeys;
 }
 
-/*
- *     dumpdb - dump the key database
- *     @filenamebase: The base filename to use for the dump.
+/**
+ *     fetch_key_skshash - Given an SKS hash fetch the key from storage.
+ *     @hash: The hash to fetch.
+ *     @publickey: A pointer to a structure to return the key in.
+ *     @intrans: If we're already in a transaction.
  */
-int dumpdb(char *filenamebase)
-{
-       return 0;
-}
-
-uint64_t getfullkeyid(uint64_t keyid)
+static int fs_fetch_key_skshash(struct onak_dbctx *dbctx,
+             const struct skshash *hash,
+             struct openpgp_publickey **publickey)
 {
        static char buffer[PATH_MAX];
-       DIR *d = NULL;
-       struct dirent *de = NULL;
-       uint64_t ret = 0;
-
-       keydir(buffer, keyid);
+       int ret = 0, fd;
+       struct openpgp_packet_list *packets = NULL;
 
-       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);    
+       skshashpath(buffer, sizeof(buffer), hash, dbctx->config->location);
+       if ((fd = open(buffer, O_RDONLY)) != -1) {
+               read_openpgp_stream(file_fetchchar, &fd, &packets, 0);
+               parse_keys(packets, publickey);
+               free_packet_list(packets);
+               packets = NULL;
+               close(fd);
+               ret = 1;
        }
 
-       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;
 }
 
+/**
+ *     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.
+ */
+static int fs_iterate_keys(struct onak_dbctx *dbctx,
+               void (*iterfunc)(void *ctx,
+               struct openpgp_publickey *key), void *ctx)
+{
+       return 0;
+}
+
 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
+#define NEED_UPDATEKEYS 1
+#define NEED_GET_FP 1
 #include "keydb.c"
+
+/**
+ *     cleanupdb - De-initialize the key database.
+ */
+static void fs_cleanupdb(struct onak_dbctx *dbctx)
+{
+       struct onak_fs_dbctx *privctx = (struct onak_fs_dbctx *) dbctx->priv;
+
+       /* Mmmm nothing to do here? */
+       close(privctx->lockfile_fd);
+}
+
+/**
+ *     initdb - Initialize the key database.
+ */
+struct onak_dbctx *keydb_fs_init(struct onak_db_config *dbcfg, bool readonly)
+{
+       char buffer[PATH_MAX];
+       struct onak_dbctx *dbctx;
+       struct onak_fs_dbctx *privctx;
+
+       dbctx = malloc(sizeof(struct onak_dbctx));
+       if (dbctx == NULL) {
+               return NULL;
+       }
+       dbctx->config = dbcfg;
+       dbctx->priv = privctx = malloc(sizeof(*privctx));
+       if (privctx == NULL) {
+               free(dbctx);
+               return NULL;
+       }
+
+       privctx->lockfile_readonly = readonly;
+
+       snprintf(buffer, sizeof(buffer), "%s/.lock", dbcfg->location);
+
+       if (access(dbcfg->location, R_OK | W_OK | X_OK) == -1) {
+               if (errno != ENOENT) {
+                       logthing(LOGTHING_CRITICAL,
+                                "Unable to access keydb_fs root of '%s'. (%s)",
+                                dbcfg->location, strerror(errno));
+                       exit(1);        /* Lacking rwx on the key dir */
+               }
+               mkdir(dbcfg->location, 0777);
+               privctx->lockfile_fd = open(buffer, O_RDWR | O_CREAT, 0600);
+       }
+       if (chdir(dbcfg->location) == -1) {
+               /* Shouldn't happen after the above */
+               logthing(LOGTHING_CRITICAL,
+                       "Couldn't change to database directory: %s",
+                       strerror(errno));
+               free(dbctx->priv);
+               free(dbctx);
+               return NULL;
+       }
+       privctx->lockfile_fd = open(buffer,
+                                (privctx->lockfile_readonly) ?
+                                O_RDONLY : O_RDWR);
+       if (privctx->lockfile_fd == -1)
+               privctx->lockfile_fd = open(buffer, O_RDWR | O_CREAT, 0600);
+       if (privctx->lockfile_fd == -1) {
+               logthing(LOGTHING_CRITICAL,
+                        "Unable to open lockfile '%s'. (%s)",
+                        buffer, strerror(errno));
+               exit(1);        /* Lacking rwx on the key dir */
+       }
+
+       dbctx->cleanupdb                = fs_cleanupdb;
+       dbctx->starttrans               = fs_starttrans;
+       dbctx->endtrans                 = fs_endtrans;
+       dbctx->fetch_key_id             = fs_fetch_key_id;
+       dbctx->fetch_key_fp             = generic_fetch_key_fp;
+       dbctx->fetch_key_text           = fs_fetch_key_text;
+       dbctx->fetch_key_skshash        = fs_fetch_key_skshash;
+       dbctx->store_key                = fs_store_key;
+       dbctx->update_keys              = generic_update_keys;
+       dbctx->delete_key               = fs_delete_key;
+       dbctx->getkeysigs               = generic_getkeysigs;
+       dbctx->cached_getkeysigs        = generic_cached_getkeysigs;
+       dbctx->keyid2uid                = generic_keyid2uid;
+       dbctx->getfullkeyid             = fs_getfullkeyid;
+       dbctx->iterate_keys             = fs_iterate_keys;
+
+       return dbctx;
+}