X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/cd002cef518222c140de94b8817874b072b2d918..f0822345a23524444df900e19b58c0b930e76cbf:/lookup.c

diff --git a/lookup.c b/lookup.c
index b824256..cc7953e 100644
--- a/lookup.c
+++ b/lookup.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: lookup.c,v 1.13 2004/03/23 12:33:47 noodles Exp $
  */
 
 #include <inttypes.h>
@@ -17,36 +15,45 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleankey.h"
+#include "cleanup.h"
 #include "getcgi.h"
 #include "keydb.h"
+#include "keyid.h"
 #include "keyindex.h"
 #include "log.h"
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
+#include "photoid.h"
+#include "version.h"
 
 #define OP_UNKNOWN 0
 #define OP_GET     1
 #define OP_INDEX   2
 #define OP_VINDEX  3
+#define OP_PHOTO   4
+#define OP_HGET    5
 
 void find_keys(char *search, uint64_t keyid, bool ishex,
-		bool fingerprint, bool exact, bool verbose, bool mrhkp)
+		bool fingerprint, bool skshash, bool exact, bool verbose,
+		bool mrhkp)
 {
 	struct openpgp_publickey *publickey = NULL;
 	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) {
 		if (mrhkp) {
 			printf("info:1:%d\n", count);
 			mrkey_index(publickey);
 		} else {
-			key_index(publickey, verbose, fingerprint, true);
+			key_index(publickey, verbose, fingerprint, skshash,
+				true);
 		}
 		free_publickey(publickey);
 	} else if (count == 0) {
@@ -73,7 +80,9 @@ int main(int argc, char *argv[])
 	char **params = NULL;
 	int op = OP_UNKNOWN;
 	int i;
+	int indx = 0;
 	bool fingerprint = false;
+	bool skshash = false;
 	bool exact = false;
 	bool ishex = false;
 	bool mrhkp = false;
@@ -83,32 +92,44 @@ int main(int argc, char *argv[])
 	struct openpgp_publickey *publickey = NULL;
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_packet_list *list_end = NULL;
+	int result;
+	struct skshash hash;
 
 	params = getcgivars(argc, argv);
 	for (i = 0; params != NULL && params[i] != NULL; i += 2) {
 		if (!strcmp(params[i], "op")) {
 			if (!strcmp(params[i+1], "get")) {
 				op = OP_GET;
+			} else if (!strcmp(params[i+1], "hget")) {
+				op = OP_HGET;
 			} else if (!strcmp(params[i+1], "index")) {
 				op = OP_INDEX;
 			} else if (!strcmp(params[i+1], "vindex")) {
 				op = OP_VINDEX;
+			} else if (!strcmp(params[i+1], "photo")) {
+				op = OP_PHOTO;
 			}
 		} else if (!strcmp(params[i], "search")) {
 			search = params[i+1];
 			params[i+1] = NULL;
 			if (search != NULL) {
-				keyid = strtoul(search, &end, 16);
+				keyid = strtoull(search, &end, 16);
 				if (*search != 0 &&
 						end != NULL &&
 						*end == 0) {
 					ishex = true;
 				}
 			}
+		} else if (!strcmp(params[i], "idx")) {
+			indx = atoi(params[i+1]);
 		} else if (!strcmp(params[i], "fingerprint")) {
 			if (!strcmp(params[i+1], "on")) {
 				fingerprint = true;
 			}
+		} else if (!strcmp(params[i], "hash")) {
+			if (!strcmp(params[i+1], "on")) {
+				skshash = true;
+			}
 		} else if (!strcmp(params[i], "exact")) {
 			if (!strcmp(params[i+1], "on")) {
 				exact = true;
@@ -137,6 +158,8 @@ int main(int argc, char *argv[])
 
 	if (mrhkp) {
 		puts("Content-Type: text/plain\n");
+	} else if (op == OP_PHOTO) {
+		puts("Content-Type: image/jpeg\n");
 	} else {
 		start_html("Lookup of key");
 	}
@@ -148,11 +171,30 @@ int main(int argc, char *argv[])
 	} else {
 		readconfig(NULL);
 		initlogthing("lookup", config.logfile);
-		initdb(true);
+		catchsignals();
+		config.dbbackend->initdb(false);
 		switch (op) {
 		case OP_GET:
-			if (fetch_key(keyid, &publickey, false)) {
+		case OP_HGET:
+			if (op == OP_HGET) {
+				parse_skshash(search, &hash);
+				result = config.dbbackend->fetch_key_skshash(
+					&hash, &publickey);
+			} else if (ishex) {
+				result = config.dbbackend->fetch_key(keyid,
+					&publickey, false);
+			} else {
+				result = config.dbbackend->fetch_key_text(
+					search,
+					&publickey);
+			}
+			if (result) {
+				logthing(LOGTHING_NOTICE, 
+					"Found %d key(s) for search %s",
+					result,
+					search);
 				puts("<pre>");
+				cleankeys(publickey);
 				flatten_publickey(publickey,
 							&packets,
 							&list_end);
@@ -161,27 +203,48 @@ int main(int argc, char *argv[])
 						packets);
 				puts("</pre>");
 			} else {
+				logthing(LOGTHING_NOTICE,
+					"Failed to find key for search %s",
+					search);
 				puts("Key not found");
 			}
 			break;
 		case OP_INDEX:
-			find_keys(search, keyid, ishex, fingerprint, exact,
-					false, mrhkp);
+			find_keys(search, keyid, ishex, fingerprint, skshash,
+					exact, false, mrhkp);
 			break;
 		case OP_VINDEX:
-			find_keys(search, keyid, ishex, fingerprint, exact,
-					true, mrhkp);
+			find_keys(search, keyid, ishex, fingerprint, skshash,
+					exact, true, mrhkp);
+			break;
+		case OP_PHOTO:
+			if (config.dbbackend->fetch_key(keyid, &publickey,
+					false)) {
+				unsigned char *photo = NULL;
+				size_t         length = 0;
+
+				if (getphoto(publickey, indx, &photo,
+						&length)) {
+					fwrite(photo,
+							1,
+							length,
+							stdout);
+				}
+				free_publickey(publickey);
+				publickey = NULL;
+			}
 			break;
 		default:
 			puts("Unknown operation!");
 		}
-		cleanupdb();
+		config.dbbackend->cleanupdb();
 		cleanuplogthing();
 		cleanupconfig();
 	}
 	if (!mrhkp) {
 		puts("<hr>");
-		puts("Produced by onak " VERSION " by Jonathan McDowell");
+		puts("Produced by onak " ONAK_VERSION 
+				" by Jonathan McDowell");
 		end_html();
 	}