user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] unsubscribe.milter: implement archive blacklist
Date: Tue, 7 Jun 2016 13:21:00 +0000	[thread overview]
Message-ID: <20160607132100.GF8151@dcvr.yhbt.net> (raw)
In-Reply-To: <20160607131821.GA6966@dcvr.yhbt.net>

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;

  parent reply	other threads:[~2016-06-07 13:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-20 21:36 [PATCH] unsubscribe: get off mah lawn^H^H^Hist Eric Wong
2016-05-21  4:24 ` [PATCH 2/3] unsubscribe: bad URL fixup Eric Wong
2016-05-21  4:24 ` [PATCH 3/3] examples/unsubscribe-psgi@.service: disable worker processes Eric Wong
2016-05-27  8:08 ` [PATCH] unsubscribe.milter: use default postfork dispatcher Eric Wong
2016-06-07 13:18 ` Merge branch 'unsubscribe' Eric Wong
2016-06-07 13:20   ` [PATCH] unsubscribe.psgi: disable confirmation Eric Wong
2016-06-07 13:21   ` Eric Wong [this message]
2016-06-07 13:40   ` [PATCH] unsubscribe: fix off-by-one error 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=20160607132100.GF8151@dcvr.yhbt.net \
    --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.
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).