www: fix attachment downloads for conflicted Message-IDs

By using the "primary" Message-ID in WwwAttach, we can avoid
conflicts in the links we use for downloading attachments.

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 133c30a8e517e70e879a7fc9bc9a7c252d504f77..aad860e996f0d12c1a33de74035c0f0b976fc672 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -24,7 +24,7 @@ sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
 # public functions: (unstable)
 
 sub msg_html {
-       my ($ctx, $mime, $more) = @_;
+       my ($ctx, $mime, $more, $smsg) = @_;
        my $hdr = $mime->header_obj;
        my $ibx = $ctx->{-inbox};
        my $obfs_ibx = $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
@@ -33,7 +33,9 @@ sub msg_html {
        PublicInbox::WwwStream->response($ctx, 200, sub {
                my ($nr, undef) = @_;
                if ($nr == 1) {
-                       $tip . multipart_text_as_html($mime, '', $obfs_ibx) .
+                       # $more cannot be true w/o $smsg being defined:
+                       my $upfx = $more ? '../'.mid_escape($smsg->mid).'/' : '';
+                       $tip . multipart_text_as_html($mime, $upfx, $obfs_ibx) .
                                '</pre><hr>'
                } elsif ($more && @$more) {
                        ++$end;
@@ -57,12 +59,13 @@ sub msg_page {
        my $mid = $ctx->{mid};
        my $ibx = $ctx->{-inbox};
        my ($first, $more, $head, $tail, $db);
+       my $smsg;
        if (my $srch = $ibx->search) {
                $srch->retry_reopen(sub {
                        ($head, $tail, $db) = $srch->each_smsg_by_mid($mid);
                        for (; !defined($first) && $head != $tail; $head++) {
                                my @args = ($head, $db, $mid);
-                               my $smsg = PublicInbox::SearchMsg->get(@args);
+                               $smsg = PublicInbox::SearchMsg->get(@args);
                                $first = $ibx->msg_by_smsg($smsg);
                        }
                        if ($head != $tail) {
@@ -73,7 +76,7 @@ sub msg_page {
        } else {
                $first = $ibx->msg_by_mid($mid) or return;
        }
-       msg_html($ctx, PublicInbox::MIME->new($first), $more);
+       msg_html($ctx, PublicInbox::MIME->new($first), $more, $smsg);
 }
 
 sub msg_html_more {
@@ -93,8 +96,9 @@ sub msg_html_more {
                }
                if ($smsg) {
                        my $mime = $smsg->{mime};
+                       my $upfx = '../' . mid_escape($smsg->mid) . '/';
                        _msg_html_prepare($mime->header_obj, $ctx, $more, $nr) .
-                               multipart_text_as_html($mime, '',
+                               multipart_text_as_html($mime, $upfx,
                                                        $ctx->{-obfs_ibx}) .
                                '</pre><hr>'
                } else {

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 11b2c794e238634c66dac443d60b64d1e717a817..31c4178bd06aafb89243aba0f3d361d85f571ad6 100644 (file)
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -171,6 +171,42 @@ test_psgi(sub { $www->call(@_) }, sub {
        is($res->code, 200, 'got info refs for dumb clones');
        $res = $cb->(GET('/v2test/info/refs'));
        is($res->code, 404, 'unpartitioned git URL fails');
+
+       # ensure conflicted attachments can be resolved
+       foreach my $body (qw(old new)) {
+               my $parts = [
+                       PublicInbox::MIME->create(
+                               attributes => { content_type => 'text/plain' },
+                               body => 'blah',
+                       ),
+                       PublicInbox::MIME->create(
+                               attributes => {
+                                       filename => 'attach.txt',
+                                       content_type => 'text/plain',
+                               },
+                               body => $body
+                       )
+               ];
+               $mime = PublicInbox::MIME->create(
+                       parts => $parts,
+                       header_str => [ From => 'root@z',
+                               'Message-ID' => '<a@dup>',
+                               Subject => 'hi']
+               );
+               ok($im->add($mime), "added attachment $body");
+       }
+       $im->done;
+       $config->each_inbox(sub { $_[0]->search->reopen });
+       $res = $cb->(GET('/v2test/a@dup/'));
+       my @links = ($res->content =~ m!"\.\./([^/]+/2-attach\.txt)\"!g);
+       is(scalar(@links), 2, 'both attachment links exist');
+       isnt($links[0], $links[1], 'attachment links are different');
+       {
+               my $old = $cb->(GET('/v2test/' . $links[0]));
+               my $new = $cb->(GET('/v2test/' . $links[1]));
+               is($old->content, 'old', 'got expected old content');
+               is($new->content, 'new', 'got expected new content');
+       }
 });
 
 done_testing();