From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] mda: support --no-precheck option
Date: Wed, 16 Oct 2019 00:39:56 +0000 [thread overview]
Message-ID: <20191016003956.13269-1-e@80x24.org> (raw)
Since -mda now supports List-ID to better support mirroring of
existing mailing lists, it probably makes sense to support
disabling the precheck function to provide more accurate (though
potentially spammier) mirrors of lists
---
Documentation/public-inbox-mda.pod | 25 +++++++++++++++++++++++++
script/public-inbox-mda | 7 +++++--
t/mda.t | 15 +++++++++++++++
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/Documentation/public-inbox-mda.pod b/Documentation/public-inbox-mda.pod
index 921b7a15..15bf4d84 100644
--- a/Documentation/public-inbox-mda.pod
+++ b/Documentation/public-inbox-mda.pod
@@ -16,6 +16,31 @@ By default, it relies on L<spamc(1)> for filtering mail,
but may be disabled via
L<public-inbox-config(5)/publicinboxmda.spamcheck>
+=head1 OPTIONS
+
+=over 8
+
+=item --no-precheck
+
+By default, public-inbox-mda does some simple checks before
+invoking L<spamc(1)> since it is intended to receive mail before
+it goes to a mailing list.
+
+Howeever, some users prefer to use public-inbox-mda to mirror
+mailing lists. This option exists to support those users.
+
+Using this option, the following prechecks are disabled:
+
+ * multiple Message-IDs
+ * non-existent Message-IDs
+ * Message-IDs longer than 244 characters long
+ * From: header shorter than 3 characters
+ * Subject: header shorter than 2 characters
+ * unusable Date: headers
+ * inbox address specified in To: or Cc: header
+
+=back
+
=head1 ENVIRONMENT
=over 8
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 2655a6c5..9b8753da 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -5,7 +5,8 @@
# Mail delivery agent for public-inbox, run from your MTA upon mail delivery
use strict;
use warnings;
-my $usage = 'public-inbox-mda < rfc2822_message';
+my $usage = 'public-inbox-mda [OPTIONS] < rfc2822_message';
+my $precheck = grep(/\A--no-precheck\z/, @ARGV) ? 0 : 1;
my ($ems, $emm);
sub do_exit {
@@ -55,7 +56,9 @@ $dst->{mainrepo} or do_exit(67);
$dst = PublicInbox::InboxWritable->new($dst);
# pre-check, MDA has stricter rules than an importer might;
-do_exit(0) unless PublicInbox::MDA->precheck($simple, $dst->{address});
+if ($precheck && !PublicInbox::MDA->precheck($simple, $dst->{address})) {
+ do_exit(0);
+}
$simple = undef;
my $spam_ok;
if ($spamc) {
diff --git a/t/mda.t b/t/mda.t
index 3cab590b..92e8ad0d 100644
--- a/t/mda.t
+++ b/t/mda.t
@@ -293,6 +293,21 @@ EOF
my $path = mid2path($mid);
my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`;
like($msg, qr/\Q$list_id\E/, 'delivered message w/ List-ID matches');
+
+ # try a message w/o precheck
+ $simple = Email::Simple->new(<<EOF);
+To: You <you\@example.com>
+List-Id: <$list_id>
+
+this message would not be accepted without --no-precheck
+EOF
+ $in = $simple->as_string;
+ my ($out, $err) = ('', '');
+ IPC::Run::run([$mda, '--no-precheck'], \$in, \$out, \$err);
+ is($?, 0, 'mda OK with List-Id match and --no-precheck');
+ my $cur = `git --git-dir=$maindir diff HEAD~1..HEAD`;
+ like($cur, qr/this message would not be accepted without --no-precheck/,
+ '--no-precheck delivered message anyways');
}
done_testing();
next reply other threads:[~2019-10-16 0:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 0:39 Eric Wong [this message]
2019-10-16 4:42 ` [PATCH] mda: support --no-precheck option Kyle Meyer
2019-10-16 8:13 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191016003956.13269-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).