X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMID.pm;h=e9a3b0c094e52b3fce1d330374d03b6bd7520235;hb=fb4bfa102bfa702f13948ac689e54bac9d0084e0;hp=6904d61a0303bb0edd2b17b479c85e6bd13e76ff;hpb=1f8065599d934b2af7d24773bb7d6901f9586945;p=public-inbox.git
diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm
index 6904d61a..e9a3b0c0 100644
--- a/lib/PublicInbox/MID.pm
+++ b/lib/PublicInbox/MID.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors
+# Copyright (C) 2015-2020 all contributors
# License: AGPL-3.0+
#
# Various Message-ID-related functions.
@@ -6,8 +6,8 @@ package PublicInbox::MID;
use strict;
use warnings;
use base qw/Exporter/;
-our @EXPORT_OK = qw/mid_clean id_compress mid2path mid_mime mid_escape MID_ESC
- mids references/;
+our @EXPORT_OK = qw(mid_clean id_compress mid2path mid_escape MID_ESC
+ mids references mids_for_index $MID_EXTRACT);
use URI::Escape qw(uri_escape_utf8);
use Digest::SHA qw/sha1_hex/;
require PublicInbox::Address;
@@ -16,11 +16,13 @@ use constant {
MAX_MID_SIZE => 244, # max term size (Xapian limitation) - length('Q')
};
+our $MID_EXTRACT = qr/<([^>]+)>/s;
+
sub mid_clean {
my ($mid) = @_;
defined($mid) or die "no Message-ID";
# MDA->precheck did more checking for us
- if ($mid =~ /<([^>]+)>/) {
+ if ($mid =~ $MID_EXTRACT) {
$mid = $1;
}
$mid;
@@ -51,22 +53,34 @@ sub mid2path {
"$x2/$x38";
}
-# Only for v1 code paths:
-sub mid_mime ($) { mids($_[0]->header_obj)->[0] }
-
-sub mids ($) {
- my ($hdr) = @_;
+# only intended for Message-ID and X-Alt-Message-ID
+sub extract_mids {
my @mids;
- my @v = $hdr->header_raw('Message-Id');
- foreach my $v (@v) {
- my @cur = ($v =~ /<([^>]+)>/sg);
+ for my $v (@_) {
+ my @cur = ($v =~ /$MID_EXTRACT/g);
if (@cur) {
push(@mids, @cur);
} else {
push(@mids, $v);
}
}
- uniq_mids(\@mids);
+ \@mids;
+}
+
+sub mids ($) {
+ my ($hdr) = @_;
+ my @mids = $hdr->header_raw('Message-ID');
+ uniq_mids(extract_mids(@mids));
+}
+
+# we allow searching on X-Alt-Message-ID since PublicInbox::NNTP uses them
+# to placate some clients, and we want to ensure NNTP-only clients can
+# import and index without relying on HTTP endpoints
+sub mids_for_index ($) {
+ my ($hdr) = @_;
+ my @mids = $hdr->header_raw('Message-ID');
+ my @alts = $hdr->header_raw('X-Alt-Message-ID');
+ uniq_mids(extract_mids(@mids, @alts));
}
# last References should be IRT, but some mail clients do things
@@ -77,7 +91,7 @@ sub references ($) {
foreach my $f (qw(References In-Reply-To)) {
my @v = $hdr->header_raw($f);
foreach my $v (@v) {
- push(@mids, ($v =~ /<([^>]+)>/sg));
+ push(@mids, ($v =~ /$MID_EXTRACT/g));
}
}
@@ -105,9 +119,7 @@ sub uniq_mids ($;$) {
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;
+ push(@ret, $mid) unless $seen->{$mid}++;
}
\@ret;
}