cscvs to tla changeset 4

[onak.git] / keydb_pg.c

diff --git a/keydb_pg.c b/keydb_pg.c
index 845ec84d8e7d3fe45d39a29e77c57e3b5be4b50e..3f519bc88aa5664e4ad7949f48dc38953c7dca7a 100644 (file)
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -25,6 +25,7 @@
 #include "keyindex.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "mem.h"

+#include "onak-conf.h"

 #include "parsekey.h"
 
 /**
 #include "parsekey.h"
 
 /**


@@ -43,9 +44,9 @@ static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
 /**
  *     keydb_putchar - Puts a char to a file.
  */
 /**
  *     keydb_putchar - Puts a char to a file.
  */

-static int keydb_putchar(void *fd, unsigned char c)
+static int keydb_putchar(void *fd, size_t count, unsigned char *c)

 {
 {

-       return !(lo_write(dbconn, *(int *) fd, &c, sizeof(c)));
+       return !(lo_write(dbconn, *(int *) fd, c, count));

 }
 
 /**
 }
 
 /**


@@ -57,13 +58,13 @@ static int keydb_putchar(void *fd, unsigned char c)
  */
 void initdb(void)
 {
  */
 void initdb(void)
 {

-       dbconn = PQsetdbLogin(NULL, // host
+       dbconn = PQsetdbLogin(config.pg_dbhost, // host

                        NULL, // port
                        NULL, // options
                        NULL, // tty
                        NULL, // port
                        NULL, // options
                        NULL, // tty

-                       "noodles", // database
-                       NULL,  //login
-                       NULL); // password
+                       config.pg_dbname, // database
+                       config.pg_dbuser,  //login
+                       config.pg_dbpass); // password

 
        if (PQstatus(dbconn) == CONNECTION_BAD) {
                fprintf(stderr, "Connection to database failed.\n");
 
        if (PQstatus(dbconn) == CONNECTION_BAD) {
                fprintf(stderr, "Connection to database failed.\n");


@@ -86,10 +87,43 @@ void cleanupdb(void)
        dbconn = NULL;
 }
 
        dbconn = NULL;
 }
 

+/**
+ *     starttrans - Start a transaction.
+ *
+ *     Start a transaction. Intended to be used if we're about to perform many
+ *     operations on the database to help speed it all up, or if we want
+ *     something to only succeed if all relevant operations are successful.
+ */
+bool starttrans(void)
+{
+       PGresult *result = NULL;
+       
+       result = PQexec(dbconn, "BEGIN");
+       PQclear(result);
+
+       return true;
+}
+
+/**
+ *     endtrans - End a transaction.
+ *
+ *     Ends a transaction.
+ */
+void endtrans(void)
+{
+       PGresult *result = NULL;
+
+       result = PQexec(dbconn, "COMMIT");
+       PQclear(result);
+
+       return;
+}
+

 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.
 /**
  *     fetch_key - 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.

  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of
  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of


@@ -97,58 +131,150 @@ void cleanupdb(void)
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
+int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, bool intrans)

 {
        struct openpgp_packet_list *packets = NULL;
        PGresult *result = NULL;
        char *oids = NULL;
        char statement[1024];
        int fd = -1;
 {
        struct openpgp_packet_list *packets = NULL;
        PGresult *result = NULL;
        char *oids = NULL;
        char statement[1024];
        int fd = -1;

+       int i = 0;
+       int numkeys = 0;

        Oid key_oid;
 
        Oid key_oid;
 

+       if (!intrans) {
+               result = PQexec(dbconn, "BEGIN");
+               PQclear(result);
+       }
+       
+       if (keyid > 0xFFFFFFFF) {
+               snprintf(statement, 1023,
+                       "SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
+                       keyid);
+       } else {
+               snprintf(statement, 1023,
+                       "SELECT keydata FROM onak_keys WHERE keyid "
+                       "LIKE '%%%llX'",
+                       keyid);
+       }
+       result = PQexec(dbconn, statement);
+
+       if (PQresultStatus(result) == PGRES_TUPLES_OK) {
+               numkeys = PQntuples(result);
+               for (i = 0; i < numkeys && numkeys <= config.maxkeys; i++) {
+                       oids = PQgetvalue(result, i, 0);
+                       key_oid = (Oid) atoi(oids);
+
+                       fd = lo_open(dbconn, key_oid, INV_READ);
+                       if (fd < 0) {
+                               fprintf(stderr, "Can't open large object.\n");
+                       } else {
+                               read_openpgp_stream(keydb_fetchchar, &fd,
+                                               &packets);
+                               parse_keys(packets, publickey);
+                               lo_close(dbconn, fd);
+                       }
+               }
+       } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
+               fprintf(stderr, "Problem retrieving key from DB.\n");
+       }
+
+       PQclear(result);
+
+       if (!intrans) {
+               result = PQexec(dbconn, "COMMIT");
+               PQclear(result);
+       }
+       return (numkeys);
+}
+
+/**
+ *     fetch_key_text - Trys to find the keys that contain the supplied text.
+ *     @search: The text to search for.
+ *     @publickey: A pointer to a structure to return the key in.
+ *
+ *     This function searches for the supplied text and returns the keys that
+ *     contain it.
+ */
+int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+{
+       struct openpgp_packet_list *packets = NULL;
+       PGresult *result = NULL;
+       char *oids = NULL;
+       char statement[1024];
+       int fd = -1;
+       int i = 0;
+       int numkeys = 0;
+       Oid key_oid;
+       char *dodgychar = NULL;
+

        result = PQexec(dbconn, "BEGIN");
        PQclear(result);
        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, '\\');
+       }
+

        
        snprintf(statement, 1023,
        
        snprintf(statement, 1023,

-                       "SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
-                       keyid & 0xFFFFFFFF);
+                       "SELECT DISTINCT onak_keys.keydata FROM onak_keys, "
+                       "onak_uids WHERE onak_keys.keyid = onak_uids.keyid "
+                       "AND onak_uids.uid LIKE '%%%s%%'",
+                       search);

        result = PQexec(dbconn, statement);
 
        result = PQexec(dbconn, statement);
 

-       if (PQresultStatus(result) == PGRES_TUPLES_OK &&
-                       PQntuples(result) == 1) {
-               oids = PQgetvalue(result, 0, 0);
-               key_oid = (Oid) atoi(oids);
-
-               fd = lo_open(dbconn, key_oid, INV_READ);
-               if (fd < 0) {
-                       fprintf(stderr, "Can't open large object.\n");
-               } else {
-                       read_openpgp_stream(keydb_fetchchar, &fd, &packets);
-                       parse_keys(packets, publickey);
-                       lo_close(dbconn, fd);
+       if (PQresultStatus(result) == PGRES_TUPLES_OK) {
+               numkeys = PQntuples(result);
+               for (i = 0; i < numkeys && numkeys <= config.maxkeys; i++) {
+                       oids = PQgetvalue(result, i, 0);
+                       key_oid = (Oid) atoi(oids);
+
+                       fd = lo_open(dbconn, key_oid, INV_READ);
+                       if (fd < 0) {
+                               fprintf(stderr, "Can't open large object.\n");
+                       } else {
+                               read_openpgp_stream(keydb_fetchchar, &fd,
+                                               &packets);
+                               parse_keys(packets, publickey);
+                               lo_close(dbconn, fd);
+                       }

                }
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
                }
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {

-               fprintf(stderr, "Problem retrieving key (%llX) from DB.\n",
-                               keyid);
+               fprintf(stderr, "Problem retrieving key from DB.\n");

        }
 
        PQclear(result);
 
        result = PQexec(dbconn, "COMMIT");
        PQclear(result);
        }
 
        PQclear(result);
 
        result = PQexec(dbconn, "COMMIT");
        PQclear(result);

-       return (fd > -1);
+       return (numkeys);

 }
 
 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.
 }
 
 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.

+ *     @intrans: If we're already in a transaction.
+ *     @update: If true the key exists and should be updated.

  *
  *     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
  *
  *     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.
+ *     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)
+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_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;


