X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_file.c;h=bc3c578667a0a36e205b69567ea3e2dd953f43e2;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=4321a682ee762e4c51855858fb746851a0ed0fa2;hpb=5d7fe5f83aafcf787f426cff450412d668d1128d;p=onak.git

diff --git a/keydb_file.c b/keydb_file.c
index 4321a68..bc3c578 100644
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -13,8 +13,7 @@
  * 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.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <sys/types.h>
@@ -22,6 +21,8 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,36 +32,18 @@
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
-#include "ll.h"
 #include "log.h"
 #include "mem.h"
+#include "onak.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 
-/**
- *	initdb - Initialize the key database.
- *
- *	This is just a no-op for flat file access.
- */
-static void file_initdb(bool readonly)
-{
-}
-
-/**
- *	cleanupdb - De-initialize the key database.
- *
- *	This is just a no-op for flat file access.
- */
-static void file_cleanupdb(void)
-{
-}
-
 /**
  *	starttrans - Start a transaction.
  *
  *	This is just a no-op for flat file access.
  */
-static bool file_starttrans(void)
+static bool file_starttrans(struct onak_dbctx *dbctx)
 {
 	return true;
 }
@@ -70,13 +53,13 @@ static bool file_starttrans(void)
  *
  *	This is just a no-op for flat file access.
  */
-static void file_endtrans(void)
+static void file_endtrans(struct onak_dbctx *dbctx)
 {
 	return;
 }
 
 /**
- *	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.
@@ -87,14 +70,17 @@ static void file_endtrans(void)
  *	in and then parse_keys() to parse the packets into a publickey
  *	structure.
  */
-static int file_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int file_fetch_key_id(struct onak_dbctx *dbctx,
+		uint64_t keyid,
+		struct openpgp_publickey **publickey,
 		bool intrans)
 {
+	char *db_dir = (char *) dbctx->priv;
 	struct openpgp_packet_list *packets = NULL;
 	char keyfile[1024];
 	int fd = -1;
 
-	snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,
+	snprintf(keyfile, 1023, "%s/0x%" PRIX64, db_dir,
 			keyid & 0xFFFFFFFF);
 	fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
@@ -120,9 +106,11 @@ static int file_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
  *	packets and then use write_openpgp_stream() to write the stream out to
  *	the file.
  */
-static int file_store_key(struct openpgp_publickey *publickey, bool intrans,
+static int file_store_key(struct onak_dbctx *dbctx,
+		struct openpgp_publickey *publickey, bool intrans,
 		bool update)
 {
+	char *db_dir = (char *) dbctx->priv;
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_packet_list *list_end = NULL;
 	struct openpgp_publickey *next = NULL;
@@ -134,7 +122,7 @@ static int file_store_key(struct openpgp_publickey *publickey, bool intrans,
 		logthing(LOGTHING_ERROR, "Couldn't find key ID for key.");
 		return 0;
 	}
-	snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,
+	snprintf(keyfile, 1023, "%s/0x%" PRIX64, db_dir,
 			keyid & 0xFFFFFFFF);
 	fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
@@ -161,11 +149,13 @@ static int file_store_key(struct openpgp_publickey *publickey, bool intrans,
  *	This function deletes a public key from whatever storage mechanism we
  *	are using. Returns 0 if the key existed.
  */
-static int file_delete_key(uint64_t keyid, bool intrans)
+static int file_delete_key(struct onak_dbctx *dbctx,
+		uint64_t keyid, bool intrans)
 {
+	char *db_dir = (char *) dbctx->priv;
 	char keyfile[1024];
 
-	snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,
+	snprintf(keyfile, 1023, "%s/0x%" PRIX64, db_dir,
 			keyid & 0xFFFFFFFF);
 
 	return unlink(keyfile);
@@ -181,7 +171,8 @@ static int file_delete_key(uint64_t keyid, bool intrans)
  *
  *	TODO: Write for flat file access. Some sort of grep?
  */
-static int file_fetch_key_text(const char *search,
+static int file_fetch_key_text(struct onak_dbctx *dbctx,
+		const char *search,
 		struct openpgp_publickey **publickey)
 {
 	return 0;
@@ -198,9 +189,11 @@ static int file_fetch_key_text(const char *search,
  *
  *	Returns the number of keys we iterated over.
  */
-static int file_iterate_keys(void (*iterfunc)(void *ctx,
-		struct openpgp_publickey *key),	void *ctx)
+static int file_iterate_keys(struct onak_dbctx *dbctx,
+		void (*iterfunc)(void *ctx, struct openpgp_publickey *key),
+		void *ctx)
 {
+	char *db_dir = (char *) dbctx->priv;
 	int                         numkeys = 0;
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_publickey   *key = NULL;
@@ -209,14 +202,14 @@ static int file_iterate_keys(void (*iterfunc)(void *ctx,
 	int                         fd = -1;
 	struct dirent              *curfile = NULL;
 
-	dir = opendir(config.db_dir);
+	dir = opendir(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,
+						db_dir,
 						curfile->d_name);
 				fd = open(keyfile, O_RDONLY);
 
@@ -253,21 +246,57 @@ static int file_iterate_keys(void (*iterfunc)(void *ctx,
 #define NEED_GETKEYSIGS 1
 #define NEED_GETFULLKEYID 1
 #define NEED_UPDATEKEYS 1
+#define NEED_GET_FP 1
 #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,
-};
+/**
+ *	cleanupdb - De-initialize the key database.
+ *
+ *	This is just a no-op for flat file access.
+ */
+static void file_cleanupdb(struct onak_dbctx *dbctx)
+{
+	if (dbctx->priv != NULL) {
+		free(dbctx->priv);
+		dbctx->priv = NULL;
+	}
+
+	if (dbctx != NULL) {
+		free(dbctx);
+	}
+}
+
+/**
+ *	initdb - Initialize the key database.
+ *
+ *	This is just a no-op for flat file access.
+ */
+struct onak_dbctx *keydb_file_init(struct onak_db_config *dbcfg, bool readonly)
+{
+	struct onak_dbctx *dbctx;
+
+	dbctx = malloc(sizeof(struct onak_dbctx));
+	if (dbctx == NULL) {
+		return NULL;
+	}
+
+	dbctx->config = dbcfg;
+	dbctx->priv = strdup(dbcfg->location);
+
+	dbctx->cleanupdb		= file_cleanupdb;
+	dbctx->starttrans		= file_starttrans;
+	dbctx->endtrans			= file_endtrans;
+	dbctx->fetch_key_id		= file_fetch_key_id;
+	dbctx->fetch_key_fp		= generic_fetch_key_fp;
+	dbctx->fetch_key_text		= file_fetch_key_text;
+	dbctx->store_key		= file_store_key;
+	dbctx->update_keys		= generic_update_keys;
+	dbctx->delete_key		= file_delete_key;
+	dbctx->getkeysigs		= generic_getkeysigs;
+	dbctx->cached_getkeysigs	= generic_cached_getkeysigs;
+	dbctx->keyid2uid		= generic_keyid2uid;
+	dbctx->getfullkeyid		= generic_getfullkeyid;
+	dbctx->iterate_keys		= file_iterate_keys;
+
+	return dbctx;
+}