From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED shortcircuit=no autolearn=unavailable autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 399501FD54 for ; Thu, 19 May 2016 21:28:29 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 5/6] www: validate and check filenames in URLs Date: Thu, 19 May 2016 21:28:46 +0000 Message-Id: <20160519212847.4822-5-e@80x24.org> In-Reply-To: <20160519212847.4822-1-e@80x24.org> References: <20160519212552.4530-1-e@80x24.org> <20160519212847.4822-1-e@80x24.org> List-Id: 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