X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_db3.c;h=3515bf40b0c78661705b133884fa698141c993e4;hb=0a3cfdec02106998006653f8ad340e996261a3d5;hp=56f4bed5a0cc11d60759c5a4ae8837df2bec04fe;hpb=ae384229c538b20b429ea640ec30071ae944c0e7;p=onak.git diff --git a/keydb_db3.c b/keydb_db3.c index 56f4bed..3515bf4 100644 --- a/keydb_db3.c +++ b/keydb_db3.c @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: keydb_db3.c,v 1.20 2003/09/30 20:40:10 noodles Exp $ + * $Id: keydb_db3.c,v 1.26 2004/05/27 03:33:24 noodles Exp $ */ #include @@ -30,6 +30,7 @@ #include "log.h" #include "onak-conf.h" #include "parsekey.h" +#include "wordlist.h" /** * dbenv - our database environment. @@ -51,6 +52,11 @@ static DB **dbconns = NULL; */ static DB *worddb = NULL; +/** + * id32db - our connection to the 32bit ID database. + */ +static DB *id32db = NULL; + /** * txn - our current transaction id. */ @@ -58,57 +64,11 @@ static DB_TXN *txn = NULL; DB *keydb(uint64_t keyid) { - return(dbconns[keyid % numdbs]); -} + uint64_t keytrun; -/** - * makewordlist - Takes a string and splits it into a set of unique words. - * @wordlist: The current word list. - * @words: The string to split and add. - * - * We take words and split it on non alpha numeric characters. These get - * added to the word list if they're not already present. If the wordlist - * is NULL then we start a new list, otherwise it's search for already - * added words. Note that words is modified in the process of scanning. - * - * Returns the new word list. - */ -struct ll *makewordlist(struct ll *wordlist, char *word) -{ - char *start = NULL; - char *end = NULL; - - /* - * Walk through the words string, spliting on non alphanumerics and - * then checking if the word already exists in the list. If not then - * we add it. - */ - end = word; - while (end != NULL && *end != 0) { - start = end; - while (*start != 0 && !isalnum(*start)) { - start++; - } - end = start; - while (*end != 0 && isalnum(*end)) { - *end = tolower(*end); - end++; - } - if (end - start > 1) { - if (*end != 0) { - *end = 0; - end++; - } - - if (llfind(wordlist, start, - strcmp) == NULL) { - wordlist = lladd(wordlist, - start); - } - } - } + keytrun = keyid >> 8; - return wordlist; + return(dbconns[keytrun % numdbs]); } /** @@ -118,12 +78,13 @@ struct ll *makewordlist(struct ll *wordlist, char *word) * this file are called in order to allow the DB to be initialized ready * for access. */ -void initdb(void) +void initdb(bool readonly) { - char buf[1024]; - FILE *numdb = NULL; - int ret = 0; - int i = 0; + char buf[1024]; + FILE *numdb = NULL; + int ret = 0; + int i = 0; + u_int32_t flags = 0; snprintf(buf, sizeof(buf) - 1, "%s/num_keydb", config.db_dir); numdb = fopen(buf, "r"); @@ -132,9 +93,18 @@ void initdb(void) numdbs = atoi(buf); } fclose(numdb); - } else { + } else if (!readonly) { logthing(LOGTHING_ERROR, "Couldn't open num_keydb: %s", strerror(errno)); + numdb = fopen(buf, "w"); + if (numdb != NULL) { + fprintf(numdb, "%d", numdbs); + fclose(numdb); + } else { + logthing(LOGTHING_ERROR, + "Couldn't write num_keydb: %s", + strerror(errno)); + } } dbconns = malloc(sizeof (DB *) * numdbs); @@ -170,7 +140,7 @@ void initdb(void) 0); if (ret != 0) { logthing(LOGTHING_CRITICAL, - "Erroring opening db environment: %s (%s)", + "Error opening db environment: %s (%s)", config.db_dir, db_strerror(ret)); exit(1); @@ -185,10 +155,14 @@ void initdb(void) } snprintf(buf, 1023, "keydb.%d.db", i); + flags = DB_CREATE; + if (readonly) { + flags = DB_RDONLY; + } ret = dbconns[i]->open(dbconns[i], buf, NULL, DB_HASH, - DB_CREATE, + flags, 0664); if (ret != 0) { logthing(LOGTHING_CRITICAL, @@ -207,7 +181,7 @@ void initdb(void) ret = worddb->set_flags(worddb, DB_DUP); ret = worddb->open(worddb, "worddb", NULL, DB_BTREE, - DB_CREATE, + flags, 0664); if (ret != 0) { logthing(LOGTHING_CRITICAL, @@ -216,6 +190,24 @@ void initdb(void) db_strerror(ret)); exit(1); } + + ret = db_create(&id32db, dbenv, 0); + if (ret != 0) { + logthing(LOGTHING_CRITICAL, "db_create: %s", db_strerror(ret)); + exit(1); + } + ret = id32db->set_flags(id32db, DB_DUP); + + ret = id32db->open(id32db, "id32db", NULL, DB_HASH, + flags, + 0664); + if (ret != 0) { + logthing(LOGTHING_CRITICAL, + "Error opening id32 database: %s (%s)", + "id32db", + db_strerror(ret)); + exit(1); + } return; } @@ -231,6 +223,8 @@ void cleanupdb(void) int i = 0; txn_checkpoint(dbenv, 0, 0, 0); + id32db->close(id32db, 0); + id32db = NULL; worddb->close(worddb, 0); worddb = NULL; for (i = 0; i < numdbs; i++) { @@ -315,6 +309,10 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, int numkeys = 0; struct buffer_ctx fetchbuf; + if (keyid < 0x100000000LL) { + keyid = getfullkeyid(keyid); + } + memset(&key, 0, sizeof(key)); memset(&data, 0, sizeof(data)); @@ -323,7 +321,6 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, key.size = sizeof(keyid); key.data = &keyid; - keyid &= 0xFFFFFFFF; if (!intrans) { starttrans(); @@ -358,7 +355,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, return (numkeys); } -int worddb_cmp(const char *d1, const char *d2) +int worddb_cmp(const void *d1, const void *d2) { return memcmp(d1, d2, 12); } @@ -492,6 +489,8 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) DBT key; DBT data; uint64_t keyid = 0; + uint32_t shortkeyid = 0; + uint64_t *subkeyids = NULL; char **uids = NULL; char *primary = NULL; unsigned char worddb_data[12]; @@ -540,7 +539,6 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) memset(&data, 0, sizeof(data)); key.data = &keyid; key.size = sizeof(keyid); - keyid &= 0xFFFFFFFF; data.size = storebuf.offset; data.data = storebuf.buffer; @@ -634,6 +632,68 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) endtrans(); } + /* + * Write the truncated 32 bit keyid so we can lookup the full id for + * queries. + */ + if (!deadlock) { + shortkeyid = keyid & 0xFFFFFFFF; + + memset(&key, 0, sizeof(key)); + memset(&data, 0, sizeof(data)); + key.data = &shortkeyid; + key.size = sizeof(shortkeyid); + data.data = &keyid; + data.size = sizeof(keyid); + + ret = id32db->put(id32db, + txn, + &key, + &data, + 0); + if (ret != 0) { + logthing(LOGTHING_ERROR, + "Problem storing short keyid: %s", + db_strerror(ret)); + if (ret == DB_LOCK_DEADLOCK) { + deadlock = true; + } + } + } + + if (!deadlock) { + subkeyids = keysubkeys(publickey); + i = 0; + while (subkeyids != NULL && subkeyids[i] != 0) { + shortkeyid = subkeyids[i++] & 0xFFFFFFFF; + + memset(&key, 0, sizeof(key)); + memset(&data, 0, sizeof(data)); + key.data = &shortkeyid; + key.size = sizeof(shortkeyid); + data.data = &keyid; + data.size = sizeof(keyid); + + ret = id32db->put(id32db, + txn, + &key, + &data, + 0); + if (ret != 0) { + logthing(LOGTHING_ERROR, + "Problem storing short keyid: %s", + db_strerror(ret)); + if (ret == DB_LOCK_DEADLOCK) { + deadlock = true; + } + } + } + if (subkeyids != NULL) { + free(subkeyids); + subkeyids = NULL; + } + } + return deadlock ? -1 : 0 ; } @@ -650,6 +710,8 @@ int delete_key(uint64_t keyid, bool intrans) struct openpgp_publickey *publickey = NULL; DBT key, data; DBC *cursor = NULL; + uint32_t shortkeyid = 0; + uint64_t *subkeyids = NULL; int ret = 0; int i; char **uids = NULL; @@ -659,8 +721,6 @@ int delete_key(uint64_t keyid, bool intrans) struct ll *curword = NULL; bool deadlock = false; - keyid &= 0xFFFFFFFF; - if (!intrans) { starttrans(); } @@ -749,6 +809,89 @@ int delete_key(uint64_t keyid, bool intrans) publickey = NULL; } + if (!deadlock) { + ret = id32db->cursor(id32db, + txn, + &cursor, + 0); /* flags */ + + shortkeyid = keyid & 0xFFFFFFFF; + + memset(&key, 0, sizeof(key)); + memset(&data, 0, sizeof(data)); + key.data = &shortkeyid; + key.size = sizeof(shortkeyid); + data.data = &keyid; + data.size = sizeof(keyid); + + ret = cursor->c_get(cursor, + &key, + &data, + DB_GET_BOTH); + + if (ret == 0) { + ret = cursor->c_del(cursor, 0); + if (ret != 0) { + logthing(LOGTHING_ERROR, + "Problem deleting short keyid: %s", + db_strerror(ret)); + } + } + + if (ret != 0) { + logthing(LOGTHING_ERROR, + "Problem deleting short keyid: %s", + db_strerror(ret)); + if (ret == DB_LOCK_DEADLOCK) { + deadlock = true; + } + } + + subkeyids = keysubkeys(publickey); + i = 0; + while (subkeyids != NULL && subkeyids[i] != 0) { + shortkeyid = subkeyids[i++] & 0xFFFFFFFF; + + memset(&key, 0, sizeof(key)); + memset(&data, 0, sizeof(data)); + key.data = &shortkeyid; + key.size = sizeof(shortkeyid); + data.data = &keyid; + data.size = sizeof(keyid); + + ret = cursor->c_get(cursor, + &key, + &data, + DB_GET_BOTH); + + if (ret == 0) { + ret = cursor->c_del(cursor, 0); + if (ret != 0) { + logthing(LOGTHING_ERROR, + "Problem deleting short" + " keyid: %s", + db_strerror(ret)); + } + } + + if (ret != 0) { + logthing(LOGTHING_ERROR, + "Problem deleting short keyid: %s", + db_strerror(ret)); + if (ret == DB_LOCK_DEADLOCK) { + deadlock = true; + } + } + } + if (subkeyids != NULL) { + free(subkeyids); + subkeyids = NULL; + } + + ret = cursor->c_close(cursor); + cursor = NULL; + } + if (!deadlock) { key.data = &keyid; key.size = sizeof(keyid); @@ -825,10 +968,58 @@ int dumpdb(char *filenamebase) return 0; } +/** + * getfullkeyid - Maps a 32bit key id to a 64bit one. + * @keyid: The 32bit keyid. + * + * This function maps a 32bit key id to the full 64bit one. It returns the + * full keyid. If the key isn't found a keyid of 0 is returned. + */ +uint64_t getfullkeyid(uint64_t keyid) +{ + DBT key, data; + DBC *cursor = NULL; + uint32_t shortkeyid = 0; + int ret = 0; + + if (keyid < 0x100000000LL) { + ret = id32db->cursor(id32db, + txn, + &cursor, + 0); /* flags */ + + shortkeyid = keyid & 0xFFFFFFFF; + + memset(&key, 0, sizeof(key)); + memset(&data, 0, sizeof(data)); + key.data = &shortkeyid; + key.size = sizeof(shortkeyid); + data.flags = DB_DBT_MALLOC; + + ret = cursor->c_get(cursor, + &key, + &data, + DB_SET); + + if (ret == 0) { + keyid = *(uint64_t *) data.data; + + if (data.data != NULL) { + free(data.data); + data.data = NULL; + } + } + + ret = cursor->c_close(cursor); + cursor = NULL; + } + + return keyid; +} + /* * Include the basic keydb routines. */ -#define NEED_GETFULLKEYID 1 #define NEED_GETKEYSIGS 1 #define NEED_KEYID2UID 1 #include "keydb.c"