X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/fd58db2034c6781399583384055ce69fc300b26b..635bd88df1273656324ee0c47dba6275259674b4:/onak.c?ds=inline

diff --git a/onak.c b/onak.c
index e79e565..3a6f62f 100644
--- a/onak.c
+++ b/onak.c
@@ -8,10 +8,13 @@
  * Copyright 2002 Project Purple
  */
 
+#include <fcntl.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "armor.h"
@@ -37,9 +40,9 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
 	int count = 0;
 
 	if (ishex) {
-		count = fetch_key(keyid, &publickey, false);
+		count = config.dbbackend->fetch_key(keyid, &publickey, false);
 	} else {
-		count = fetch_key_text(search, &publickey);
+		count = config.dbbackend->fetch_key_text(search, &publickey);
 	}
 	if (publickey != NULL) {
 		key_index(publickey, verbose, fingerprint, false);
@@ -54,6 +57,41 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
 	}
 }
 
+struct dump_ctx {
+	int count;
+	int maxcount;
+	int fd;
+	int filenum;
+	char *filebase;
+};
+
+void dump_func(void *ctx, struct openpgp_publickey *key)
+{
+	struct openpgp_packet_list *packets = NULL;
+	struct openpgp_packet_list *list_end = NULL;
+	struct dump_ctx *state;
+	char filename[1024];
+
+	state = (struct dump_ctx *) ctx;
+
+	if (state->fd == -1 || state->count > state->maxcount) {
+		if (state->fd != -1) {
+			close(state->fd);
+			state->fd = -1;
+		}
+		snprintf(filename, 1023, state->filebase, state->filenum);
+		state->fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640);
+		state->filenum++;
+		state->count = 0;
+	}
+	flatten_publickey(key, &packets, &list_end);
+	write_openpgp_stream(file_putchar, &state->fd, packets);
+	free_packet_list(packets);
+	packets = list_end = NULL;
+
+	return;
+}
+
 void usage(void) {
 	puts("onak " PACKAGE_VERSION " - an OpenPGP keyserver.\n");
 	puts("Usage:\n");
@@ -61,7 +99,7 @@ void usage(void) {
 	puts("\tCommands:\n");
 	puts("\tadd      - read armored OpenPGP keys from stdin and add to the"
 		" keyserver");
-	puts("\tclean    - read armored OpenPGP keys from stdin, run the "
+	puts("\tclean    - read armored OpenPGP keys from stdin, run the"
 		" cleaning\n\t       	   routines against them and dump to"
 		" stdout");
 	puts("\tdelete   - delete a given key from the keyserver");
@@ -91,6 +129,7 @@ int main(int argc, char *argv[])
 	bool				 binary = false;
 	bool				 fingerprint = false;
 	int				 optchar;
+	struct dump_ctx                  dumpstate;
 
 	while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) {
 		switch (optchar) {
@@ -120,9 +159,17 @@ int main(int argc, char *argv[])
 	if ((argc - optind) < 1) {
 		usage();
 	} else if (!strcmp("dump", argv[optind])) {
-		initdb(true);
-		dumpdb("keydump");
-		cleanupdb();
+		config.dbbackend->initdb(true);
+		dumpstate.count = dumpstate.filenum = 0;
+		dumpstate.maxcount = 1000000;
+		dumpstate.fd = -1;
+		dumpstate.filebase = "keydump.%d.pgp";
+		config.dbbackend->iterate_keys(dump_func, &dumpstate);
+		if (dumpstate.fd != -1) {
+			close(dumpstate.fd);
+			dumpstate.fd = -1;
+		}
+		config.dbbackend->cleanupdb();
 	} else if (!strcmp("add", argv[optind])) {
 		if (binary) {
 			result = read_openpgp_stream(stdin_getchar, NULL,
@@ -143,9 +190,10 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					result);
 
-			initdb(false);
+			config.dbbackend->initdb(false);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
-					update_keys(&keys, false));
+					config.dbbackend->update_keys(&keys,
+					false));
 			if (keys != NULL && update) {
 				flatten_publickey(keys,
 					&packets,
@@ -162,7 +210,7 @@ int main(int argc, char *argv[])
 				free_packet_list(packets);
 				packets = NULL;
 			}
-			cleanupdb();
+			config.dbbackend->cleanupdb();
 		} else {
 			rc = 1;
 			logthing(LOGTHING_NOTICE, "No keys read.");
@@ -232,7 +280,7 @@ int main(int argc, char *argv[])
 				ishex = true;
 			}
 		}
-		initdb(false);
+		config.dbbackend->initdb(false);
 		if (!strcmp("index", argv[optind])) {
 			find_keys(search, keyid, ishex, fingerprint,
 					false, false);
@@ -243,7 +291,8 @@ int main(int argc, char *argv[])
 			if (!ishex) {
 				puts("Can't get a key on uid text."
 					" You must supply a keyid.");
-			} else if (fetch_key(keyid, &keys, false)) {
+			} else if (config.dbbackend->fetch_key(keyid, &keys,
+					false)) {
 				unsigned char *photo = NULL;
 				size_t         length = 0;
 
@@ -259,12 +308,15 @@ int main(int argc, char *argv[])
 				puts("Key not found");
 			}
 		} else if (!strcmp("delete", argv[optind])) {
-			delete_key(getfullkeyid(keyid), false);
+			config.dbbackend->delete_key(
+					config.dbbackend->getfullkeyid(keyid),
+					false);
 		} else if (!strcmp("get", argv[optind])) {
 			if (!ishex) {
 				puts("Can't get a key on uid text."
 					" You must supply a keyid.");
-			} else if (fetch_key(keyid, &keys, false)) {
+			} else if (config.dbbackend->fetch_key(keyid, &keys,
+					false)) {
 				logthing(LOGTHING_INFO, "Got key.");
 				flatten_publickey(keys,
 						&packets,
@@ -279,7 +331,7 @@ int main(int argc, char *argv[])
 				puts("Key not found");
 			}
 		}
-		cleanupdb();
+		config.dbbackend->cleanupdb();
 	} else {
 		usage();
 	}