Add ability to drop overly large packets

[onak.git] / add.c

diff --git a/add.c b/add.c
index 189444e294fb2d83af8869b3c943504c30fba810..c3a54a7295601947fc46b8277dbaa4731e324901 100644 (file)
--- a/add.c
+++ b/add.c
@@ -1,12 +1,22 @@
 /*
  * 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.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
  */
 
-#include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,13 +27,10 @@
 #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"
-#include "sendsync.h"
 
 int main(int argc, char *argv[])
 {
@@ -33,6 +40,7 @@ int main(int argc, char *argv[])
        struct buffer_ctx            ctx;
        int                          count = 0;
        int                          i;
+       struct onak_dbctx           *dbctx;
 
        memset(&ctx, 0, sizeof(ctx));
 
@@ -67,26 +75,33 @@ int main(int argc, char *argv[])
                        count = parse_keys(packets, &keys);
                        logthing(LOGTHING_NOTICE, "Received %d keys.",
                                count);
-                       printf("Storing %d keys.\n", count);
+                       printf("Key block added to key server database.\n");
+                       printf("  New public keys added: %d\n", count);
                        end_html();
-                       fclose(stdout);
-                       fclose(stderr);
+                       if (stdout != NULL && fileno(stdout) != -1) {
+                               fclose(stdout);
+                       }
+                       if (stderr != NULL && stderr != stdout &&
+                                       fileno(stderr) != -1) {
+                               fclose(stderr);
+                       }
                        catchsignals();
-                       initdb(false);
+                       dbctx = config.dbinit(config.backend, false);
                        
-                       count = cleankeys(keys);
+                       count = cleankeys(&keys, config.clean_policies);
                        logthing(LOGTHING_INFO, "%d keys cleaned.",
                                        count);
 
-                       count = update_keys(&keys);
+                       count = dbctx->update_keys(dbctx, &keys, true);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                count);
+
                        if (keys != NULL) {
-                               sendkeysync(keys);
                                free_publickey(keys);
                                keys = NULL;
                        }
-                       cleanupdb();
+                       
+                       dbctx->cleanupdb(dbctx);
                } else {
                        puts("No OpenPGP packets found in input.");
                        end_html();