* [PATCH 5/6] www: validate and check filenames in URLs
@ 2016-05-19 21:28 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2016-05-19 21:28 UTC (permalink / raw)
To: meta
We shall ensure links continue working for this.
---
lib/PublicInbox/View.pm | 2 +-
lib/PublicInbox/WWW.pm | 2 +-
t/psgi_attach.t | 16 +++++++++++-----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 326da4c..2303a1f 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -262,7 +262,7 @@ sub attach_link ($$$$) {
$desc = '' unless defined $desc;
$desc = ': '.$desc if $desc;
my $sfn;
- if (defined $fn && $fn =~ /\A[\w-]+\.[a-z0-9]+\z/) {
+ if (defined $fn && $fn =~ /\A[\w\.-]+[a-zA-Z0-9]\z/) {
$sfn = $fn;
} elsif ($ct eq 'text/plain') {
$sfn = 'a.txt';
diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index f87f417..10c2e7c 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-z0-9]+)!i;
+our $ATTACH_RE = qr!(\d[\.\d]*)-([\w\.-]+[a-zA-Z0-9])!i;
sub new {
my ($class, $pi_config) = @_;
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 535cd21..43018e8 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -53,7 +53,7 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
body => $b64),
Email::MIME->create(
attributes => {
- filename => 'noop',
+ filename => 'noop.txt',
content_type => 'text/plain',
},
body => $txt),
@@ -73,8 +73,13 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
test_psgi(sub { $www->call(@_) }, sub {
my ($cb) = @_;
my $res;
+ $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)],
+ \@href, 'attachment links generated');
- $res = $cb->(GET('/test/Z%40B/1-a.txt'));
+ $res = $cb->(GET('/test/Z%40B/1-queue-pee'));
my $qp_res = $res->content;
ok(length($qp_res) >= length($qp), 'QP length is close');
like($qp_res, qr/\n\z/s, 'trailing newline exists');
@@ -82,13 +87,14 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
$qp_res =~ s/\r\n/\n/g;
is(index($qp_res, $qp), 0, 'QP trailing newline is there');
- $res = $cb->(GET('/test/Z%40B/2-a.txt'));
+ $res = $cb->(GET('/test/Z%40B/2-base-sixty-four'));
is(quotemeta($res->content), quotemeta($b64),
'Base64 matches exactly');
- $res = $cb->(GET('/test/Z%40B/3-a.txt'));
+ $res = $cb->(GET('/test/Z%40B/3-noop.txt'));
my $txt_res = $res->content;
- ok(length($txt_res) >= length($txt), 'plain text almost matches');
+ ok(length($txt_res) >= length($txt),
+ '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');
});
--
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 7% ` [PATCH 5/6] www: validate and check filenames in URLs 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).