X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/58d762ea573eb3cfea626bb52ea7a99e24b8a0aa..HEAD:/lookup.c diff --git a/lookup.c b/lookup.c index 72798ce..9af11d9 100644 --- a/lookup.c +++ b/lookup.c @@ -1,11 +1,20 @@ /* * lookup.c - CGI to lookup keys. * - * Jonathan McDowell + * Copyright 2002-2005,2007-2009,2011 Jonathan McDowell * - * Copyright 2002 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. * - * $Id: lookup.c,v 1.11 2003/10/04 10:21:41 noodles Exp $ + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * 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. */ #include @@ -17,36 +26,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 +91,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 +103,54 @@ 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); + if (search != NULL && strlen(search) == 42 && + search[0] == '0' && search[1] == 'x') { + /* + * Fingerprint. Truncate to last 64 bits for + * now. + */ + keyid = strtoull(&search[26], &end, 16); + if (end != NULL && *end == 0) { + ishex = true; + } + } else if (search != NULL) { + 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 +179,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"); } @@ -146,13 +190,32 @@ int main(int argc, char *argv[]) } else if (search == NULL) { puts("Error: No key to search for supplied."); } else { - readconfig(); + readconfig(NULL); initlogthing("lookup", config.logfile); - initdb(); + 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("
");
+				cleankeys(publickey);
 				flatten_publickey(publickey,
 							&packets,
 							&list_end);
@@ -161,27 +224,47 @@ int main(int argc, char *argv[])
 						packets);
 				puts("
"); } 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) == ONAK_E_OK) { + 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 " VERSION " by Jonathan McDowell"); + puts("Produced by onak " ONAK_VERSION ); end_html(); }