From 8f9e9ae77525418a4d916d80297c66c4c854b16e Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Thu, 29 Mar 2018 09:57:47 +0000 Subject: 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. --- t/psgi_v2.t | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 't/psgi_v2.t') diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 11b2c794..31c4178b 100644 --- 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' => '', + 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(); -- cgit v1.2.3-24-ge0c7