X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/7f046503b8b8dcec51c1f7752e87ba0ba0af0631..a047e3e158d560af079bec920460711d8222317c:/onak.c

diff --git a/onak.c b/onak.c
index 7748ed2..7bd8919 100644
--- a/onak.c
+++ b/onak.c
@@ -6,10 +6,9 @@
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2002 Project Purple
- *
- * $Id: onak.c,v 1.18 2003/10/15 21:15:21 noodles Exp $
  */
 
+#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +16,9 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleankey.h"
+#include "cleanup.h"
+#include "config.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
@@ -26,6 +28,7 @@
 #include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"
+#include "photoid.h"
 
 void find_keys(char *search, uint64_t keyid, bool ishex,
 		bool fingerprint, bool exact, bool verbose)
@@ -52,18 +55,23 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
 }
 
 void usage(void) {
-	puts("onak " VERSION " - an OpenPGP keyserver.\n");
+	puts("onak " PACKAGE_VERSION " - an OpenPGP keyserver.\n");
 	puts("Usage:\n");
 	puts("\tonak [options] <command> <parameters>\n");
 	puts("\tCommands:\n");
-	puts("\tadd    - read armored OpenPGP keys from stdin and add to the"
+	puts("\tadd      - read armored OpenPGP keys from stdin and add to the"
 		" keyserver");
-	puts("\tdelete - delete a given key from the keyserver");
-	puts("\tdump   - dump all the keys from the keyserver to a file or"
-		" files\n\t         starting keydump*");
-	puts("\tget    - retrieves the key requested from the keyserver");
-	puts("\tindex  - search for a key and list it");
-	puts("\tvindex - search for a key and list it and its signatures");
+	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");
+	puts("\tdump     - dump all the keys from the keyserver to a file or"
+		" files\n\t           starting keydump*");
+	puts("\tget      - retrieves the key requested from the keyserver");
+	puts("\tgetphoto - retrieves the first photoid on the given key and"
+		" dumps to\n\t           stdout");
+	puts("\tindex    - search for a key and list it");
+	puts("\tvindex   - search for a key and list it and its signatures");
 }
 
 int main(int argc, char *argv[])
@@ -107,11 +115,12 @@ int main(int argc, char *argv[])
 
 	readconfig(configfile);
 	initlogthing("onak", config.logfile);
+	catchsignals();
 
 	if ((argc - optind) < 1) {
 		usage();
 	} else if (!strcmp("dump", argv[optind])) {
-		initdb();
+		initdb(true);
 		dumpdb("keydump");
 		cleanupdb();
 	} else if (!strcmp("add", argv[optind])) {
@@ -130,16 +139,26 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_INFO, "Finished reading %d keys.",
 					result);
 
-			initdb();
+			result = cleankeys(keys);
+			logthing(LOGTHING_INFO, "%d keys cleaned.",
+					result);
+
+			initdb(false);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 					update_keys(&keys));
 			if (keys != NULL && update) {
 				flatten_publickey(keys,
 					&packets,
 					&list_end);
-				armor_openpgp_stream(stdout_putchar,
-					NULL,
-					packets);
+				if (binary) {
+					write_openpgp_stream(stdout_putchar,
+							NULL,
+						 	packets);
+				} else {
+					armor_openpgp_stream(stdout_putchar,
+						NULL,
+						packets);
+				}
 				free_packet_list(packets);
 				packets = NULL;
 			}
@@ -156,6 +175,53 @@ int main(int argc, char *argv[])
 			rc = 1;
 			logthing(LOGTHING_NOTICE, "No changes.");
 		}
+	} else if (!strcmp("clean", argv[optind])) {
+		if (binary) {
+			result = read_openpgp_stream(stdin_getchar, NULL,
+				 &packets, 0);
+			logthing(LOGTHING_INFO,
+					"read_openpgp_stream: %d", result);
+		} else {
+			dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
+		}
+
+		if (packets != NULL) {
+			result = parse_keys(packets, &keys);
+			free_packet_list(packets);
+			packets = NULL;
+			logthing(LOGTHING_INFO, "Finished reading %d keys.",
+					result);
+
+			if (keys != NULL) {
+				result = cleankeys(keys);
+				logthing(LOGTHING_INFO, "%d keys cleaned.",
+						result);
+
+				flatten_publickey(keys,
+					&packets,
+					&list_end);
+
+				if (binary) {
+					write_openpgp_stream(stdout_putchar,
+							NULL,
+						 	packets);
+				} else {
+					armor_openpgp_stream(stdout_putchar,
+						NULL,
+						packets);
+				}
+				free_packet_list(packets);
+				packets = NULL;
+			}
+		} else {
+			rc = 1;
+			logthing(LOGTHING_NOTICE, "No keys read.");
+		}
+		
+		if (keys != NULL) {
+			free_publickey(keys);
+			keys = NULL;
+		}
 	} else if ((argc - optind) == 2) {
 		search = argv[optind+1];
 		if (search != NULL) {
@@ -166,13 +232,32 @@ int main(int argc, char *argv[])
 				ishex = true;
 			}
 		}
-		initdb();
+		initdb(false);
 		if (!strcmp("index", argv[optind])) {
 			find_keys(search, keyid, ishex, fingerprint,
 					false, false);
 		} else if (!strcmp("vindex", argv[optind])) {
 			find_keys(search, keyid, ishex, fingerprint,
 					false, true);
+		} else if (!strcmp("getphoto", 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)) {
+				unsigned char *photo = NULL;
+				size_t         length = 0;
+
+				if (getphoto(keys, 0, &photo, &length)) {
+					fwrite(photo,
+						1,
+						length,
+						stdout);
+				}
+				free_publickey(keys);
+				keys = NULL;
+			} else {
+				puts("Key not found");
+			}
 		} else if (!strcmp("delete", argv[optind])) {
 			delete_key(getfullkeyid(keyid), false);
 		} else if (!strcmp("get", argv[optind])) {