X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/3dcacadf03a7cf272f1618b981b08121504e131a..94ffe75fd3251c74320167cf94604e73fdb99dfc:/onak.c?ds=sidebyside diff --git a/onak.c b/onak.c index 4e63720..6baea3d 100644 --- a/onak.c +++ b/onak.c @@ -3,9 +3,20 @@ * * This is the main swiss army knife binary. * - * Jonathan McDowell - * - * Copyright 2002 Project Purple + * Copyright 2002 Jonathan McDowell + * + * 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. + * + * 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 @@ -21,7 +32,6 @@ #include "charfuncs.h" #include "cleankey.h" #include "cleanup.h" -#include "config.h" #include "keydb.h" #include "keyid.h" #include "keyindex.h" @@ -32,20 +42,21 @@ #include "onak-conf.h" #include "parsekey.h" #include "photoid.h" +#include "version.h" void find_keys(char *search, uint64_t keyid, bool ishex, - bool fingerprint, bool exact, bool verbose) + bool fingerprint, bool skshash, bool exact, bool verbose) { 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, false); + key_index(publickey, verbose, fingerprint, skshash, false); free_publickey(publickey); } else if (count == 0) { puts("Key not found."); @@ -57,11 +68,19 @@ void find_keys(char *search, uint64_t keyid, bool ishex, } } +/** + * @brief Context for the keyserver dumping function + */ struct dump_ctx { + /** Keys we've dumped so far to this file */ int count; + /** Maximum keys to dump per file */ int maxcount; + /** File descriptor for the current dump file */ int fd; + /** Number of the current dump file */ int filenum; + /** Base filename to use for dump files */ char *filebase; }; @@ -74,7 +93,7 @@ void dump_func(void *ctx, struct openpgp_publickey *key) state = (struct dump_ctx *) ctx; - if (state->fd == -1 || state->count > state->maxcount) { + if (state->fd == -1 || state->count++ > state->maxcount) { if (state->fd != -1) { close(state->fd); state->fd = -1; @@ -93,13 +112,13 @@ void dump_func(void *ctx, struct openpgp_publickey *key) } void usage(void) { - puts("onak " PACKAGE_VERSION " - an OpenPGP keyserver.\n"); + puts("onak " ONAK_VERSION " - an OpenPGP keyserver.\n"); puts("Usage:\n"); puts("\tonak [options] \n"); 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"); @@ -128,10 +147,12 @@ int main(int argc, char *argv[]) bool update = false; bool binary = false; bool fingerprint = false; + bool skshash = false; int optchar; struct dump_ctx dumpstate; + struct skshash hash; - while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) { + while ((optchar = getopt(argc, argv, "bc:fsuv")) != -1 ) { switch (optchar) { case 'b': binary = true; @@ -142,6 +163,9 @@ int main(int argc, char *argv[]) case 'f': fingerprint = true; break; + case 's': + skshash = true; + break; case 'u': update = true; break; @@ -159,17 +183,17 @@ int main(int argc, char *argv[]) if ((argc - optind) < 1) { usage(); } else if (!strcmp("dump", argv[optind])) { - initdb(true); + config.dbbackend->initdb(true); dumpstate.count = dumpstate.filenum = 0; - dumpstate.maxcount = 1000000; + dumpstate.maxcount = 100000; dumpstate.fd = -1; dumpstate.filebase = "keydump.%d.pgp"; - iterate_keys(dump_func, &dumpstate); + config.dbbackend->iterate_keys(dump_func, &dumpstate); if (dumpstate.fd != -1) { close(dumpstate.fd); dumpstate.fd = -1; } - cleanupdb(); + config.dbbackend->cleanupdb(); } else if (!strcmp("add", argv[optind])) { if (binary) { result = read_openpgp_stream(stdin_getchar, NULL, @@ -190,9 +214,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, @@ -209,7 +234,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."); @@ -271,7 +296,17 @@ int main(int argc, char *argv[]) } } else if ((argc - optind) == 2) { search = argv[optind+1]; - if (search != NULL) { + 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 = strtoul(search, &end, 16); if (*search != 0 && end != NULL && @@ -279,22 +314,24 @@ 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, + find_keys(search, keyid, ishex, fingerprint, skshash, false, false); } else if (!strcmp("vindex", argv[optind])) { - find_keys(search, keyid, ishex, fingerprint, + find_keys(search, keyid, ishex, fingerprint, skshash, 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)) { + } else if (config.dbbackend->fetch_key(keyid, &keys, + false)) { unsigned char *photo = NULL; size_t length = 0; - if (getphoto(keys, 0, &photo, &length)) { + if (getphoto(keys, 0, &photo, + &length) == ONAK_E_OK) { fwrite(photo, 1, length, @@ -306,27 +343,60 @@ 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, &list_end); free_publickey(keys); - armor_openpgp_stream(stdout_putchar, + if (binary) { + write_openpgp_stream(stdout_putchar, NULL, packets); + } else { + armor_openpgp_stream(stdout_putchar, + NULL, + packets); + } + free_packet_list(packets); + packets = NULL; + } else { + puts("Key not found"); + } + } else if (!strcmp("hget", argv[optind])) { + if (!parse_skshash(search, &hash)) { + puts("Couldn't parse sks hash."); + } else if (config.dbbackend->fetch_key_skshash(&hash, + &keys)) { + logthing(LOGTHING_INFO, "Got key."); + flatten_publickey(keys, + &packets, + &list_end); + free_publickey(keys); + if (binary) { + write_openpgp_stream(stdout_putchar, + NULL, + packets); + } else { + armor_openpgp_stream(stdout_putchar, + NULL, + packets); + } free_packet_list(packets); packets = NULL; } else { puts("Key not found"); } } - cleanupdb(); + config.dbbackend->cleanupdb(); } else { usage(); }