* [PATCH v2] mda: allow configuring globally without spamc support
2018-07-29 0:33 5% [PATCH] mda: allow configuring globally without spamc support Eric Wong
@ 2018-07-29 10:05 5% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2018-07-29 10:05 UTC (permalink / raw)
To: meta
This reuses some of the configuration from -watch, but remains
independent since some configurations will use -watch for some
inboxes and -mda for others.
The default remains "spamc" for -mda users so nothing changes
without explicit configuration.
Per-inbox configurations may also be supported in the future.
---
Documentation/public-inbox-config.pod | 9 ++++
Documentation/public-inbox-mda.pod | 4 ++
MANIFEST | 1 +
lib/PublicInbox/Spamcheck.pm | 25 +++++++++++
lib/PublicInbox/WatchMaildir.pm | 17 ++-----
script/public-inbox-mda | 27 +++++++----
t/v2mda.t | 65 +++++++++++++++++++++------
7 files changed, 114 insertions(+), 34 deletions(-)
create mode 100644 lib/PublicInbox/Spamcheck.pm
diff --git a/Documentation/public-inbox-config.pod b/Documentation/public-inbox-config.pod
index 22ee909..f7353dc 100644
--- a/Documentation/public-inbox-config.pod
+++ b/Documentation/public-inbox-config.pod
@@ -91,6 +91,15 @@ C<nntp://news.gmane.org/gmane.mail.public-inbox.general>
Default: none
+=item publicinboxmda.spamcheck
+
+This may be set to C<none> to disable the use of SpamAssassin
+L<spamc(1)> for filtering spam before it is imported into git
+history. Other spam filtering backends may be supported in
+the future.
+
+Default: spamc
+
=item publicinboxwatch.spamcheck
This may be set to C<spamc> to enable the use of SpamAssassin
diff --git a/Documentation/public-inbox-mda.pod b/Documentation/public-inbox-mda.pod
index a6c704e..1a5ade8 100644
--- a/Documentation/public-inbox-mda.pod
+++ b/Documentation/public-inbox-mda.pod
@@ -12,6 +12,10 @@ Mail Delivery Agent (MDA) for public-inbox installations.
Each system user may have their own public-inbox instances.
This may be invoked via L<procmail(1)> or similar tools.
+By default, it relies on L<spamc(1)> for filtering mail,
+but may be disabled via
+L<public-inbox-config(5)/publicinboxmda.spamcheck>
+
=head1 ENVIRONMENT
=over 8
diff --git a/MANIFEST b/MANIFEST
index 003c3c5..a455dba 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -98,6 +98,7 @@ lib/PublicInbox/SearchIdxPart.pm
lib/PublicInbox/SearchMsg.pm
lib/PublicInbox/SearchThread.pm
lib/PublicInbox/SearchView.pm
+lib/PublicInbox/Spamcheck.pm
lib/PublicInbox/Spamcheck/Spamc.pm
lib/PublicInbox/Spawn.pm
lib/PublicInbox/SpawnPP.pm
diff --git a/lib/PublicInbox/Spamcheck.pm b/lib/PublicInbox/Spamcheck.pm
new file mode 100644
index 0000000..062479d
--- /dev/null
+++ b/lib/PublicInbox/Spamcheck.pm
@@ -0,0 +1,25 @@
+# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+package PublicInbox::Spamcheck;
+use strict;
+use warnings;
+
+sub get {
+ my ($config, $key, $default) = @_;
+ my $spamcheck = $config->{$key};
+ $spamcheck = $default unless $spamcheck;
+
+ return if !$spamcheck || $spamcheck eq 'none';
+
+ if ($spamcheck eq 'spamc') {
+ $spamcheck = 'PublicInbox::Spamcheck::Spamc';
+ }
+ if ($spamcheck =~ /::/) {
+ eval "require $spamcheck";
+ return $spamcheck->new;
+ }
+ warn "unsupported $key=$spamcheck\n";
+ undef;
+}
+
+1;
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 10dc618..13dea16 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -14,6 +14,7 @@ use PublicInbox::Spawn qw(spawn);
use PublicInbox::InboxWritable;
use File::Temp qw//;
use PublicInbox::Filter::Base;
+use PublicInbox::Spamcheck;
*REJECT = *PublicInbox::Filter::Base::REJECT;
sub new {
@@ -40,19 +41,9 @@ sub new {
}
my $k = 'publicinboxwatch.spamcheck';
- my $spamcheck = $config->{$k};
- if ($spamcheck) {
- if ($spamcheck eq 'spamc') {
- $spamcheck = 'PublicInbox::Spamcheck::Spamc';
- }
- if ($spamcheck =~ /::/) {
- eval "require $spamcheck";
- $spamcheck = _spamcheck_cb($spamcheck->new);
- } else {
- warn "unsupported $k=$spamcheck\n";
- $spamcheck = undef;
- }
- }
+ my $default = undef;
+ my $spamcheck = PublicInbox::Spamcheck::get($config, $k, $default);
+ $spamcheck = _spamcheck_cb($spamcheck) if $spamcheck;
# need to make all inboxes writable for spam removal:
$config->each_inbox(sub { PublicInbox::InboxWritable->new($_[0]) });
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 2b7f298..183b915 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -20,8 +20,8 @@ use PublicInbox::MDA;
use PublicInbox::Config;
use PublicInbox::Emergency;
use PublicInbox::Filter::Base;
-use PublicInbox::Spamcheck::Spamc;
use PublicInbox::InboxWritable;
+use PublicInbox::Spamcheck;
# n.b: hopefully we can setup the emergency path without bailing due to
# user error, we really want to setup the emergency destination ASAP
@@ -33,7 +33,9 @@ $str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
$ems->prepare(\$str);
my $simple = Email::Simple->new(\$str);
my $config = PublicInbox::Config->new;
-
+my $key = 'publicinboxmda.spamcheck';
+my $default = 'PublicInbox::Spamcheck::Spamc';
+my $spamc = PublicInbox::Spamcheck::get($config, $key, $default);
my $recipient = $ENV{ORIGINAL_RECIPIENT};
defined $recipient or die "ORIGINAL_RECIPIENT not defined in ENV\n";
my $dst = $config->lookup($recipient); # first check
@@ -43,13 +45,22 @@ $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});
-my $spamc = PublicInbox::Spamcheck::Spamc->new;
-$str = '';
-my $spam_ok = $spamc->spamcheck($ems->fh, \$str);
$simple = undef;
-$emm = PublicInbox::Emergency->new($emergency);
-$emm->prepare(\$str);
-$ems = $ems->abort;
+my $spam_ok;
+if ($spamc) {
+ $str = '';
+ $spam_ok = $spamc->spamcheck($ems->fh, \$str);
+ # update the emergency dump with the new message:
+ $emm = PublicInbox::Emergency->new($emergency);
+ $emm->prepare(\$str);
+ $ems = $ems->abort;
+} else { # no spam checking configured:
+ $spam_ok = 1;
+ $emm = $ems;
+ my $fh = $emm->fh;
+ read($fh, $str, -s $fh);
+}
+
my $mime = PublicInbox::MIME->new(\$str);
do_exit(0) unless $spam_ok;
diff --git a/t/v2mda.t b/t/v2mda.t
index 6145720..d041ffd 100644
--- a/t/v2mda.t
+++ b/t/v2mda.t
@@ -35,11 +35,13 @@ my $mime = PublicInbox::MIME->create(
my $mda = "blib/script/public-inbox-mda";
ok(-f "blib/script/public-inbox-mda", '-mda exists');
my $main_bin = getcwd()."/t/main-bin";
+my $fail_bin = getcwd()."/t/fail-bin";
local $ENV{PI_DIR} = "$tmpdir/foo";
+my $fail_path = "$fail_bin:blib/script:$ENV{PATH}";
local $ENV{PATH} = "$main_bin:blib/script:$ENV{PATH}";
-local $ENV{PI_EMERGENCY} = "$tmpdir/fail";
-ok(mkdir "$tmpdir/fail");
-
+my $faildir = "$tmpdir/fail";
+local $ENV{PI_EMERGENCY} = $faildir;
+ok(mkdir $faildir);
my @cmd = (qw(public-inbox-init), "-V$V", $ibx->{name},
$ibx->{mainrepo}, 'http://localhost/test',
$ibx->{address}->[0]);
@@ -62,17 +64,54 @@ if ($V == 1) {
ok(PublicInbox::Import::run_die($cmd, undef, $rdr), 'v1 indexed');
}
my $msgs = $ibx->search->query('');
+is(scalar(@$msgs), 1, 'only got one message');
my $saved = $ibx->smsg_mime($msgs->[0]);
is($saved->{mime}->as_string, $mime->as_string, 'injected message');
-my $patch = 't/data/0001.patch';
-open my $fh, '<', $patch or die "failed to open $patch: $!\n";
-$rdr = { 0 => fileno($fh) };
-ok(PublicInbox::Import::run_die(['public-inbox-mda'], undef, $rdr),
- 'mda delivered a patch');
-my $post = $ibx->search->reopen->query('dfpost:6e006fd7');
-is(scalar(@$post), 1, 'got one result for dfpost');
-my $pre = $ibx->search->query('dfpre:090d998');
-is(scalar(@$pre), 1, 'got one result for dfpre');
-is($post->[0]->{blob}, $pre->[0]->{blob}, 'same message in both cases');
+{
+ my @new = glob("$faildir/new/*");
+ is_deeply(\@new, [], 'nothing in faildir');
+ local $ENV{PATH} = $fail_path;
+ $mime->header_set('Message-ID', '<bar@foo>');
+ ok($tmp->sysseek(0, SEEK_SET) &&
+ $tmp->truncate(0) &&
+ $tmp->print($mime->as_string) &&
+ $tmp->flush &&
+ $tmp->sysseek(0, SEEK_SET),
+ 'rewound and rewrite temporary file');
+ my $cmd = ['public-inbox-mda'];
+ ok(PublicInbox::Import::run_die($cmd, undef, $rdr),
+ 'mda did not die on "spam"');
+ @new = glob("$faildir/new/*");
+ is(scalar(@new), 1, 'got a message in faildir');
+ $msgs = $ibx->search->reopen->query('');
+ is(scalar(@$msgs), 1, 'no new message');
+
+ my $config = "$ENV{PI_DIR}/config";
+ ok(-f $config, 'config exists');
+ my $k = 'publicinboxmda.spamcheck';
+ is(system('git', 'config', "--file=$config", $k, 'none'), 0,
+ 'disabled spamcheck for mda');
+ ok($tmp->sysseek(0, SEEK_SET), 'rewound input file');
+
+ ok(PublicInbox::Import::run_die($cmd, undef, $rdr), 'mda did not die');
+ my @again = glob("$faildir/new/*");
+ is_deeply(\@again, \@new, 'no new message in faildir');
+ $msgs = $ibx->search->reopen->query('');
+ is(scalar(@$msgs), 2, 'new message added OK');
+}
+
+{
+ my $patch = 't/data/0001.patch';
+ open my $fh, '<', $patch or die "failed to open $patch: $!\n";
+ $rdr = { 0 => fileno($fh) };
+ ok(PublicInbox::Import::run_die(['public-inbox-mda'], undef, $rdr),
+ 'mda delivered a patch');
+ my $post = $ibx->search->reopen->query('dfpost:6e006fd7');
+ is(scalar(@$post), 1, 'got one result for dfpost');
+ my $pre = $ibx->search->query('dfpre:090d998');
+ is(scalar(@$pre), 1, 'got one result for dfpre');
+ is($post->[0]->{blob}, $pre->[0]->{blob}, 'same message in both cases');
+}
+
done_testing();
--
EW
^ permalink raw reply related [relevance 5%]
* [PATCH] mda: allow configuring globally without spamc support
@ 2018-07-29 0:33 5% Eric Wong
2018-07-29 10:05 5% ` [PATCH v2] " Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2018-07-29 0:33 UTC (permalink / raw)
To: meta
This reuses some of the configuration from -watch, but remains
independent since some configurations will use -watch for some
inboxes and -mda for others.
The default remains "spamc" for -mda users so nothing changes
without explicit configuration.
Per-inbox configurations may also be supported in the future.
---
Documentation/public-inbox-config.pod | 9 ++++++
Documentation/public-inbox-mda.pod | 4 +++
MANIFEST | 1 +
lib/PublicInbox/Spamcheck.pm | 25 ++++++++++++++++
lib/PublicInbox/WatchMaildir.pm | 17 +++--------
script/public-inbox-mda | 27 ++++++++++++------
t/v2mda.t | 41 +++++++++++++++++++++++++--
7 files changed, 101 insertions(+), 23 deletions(-)
create mode 100644 lib/PublicInbox/Spamcheck.pm
diff --git a/Documentation/public-inbox-config.pod b/Documentation/public-inbox-config.pod
index 22ee909..f7353dc 100644
--- a/Documentation/public-inbox-config.pod
+++ b/Documentation/public-inbox-config.pod
@@ -91,6 +91,15 @@ C<nntp://news.gmane.org/gmane.mail.public-inbox.general>
Default: none
+=item publicinboxmda.spamcheck
+
+This may be set to C<none> to disable the use of SpamAssassin
+L<spamc(1)> for filtering spam before it is imported into git
+history. Other spam filtering backends may be supported in
+the future.
+
+Default: spamc
+
=item publicinboxwatch.spamcheck
This may be set to C<spamc> to enable the use of SpamAssassin
diff --git a/Documentation/public-inbox-mda.pod b/Documentation/public-inbox-mda.pod
index a6c704e..1a5ade8 100644
--- a/Documentation/public-inbox-mda.pod
+++ b/Documentation/public-inbox-mda.pod
@@ -12,6 +12,10 @@ Mail Delivery Agent (MDA) for public-inbox installations.
Each system user may have their own public-inbox instances.
This may be invoked via L<procmail(1)> or similar tools.
+By default, it relies on L<spamc(1)> for filtering mail,
+but may be disabled via
+L<public-inbox-config(5)/publicinboxmda.spamcheck>
+
=head1 ENVIRONMENT
=over 8
diff --git a/MANIFEST b/MANIFEST
index fd74a43..1e3c7e3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -98,6 +98,7 @@ lib/PublicInbox/SearchIdxPart.pm
lib/PublicInbox/SearchMsg.pm
lib/PublicInbox/SearchThread.pm
lib/PublicInbox/SearchView.pm
+lib/PublicInbox/Spamcheck.pm
lib/PublicInbox/Spamcheck/Spamc.pm
lib/PublicInbox/Spawn.pm
lib/PublicInbox/SpawnPP.pm
diff --git a/lib/PublicInbox/Spamcheck.pm b/lib/PublicInbox/Spamcheck.pm
new file mode 100644
index 0000000..062479d
--- /dev/null
+++ b/lib/PublicInbox/Spamcheck.pm
@@ -0,0 +1,25 @@
+# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+package PublicInbox::Spamcheck;
+use strict;
+use warnings;
+
+sub get {
+ my ($config, $key, $default) = @_;
+ my $spamcheck = $config->{$key};
+ $spamcheck = $default unless $spamcheck;
+
+ return if !$spamcheck || $spamcheck eq 'none';
+
+ if ($spamcheck eq 'spamc') {
+ $spamcheck = 'PublicInbox::Spamcheck::Spamc';
+ }
+ if ($spamcheck =~ /::/) {
+ eval "require $spamcheck";
+ return $spamcheck->new;
+ }
+ warn "unsupported $key=$spamcheck\n";
+ undef;
+}
+
+1;
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 10dc618..13dea16 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -14,6 +14,7 @@ use PublicInbox::Spawn qw(spawn);
use PublicInbox::InboxWritable;
use File::Temp qw//;
use PublicInbox::Filter::Base;
+use PublicInbox::Spamcheck;
*REJECT = *PublicInbox::Filter::Base::REJECT;
sub new {
@@ -40,19 +41,9 @@ sub new {
}
my $k = 'publicinboxwatch.spamcheck';
- my $spamcheck = $config->{$k};
- if ($spamcheck) {
- if ($spamcheck eq 'spamc') {
- $spamcheck = 'PublicInbox::Spamcheck::Spamc';
- }
- if ($spamcheck =~ /::/) {
- eval "require $spamcheck";
- $spamcheck = _spamcheck_cb($spamcheck->new);
- } else {
- warn "unsupported $k=$spamcheck\n";
- $spamcheck = undef;
- }
- }
+ my $default = undef;
+ my $spamcheck = PublicInbox::Spamcheck::get($config, $k, $default);
+ $spamcheck = _spamcheck_cb($spamcheck) if $spamcheck;
# need to make all inboxes writable for spam removal:
$config->each_inbox(sub { PublicInbox::InboxWritable->new($_[0]) });
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 1f1252a..7fd2a28 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -22,7 +22,7 @@ use PublicInbox::Import;
use PublicInbox::Git;
use PublicInbox::Emergency;
use PublicInbox::Filter::Base;
-use PublicInbox::Spamcheck::Spamc;
+use PublicInbox::Spamcheck;
# n.b: hopefully we can setup the emergency path without bailing due to
# user error, we really want to setup the emergency destination ASAP
@@ -34,7 +34,9 @@ $str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
$ems->prepare(\$str);
my $simple = Email::Simple->new(\$str);
my $config = PublicInbox::Config->new;
-
+my $key = 'publicinboxmda.spamcheck';
+my $default = 'PublicInbox::Spamcheck::Spamc';
+my $spamc = PublicInbox::Spamcheck::get($config, $key, $default);
my $recipient = $ENV{ORIGINAL_RECIPIENT};
defined $recipient or die "ORIGINAL_RECIPIENT not defined in ENV\n";
my $dst = $config->lookup($recipient); # first check
@@ -43,13 +45,22 @@ my $main_repo = $dst->{mainrepo} or do_exit(67);
# pre-check, MDA has stricter rules than an importer might;
do_exit(0) unless PublicInbox::MDA->precheck($simple, $dst->{address});
-my $spamc = PublicInbox::Spamcheck::Spamc->new;
-$str = '';
-my $spam_ok = $spamc->spamcheck($ems->fh, \$str);
$simple = undef;
-$emm = PublicInbox::Emergency->new($emergency);
-$emm->prepare(\$str);
-$ems = $ems->abort;
+my $spam_ok;
+if ($spamc) {
+ $str = '';
+ $spam_ok = $spamc->spamcheck($ems->fh, \$str);
+ # update the emergency dump with the new message:
+ $emm = PublicInbox::Emergency->new($emergency);
+ $emm->prepare(\$str);
+ $ems = $ems->abort;
+} else { # no spam checking configured:
+ $spam_ok = 1;
+ $emm = $ems;
+ my $fh = $emm->fh;
+ read($fh, $str, -s $fh);
+}
+
my $mime = PublicInbox::MIME->new(\$str);
$str = '';
do_exit(0) unless $spam_ok;
diff --git a/t/v2mda.t b/t/v2mda.t
index f386289..5d28f95 100644
--- a/t/v2mda.t
+++ b/t/v2mda.t
@@ -34,10 +34,13 @@ my $mime = PublicInbox::MIME->create(
my $mda = "blib/script/public-inbox-mda";
ok(-f "blib/script/public-inbox-mda", '-mda exists');
my $main_bin = getcwd()."/t/main-bin";
+my $fail_bin = getcwd()."/t/fail-bin";
local $ENV{PI_DIR} = "$tmpdir/foo";
+my $fail_path = "$fail_bin:blib/script:$ENV{PATH}";
local $ENV{PATH} = "$main_bin:blib/script:$ENV{PATH}";
-local $ENV{PI_EMERGENCY} = "$tmpdir/fail";
-ok(mkdir "$tmpdir/fail");
+my $faildir = "$tmpdir/fail";
+local $ENV{PI_EMERGENCY} = $faildir;
+ok(mkdir $faildir);
my @cmd = (qw(public-inbox-init -V2), $ibx->{name},
$ibx->{mainrepo}, 'http://localhost/test',
$ibx->{address}->[0]);
@@ -55,7 +58,41 @@ ok(PublicInbox::Import::run_die(['public-inbox-mda'], undef, $rdr),
$ibx = PublicInbox::Inbox->new($ibx);
my $msgs = $ibx->search->query('');
+is(scalar(@$msgs), 1, 'only got one message');
my $saved = $ibx->smsg_mime($msgs->[0]);
is($saved->{mime}->as_string, $mime->as_string, 'injected message');
+{
+ my @new = glob("$faildir/new/*");
+ is_deeply(\@new, [], 'nothing in faildir');
+ local $ENV{PATH} = $fail_path;
+ $mime->header_set('Message-ID', '<bar@foo>');
+ ok($tmp->sysseek(0, SEEK_SET) &&
+ $tmp->truncate(0) &&
+ $tmp->print($mime->as_string) &&
+ $tmp->flush &&
+ $tmp->sysseek(0, SEEK_SET),
+ 'rewound and rewrite temporary file');
+ my $cmd = ['public-inbox-mda'];
+ ok(PublicInbox::Import::run_die($cmd, undef, $rdr),
+ 'mda did not die on "spam"');
+ @new = glob("$faildir/new/*");
+ is(scalar(@new), 1, 'got a message in faildir');
+ $msgs = $ibx->search->reopen->query('');
+ is(scalar(@$msgs), 1, 'no new message');
+
+ my $config = "$ENV{PI_DIR}/config";
+ ok(-f $config, 'config exists');
+ my $k = 'publicinboxmda.spamcheck';
+ is(system('git', 'config', "--file=$config", $k, 'none'), 0,
+ 'disabled spamcheck for mda');
+ ok($tmp->sysseek(0, SEEK_SET), 'rewound input file');
+
+ ok(PublicInbox::Import::run_die($cmd, undef, $rdr), 'mda did not die');
+ my @again = glob("$faildir/new/*");
+ is_deeply(\@again, \@new, 'no new message in faildir');
+ $msgs = $ibx->search->reopen->query('');
+ is(scalar(@$msgs), 2, 'new message added OK');
+}
+
done_testing();
--
EW
^ permalink raw reply related [relevance 5%]
* [PATCH 13/14] learn: allow running without spamc
@ 2019-10-28 10:45 7% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2019-10-28 10:45 UTC (permalink / raw)
To: meta
It's possible that a user will want to disabe SpamAssassin
via "publicinboxmda.spamcheck=none" in public-inbox-config(5)
when injecting ham into an inbox.
Fixes: 466df3e029fe ("mda: allow configuring globally without spamc support")
---
script/public-inbox-learn | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/script/public-inbox-learn b/script/public-inbox-learn
index 3073294a..145f41ea 100644
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -11,21 +11,23 @@ use PublicInbox::Config;
use PublicInbox::InboxWritable;
use PublicInbox::MIME;
use PublicInbox::Address;
-use PublicInbox::Spamcheck::Spamc;
+use PublicInbox::Spamcheck;
my $train = shift or die "usage: $usage\n";
if ($train !~ /\A(?:ham|spam|rm)\z/) {
die "`$train' not recognized.\nusage: $usage\n";
}
-my $spamc = PublicInbox::Spamcheck::Spamc->new;
my $pi_config = PublicInbox::Config->new;
+my $key = 'publicinboxmda.spamcheck';
+my $default = 'PublicInbox::Spamcheck::Spamc';
+my $spamc = PublicInbox::Spamcheck::get($pi_config, $key, $default);
my $err;
my $mime = PublicInbox::MIME->new(eval {
local $/;
my $data = scalar <STDIN>;
$data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
- if ($train ne 'rm') {
+ if ($train ne 'rm' && defined($spamc)) {
eval {
if ($train eq 'ham') {
$spamc->hamlearn(\$data);
^ permalink raw reply related [relevance 7%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2018-07-29 0:33 5% [PATCH] mda: allow configuring globally without spamc support Eric Wong
2018-07-29 10:05 5% ` [PATCH v2] " Eric Wong
2019-10-28 10:45 [PATCH 00/14] learn: sync w/ -mda changes and add manpage Eric Wong
2019-10-28 10:45 7% ` [PATCH 13/14] learn: allow running without spamc Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).