Prevent read_openpgp_stream from returning empty packets

[onak.git] / add.c

diff --git a/add.c b/add.c
index 2c6abb93af54ba35aa13ecf223e35a54a0a61a38..6f919becfe7e30b077cfd11d079851a478fe0091 100644 (file)
--- a/add.c
+++ b/add.c
@@ -1,11 +1,20 @@
 /*
  * add.c - CGI to add keys.
  *
 /*
  * add.c - CGI to add keys.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2007-2008 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2002 Project Purple
+ * 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.

  *
  *

- * $Id: add.c,v 1.10 2003/06/04 20:57:06 noodles Exp $
+ * 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 <errno.h>
  */
 
 #include <errno.h>


@@ -14,6 +23,8 @@
 #include <string.h>
 
 #include "armor.h"
 #include <string.h>
 
 #include "armor.h"

+#include "cleankey.h"
+#include "cleanup.h"

 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"


@@ -23,15 +34,15 @@
 #include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"

-#include "sendsync.h"

 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {

-       struct openpgp_packet_list *packets = NULL;
-       struct openpgp_publickey *keys = NULL;
-       char **params = NULL;
-       struct buffer_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));
 
 
        memset(&ctx, 0, sizeof(ctx));
 


@@ -55,29 +66,50 @@ int main(int argc, char *argv[])
        start_html("onak : Add");
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");
        start_html("onak : Add");
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");

+               end_html();

        } else {
        } else {

-               readconfig();
+               readconfig(NULL);

                initlogthing("add", config.logfile);
                dearmor_openpgp_stream(buffer_fetchchar,
                                        &ctx,
                                        &packets);
                if (packets != NULL) {
                initlogthing("add", config.logfile);
                dearmor_openpgp_stream(buffer_fetchchar,
                                        &ctx,
                                        &packets);
                if (packets != NULL) {

-                       parse_keys(packets, &keys);
-                       initdb();
-                       printf("Got %d new keys.\n",
-                                       update_keys(&keys));
+                       count = parse_keys(packets, &keys);
+                       logthing(LOGTHING_NOTICE, "Received %d keys.",
+                               count);
+                       printf("Key block added to key server database.\n");
+                       printf("  New public keys added: %d\n", count);
+                       end_html();
+                       if (stdout != NULL && fileno(stdout) != -1) {
+                               fclose(stdout);
+                       }
+                       if (stderr != NULL && stderr != stdout &&
+                                       fileno(stderr) != -1) {
+                               fclose(stderr);
+                       }
+                       catchsignals();
+                       config.dbbackend->initdb(false);
+                       
+                       count = cleankeys(keys);
+                       logthing(LOGTHING_INFO, "%d keys cleaned.",
+                                       count);
+
+                       count = config.dbbackend->update_keys(&keys, true);
+                       logthing(LOGTHING_NOTICE, "Got %d new keys.",
+                               count);
+

                        if (keys != NULL) {
                        if (keys != NULL) {

-                               sendkeysync(keys);

                                free_publickey(keys);
                                keys = NULL;
                        }
                                free_publickey(keys);
                                keys = NULL;
                        }

-                       cleanupdb();
+                       
+                       config.dbbackend->cleanupdb();

                } else {
                        puts("No OpenPGP packets found in input.");
                } else {
                        puts("No OpenPGP packets found in input.");

+                       end_html();

                }
                cleanuplogthing();
                cleanupconfig();
        }
                }
                cleanuplogthing();
                cleanupconfig();
        }

-       end_html();

        return (EXIT_SUCCESS);
 }
        return (EXIT_SUCCESS);
 }