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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'public-inbox.cgi') 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); -- cgit v1.2.3-24-ge0c7