/*
- * 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <sys/types.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 void keypath(char *buffer, uint64_t _keyid)
+static void keypath(char *buffer, size_t length, uint64_t _keyid)
{
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);
}
-static void keydir(char *buffer, uint64_t _keyid)
+static void keydir(char *buffer, size_t length, uint64_t _keyid)
{
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));
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);
- 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);
- 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);
- 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);
}
-static 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);
}
-static 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);
}
-static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
+static void subkeypath(char *buffer, size_t length, uint64_t subkey,
+ uint64_t keyid)
{
- snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
+ snprintf(buffer, length, "%s/subkeys/%02X/%02X/%08X/%016" PRIX64,
config.db_dir,
(uint8_t) ((subkey >> 24) & 0xFF),
(uint8_t) ((subkey >> 16) & 0xFF),
keyid);
}
-static void subkeydir(char *buffer, uint64_t subkey)
+static void skshashpath(char *buffer, size_t length,
+ const struct skshash *hash)
{
- snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X",
+ snprintf(buffer, length, "%s/skshash/%02X/%02X/%02X%02X%02X%02X/"
+ "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
+ config.db_dir,
+ 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]);
+}
+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),
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) {
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.
struct openpgp_packet_list *packets = NULL;
if (!intrans)
- starttrans();
+ fs_starttrans();
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 (!intrans)
- endtrans();
+ fs_endtrans();
return ret;
}
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;
+ struct skshash hash;
uint64_t *subkeyids = NULL;
+ uint32_t hashid;
int i = 0;
+ get_keyid(publickey, &keyid);
if (!intrans)
- starttrans();
+ fs_starttrans();
prove_path_to(keyid, "key");
- keypath(buffer, keyid);
+ keypath(buffer, sizeof(buffer), keyid);
if ((fd =
open(buffer, O_WRONLY | (update ? O_TRUNC : O_CREAT),
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);
- wordpath(wbuffer, wl->object, hash, keyid);
+ wordpath(wbuffer, sizeof(wbuffer), wl->object, hash,
+ keyid);
link(buffer, wbuffer);
wl = wl->next;
while (subkeyids != NULL && subkeyids[i] != 0) {
prove_path_to(subkeyids[i], "subkeys");
- subkeydir(wbuffer, subkeyids[i]);
+ subkeydir(wbuffer, sizeof(wbuffer), subkeyids[i]);
mkdir(wbuffer, 0777);
- subkeypath(wbuffer, subkeyids[i], keyid);
+ subkeypath(wbuffer, sizeof(wbuffer), subkeyids[i],
+ keyid);
link(buffer, wbuffer);
i++;
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");
+ skshashpath(wbuffer, sizeof(wbuffer), &hash);
+ link(buffer, wbuffer);
}
if (!intrans)
- endtrans();
+ fs_endtrans();
return ret;
}
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;
int i = 0;
if ((keyid >> 32) == 0)
- keyid = getfullkeyid(keyid);
+ keyid = fs_getfullkeyid(keyid);
if (!intrans)
- starttrans();
+ fs_starttrans();
- ret = fetch_key(keyid, &pk, true);
+ ret = fs_fetch_key(keyid, &pk, true);
if (ret) {
- logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",
+ logthing(LOGTHING_DEBUG, "Wordlist for key %016" PRIX64,
keyid);
wl = wordlist = makewordlistfromkey(wordlist, pk);
logthing(LOGTHING_DEBUG,
- "Wordlist for key %016llX done", keyid);
+ "Wordlist for key %016" PRIX64 " done", keyid);
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;
while (subkeyids != NULL && subkeyids[i] != 0) {
prove_path_to(subkeyids[i], "subkeys");
- subkeypath(buffer, subkeyids[i], keyid);
+ subkeypath(buffer, sizeof(buffer), subkeyids[i],
+ keyid);
unlink(buffer);
i++;
subkeyids = NULL;
}
+ get_skshash(pk, &hash);
+ skshashpath(buffer, sizeof(buffer), &hash);
+ unlink(buffer);
}
- keypath(buffer, keyid);
+ keypath(buffer, sizeof(buffer), keyid);
unlink(buffer);
if (!intrans)
- endtrans();
+ fs_endtrans();
return 1;
}
uint32_t hash = calchash((uint8_t *) (word));
struct dirent *de;
- worddir(buffer, word, hash);
+ worddir(buffer, sizeof(buffer), word, hash);
d = opendir(buffer);
logthing(LOGTHING_DEBUG, "Scanning for word %s in dir %s", word,
buffer);
while (wl) {
logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);
addedkeys +=
- fetch_key(strtoull(wl->object, NULL, 16), publickey,
+ fs_fetch_key(strtoull(wl->object, NULL, 16), publickey,
false);
if (addedkeys >= config.maxkeys)
break;
return addedkeys;
}
-static uint64_t fs_getfullkeyid(uint64_t keyid)
+/**
+ * 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.
+ */
+static int fs_fetch_key_skshash(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);
+ 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;
}
.endtrans = fs_endtrans,
.fetch_key = fs_fetch_key,
.fetch_key_text = fs_fetch_key_text,
+ .fetch_key_skshash = fs_fetch_key_skshash,
.store_key = fs_store_key,
.update_keys = generic_update_keys,
.delete_key = fs_delete_key,
projects / onak.git / blobdiff