From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=unavailable autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id A99B51FF70; Tue, 7 Jun 2016 13:21:00 +0000 (UTC) Date: Tue, 7 Jun 2016 13:21:00 +0000 From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] unsubscribe.milter: implement archive blacklist Message-ID: <20160607132100.GF8151@dcvr.yhbt.net> References: <20160520213655.19381-1-e@80x24.org> <20160607131821.GA6966@dcvr.yhbt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160607131821.GA6966@dcvr.yhbt.net> List-Id: We don't want people following links from archivers and breaking archival. --- examples/unsubscribe.milter | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/examples/unsubscribe.milter b/examples/unsubscribe.milter index eb1717b..c245a5b 100644 --- a/examples/unsubscribe.milter +++ b/examples/unsubscribe.milter @@ -72,16 +72,13 @@ $cbs{header} = sub { SMFIS_CONTINUE; }; -# only whitelist a few users for testing: -my $whitelist = '/etc/unsubscribe-milter.whitelist'; -my %TEST_WHITELIST = map { $_ => 1 } eval { - open my $fh, '<', $whitelist or - die "Failed to open $whitelist: $!"; - local $/ = "\n"; - chomp(my @lines = (<$fh>)); - @lines; - }; -die "No whitelist at $whitelist\n" unless scalar keys %TEST_WHITELIST; +# We don't want people unsubscribing archivers: +sub archive_addr { + my ($addr) = @_; + return 1 if ($addr =~ /\@m\.gmane\.org\z/); + return 1 if ($addr eq 'archive@mail-archive.com'); + 0 +} $cbs{eom} = sub { my ($ctx) = @_; @@ -92,7 +89,7 @@ $cbs{eom} = sub { # one recipient, one unique HTTP(S) URL return SMFIS_CONTINUE if @rcpt != 1; - return SMFIS_CONTINUE unless $TEST_WHITELIST{$rcpt[0]}; + return SMFIS_CONTINUE if archive_addr(lc($rcpt[0])); my $unsub = $priv->{header}->{'list-unsubscribe'} || []; my $n = 0;