X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/b3e534f945ae56605bc5309e7c5af020c797a69b..edae27083dd4a70b1b7b8c968949ffb7dc11c508:/onak.c diff --git a/onak.c b/onak.c index 2a0376e..3a6f62f 100644 --- a/onak.c +++ b/onak.c @@ -6,17 +6,22 @@ * Jonathan McDowell * * Copyright 2002 Project Purple - * - * $Id: onak.c,v 1.21 2004/05/27 21:58:18 noodles Exp $ */ +#include +#include #include #include #include +#include +#include #include #include "armor.h" #include "charfuncs.h" +#include "cleankey.h" +#include "cleanup.h" +#include "config.h" #include "keydb.h" #include "keyid.h" #include "keyindex.h" @@ -35,9 +40,9 @@ void find_keys(char *search, uint64_t keyid, bool ishex, 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); @@ -52,19 +57,59 @@ void find_keys(char *search, uint64_t keyid, bool ishex, } } +struct dump_ctx { + int count; + int maxcount; + int fd; + int filenum; + char *filebase; +}; + +void dump_func(void *ctx, struct openpgp_publickey *key) +{ + struct openpgp_packet_list *packets = NULL; + struct openpgp_packet_list *list_end = NULL; + struct dump_ctx *state; + char filename[1024]; + + state = (struct dump_ctx *) ctx; + + if (state->fd == -1 || state->count > state->maxcount) { + if (state->fd != -1) { + close(state->fd); + state->fd = -1; + } + snprintf(filename, 1023, state->filebase, state->filenum); + state->fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640); + state->filenum++; + state->count = 0; + } + flatten_publickey(key, &packets, &list_end); + write_openpgp_stream(file_putchar, &state->fd, packets); + free_packet_list(packets); + packets = list_end = NULL; + + return; +} + void usage(void) { - puts("onak " VERSION " - an OpenPGP keyserver.\n"); + puts("onak " PACKAGE_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" + 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[]) @@ -84,6 +129,7 @@ int main(int argc, char *argv[]) bool binary = false; bool fingerprint = false; int optchar; + struct dump_ctx dumpstate; while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) { switch (optchar) { @@ -108,13 +154,22 @@ 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(true); - dumpdb("keydump"); - cleanupdb(); + config.dbbackend->initdb(true); + dumpstate.count = dumpstate.filenum = 0; + dumpstate.maxcount = 1000000; + dumpstate.fd = -1; + dumpstate.filebase = "keydump.%d.pgp"; + config.dbbackend->iterate_keys(dump_func, &dumpstate); + if (dumpstate.fd != -1) { + close(dumpstate.fd); + dumpstate.fd = -1; + } + config.dbbackend->cleanupdb(); } else if (!strcmp("add", argv[optind])) { if (binary) { result = read_openpgp_stream(stdin_getchar, NULL, @@ -131,20 +186,31 @@ int main(int argc, char *argv[]) logthing(LOGTHING_INFO, "Finished reading %d keys.", result); - initdb(false); + result = cleankeys(keys); + logthing(LOGTHING_INFO, "%d keys cleaned.", + result); + + config.dbbackend->initdb(false); logthing(LOGTHING_NOTICE, "Got %d new keys.", - update_keys(&keys)); + config.dbbackend->update_keys(&keys, + false)); 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; } - cleanupdb(); + config.dbbackend->cleanupdb(); } else { rc = 1; logthing(LOGTHING_NOTICE, "No keys read."); @@ -157,6 +223,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) { @@ -167,7 +280,7 @@ 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, false, false); @@ -178,7 +291,8 @@ int main(int argc, char *argv[]) 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; @@ -194,12 +308,15 @@ 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, @@ -214,7 +331,7 @@ int main(int argc, char *argv[]) puts("Key not found"); } } - cleanupdb(); + config.dbbackend->cleanupdb(); } else { usage(); }