onak : Add

X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4b8483ae278577a3adc8d84da81d77019704466f..2a4f5c4bfeba9f167317015ca0eb027cfca3db93:/add.c?ds=sidebyside diff --git a/add.c b/add.c index 323373b..167e5bd 100644 --- a/add.c +++ b/add.c @@ -12,36 +12,26 @@ #include #include "armor.h" +#include "cleankey.h" +#include "cleanup.h" +#include "charfuncs.h" #include "getcgi.h" #include "keydb.h" #include "keystructs.h" +#include "log.h" +#include "mem.h" +#include "merge.h" +#include "onak-conf.h" #include "parsekey.h" -struct cgi_get_ctx { - char *buffer; - int offset; -}; - - -int cgi_getchar(void *ctx, unsigned char *c) -{ - struct cgi_get_ctx *buf = NULL; - - buf = (struct cgi_get_ctx *) ctx; - - *c = buf->buffer[buf->offset++]; - - return (*c == 0); -} - int main(int argc, char *argv[]) { - struct openpgp_packet_list *packets = NULL; - struct openpgp_publickey *keys = NULL; - struct openpgp_publickey *curkey = NULL; - char **params = NULL; - struct cgi_get_ctx ctx; - int i; + struct openpgp_packet_list *packets = NULL; + struct openpgp_publickey *keys = NULL; + char **params = NULL; + struct buffer_ctx ctx; + int count = 0; + int i; memset(&ctx, 0, sizeof(ctx)); @@ -49,37 +39,65 @@ int main(int argc, char *argv[]) for (i = 0; params != NULL && params[i] != NULL; i += 2) { if (!strcmp(params[i], "keytext")) { ctx.buffer = params[i+1]; + ctx.size = strlen(ctx.buffer); + } else { + free(params[i+1]); } + params[i+1] = NULL; + free(params[i]); + params[i] = NULL; + } + if (params != NULL) { + free(params); + params = NULL; } -// puts("HTTP/1.0 200 OK"); -// puts("Server: onak 0.0.1"); - puts("Content-Type: text/html\n"); - puts("onak : Add"); + start_html("onak : Add"); if (ctx.buffer == NULL) { puts("Error: No keytext to add supplied."); + end_html(); } else { - dearmor_openpgp_stream(cgi_getchar, + readconfig(NULL); + initlogthing("add", config.logfile); + dearmor_openpgp_stream(buffer_fetchchar, &ctx, &packets); if (packets != NULL) { - parse_keys(packets, &keys); - curkey = keys; - initdb(); - while (curkey != NULL) { - if (store_key(curkey)) { -// puts("Key added successfully."); - } else { - printf("Problem adding key '%s'.\n", strerror(errno)); - } - curkey = curkey->next; + count = parse_keys(packets, &keys); + logthing(LOGTHING_NOTICE, "Received %d keys.", + count); + printf("Storing %d keys.\n", count); + end_html(); + if (stdout != NULL && fileno(stdout) != -1) { + fclose(stdout); + } + if (stderr != NULL && stderr != stdout && + fileno(stderr) != -1) { + fclose(stderr); + } + catchsignals(); + initdb(false); + + count = cleankeys(keys); + logthing(LOGTHING_INFO, "%d keys cleaned.", + count); + + count = update_keys(&keys, true); + logthing(LOGTHING_NOTICE, "Got %d new keys.", + count); + + if (keys != NULL) { + free_publickey(keys); + keys = NULL; } + cleanupdb(); - puts("Keys added."); } else { puts("No OpenPGP packets found in input."); + end_html(); } + cleanuplogthing(); + cleanupconfig(); } - puts(""); return (EXIT_SUCCESS); }