X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_pg.c;h=04c760dfbf9759cca2e60241f1fdaeac1f2f8bb3;hb=0e735a0b184b202a0533c52171fc55506fa45db2;hp=812e5d76b1aa079777ffa58a43b579c08a966070;hpb=d060a4874d44c3cbe0681db81fca0e7e892f3537;p=onak.git diff --git a/keydb_pg.c b/keydb_pg.c index 812e5d7..04c760d 100644 --- a/keydb_pg.c +++ b/keydb_pg.c @@ -1,9 +1,20 @@ /* * keydb_pg.c - Routines to store and fetch keys in a PostGres database. * - * Jonathan McDowell + * Copyright 2002-2004 Jonathan McDowell * - * Copyright 2002-2004 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 @@ -36,7 +47,7 @@ static PGconn *dbconn = NULL; /** * keydb_fetchchar - Fetches a char from a file. */ -static int keydb_fetchchar(void *fd, size_t count, unsigned char *c) +static int keydb_fetchchar(void *fd, size_t count, void *c) { return (!lo_read(dbconn, *(int *) fd, (char *) c, count)); } @@ -44,7 +55,7 @@ static int keydb_fetchchar(void *fd, size_t count, unsigned char *c) /** * keydb_putchar - Puts a char to a file. */ -static int keydb_putchar(void *fd, size_t count, unsigned char *c) +static int keydb_putchar(void *fd, size_t count, void *c) { return !(lo_write(dbconn, *(int *) fd, (char *) c, count)); } @@ -120,7 +131,7 @@ static void pg_endtrans(void) } /** - * fetch_key - Given a keyid fetch the key from storage. + * fetch_key_id - 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. @@ -131,7 +142,8 @@ static void pg_endtrans(void) * in and then parse_keys() to parse the packets into a publickey * structure. */ -static int pg_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, +static int pg_fetch_key_id(uint64_t keyid, + struct openpgp_publickey **publickey, bool intrans) { struct openpgp_packet_list *packets = NULL; @@ -150,12 +162,13 @@ static int pg_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, if (keyid > 0xFFFFFFFF) { snprintf(statement, 1023, - "SELECT keydata FROM onak_keys WHERE keyid = '%llX'", + "SELECT keydata FROM onak_keys WHERE keyid = '%" + PRIX64 "'", keyid); } else { snprintf(statement, 1023, "SELECT keydata FROM onak_keys WHERE keyid " - "LIKE '%%%llX'", + "LIKE '%%%" PRIX64 "'", keyid); } result = PQexec(dbconn, statement); @@ -282,7 +295,8 @@ static int pg_delete_key(uint64_t keyid, bool intrans) } snprintf(statement, 1023, - "SELECT keydata FROM onak_keys WHERE keyid = '%llX'", + "SELECT keydata FROM onak_keys WHERE keyid = '%" + PRIX64 "'", keyid); result = PQexec(dbconn, statement); @@ -298,24 +312,25 @@ static int pg_delete_key(uint64_t keyid, bool intrans) PQclear(result); snprintf(statement, 1023, - "DELETE FROM onak_keys WHERE keyid = '%llX'", + "DELETE FROM onak_keys WHERE keyid = '%" PRIX64 "'", keyid); result = PQexec(dbconn, statement); PQclear(result); snprintf(statement, 1023, - "DELETE FROM onak_sigs WHERE signee = '%llX'", + "DELETE FROM onak_sigs WHERE signee = '%" PRIX64 "'", keyid); result = PQexec(dbconn, statement); PQclear(result); snprintf(statement, 1023, - "DELETE FROM onak_uids WHERE keyid = '%llX'", + "DELETE FROM onak_uids WHERE keyid = '%" PRIX64 "'", keyid); result = PQexec(dbconn, statement); } else if (PQresultStatus(result) != PGRES_TUPLES_OK) { logthing(LOGTHING_ERROR, - "Problem retrieving key (%llX) from DB.", + "Problem retrieving key (%" PRIX64 + ") from DB.", keyid); } @@ -355,12 +370,18 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans, char *primary = NULL; char *safeuid = NULL; int i; + uint64_t keyid; if (!intrans) { result = PQexec(dbconn, "BEGIN"); PQclear(result); } + if (get_keyid(publickey, &keyid) != ONAK_E_OK) { + logthing(LOGTHING_ERROR, "Couldn't find key ID for key."); + return 0; + } + /* * Delete the key if we already have it. * @@ -370,7 +391,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans, * it definitely needs updated. */ if (update) { - pg_delete_key(get_keyid(publickey), true); + pg_delete_key(keyid, true); } next = publickey->next; @@ -391,8 +412,8 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans, snprintf(statement, 1023, "INSERT INTO onak_keys (keyid, keydata) VALUES " - "('%llX', '%d')", - get_keyid(publickey), + "('%" PRIX64 "', '%d')", + keyid, key_oid); result = PQexec(dbconn, statement); @@ -414,8 +435,8 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans, snprintf(statement, 1023, "INSERT INTO onak_uids " "(keyid, uid, pri) " - "VALUES ('%llX', '%s', '%c')", - get_keyid(publickey), + "VALUES ('%" PRIX64 "', '%s', '%c')", + keyid, safeuid, (uids[i] == primary) ? 't' : 'f'); result = PQexec(dbconn, statement); @@ -448,9 +469,9 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans, packets = packets->next) { snprintf(statement, 1023, "INSERT INTO onak_sigs (signer, signee) " - "VALUES ('%llX', '%llX')", + "VALUES ('%" PRIX64 "', '%" PRIX64 "')", sig_keyid(packets->packet), - get_keyid(publickey)); + keyid); result = PQexec(dbconn, statement); PQclear(result); } @@ -475,7 +496,8 @@ static char *pg_keyid2uid(uint64_t keyid) char *uid = NULL; snprintf(statement, 1023, - "SELECT uid FROM onak_uids WHERE keyid = '%llX' AND pri = 't'", + "SELECT uid FROM onak_uids WHERE keyid = '%" PRIX64 + "' AND pri = 't'", keyid); result = PQexec(dbconn, statement); @@ -491,7 +513,8 @@ static char *pg_keyid2uid(uint64_t keyid) uid = strdup(PQgetvalue(result, 0, 0)); } else if (PQresultStatus(result) != PGRES_TUPLES_OK) { logthing(LOGTHING_ERROR, - "Problem retrieving key (%llX) from DB.", + "Problem retrieving key (%" PRIX64 + ") from DB.", keyid); } @@ -525,7 +548,8 @@ static struct ll *pg_getkeysigs(uint64_t keyid, bool *revoked) } snprintf(statement, 1023, - "SELECT DISTINCT signer FROM onak_sigs WHERE signee = '%llX'", + "SELECT DISTINCT signer FROM onak_sigs WHERE signee = '%" + PRIX64 "'", keyid); result = PQexec(dbconn, statement); @@ -587,7 +611,6 @@ static int pg_iterate_keys(void (*iterfunc)(void *ctx, struct openpgp_publickey *key = NULL; PGresult *result = NULL; char *oids = NULL; - char statement[1024]; int fd = -1; int i = 0; int numkeys = 0; @@ -608,7 +631,7 @@ static int pg_iterate_keys(void (*iterfunc)(void *ctx, } else { read_openpgp_stream(keydb_fetchchar, &fd, &packets, 0); - parse_keys(packets, key); + parse_keys(packets, &key); lo_close(dbconn, fd); iterfunc(ctx, key); @@ -633,6 +656,7 @@ static int pg_iterate_keys(void (*iterfunc)(void *ctx, */ #define NEED_GETFULLKEYID 1 #define NEED_UPDATEKEYS 1 +#define NEED_GET_FP 1 #include "keydb.c" struct dbfuncs keydb_pg_funcs = { @@ -640,7 +664,8 @@ struct dbfuncs keydb_pg_funcs = { .cleanupdb = pg_cleanupdb, .starttrans = pg_starttrans, .endtrans = pg_endtrans, - .fetch_key = pg_fetch_key, + .fetch_key_id = pg_fetch_key_id, + .fetch_key_fp = generic_fetch_key_fp, .fetch_key_text = pg_fetch_key_text, .store_key = pg_store_key, .update_keys = generic_update_keys,