@@ -157,7 +283,15 @@ int store_key(struct openpgp_publickey *publickey)
        char statement[1024];
        Oid key_oid;
        int fd;
        char statement[1024];
        Oid key_oid;
        int fd;

+       char **uids = NULL;
+       char *primary = NULL;
+       char *dodgychar = NULL;
+       int i;

 
 

+       if (!intrans) {
+               result = PQexec(dbconn, "BEGIN");
+               PQclear(result);
+       }

 
        /*
         * Delete the key if we already have it.
 
        /*
         * Delete the key if we already have it.


@@ -167,10 +301,9 @@ int store_key(struct openpgp_publickey *publickey)
         * of difference though - the largest chunk of data is the keydata and
         * it definitely needs updated.
         */
         * of difference though - the largest chunk of data is the keydata and
         * it definitely needs updated.
         */

-       delete_key(get_keyid(publickey));
-
-       result = PQexec(dbconn, "BEGIN");
-       PQclear(result);
+       if (update) {
+               delete_key(get_keyid(publickey), true);
+       }

 
        next = publickey->next;
        publickey->next = NULL;
 
        next = publickey->next;
        publickey->next = NULL;


@@ -189,7 +322,7 @@ int store_key(struct openpgp_publickey *publickey)
        snprintf(statement, 1023, 
                        "INSERT INTO onak_keys (keyid, keydata) VALUES "
                        "('%llX', '%d')", 
        snprintf(statement, 1023, 
                        "INSERT INTO onak_keys (keyid, keydata) VALUES "
                        "('%llX', '%d')", 

-                       get_keyid(publickey) & 0xFFFFFFFF,
+                       get_keyid(publickey),

                        key_oid);
        result = PQexec(dbconn, statement);
 
                        key_oid);
        result = PQexec(dbconn, statement);
 


