* Daniel Silverstone <dsilvers@digital-scurf.org>
*
* Copyright 2004 Daniel Silverstone and Project Purple
- *
- * $Id: keydb_fs.c,v 1.3 2004/05/28 03:23:04 noodles Exp $
*/
#include <sys/types.h>
#include <dirent.h>
#include "charfuncs.h"
+#include "decodekey.h"
#include "keydb.h"
#include "keyid.h"
#include "keystructs.h"
{
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;
}
-void keypath(char *buffer, uint64_t _keyid)
+static void keypath(char *buffer, uint64_t _keyid)
{
uint64_t keyid = _keyid << 32;
- snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08lX/%016llX",
+ snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX",
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;
- 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));
}
-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);
(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);
}
-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/%016llX",
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);
}
+static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
+{
+ snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
+ 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.
*/
-void initdb(bool readonly)
+static void fs_initdb(bool readonly)
{
char buffer[PATH_MAX];
/**
* cleanupdb - De-initialize the key database.
*/
-void cleanupdb(void)
+static void fs_cleanupdb(void)
{
/* Mmmm nothing to do here? */
close(keydb_lockfile_fd);
/**
* starttrans - Start a transaction.
*/
-bool starttrans(void)
+static bool fs_starttrans(void)
{
struct flock lockstruct;
int remaining = 20;
/**
* endtrans - End a transaction.
*/
-void endtrans(void)
+static void fs_endtrans(void)
{
struct flock lockstruct;
* @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];
* @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];
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)
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);
+
+ i++;
+ }
+ if (subkeyids != NULL) {
+ free(subkeyids);
+ subkeyids = NULL;
+ }
}
if (!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(uint64_t keyid, bool intrans)
{
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)
keyid = getfullkeyid(keyid);
ret = fetch_key(keyid, &pk, true);
if (ret) {
- logthing(LOGTHING_CRITICAL, "Wordlist for key %016llX",
+ logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",
keyid);
wl = wordlist = makewordlistfromkey(wordlist, pk);
- logthing(LOGTHING_CRITICAL,
+ logthing(LOGTHING_DEBUG,
"Wordlist for key %016llX done", keyid);
while (wl) {
uint32_t hash = calchash((uint8_t *) (wl->object));
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);
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)
- || (llfind(mct, de->d_name, strcmp) !=
+ || (llfind(mct, de->d_name,
+ (int (*)(const void *, const void *))
+ strcmp) !=
NULL)) {
- logthing(LOGTHING_CRITICAL,
+ logthing(LOGTHING_DEBUG,
"Found %s // %s", word,
de->d_name);
keys =
* @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;
+ char *searchtext = NULL;
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);
+ free(searchtext);
+ searchtext = NULL;
return 0;
}
if (!nkl) {
llfree(wordlist, NULL);
llfree(keylist, free);
+ free(searchtext);
+ searchtext = NULL;
return 0;
}
llfree(keylist, free);
/* 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,
false);
}
llfree(keylist, free);
+ free(searchtext);
+ searchtext = NULL;
return addedkeys;
}
-/*
- * dumpdb - dump the key database
- * @filenamebase: The base filename to use for the dump.
- */
-int dumpdb(char *filenamebase)
-{
- return 0;
-}
-
-uint64_t getfullkeyid(uint64_t keyid)
+static uint64_t fs_getfullkeyid(uint64_t keyid)
{
static char buffer[PATH_MAX];
- DIR *d;
- struct dirent *de;
+ DIR *d = NULL;
+ struct dirent *de = NULL;
uint64_t ret = 0;
keydir(buffer, keyid);
d = opendir(buffer);
- do {
- de = readdir(d);
- if (de)
+ 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);
+ } 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;
}
+/**
+ * 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(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
#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,
+};
projects / onak.git / blobdiff