From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
To: meta@public-inbox.org
Cc: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
Subject: [PATCH 04/14] www: fix attachment downloads for conflicted Message-IDs
Date: Thu, 29 Mar 2018 10:28:09 +0000 [thread overview]
Message-ID: <20180329102819.15234-5-e@80x24.org> (raw)
In-Reply-To: <20180329102819.15234-1-e@80x24.org>
By using the "primary" Message-ID in WwwAttach, we can avoid
conflicts in the links we use for downloading attachments.
---
lib/PublicInbox/View.pm | 14 +++++++++-----
t/psgi_v2.t | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 133c30a..aad860e 100644
--- 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 11b2c79..31c4178 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' => '<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();
--
EW
next prev parent reply other threads:[~2018-03-29 10:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-29 10:28 [PATCH 00/14] purging support, v1 conversions, cleanups + more Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 01/14] www: remove unnecessary ghost checks Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 02/14] v2writable: append, instead of prepending generated Message-ID Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 03/14] lookup by Message-ID favors the "primary" one Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` Eric Wong (Contractor, The Linux Foundation) [this message]
2018-03-29 10:28 ` [PATCH 05/14] searchmsg: document why we store To: and Cc: for NNTP Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 06/14] public-inbox-convert: tool for converting old to new inboxes Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 07/14] v2writable: support purging messages from git entirely Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 08/14] search: cleanup uniqueness checking Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 09/14] search: get rid of most lookup_* subroutines Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 10/14] search: move find_doc_ids to searchidx Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 11/14] v2writable: cleanup: get rid of unused fields Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 12/14] mbox: avoid extracting Message-ID for linkification Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 13/14] www: cleanup expensive fallback for legacy URLs Eric Wong (Contractor, The Linux Foundation)
2018-03-29 10:28 ` [PATCH 14/14] view: get rid of some unnecessary imports Eric Wong (Contractor, The Linux Foundation)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180329102819.15234-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).