X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=add.c;h=c3a54a7295601947fc46b8277dbaa4731e324901;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=95f218943b5dcaab6540201e116fe57bce2e5608;hpb=200b89a2c66c58c41a27883f021850445698b337;p=onak.git

diff --git a/add.c b/add.c
index 95f2189..c3a54a7 100644
--- a/add.c
+++ b/add.c
@@ -1,49 +1,46 @@
 /*
  * 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>
 
 #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 "onak-conf.h"
 #include "parsekey.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);
-}
 
 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;
-	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;
+	struct onak_dbctx           *dbctx;
 
 	memset(&ctx, 0, sizeof(ctx));
 
@@ -51,6 +48,7 @@ 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]);
 		}
@@ -66,20 +64,50 @@ int main(int argc, char *argv[])
 	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);
-			initdb();
-			printf("Got %d new keys.\n",
-					update_keys(&keys, false));
-			cleanupdb();
+			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();
+			dbctx = config.dbinit(config.backend, false);
+			
+			count = cleankeys(&keys, config.clean_policies);
+			logthing(LOGTHING_INFO, "%d keys cleaned.",
+					count);
+
+			count = dbctx->update_keys(dbctx, &keys, true);
+			logthing(LOGTHING_NOTICE, "Got %d new keys.",
+				count);
+
+			if (keys != NULL) {
+				free_publickey(keys);
+				keys = NULL;
+			}
+			
+			dbctx->cleanupdb(dbctx);
 		} else {
 			puts("No OpenPGP packets found in input.");
+			end_html();
 		}
+		cleanuplogthing();
+		cleanupconfig();
 	}
-	end_html();
 	return (EXIT_SUCCESS);
 }