@@ -199,8 +332,49 @@ int store_key(struct openpgp_publickey *publickey)
        }
        PQclear(result);
 
        }
        PQclear(result);
 

-       result = PQexec(dbconn, "COMMIT");
-       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], '\'');
+                       }
+                       dodgychar = strchr(uids[i], '\\');
+                               while (dodgychar != NULL) {
+                               *dodgychar = ' ';
+                               dodgychar = strchr(uids[i], '\\');
+                       }
+
+                       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",
+                                               PQresultErrorMessage(result));
+                       }
+                       /*
+                        * TODO: Check result.
+                        */
+                       PQclear(result);
+               }
+       }
+
+       if (!intrans) {
+               result = PQexec(dbconn, "COMMIT");
+               PQclear(result);
+       }

        
        return 0;
 }
        
        return 0;
 }


@@ -208,36 +382,50 @@ int store_key(struct openpgp_publickey *publickey)
 /**
  *     delete_key - Given a keyid delete the key from storage.
  *     @keyid: The keyid to delete.
 /**
  *     delete_key - Given a keyid delete the key from storage.
  *     @keyid: The keyid to delete.

+ *     @intrans: If we're already in a transaction.

  *
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */
  *
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */

-int delete_key(uint64_t keyid)
+int delete_key(uint64_t keyid, bool intrans)

 {
        PGresult *result = NULL;
        char *oids = NULL;
        char statement[1024];
        int found = 1;
 {
        PGresult *result = NULL;
        char *oids = NULL;
        char statement[1024];
        int found = 1;

+       int i;

        Oid key_oid;
 
        Oid key_oid;
 

-       result = PQexec(dbconn, "BEGIN");
-       PQclear(result);
+       if (!intrans) {
+               result = PQexec(dbconn, "BEGIN");
+               PQclear(result);
+       }

        
        snprintf(statement, 1023,
                        "SELECT keydata FROM onak_keys WHERE keyid = '%llX'",
        
        snprintf(statement, 1023,
                        "SELECT keydata FROM onak_keys WHERE keyid = '%llX'",

-                       keyid & 0xFFFFFFFF);
+                       keyid);

        result = PQexec(dbconn, statement);
 
        result = PQexec(dbconn, statement);
 

-       if (PQresultStatus(result) == PGRES_TUPLES_OK &&
-                       PQntuples(result) == 1) {
+       if (PQresultStatus(result) == PGRES_TUPLES_OK) {

                found = 0;
                found = 0;

-               oids = PQgetvalue(result, 0, 0);
-               key_oid = (Oid) atoi(oids);
-               lo_unlink(dbconn, key_oid);
+               i = PQntuples(result);
+               while (i > 0) {
+                       oids = PQgetvalue(result, i-1, 0);
+                       key_oid = (Oid) atoi(oids);
+                       lo_unlink(dbconn, key_oid);
+                       i--;
+               }

                PQclear(result);
                PQclear(result);

+

                snprintf(statement, 1023,
                snprintf(statement, 1023,

-                       "DELETE * FROM onak_keys WHERE keyid = '%llX'",
-                       keyid & 0xFFFFFFFF);
+                       "DELETE FROM onak_keys WHERE keyid = '%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",
                result = PQexec(dbconn, statement);
        } else if (PQresultStatus(result) != PGRES_TUPLES_OK) {
                fprintf(stderr, "Problem retrieving key (%llX) from DB.\n",


@@ -246,12 +434,51 @@ int delete_key(uint64_t keyid)
 
        PQclear(result);
 
 
        PQclear(result);
 

-       result = PQexec(dbconn, "COMMIT");
-       PQclear(result);
+       if (!intrans) {
+               result = PQexec(dbconn, "COMMIT");
+               PQclear(result);
+       }

        return (found);
 }
 
        return (found);
 }
 

+/**
+ *     keyid2uid - Takes a keyid and returns the primary UID for it.
+ *     @keyid: The keyid to lookup.
+ */
+char *keyid2uid(uint64_t keyid)
+{
+       PGresult *result = NULL;
+       char statement[1024];
+       char *uid = NULL;
+
+       snprintf(statement, 1023,
+               "SELECT uid FROM onak_uids WHERE keyid = '%llX' AND pri = 't'",
+               keyid);
+       result = PQexec(dbconn, statement);
+
+       /*
+        * Technically we only expect one response to the query; a key only has
+        * one primary ID. Better to return something than nothing though.
+        *
+        * TODO: Log if we get more than one response? Needs logging framework
+        * first though.
+        */
+       if (PQresultStatus(result) == PGRES_TUPLES_OK &&
+                       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",
+                               keyid);
+       }
+
+       PQclear(result);
+
+       return uid;
+}
+

 /*
  * Include the basic keydb routines.
  */
 /*
  * Include the basic keydb routines.
  */

+#define NEED_GETKEYSIGS 1
+#define NEED_GETFULLKEYID 1

 #include "keydb.c"
 #include "keydb.c"