From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:48:06 +0000 (+0000)
Subject: cscvs to tla changeset 110
X-Git-Tag: 0.2.1~1
X-Git-Url: https://the.earth.li/gitweb/?a=commitdiff_plain;h=f5f103192a4105438bee90bbf85e7407f73b49ca;p=onak.git

cscvs to tla changeset 110
Author: noodles
Date: 2003/10/11 22:17:17
Add (verbose) index support to onak-mail.pl
---

diff --git a/onak-mail.pl b/onak-mail.pl
index 841d4ee..1c3647c 100755
--- a/onak-mail.pl
+++ b/onak-mail.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-
 #
 # onak-mail.pl - Mail processing interface for onak, an OpenPGP Keyserver.
 #
@@ -7,7 +6,7 @@
 # Copyright 2002 Project Purple
 # Released under the GPL.
 #
-# $Id: onak-mail.pl,v 1.7 2003/09/28 17:25:40 noodles Exp $
+# $Id: onak-mail.pl,v 1.8 2003/10/11 22:17:17 noodles Exp $
 #
 
 use strict;
@@ -66,7 +65,9 @@ sub submitupdate {
 	print MERGEIN @data;
 	close MERGEIN;
 	@mergedata = <MERGEOUT>;
+	close MERGEOUT;
 	@errors = <MERGEERR>;
+	close MERGEERR;
 
 	return @mergedata;
 }
@@ -95,6 +96,9 @@ while (<>) {
 		push @body, $_;
 	}
 }
+if (! defined($replyto)) {
+	$replyto = $from;
+}
 
 # HELP, ADD, INCREMENTAL, VERBOSE INDEX <keyid>, INDEX <keyid>, GET <keyid>,
 # LAST <days>
@@ -156,7 +160,34 @@ if ($subject =~ /^INCREMENTAL$/i) {
 		print MAIL "MIME-Version: 1.0\n";
 		print MAIL "Content-Type: application/pgp-keys\n";
 		print MAIL "\n";
-		print @newupdate;
+		print MAIL @newupdate;
 		close MAIL;
 	}
+} elsif ($subject =~ /^(VERBOSE )?INDEX (.*)$/i) {
+	my (@indexdata, $command);
+
+	$command = "index";
+	if (defined($1)) {
+		$command = "vindex";
+	}
+
+	open3(\*INDEXIN, \*INDEXOUT, \*INDEXERR,
+		$config{'pks_bin_dir'}."/onak", $command, "$2");
+	close INDEXIN;
+	@indexdata = <INDEXOUT>;
+	close INDEXOUT;
+	close INDEXERR;
+
+	open(MAIL, "|$config{mta}");
+	print MAIL "From: $config{adminemail}\n";
+	print MAIL "To: $replyto\n";
+	print MAIL "Subject: Reply to INDEX $2\n";
+	print MAIL "Precedence: list\n";
+	print MAIL "MIME-Version: 1.0\n";
+	print MAIL "Content-Type: text/plain\n";
+	print MAIL "\n";
+	print MAIL "Below follows the reply to your recent keyserver query:\n";
+	print MAIL "\n";
+	print MAIL @indexdata;
+	close MAIL;
 }