-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# Various Message-ID-related functions.
mids references/;
use URI::Escape qw(uri_escape_utf8);
use Digest::SHA qw/sha1_hex/;
+require PublicInbox::Address;
use constant {
MID_MAX => 40, # SHA-1 hex length # TODO: get rid of this
MAX_MID_SIZE => 244, # max term size (Xapian limitation) - length('Q')
$mid;
}
-# this is idempotent
+# this is idempotent, used for HTML anchor/ids and such
sub id_compress {
my ($id, $force) = @_;
- if ($force || $id =~ /[^\w\-]/ || length($id) > MID_MAX) {
+ if ($force || $id =~ /[^a-zA-Z0-9_\-]/ || length($id) > MID_MAX) {
utf8::encode($id);
return sha1_hex($id);
}
"$x2/$x38";
}
-sub mid_mime ($) { $_[0]->header_obj->header_raw('Message-ID') }
+# Only for v1 code paths:
+sub mid_mime ($) { mids($_[0]->header_obj)->[0] }
sub mids ($) {
my ($hdr) = @_;
push(@mids, $v);
}
}
- foreach my $i (0..$#mids) {
- next if length($mids[$i]) <= MAX_MID_SIZE;
- warn "Message-ID: <$mids[$i]> too long, truncating\n";
- $mids[$i] = substr($mids[$i], 0, MAX_MID_SIZE);
- }
-
uniq_mids(\@mids);
}
push(@mids, ($v =~ /<([^>]+)>/sg));
}
}
- uniq_mids(\@mids);
+
+ # old versions of git-send-email would prompt users for
+ # In-Reply-To and users' muscle memory would use 'y' or 'n'
+ # as responses:
+ my %addr = ( y => 1, n => 1 );
+
+ foreach my $f (qw(To From Cc)) {
+ my @v = $hdr->header_raw($f);
+ foreach my $v (@v) {
+ $addr{$_} = 1 for (PublicInbox::Address::emails($v));
+ }
+ }
+ uniq_mids(\@mids, \%addr);
}
-sub uniq_mids ($) {
- my ($mids) = @_;
+sub uniq_mids ($;$) {
+ my ($mids, $seen) = @_;
my @ret;
- my %seen;
- foreach (@$mids) {
- next if $seen{$_};
- push @ret, $_;
- $seen{$_} = 1;
+ $seen ||= {};
+ foreach my $mid (@$mids) {
+ $mid =~ tr/\n\t\r//d;
+ if (length($mid) > MAX_MID_SIZE) {
+ warn "Message-ID: <$mid> too long, truncating\n";
+ $mid = substr($mid, 0, MAX_MID_SIZE);
+ }
+ next if $seen->{$mid};
+ push @ret, $mid;
+ $seen->{$mid} = 1;
}
\@ret;
}