X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=examples%2Funsubscribe.milter;h=216b0dddd0cf737e77dfb3780f48b48c5fc9d1cd;hb=3e639ca78aa70ad6a6598bcf32d4b72696e3ebfb;hp=c245a5b8121db5604cf4163676e17e7deaeeced4;hpb=4d507f66b73b3bb286810387a480087cf9b63e6e;p=public-inbox.git

diff --git a/examples/unsubscribe.milter b/examples/unsubscribe.milter
index c245a5b8..216b0ddd 100644
--- a/examples/unsubscribe.milter
+++ b/examples/unsubscribe.milter
@@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use warnings;
 use Sendmail::PMilter qw(:all);
 use IO::Socket;
 use Crypt::CBC;
@@ -16,6 +15,10 @@ if (read($fh, $key, 8) != 8 || read($fh, $iv, 8) != 8 ||
 	die "KEY_FILE must be 16 bytes\n";
 }
 
+# optionally support unique mailto: subject in List-Unsubscribe,
+# requires a custom rule in front of mlmmj, see __END__
+my $unique_mailto = $ENV{UNIQUE_MAILTO};
+
 # these parameters were chosen to generate shorter parameters
 # to reduce the possibility of copy+paste errors
 my $crypt = Crypt::CBC->new(-key => $key,
@@ -75,7 +78,7 @@ $cbs{header} = sub {
 # We don't want people unsubscribing archivers:
 sub archive_addr {
 	my ($addr) = @_;
-	return 1 if ($addr =~ /\@m\.gmane\.org\z/);
+	return 1 if ($addr =~ /\@m\.gmane(?:-mx)?\.org\z/);
 	return 1 if ($addr eq 'archive@mail-archive.com');
 	0
 }
@@ -93,6 +96,7 @@ $cbs{eom} = sub {
 
 		my $unsub = $priv->{header}->{'list-unsubscribe'} || [];
 		my $n = 0;
+		my $added;
 		foreach my $u (@$unsub) {
 			# Milter indices are 1-based,
 			# not 0-based like Perl arrays
@@ -102,10 +106,20 @@ $cbs{eom} = sub {
 			next unless $k && $v && $list && $domain;
 			my $u = $crypt->encrypt($rcpt[0]);
 			$u = encode_base64url($u);
+			if ($unique_mailto) {
+				# $u needs to be in the Subject: header since
+				# +$EXTENSION is case-insensitive
+				my $s = "subject=$u";
+				$v = "<mailto:$list+unique-unsub\@$domain?$s>";
+			}
 			$v .= ",\n <https://$domain/u/$u/$list>";
 
 			$ctx->chgheader($k, $index, $v);
+			$added = 1;
 		}
+		# RFC 8058
+		$added and $ctx->addheader('List-Unsubscribe-Post',
+					'List-Unsubscribe=One-Click');
 	};
 	warn $@ if $@;
 	SMFIS_CONTINUE;
@@ -132,3 +146,28 @@ if ($fds && (($ENV{LISTEN_PID} || 0) == $$)) {
 
 $milter->register('unsubscribe', \%cbs, SMFI_CURR_ACTS);
 $milter->main();
+__END__
+# TMPMSG comes from dc-dlvr, it's populated before the above runs:
+# TMPMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1)
+# cat >$TMPMSG
+
+# I use something like this in front of mlmmj for UNIQUE_MAILTO
+# $EXTENSION and $ORIGINAL_RECIPIENT are set by postfix, $list
+# is a local mapping of addresses to mailing list names.
+case $ORIGINAL_RECIPIENT in
+foo+*) list=foo ;;
+# ...
+esac
+
+case $EXTENSION in
+unique-unsub)
+	u="$(formail -z -c -x Subject <$TMPMSG)"
+	d=$(expr "$ORIGINAL_RECIPIENT" : '^.*@\(.*\)')
+
+	# forward this to the unsubscribe.psgi service
+	curl -sSf https://$d/u/$u/$list >/dev/null
+	exit
+	;;
+esac
+/usr/bin/mlmmj-receive -L /path/to/mlmmj-spool/$list <"$TMPMSG"
+exit