X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/42bcfe2cae29f375af4cf2cd3ccfa196b77a3946..8d14d66b84cc370cefe54b33de1b95bb49c90bf6:/lookup.c diff --git a/lookup.c b/lookup.c index 95ab6af..e670d49 100644 --- a/lookup.c +++ b/lookup.c @@ -6,52 +6,68 @@ * Copyright 2002 Project Purple */ -//#include #include #include #include #include +#include #include #include "armor.h" +#include "charfuncs.h" +#include "cleankey.h" +#include "cleanup.h" +#include "config.h" #include "getcgi.h" #include "keydb.h" #include "keyindex.h" +#include "log.h" #include "mem.h" #include "onak-conf.h" #include "parsekey.h" +#include "photoid.h" #define OP_UNKNOWN 0 #define OP_GET 1 #define OP_INDEX 2 #define OP_VINDEX 3 - -int putnextchar(void *ctx, size_t count, unsigned char *c) -{ - return printf("%.*s", (int) count, c); -} +#define OP_PHOTO 4 void find_keys(char *search, uint64_t keyid, bool ishex, - bool fingerprint, bool exact, bool verbose) + bool fingerprint, 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) { - key_index(publickey, verbose, fingerprint, true); + if (mrhkp) { + printf("info:1:%d\n", count); + mrkey_index(publickey); + } else { + key_index(publickey, verbose, fingerprint, true); + } free_publickey(publickey); } else if (count == 0) { - puts("Key not found."); + if (mrhkp) { + puts("info:1:0"); + } else { + puts("Key not found."); + } } else { - printf("Found %d keys, but maximum number to return is %d.\n", + if (mrhkp) { + puts("info:1:0"); + } else { + printf("Found %d keys, but maximum number to return" + " is %d.\n", count, config.maxkeys); - puts("Try again with a more specific search."); + puts("Try again with a more specific search."); + } } } @@ -60,15 +76,18 @@ int main(int argc, char *argv[]) char **params = NULL; int op = OP_UNKNOWN; int i; + int indx = 0; bool fingerprint = false; bool exact = false; bool ishex = false; + bool mrhkp = false; uint64_t keyid = 0; char *search = NULL; char *end = NULL; struct openpgp_publickey *publickey = NULL; struct openpgp_packet_list *packets = NULL; struct openpgp_packet_list *list_end = NULL; + int result; params = getcgivars(argc, argv); for (i = 0; params != NULL && params[i] != NULL; i += 2) { @@ -79,18 +98,22 @@ int main(int argc, char *argv[]) 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; @@ -99,6 +122,15 @@ int main(int argc, char *argv[]) if (!strcmp(params[i+1], "on")) { exact = true; } + } else if (!strcmp(params[i], "options")) { + /* + * TODO: We should be smarter about this; options may + * have several entries. For now mr is the only valid + * one though. + */ + if (!strcmp(params[i+1], "mr")) { + mrhkp = true; + } } free(params[i]); params[i] = NULL; @@ -112,46 +144,93 @@ int main(int argc, char *argv[]) params = NULL; } - start_html("Lookup of key"); + 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"); + } if (op == OP_UNKNOWN) { puts("Error: No operation supplied."); } else if (search == NULL) { puts("Error: No key to search for supplied."); } else { - readconfig(); - initdb(); + readconfig(NULL); + initlogthing("lookup", config.logfile); + catchsignals(); + config.dbbackend->initdb(false); switch (op) { case OP_GET: - if (fetch_key(keyid, &publickey, false)) { + if (ishex) { + logthing(LOGTHING_NOTICE, + "Getting keyid 0x%llX", + keyid); + result = config.dbbackend->fetch_key(keyid, + &publickey, false); + } else { + logthing(LOGTHING_NOTICE, + "Getting key(s) for search text %s", + search); + result = config.dbbackend->fetch_key_text( + search, + &publickey); + } + if (result) { puts("
");
+				cleankeys(publickey);
 				flatten_publickey(publickey,
 							&packets,
 							&list_end);
-				armor_openpgp_stream(putnextchar,
+				armor_openpgp_stream(stdout_putchar,
 						NULL,
 						packets);
 				puts("
"); } else { + logthing(LOGTHING_NOTICE, + "Failed to fetch key."); puts("Key not found"); } break; case OP_INDEX: find_keys(search, keyid, ishex, fingerprint, exact, - false); + false, mrhkp); break; case OP_VINDEX: find_keys(search, keyid, ishex, fingerprint, exact, - true); + 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("
"); + puts("Produced by onak " PACKAGE_VERSION + " by Jonathan McDowell"); + end_html(); } - puts("
"); - puts("Produced by onak " VERSION " by Jonathan McDowell"); - end_html(); if (search != NULL) { free(search);