Fix Debian changelog versions for real 0.3.5 release.

[onak.git] / keydb_file.c

diff --git a/keydb_file.c b/keydb_file.c
index 1d9b081e726ba38f3f52202ef5bb74c859171320..88bb6803bad50907ceeee29b80d9dcb6d8afaacb 100644 (file)
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -3,11 +3,12 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
  *
  * Jonathan McDowell <noodles@earth.li>
  *

- * Copyright 2002 Project Purple
+ * Copyright 2002-2004 Project Purple

  */
 
 #include <sys/types.h>
 #include <sys/uio.h>
  */
 
 #include <sys/types.h>
 #include <sys/uio.h>

+#include <dirent.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>


@@ -15,52 +16,59 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

+#include "charfuncs.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"

+#include "log.h"

 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 
 /**
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 
 /**

- *     keydb_fetchchar - Fetches a char from a file.
+ *     initdb - Initialize the key database.
+ *
+ *     This is just a no-op for flat file access.

  */
  */

-static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
+static void file_initdb(bool readonly)

 {
 {

-       return !(read( *(int *) fd, c, count));

 }
 
 /**
 }
 
 /**

- *     keydb_putchar - Puts a char to a file.
+ *     cleanupdb - De-initialize the key database.
+ *
+ *     This is just a no-op for flat file access.

  */
  */

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

 {
 {

-       return !(write( *(int *) fd, c, count));

 }
 
 /**
 }
 
 /**

- *     initdb - Initialize the key database.
+ *     starttrans - Start a transaction.

  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-void initdb(void)
+static bool file_starttrans(void)

 {
 {

+       return true;

 }
 
 /**
 }
 
 /**

- *     cleanupdb - De-initialize the key database.
+ *     endtrans - End a transaction.

  *
  *     This is just a no-op for flat file access.
  */
  *
  *     This is just a no-op for flat file access.
  */

-void cleanupdb(void)
+static void file_endtrans(void)

 {
 {

+       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


@@ -68,19 +76,22 @@ 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)
+static int file_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+               bool intrans)

 {
        struct openpgp_packet_list *packets = NULL;
        char keyfile[1024];
        int fd = -1;
 
 {
        struct openpgp_packet_list *packets = NULL;
        char keyfile[1024];
        int fd = -1;
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,

                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
        if (fd > -1) {
                        keyid & 0xFFFFFFFF);
        fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
        if (fd > -1) {

-               read_openpgp_stream(keydb_fetchchar, &fd, &packets);
+               read_openpgp_stream(file_fetchchar, &fd, &packets, 0);

                parse_keys(packets, publickey);
                parse_keys(packets, publickey);

+               free_packet_list(packets);
+               packets = NULL;

                close(fd);
        }
 
                close(fd);
        }
 


@@ -90,13 +101,16 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
 /**
  *     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
  *     the file.
  */
  *
  *     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.
  */

-int store_key(struct openpgp_publickey *publickey)
+static int file_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;


@@ -104,7 +118,7 @@ int store_key(struct openpgp_publickey *publickey)
        char keyfile[1024];
        int fd = -1;
 
        char keyfile[1024];
        int fd = -1;
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,

                        get_keyid(publickey) & 0xFFFFFFFF);
        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
                        get_keyid(publickey) & 0xFFFFFFFF);
        fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 


@@ -114,8 +128,10 @@ int store_key(struct openpgp_publickey *publickey)
                flatten_publickey(publickey, &packets, &list_end);
                publickey -> next = next;
                
                flatten_publickey(publickey, &packets, &list_end);
                publickey -> next = next;
                

-               write_openpgp_stream(keydb_putchar, &fd, packets);
+               write_openpgp_stream(file_putchar, &fd, packets);

                close(fd);
                close(fd);

+               free_packet_list(packets);
+               packets = NULL;

        }
 
        return (fd > -1);
        }
 
        return (fd > -1);


@@ -124,24 +140,118 @@ 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)
+static int file_delete_key(uint64_t keyid, bool intrans)

 {
        char keyfile[1024];
 
 {
        char keyfile[1024];
 

-       snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+       snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,

                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);
 }
 
                        keyid & 0xFFFFFFFF);
 
        return unlink(keyfile);
 }
 

+/**
+ *     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.
+ *
+ *     TODO: Write for flat file access. Some sort of grep?
+ */
+static int file_fetch_key_text(const char *search,
+               struct openpgp_publickey **publickey)
+{
+       return 0;
+}
+
+/**
+ *     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 file_iterate_keys(void (*iterfunc)(void *ctx,
+               struct openpgp_publickey *key), void *ctx)
+{
+       int                         numkeys = 0;
+       struct openpgp_packet_list *packets = NULL;
+       struct openpgp_publickey   *key = NULL;
+       DIR                        *dir;
+       char                        keyfile[1024];
+       int                         fd = -1;
+       struct dirent              *curfile = NULL;
+
+       dir = opendir(config.db_dir);
+
+       if (dir != NULL) {
+               while ((curfile = readdir(dir)) != NULL) {
+                       if (curfile->d_name[0] == '0' &&
+                                       curfile->d_name[1] == 'x') {
+                               snprintf(keyfile, 1023, "%s/%s",
+                                               config.db_dir,
+                                               curfile->d_name);
+                               fd = open(keyfile, O_RDONLY);
+
+                               if (fd > -1) {
+                                       read_openpgp_stream(file_fetchchar,
+                                                       &fd,
+                                                       &packets,
+                                                       0);
+                                       parse_keys(packets, &key);
+
+                                       iterfunc(ctx, key);
+
+                                       free_publickey(key);
+                                       key = NULL;
+                                       free_packet_list(packets);
+                                       packets = NULL;
+                                       close(fd);
+                               }
+                               numkeys++;
+                       }
+               }
+               
+               closedir(dir);
+               dir = NULL;
+       }
+
+       return numkeys;
+}
+

 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
 #define NEED_GETFULLKEYID 1
 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
 #define NEED_GETFULLKEYID 1

+#define NEED_UPDATEKEYS 1

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

+
+struct dbfuncs keydb_file_funcs = {
+       .initdb                 = file_initdb,
+       .cleanupdb              = file_cleanupdb,
+       .starttrans             = file_starttrans,
+       .endtrans               = file_endtrans,
+       .fetch_key              = file_fetch_key,
+       .fetch_key_text         = file_fetch_key_text,
+       .store_key              = file_store_key,
+       .update_keys            = generic_update_keys,
+       .delete_key             = file_delete_key,
+       .getkeysigs             = generic_getkeysigs,
+       .cached_getkeysigs      = generic_cached_getkeysigs,
+       .keyid2uid              = generic_keyid2uid,
+       .getfullkeyid           = generic_getfullkeyid,
+       .iterate_keys           = file_iterate_keys,
+};