X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=7bd89190118f02c664a6e758ef766a74b45faf77;hb=5ace83529b1fd3e46db32357c8716be51d921449;hp=7b0f2f3beec4d4cb28e0cb5d0cdac6493be18f81;hpb=8e58a1769ce5e492dd68904dfc81b6e077fc2a3a;p=onak.git diff --git a/onak.c b/onak.c index 7b0f2f3..7bd8919 100644 --- a/onak.c +++ b/onak.c @@ -8,64 +8,284 @@ * Copyright 2002 Project Purple */ +#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" #include "keystructs.h" +#include "log.h" #include "mem.h" #include "merge.h" +#include "onak-conf.h" #include "parsekey.h" +#include "photoid.h" -int stdin_getchar(void *ctx, size_t count, unsigned char *c) +void find_keys(char *search, uint64_t keyid, bool ishex, + bool fingerprint, bool exact, bool verbose) { - int ic; - - do { - ic = getchar(); - *c = ic; - c++; - } while ((ic != EOF) && (--count > 0)); - return (ic == EOF); -} + struct openpgp_publickey *publickey = NULL; + int count = 0; -int stdout_putchar(void *ctx, unsigned char c) -{ - return (putchar(c)); + if (ishex) { + count = fetch_key(keyid, &publickey, false); + } else { + count = fetch_key_text(search, &publickey); + } + if (publickey != NULL) { + key_index(publickey, verbose, fingerprint, false); + free_publickey(publickey); + } else if (count == 0) { + puts("Key not found."); + } else { + printf("Found %d keys, but maximum number to return is %d.\n", + count, + config.maxkeys); + puts("Try again with a more specific search."); + } } +void usage(void) { + 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" + " keyserver"); + 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[]) { struct openpgp_packet_list *packets = NULL; struct openpgp_packet_list *list_end = NULL; struct openpgp_publickey *keys = NULL; + char *configfile = NULL; int rc = EXIT_SUCCESS; + int result = 0; + char *search = NULL; + char *end = NULL; + uint64_t keyid = 0; + bool ishex = false; + bool verbose = false; + bool update = false; + bool binary = false; + bool fingerprint = false; + int optchar; - read_openpgp_stream(stdin_getchar, NULL, &packets); - if (packets != NULL) { - parse_keys(packets, &keys); - free_packet_list(packets); - packets = NULL; + while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) { + switch (optchar) { + case 'b': + binary = true; + break; + case 'c': + configfile = strdup(optarg); + break; + case 'f': + fingerprint = true; + break; + case 'u': + update = true; + break; + case 'v': + verbose = true; + setlogthreshold(LOGTHING_INFO); + break; + } + } - initdb(); - fprintf(stderr, "Got %d new keys.\n", - update_keys(&keys)); + readconfig(configfile); + initlogthing("onak", config.logfile); + catchsignals(); + + if ((argc - optind) < 1) { + usage(); + } else if (!strcmp("dump", argv[optind])) { + initdb(true); + dumpdb("keydump"); cleanupdb(); - } else { - rc = 1; - fprintf(stderr, "No keys read.\n"); - } + } else if (!strcmp("add", 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); + + result = cleankeys(keys); + logthing(LOGTHING_INFO, "%d keys cleaned.", + result); + + initdb(false); + logthing(LOGTHING_NOTICE, "Got %d new keys.", + update_keys(&keys)); + if (keys != NULL && update) { + 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; + } + cleanupdb(); + } else { + rc = 1; + logthing(LOGTHING_NOTICE, "No keys read."); + } + + if (keys != NULL) { + free_publickey(keys); + keys = NULL; + } else { + 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) { - free_publickey(keys); - keys = NULL; + 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) { + keyid = strtoul(search, &end, 16); + if (*search != 0 && + end != NULL && + *end == 0) { + ishex = true; + } + } + initdb(false); + if (!strcmp("index", argv[optind])) { + find_keys(search, keyid, ishex, fingerprint, + false, false); + } else if (!strcmp("vindex", argv[optind])) { + find_keys(search, keyid, ishex, fingerprint, + 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)) { + unsigned char *photo = NULL; + size_t length = 0; + + if (getphoto(keys, 0, &photo, &length)) { + fwrite(photo, + 1, + length, + stdout); + } + free_publickey(keys); + keys = NULL; + } else { + puts("Key not found"); + } + } else if (!strcmp("delete", argv[optind])) { + delete_key(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)) { + logthing(LOGTHING_INFO, "Got key."); + flatten_publickey(keys, + &packets, + &list_end); + free_publickey(keys); + armor_openpgp_stream(stdout_putchar, + NULL, + packets); + free_packet_list(packets); + packets = NULL; + } else { + puts("Key not found"); + } + } + cleanupdb(); } else { - rc = 1; - fprintf(stderr, "No changes.\n"); + usage(); } + cleanuplogthing(); + cleanupconfig(); + return rc; }