X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=examples%2Funsubscribe.milter;h=d6db766a51beb5bebc750045369ce882f92b8fb1;hb=2f3a39b6a37a91a73368ac6af513b3b7a851c8ff;hp=e19363862b8eaa82d55a6ce573449e8fd25b995c;hpb=1f29b33d3f71b8a40f5ae76bf20b95618b518654;p=public-inbox.git

diff --git a/examples/unsubscribe.milter b/examples/unsubscribe.milter
index e1936386..d6db766a 100644
--- a/examples/unsubscribe.milter
+++ b/examples/unsubscribe.milter
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -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;
@@ -134,6 +131,4 @@ if ($fds && (($ENV{LISTEN_PID} || 0) == $$)) {
 }
 
 $milter->register('unsubscribe', \%cbs, SMFI_CURR_ACTS);
-my $dispatcher = Sendmail::PMilter::prefork_dispatcher(max_children => 2);
-$milter->set_dispatcher($dispatcher);
 $milter->main();