cscvs to tla changeset 5

Author: noodles
Date: 2005/03/21 15:11:01
Add support for MIME signed mails from Simon Huggins.

git-archimport-id: noodles@earth.li--pie/autodns--mainline--1.0--patch-4

diff --git a/HISTORY b/HISTORY
index 6a845aebb6659df36cf009e58e3aaa617b2af502..206261c7c59c372d8e569f8bb57130ccd28db429 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -42,3 +42,7 @@
 
 * Fix for problems with gpg flushing & lots of domains. (James Harrison)
 * Fix bug with writing filenames with /s in them - we convert them to :s now.
+
+0.0.8
+
+* Add support for MIME signed mails. (Simon Huggins)

diff --git a/autodns.pl b/autodns.pl
index 2b973ee4efe39c52273c1e31e9465d7c72e8537b..67377a3025ee36bcb4cc875361b95a55e4ca2774 100755 (executable)
--- a/autodns.pl
+++ b/autodns.pl
@@ -5,12 +5,14 @@
 # http://www.earth.li/projectpurple/progs/autodns.html
 # Released under the GPL.
 #
-# $Id: autodns.pl,v 1.4 2004/04/08 10:48:35 noodles Exp $
+# $Id: autodns.pl,v 1.5 2005/03/21 15:11:01 noodles Exp $
 #
 
 use strict;
-use IPC::Open3;
 use Fcntl qw(:flock);
+use File::Temp qw(tempfile);
+use IPC::Open3;
+use MIME::Parser;
 
 $ENV{'PATH'}="/usr/local/bin:/usr/bin:/bin:/usr/sbin";
 
@@ -211,21 +213,72 @@ Released under the GPL.
 EOF
 
 #
-# Now run GPG against our incoming mail, first making sure that our locale is
-# set to C so that we get the messages in English as we expect.
+# Throw the mail at MIME::Parser and see if it accepts it.
+#
+my $parser = new MIME::Parser;
+$parser->output_to_core(1); # No temporary files
+my $entity = $parser->parse_data(\@MAIL);
+
+#
+# Make sure locale is set to C so we get messages in English as we expect.
 #
 $ENV{'LC_ALL'}="C";
-open3(\*GPGIN, \*GPGOUT, \*GPGERR, "gpg --batch");
 
-# Feed it the mail.
-print GPGIN @MAIL;
-close GPGIN;
+if ($entity->parts) {
+       # MIME
+
+       my ($got_sig, $got_text) = (0, 0);
+       my ($sig_name,$sig_fh,$text_name,$text_fh);
+       ($sig_fh, $sig_name) = tempfile();
+       ($text_fh, $text_name) = tempfile();
+
+       foreach my $subent ($entity->parts) {
+               if ($subent->effective_type eq "text/plain") {
+                       @COMMANDS = split /\n/,$subent->bodyhandle->as_string;
+
+                       my $str = $subent->as_string;
+                       $str =~ s/=\n$//;
+                       $str =~ s/\n/\r\n/g;
+                       print $text_fh $str;
+                       close($text_fh);
+                       $got_text++;
+               } elsif ($subent->effective_type eq
+                               "application/pgp-signature") {
+                       print $sig_fh $subent->as_string;
+                       close($sig_fh);
+                       $got_sig++;
+               }
+       }
+
+       if ($got_sig && $got_text) {
+               open3(\*GPGIN, \*GPGOUT, \*GPGERR, "gpg --batch --verify ".
+                       $sig_name." ".$text_name);
 
-# And grab what it has to say.
-@GPGERROR=<GPGERR>;
-@COMMANDS=<GPGOUT>;
-close GPGERR;
-close GPGOUT;
+               close GPGIN;
+
+               @GPGERROR=<GPGERR>;
+               my @GPGOUTPUT=<GPGOUT>;
+               close GPGERR;
+               close GPGOUT;
+
+               unlink($text_name);
+               unlink($sig_name);
+       }
+} else {
+       # Clear text.
+
+       open3(\*GPGIN, \*GPGOUT, \*GPGERR, "gpg --batch");
+
+       # Feed it the mail.
+       print GPGIN @MAIL;
+       close GPGIN;
+
+       # And grab what it has to say.
+       @GPGERROR=<GPGERR>;
+       @COMMANDS=<GPGOUT>;
+       close GPGERR;
+       close GPGOUT;
+}
 
 # Check who it's from and if the signature was a good one.
 $gpggood=1;