* [PATCH] view: do not offer links to 0-byte multipart attachments
@ 2020-05-25 8:21 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2020-05-25 8:21 UTC (permalink / raw)
To: meta
Offering links to download 0-byte files is useless. We could
waste memory by preserving $eml->{bdy} during iteration, but
offering attachments of type "multipart" is not very useful,
as users are usually interested in decoded attachments or
the entire raw message.
Fixes: e60231148eb604a3 ("descend into message/(rfc822|news|global) parts")
---
lib/PublicInbox/View.pm | 5 +++++
t/psgi_attach.t | 2 ++
2 files changed, 7 insertions(+)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 93a5b329155..a05ac4142f2 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -499,6 +499,11 @@ sub submsg_hdr ($$) {
sub attach_link ($$$$;$) {
my ($ctx, $ct, $p, $fn, $err) = @_;
my ($part, $depth, $idx) = @$p;
+
+ # Eml iteration clobbers multipart ->{bdy}, so do not offer
+ # downloads for 0-byte multipart attachments
+ return unless $part->{bdy};
+
my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
my $size = bytes::length($part->body);
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index c6f8072ff9a..9a734f813fa 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -73,6 +73,8 @@ $im->init_bare;
my $mid = '20200418222508.GA13918@dcvr';
my $irt = '20200418222020.GA2745@dcvr';
$res = $cb->(GET("/test/$mid/"));
+ unlike($res->content, qr! multipart/mixed, Size: 0 bytes!,
+ '0-byte download not offered');
like($res->content, qr/\bhref="2-embed2x\.eml"/s,
'href to message/rfc822 attachment visible');
like($res->content, qr/\bhref="2\.1\.2-test\.eml"/s,
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-25 8:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-25 8:21 [PATCH] view: do not offer links to 0-byte multipart attachments Eric Wong
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).