X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e02c731dfbb288c736f2cd09a9b6df0507c59ddd..6105d01bd446c4a27638e90ff8fd539e093b3ea2:/keydb_pg.c?ds=sidebyside diff --git a/keydb_pg.c b/keydb_pg.c index 3f519bc..ade6bfd 100644 --- a/keydb_pg.c +++ b/keydb_pg.c @@ -4,6 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple + * + * $Id: keydb_pg.c,v 1.10 2003/06/04 20:57:09 noodles Exp $ */ #include @@ -20,10 +22,12 @@ #include #include +#include "hash.h" #include "keydb.h" #include "keyid.h" -#include "keyindex.h" +#include "decodekey.h" #include "keystructs.h" +#include "log.h" #include "mem.h" #include "onak-conf.h" #include "parsekey.h" @@ -67,8 +71,8 @@ void initdb(void) config.pg_dbpass); // password if (PQstatus(dbconn) == CONNECTION_BAD) { - fprintf(stderr, "Connection to database failed.\n"); - fprintf(stderr, "%s\n", PQerrorMessage(dbconn)); + logthing(LOGTHING_CRITICAL, "Connection to database failed."); + logthing(LOGTHING_CRITICAL, "%s", PQerrorMessage(dbconn)); PQfinish(dbconn); dbconn = NULL; exit(1); @@ -131,7 +135,8 @@ void endtrans(void) * in and then parse_keys() to parse the packets into a publickey * structure. */ -int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, bool intrans) +int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, + bool intrans) { struct openpgp_packet_list *packets = NULL; PGresult *result = NULL; @@ -167,16 +172,19 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, bool intrans fd = lo_open(dbconn, key_oid, INV_READ); if (fd < 0) { - fprintf(stderr, "Can't open large object.\n"); + logthing(LOGTHING_ERROR, + "Can't open large object."); } else { read_openpgp_stream(keydb_fetchchar, &fd, &packets); parse_keys(packets, publickey); lo_close(dbconn, fd); + free_packet_list(packets); + packets = NULL; } } } else if (PQresultStatus(result) != PGRES_TUPLES_OK) { - fprintf(stderr, "Problem retrieving key from DB.\n"); + logthing(LOGTHING_ERROR, "Problem retrieving key from DB."); } PQclear(result); @@ -206,34 +214,22 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey) int i = 0; int numkeys = 0; Oid key_oid; - char *dodgychar = NULL; + char *newsearch = NULL; result = PQexec(dbconn, "BEGIN"); PQclear(result); - /* - * TODO: We really want to use PQescapeString, but this isn't supported - * by the version of Postgresql in Debian Stable. Roll on Woody and for - * now kludge it. - */ - dodgychar = strchr(search, '\''); - while (dodgychar != NULL) { - *dodgychar = ' '; - dodgychar = strchr(search, '\''); - } - dodgychar = strchr(search, '\\'); - while (dodgychar != NULL) { - *dodgychar = ' '; - dodgychar = strchr(search, '\\'); - } - - + newsearch = malloc(strlen(search) * 2 + 1); + memset(newsearch, 0, strlen(search) * 2 + 1); + PQescapeString(newsearch, search, strlen(search)); snprintf(statement, 1023, "SELECT DISTINCT onak_keys.keydata FROM onak_keys, " "onak_uids WHERE onak_keys.keyid = onak_uids.keyid " "AND onak_uids.uid LIKE '%%%s%%'", - search); + newsearch); result = PQexec(dbconn, statement); + free(newsearch); + newsearch = NULL; if (PQresultStatus(result) == PGRES_TUPLES_OK) { numkeys = PQntuples(result); @@ -243,16 +239,19 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey) fd = lo_open(dbconn, key_oid, INV_READ); if (fd < 0) { - fprintf(stderr, "Can't open large object.\n"); + logthing(LOGTHING_ERROR, + "Can't open large object."); } else { read_openpgp_stream(keydb_fetchchar, &fd, &packets); parse_keys(packets, publickey); lo_close(dbconn, fd); + free_packet_list(packets); + packets = NULL; } } } else if (PQresultStatus(result) != PGRES_TUPLES_OK) { - fprintf(stderr, "Problem retrieving key from DB.\n"); + logthing(LOGTHING_ERROR, "Problem retrieving key from DB."); } PQclear(result); @@ -271,21 +270,22 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey) * Again we just use the hex representation of the keyid as the filename * to store the key to. We flatten the public key to a list of OpenPGP * packets and then use write_openpgp_stream() to write the stream out to - * the file. If update is true then we delete the old key first, otherwise we - * trust that it doesn't exist. + * the file. If update is true then we delete the old key first, otherwise + * we trust that it doesn't exist. */ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) { struct openpgp_packet_list *packets = NULL; struct openpgp_packet_list *list_end = NULL; struct openpgp_publickey *next = NULL; + struct openpgp_signedpacket_list *curuid = NULL; PGresult *result = NULL; char statement[1024]; Oid key_oid; int fd; char **uids = NULL; char *primary = NULL; - char *dodgychar = NULL; + char *safeuid = NULL; int i; if (!intrans) { @@ -312,12 +312,14 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) key_oid = lo_creat(dbconn, INV_READ | INV_WRITE); if (key_oid == 0) { - fprintf(stderr, "Can't create key OID\n"); + logthing(LOGTHING_ERROR, "Can't create key OID"); } else { fd = lo_open(dbconn, key_oid, INV_WRITE); write_openpgp_stream(keydb_putchar, &fd, packets); lo_close(dbconn, fd); } + free_packet_list(packets); + packets = NULL; snprintf(statement, 1023, "INSERT INTO onak_keys (keyid, keydata) VALUES " @@ -327,41 +329,41 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) result = PQexec(dbconn, statement); if (PQresultStatus(result) != PGRES_COMMAND_OK) { - fprintf(stderr, "Problem storing key in DB.\n"); - fprintf(stderr, "%s\n", PQresultErrorMessage(result)); + logthing(LOGTHING_ERROR, "Problem storing key in DB."); + logthing(LOGTHING_ERROR, "%s", PQresultErrorMessage(result)); } PQclear(result); uids = keyuids(publickey, &primary); if (uids != NULL) { for (i = 0; uids[i] != NULL; i++) { - /* - * TODO: We really want to use PQescapeString, but this - * isn't supported by the version of Postgresql in - * Debian Stable. Roll on Woody and for now kludge it. - */ - dodgychar = strchr(uids[i], '\''); - while (dodgychar != NULL) { - *dodgychar = ' '; - dodgychar = strchr(uids[i], '\''); + safeuid = malloc(strlen(uids[i]) * 2 + 1); + if (safeuid != NULL) { + memset(safeuid, 0, strlen(uids[i]) * 2 + 1); + PQescapeString(safeuid, uids[i], + strlen(uids[i])); + + snprintf(statement, 1023, + "INSERT INTO onak_uids " + "(keyid, uid, pri) " + "VALUES ('%llX', '%s', '%c')", + get_keyid(publickey), + safeuid, + (uids[i] == primary) ? 't' : 'f'); + result = PQexec(dbconn, statement); + + free(safeuid); + safeuid = NULL; } - dodgychar = strchr(uids[i], '\\'); - while (dodgychar != NULL) { - *dodgychar = ' '; - dodgychar = strchr(uids[i], '\\'); + if (uids[i] != NULL) { + free(uids[i]); + uids[i] = NULL; } - snprintf(statement, 1023, - "INSERT INTO onak_uids (keyid, uid, pri) " - "VALUES ('%llX', '%s', '%c')", - get_keyid(publickey), - uids[i], - (uids[i] == primary) ? 't' : 'f'); - result = PQexec(dbconn, statement); - if (PQresultStatus(result) != PGRES_COMMAND_OK) { - fprintf(stderr, "Problem storing key in DB.\n"); - fprintf(stderr, "%s\n", + logthing(LOGTHING_ERROR, + "Problem storing key in DB."); + logthing(LOGTHING_ERROR, "%s", PQresultErrorMessage(result)); } /* @@ -369,6 +371,21 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update) */ PQclear(result); } + free(uids); + uids = NULL; + } + + for (curuid = publickey->uids; curuid != NULL; curuid = curuid->next) { + for (packets = curuid->sigs; packets != NULL; + packets = packets->next) { + snprintf(statement, 1023, + "INSERT INTO onak_sigs (signer, signee) " + "VALUES ('%llX', '%llX')", + sig_keyid(packets->packet), + get_keyid(publickey)); + result = PQexec(dbconn, statement); + PQclear(result); + } } if (!intrans) { @@ -423,12 +440,19 @@ int delete_key(uint64_t keyid, bool intrans) result = PQexec(dbconn, statement); PQclear(result); + snprintf(statement, 1023, + "DELETE FROM onak_sigs WHERE signee = '%llX'", + keyid); + result = PQexec(dbconn, statement); + PQclear(result); + snprintf(statement, 1023, "DELETE FROM onak_uids WHERE keyid = '%llX'", keyid); result = PQexec(dbconn, statement); } else if (PQresultStatus(result) != PGRES_TUPLES_OK) { - fprintf(stderr, "Problem retrieving key (%llX) from DB.\n", + logthing(LOGTHING_ERROR, + "Problem retrieving key (%llX) from DB.", keyid); } @@ -467,7 +491,8 @@ char *keyid2uid(uint64_t keyid) PQntuples(result) >= 1) { uid = strdup(PQgetvalue(result, 0, 0)); } else if (PQresultStatus(result) != PGRES_TUPLES_OK) { - fprintf(stderr, "Problem retrieving key (%llX) from DB.\n", + logthing(LOGTHING_ERROR, + "Problem retrieving key (%llX) from DB.", keyid); } @@ -476,9 +501,66 @@ char *keyid2uid(uint64_t keyid) return uid; } +/** + * getkeysigs - Gets a linked list of the signatures on a key. + * @keyid: The keyid to get the sigs for. + * + * This function gets the list of signatures on a key. Used for key + * indexing and doing stats bits. + */ +struct ll *getkeysigs(uint64_t keyid) +{ + struct ll *sigs = NULL; + PGresult *result = NULL; + uint64_t signer; + char statement[1024]; + int i, j; + int numsigs = 0; + bool intrans = false; + char *str; + + if (!intrans) { + result = PQexec(dbconn, "BEGIN"); + PQclear(result); + } + + snprintf(statement, 1023, + "SELECT DISTINCT signer FROM onak_sigs WHERE signee = '%llX'", + keyid); + result = PQexec(dbconn, statement); + + if (PQresultStatus(result) == PGRES_TUPLES_OK) { + numsigs = PQntuples(result); + for (i = 0; i < numsigs; i++) { + j = 0; + signer = 0; + str = PQgetvalue(result, i, 0); + while (str[j] != 0) { + signer <<= 4; + if (str[j] >= '0' && str[j] <= '9') { + signer += str[j] - '0'; + } else { + signer += str[j] - 'A' + 10; + } + j++; + } + sigs = lladd(sigs, createandaddtohash(signer)); + } + } else if (PQresultStatus(result) != PGRES_TUPLES_OK) { + logthing(LOGTHING_ERROR, "Problem retrieving key from DB."); + } + + PQclear(result); + + if (!intrans) { + result = PQexec(dbconn, "COMMIT"); + PQclear(result); + } + return sigs; +} + /* * Include the basic keydb routines. */ -#define NEED_GETKEYSIGS 1 #define NEED_GETFULLKEYID 1 #include "keydb.c"