X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=f65203c3a06b906486686e8c131f8a2f093aeade;hb=556f51f104fbbb5bd0d51b61a18d7e5af2759079;hp=3af930903ce4d70e4f87b49b566c1122e0f6f7e6;hpb=e02c731dfbb288c736f2cd09a9b6df0507c59ddd;p=onak.git diff --git a/add.c b/add.c index 3af9309..f65203c 100644 --- a/add.c +++ b/add.c @@ -12,37 +12,22 @@ #include #include "armor.h" +#include "charfuncs.h" #include "getcgi.h" #include "keydb.h" #include "keystructs.h" -#include "parsekey.h" +#include "mem.h" #include "merge.h" - -struct cgi_get_ctx { - char *buffer; - int offset; -}; - - -int cgi_getchar(void *ctx, size_t count, unsigned char *c) -{ - struct cgi_get_ctx *buf = NULL; - - buf = (struct cgi_get_ctx *) ctx; - - while (count-- > 0 && *c != 0) { - *c = buf->buffer[buf->offset++]; - } - - return (*c == 0); -} +#include "onak-conf.h" +#include "parsekey.h" +#include "sendsync.h" int main(int argc, char *argv[]) { struct openpgp_packet_list *packets = NULL; struct openpgp_publickey *keys = NULL; char **params = NULL; - struct cgi_get_ctx ctx; + struct buffer_ctx ctx; int i; memset(&ctx, 0, sizeof(ctx)); @@ -51,27 +36,42 @@ 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("Content-Type: text/html\n"); - puts("onak : Add"); + start_html("onak : Add"); if (ctx.buffer == NULL) { puts("Error: No keytext to add supplied."); } else { - dearmor_openpgp_stream(cgi_getchar, + dearmor_openpgp_stream(buffer_fetchchar, &ctx, &packets); if (packets != NULL) { parse_keys(packets, &keys); + readconfig(); initdb(); printf("Got %d new keys.\n", update_keys(&keys, false)); + if (keys != NULL) { + sendkeysync(keys); + free_publickey(keys); + keys = NULL; + } cleanupdb(); } else { puts("No OpenPGP packets found in input."); } } - puts(""); + end_html(); return (EXIT_SUCCESS); }