From 2599ac264e1164f9593a7016165d2af76f4ff95a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 17 Aug 2015 02:41:14 +0000 Subject: search: use raw headers without MIME decoding This should be less error-prone in case somebody tries to screw with us and our thread_id mechanism or somehow waste our resources. Unfortunately Mail::Thread isn't smart enough for this, yet, so we may need to downgrade to Email::Simple objects as a workaround. Or simply not worry about the display so much if somebody is intentionally trying to make it thread badly/incorrectly. --- lib/PublicInbox/Search.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/PublicInbox/Search.pm') diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm index 6fd46f44..051f7a54 100644 --- a/lib/PublicInbox/Search.pm +++ b/lib/PublicInbox/Search.pm @@ -74,7 +74,7 @@ sub add_message { my $db = $self->{xdb}; my $doc_id; - my $mid = mid_clean($mime->header('Message-ID')); + my $mid = mid_clean($mime->header_obj->header_raw('Message-ID')); $mid = mid_compressed($mid); my $was_ghost = 0; my $ct_msg = $mime->header('Content-Type') || 'text/plain'; @@ -341,9 +341,9 @@ sub link_message_to_parents { my $doc = $smsg->{doc}; my $mid = mid_compressed($smsg->mid); my $mime = $smsg->mime; - my $refs = $mime->header('References'); + my $refs = $mime->header_obj->header_raw('References'); my @refs = $refs ? ($refs =~ /<([^>]+)>/g) : (); - my $irt = $mime->header('In-Reply-To'); + my $irt = $mime->header_obj->header_raw('In-Reply-To'); if ($irt) { if ($irt =~ /<([^>]+)>/) { $irt = $1; @@ -498,7 +498,7 @@ sub index_blob { sub unindex_blob { my ($self, $git, $blob) = @_; my $mime = do_cat_mail($git, $blob) or return; - my $mid = $mime->header('Message-ID'); + my $mid = $mime->header_obj->header_raw('Message-ID'); eval { $self->remove_message($mid) } if defined $mid; warn "W: unindex_blob $blob: $@\n" if $@; } -- cgit v1.2.3-24-ge0c7