X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWatchMaildir.pm;h=0b284bdba41bc5dcf0de46e0f8711a3f679ba3ea;hb=c265481528208a832c5731b8da597554f2a8f693;hp=72bd3d085dc6a5fcbf8fe2c01308caf1e948ea4c;hpb=40782735e74e427997b5b900d60cc07597e330c3;p=public-inbox.git

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 72bd3d08..0b284bdb 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -1,9 +1,12 @@
 # Copyright (C) 2016 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+#
+# ref: https://cr.yp.to/proto/maildir.html
+#	http://wiki2.dovecot.org/MailboxFormat/Maildir
 package PublicInbox::WatchMaildir;
 use strict;
 use warnings;
-use Email::MIME;
+use PublicInbox::MIME;
 use Email::MIME::ContentType;
 $Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect
 use PublicInbox::Git;
@@ -15,21 +18,25 @@ sub new {
 	my ($class, $config) = @_;
 	my (%mdmap, @mdir, $spamc);
 
-	# XXX is "publicinboxlearn" really a good namespace for this?
-	my $k = 'publicinboxlearn.watchspam';
-	if (my $spamdir = $config->{$k}) {
-		if ($spamdir =~ s/\Amaildir://) {
-			$spamdir =~ s!/+\z!!;
-			# skip "new", no MUA has seen it, yet.
-			my $cur = "$spamdir/cur";
-			push @mdir, $cur;
-			$mdmap{$cur} = 'watchspam';
-		} else {
-			warn "unsupported $k=$spamdir\n";
+	# "publicinboxwatch" is the documented namespace
+	# "publicinboxlearn" is legacy but may be supported
+	# indefinitely...
+	foreach my $pfx (qw(publicinboxwatch publicinboxlearn)) {
+		my $k = "$pfx.watchspam";
+		if (my $spamdir = $config->{$k}) {
+			if ($spamdir =~ s/\Amaildir://) {
+				$spamdir =~ s!/+\z!!;
+				# skip "new", no MUA has seen it, yet.
+				my $cur = "$spamdir/cur";
+				push @mdir, $cur;
+				$mdmap{$cur} = 'watchspam';
+			} else {
+				warn "unsupported $k=$spamdir\n";
+			}
 		}
 	}
 
-	$k = 'publicinboxwatch.spamcheck';
+	my $k = 'publicinboxwatch.spamcheck';
 	my $spamcheck = $config->{$k};
 	if ($spamcheck) {
 		if ($spamcheck eq 'spamc') {
@@ -73,6 +80,7 @@ sub new {
 		mdmap => \%mdmap,
 		mdir => \@mdir,
 		mdre => $mdre,
+		config => $config,
 		importers => {},
 	}, $class;
 }
@@ -89,18 +97,21 @@ sub _try_fsn_paths {
 
 sub _remove_spam {
 	my ($self, $path) = @_;
-	$path =~ /:2,[A-R]*S[T-Z]*\z/ or return;
+	$path =~ /:2,[A-R]*S[T-Z]*\z/i or return;
 	my $mime = _path_to_mime($path) or return;
 	_force_mid($mime);
-	foreach my $inbox (values %{$self->{mdmap}}) {
-		next unless ref $inbox;
-		my $im = _importer_for($self, $inbox);
-		$im->remove($mime);
-		if (my $scrub = _scrubber_for($inbox)) {
-			my $scrubbed = $scrub->scrub($mime) or next;
-			$im->remove($scrubbed);
-		}
-	}
+	$self->{config}->each_inbox(sub {
+		my ($ibx) = @_;
+		eval {
+			my $im = _importer_for($self, $ibx);
+			$im->remove($mime);
+			if (my $scrub = _scrubber_for($ibx)) {
+				my $scrubbed = $scrub->scrub($mime) or return;
+				$im->remove($scrubbed);
+			}
+		};
+		warn "error removing spam at $path from $ibx->{name}\n" if $@;
+	})
 }
 
 # used to hash the relevant portions of a message when there are conflicts
@@ -127,7 +138,11 @@ sub _force_mid {
 sub _try_path {
 	my ($self, $path) = @_;
 	my @p = split(m!/+!, $path);
-	return unless $p[-1] =~ /\A[a-zA-Z0-9][\w:,=\.]+\z/;
+	return if $p[-1] !~ /\A[a-zA-Z0-9][\w:,=\.]+\z/;
+	if ($p[-1] =~ /:2,([A-Z]+)\z/i) {
+		my $flags = $1;
+		return if $flags =~ /[DT]/; # no [D]rafts or [T]rashed mail
+	}
 	return unless -f $path;
 	if ($path !~ $self->{mdre}) {
 		warn "unrecognized path: $path\n";
@@ -192,7 +207,7 @@ sub _path_to_mime {
 		local $/;
 		my $str = <$fh>;
 		$str or return;
-		return Email::MIME->new(\$str);
+		return PublicInbox::MIME->new(\$str);
 	} elsif ($!{ENOENT}) {
 		return;
 	} else {
@@ -207,9 +222,16 @@ sub _importer_for {
 		my $git = $inbox->git;
 		my $name = $inbox->{name};
 		my $addr = $inbox->{-primary_address};
-		PublicInbox::Import->new($git, $name, $addr);
+		PublicInbox::Import->new($git, $name, $addr, $inbox);
 	};
-	$self->{importers}->{"$im"} = $im;
+
+	my $importers = $self->{importers};
+	if (scalar(keys(%$importers)) > 2) {
+		delete $importers->{"$im"};
+		_done_for_now($self);
+	}
+
+	$importers->{"$im"} = $im;
 }
 
 sub _scrubber_for {
@@ -232,8 +254,9 @@ sub _spamcheck_cb {
 		my ($mime) = @_;
 		my $tmp = '';
 		if ($sc->spamcheck($mime, \$tmp)) {
-			return Email::MIME->new(\$tmp);
+			return PublicInbox::MIME->new(\$tmp);
 		}
+		warn $mime->header('Message-ID')." failed spam check\n";
 		undef;
 	}
 }