X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-mail.pl;h=6799b3d86b4c897fd41aacc25bdf03f912f60b61;hb=28052481c1892cd06a2626a1ecd7221c3814f0e6;hp=30e5b9326034e96686ef76f5e2f11acf63bd065d;hpb=8e58a1769ce5e492dd68904dfc81b6e077fc2a3a;p=onak.git

diff --git a/onak-mail.pl b/onak-mail.pl
index 30e5b93..6799b3d 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.
 #
@@ -9,8 +8,47 @@
 #
 
 use strict;
+use Fcntl ':flock';
 use IPC::Open3;
 
+my %config;
+
+#
+# readconfig
+#
+# Reads in our config file. Ignores any command it doesn't understand rather
+# than having to list all the ones that are of no interest to us.
+#
+sub readconfig {
+
+	open(CONFIG, "/home/noodles/projects/onak/onak.conf") or
+		die "Can't read config file: $!";
+	
+	while (<CONFIG>) {
+		if (/^#/ or /^$/) {
+			# Ignore; comment line.
+		} elsif (/^this_site (.*)/) {
+			$config{'thissite'} = $1;
+		} elsif (/^logfile (.*)/) {
+			$config{'logfile'} = $1;
+		} elsif (/^maintainer_email (.*)/) {
+			$config{'adminemail'} = $1;
+		} elsif (/^mail_delivery_client (.*)/) {
+			$config{'mta'} = $1;
+		} elsif (/^pks_bin_dir (.*)/) {
+			$config{'pks_bin_dir'} = $1;
+		} elsif (/^db_dir (.*)/) {
+			$config{'db_dir'} = $1;
+		} elsif (/^syncsite (.*)/) {
+			push @{$config{'syncsites'}}, $1;
+		}
+	}
+
+	close(CONFIG);
+
+	return;
+}
+
 #
 # submitupdate
 #
@@ -22,29 +60,38 @@ sub submitupdate {
 	my @data = @_;
 	my (@errors, @mergedata);
 
-	open3(\*MERGEIN, \*MERGEOUT, \*MERGEERR, "/home/noodles/onak-0.0.2/keymerge");
+	open(LOCKFILE, '>'.$config{'db_dir'}.'/onak-mail.lck');
+	flock(LOCKFILE, LOCK_EX);
+	print LOCKFILE "$$";
+
+	open3(\*MERGEIN, \*MERGEOUT, \*MERGEERR,
+		$config{'pks_bin_dir'}."/onak", "-u", "add");
 
 	print MERGEIN @data;
 	close MERGEIN;
-	@errors = <MERGEERR>;
 	@mergedata = <MERGEOUT>;
+	close MERGEOUT;
+	@errors = <MERGEERR>;
+	close MERGEERR;
 
-	#print @errors;
+	flock(LOCKFILE, LOCK_UN);
+	close(LOCKFILE);
 
 	return @mergedata;
 }
 
-my ($inheader, %syncsites, $subject, $from, $replyto, @body, @syncmail);
+my ($inheader, %seenby, $subject, $from, $replyto, @body, @syncmail);
 
 $inheader = 1;
 $subject = "";
+&readconfig;
 
 while (<>) {
 	if ($inheader) {
 		if (/^Subject:\s*(.*)\s*$/i) {
 			$subject = $1;
 		} elsif (/^X-KeyServer-Sent:\s*(.*)\s*$/i) {
-			$syncsites{$1} = 1;
+			$seenby{$1} = 1;
 		} elsif (/^From:\s*(.*)\s*$/i) {
 			$from = $1;
 		} elsif (/^Reply-To:\s*(.*)\s*$/i) {
@@ -57,10 +104,98 @@ while (<>) {
 		push @body, $_;
 	}
 }
+if (! defined($replyto)) {
+	$replyto = $from;
+}
 
 # HELP, ADD, INCREMENTAL, VERBOSE INDEX <keyid>, INDEX <keyid>, GET <keyid>,
 # LAST <days>
 
 if ($subject =~ /^INCREMENTAL$/i) {
-	submitupdate(@body);
+	my $site;
+	my $count;
+	my $i;
+	my @newupdate = submitupdate(@body);
+	my @time;
+
+	$count = 0;
+	foreach $i (@{$config{'syncsites'}}) {
+		if (! defined($seenby{$i})) {
+			$count++;
+		}
+	}
+
+	open (LOG, ">>$config{'logfile'}");
+	@time = localtime(time);
+	print LOG "[";
+	print LOG sprintf "%02d/%02d/%04d %02d:%02d:%02d",
+		$time[3], $time[4] + 1, $time[5] + 1900,
+		$time[2], $time[1], $time[0];
+	print LOG "] onak-mail[$$]: Syncing with $count sites.\n";
+	close LOG;
+
+	if ((! defined($newupdate[0])) || $newupdate[0] eq '') {
+		open (LOG, ">>$config{'logfile'}");
+		print LOG "[";
+		print LOG sprintf "%02d/%02d/%04d %02d:%02d:%02d",
+			$time[3], $time[4] + 1, $time[5] + 1900,
+			$time[2], $time[1], $time[0];
+		print LOG "] onak-mail[$$]: Nothing to sync.\n";
+		close LOG;
+		$count = 0;
+	}
+
+	if ($count > 0) {
+		open(MAIL, "|$config{mta}");
+		print MAIL "From: $config{adminemail}\n";
+		print MAIL "To: ";
+		foreach $i (@{$config{'syncsites'}}) {
+			if (! defined($seenby{$i})) {
+				print MAIL "$i";
+				$count--;
+				if ($count > 0) {
+					print MAIL ", ";
+				}
+			}
+		}
+		print MAIL "\n";
+		print MAIL "Subject: incremental\n";
+		foreach $site (keys %seenby) {
+			print MAIL "X-KeyServer-Sent: $site\n";
+		}
+		print MAIL "X-KeyServer-Sent: $config{thissite}\n";
+		print MAIL "Precedence: list\n";
+		print MAIL "MIME-Version: 1.0\n";
+		print MAIL "Content-Type: application/pgp-keys\n";
+		print MAIL "\n";
+		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;
 }