* [PATCH 8/7] www: tighten up allowable filenames for attachments
@ 2016-05-19 22:06 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2016-05-19 22:06 UTC (permalink / raw)
To: meta
Having a file start with '.' or '-' can be confusing
and for users, so do not allow it.
---
Sorry for the wonky numbering, got trigger-happy with send-email :x
lib/PublicInbox/View.pm | 2 +-
lib/PublicInbox/WWW.pm | 2 +-
t/psgi_attach.t | 17 ++++++++++++++++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index ec5f390..2194981 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -261,7 +261,7 @@ sub attach_link ($$$$) {
$desc = $fn unless defined $desc;
$desc = '' unless defined $desc;
my $sfn;
- if (defined $fn && $fn =~ /\A[\w\.-]+[a-zA-Z0-9]\z/) {
+ if (defined $fn && $fn =~ /\A[[:alnum:]][\w\.-]+[[:alnum:]]\z/) {
$sfn = $fn;
} elsif ($ct eq 'text/plain') {
$sfn = 'a.txt';
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 10c2e7c..5b4d6c1 100644
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -23,7 +23,7 @@ use PublicInbox::GitHTTPBackend;
our $INBOX_RE = qr!\A/([\w\.\-]+)!;
our $MID_RE = qr!([^/]+)!;
our $END_RE = qr!(T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
-our $ATTACH_RE = qr!(\d[\.\d]*)-([\w\.-]+[a-zA-Z0-9])!i;
+our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
sub new {
my ($class, $pi_config) = @_;
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 43018e8..ef116c6 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -36,6 +36,7 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
my $qp = "abcdef=g\n==blah\n";
my $b64 = 'b64'.$buf."\n";
my $txt = "plain\ntext\npass\nthrough\n";
+ my $dot = "dotfile\n";
my $parts = [
Email::MIME->create(
attributes => {
@@ -57,6 +58,12 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
content_type => 'text/plain',
},
body => $txt),
+ Email::MIME->create(
+ attributes => {
+ filename => '.dotfile',
+ content_type => 'text/plain',
+ },
+ body => $dot),
];
my $mime = Email::MIME->create(
parts => $parts,
@@ -76,7 +83,8 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
$res = $cb->(GET('/test/Z%40B/'));
my @href = ($res->content =~ /^href="([^"]+)"/gms);
@href = grep(/\A[\d\.]+-/, @href);
- is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt)],
+ is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt
+ 4-a.txt)],
\@href, 'attachment links generated');
$res = $cb->(GET('/test/Z%40B/1-queue-pee'));
@@ -97,6 +105,13 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
'plain text almost matches');
like($txt_res, qr/\n\z/s, 'trailing newline exists in text');
is(index($txt_res, $txt), 0, 'plain text not truncated');
+
+ $res = $cb->(GET('/test/Z%40B/4-a.txt'));
+ my $dot_res = $res->content;
+ ok(length($dot_res) >= length($dot), 'dot almost matches');
+ $res = $cb->(GET('/test/Z%40B/4-any-filename.txt'));
+ is($res->content, $dot_res, 'user-specified filename is OK');
+
});
}
done_testing();
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-05-19 21:25 [PATCH 1/7] view: rely on Email::MIME::body_str for decoding Eric Wong
2016-05-19 21:28 ` [PATCH 1/6] msg_iter: new internal API for iterating through MIME Eric Wong
2016-05-19 21:28 ` [PATCH 6/6] view: reduce clutter for attachments w/o description Eric Wong
2016-05-19 22:06 7% ` [PATCH 8/7] www: tighten up allowable filenames for 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).