From c394de9f2c91c2c5ed1f7832a5a7cc0206120b7f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 12 Apr 2014 00:49:34 +0000 Subject: cgi: relax path restriction for top-level We may have something like /foo.cgi/m/$MID.html in there. --- public-inbox.cgi | 4 ++-- t/cgi.t | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public-inbox.cgi b/public-inbox.cgi index 6a6f31e2..fb435777 100755 --- a/public-inbox.cgi +++ b/public-inbox.cgi @@ -16,7 +16,7 @@ use CGI qw(:cgi :escapeHTML -nosticky); # PSGI/FastCGI/mod_perl compat use Encode qw(decode_utf8); use PublicInbox::Config; use Digest::SHA qw(sha1_hex); -our $LISTNAME_RE = qr!\A/([\w\.\-]+)!; +our $LISTNAME_RE = qr!\A(?:/.*?)?/([\w\.\-]+)!; our $pi_config; BEGIN { $pi_config = PublicInbox::Config->new; @@ -55,7 +55,7 @@ sub main { # top-level indices and feeds if ($path_info eq "/") { r404(); - } elsif ($path_info =~ m!$LISTNAME_RE(?:/|/index\.html)?\z!o) { + } elsif ($path_info =~ m!$LISTNAME_RE/(?:index\.html)?\z!o) { invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 1); } elsif ($path_info =~ m!$LISTNAME_RE/index\.atom\.xml\z!o) { invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 1); diff --git a/t/cgi.t b/t/cgi.t index a66c5825..39242bce 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -131,6 +131,10 @@ EOF my $res = cgi_run("/test/m/blahblah\@example.com.txt"); like($res->{body}, qr/Message-Id: /, "mid.txt hit"); + + my $pfx = cgi_run("/prefixed/test/m/blahblah\@example.com.txt"); + is_deeply($pfx, $res, "we do not have to be a top-level URL"); + $res = cgi_run("/test/m/blahblah\@example.con.txt"); like($res->{head}, qr/Status: 404 Not Found/, "mid.txt miss"); -- cgit v1.2.3-24-ge0c7