diff options
| -rwxr-xr-x | public-inbox.cgi | 8 | ||||
| -rw-r--r-- | t/cgi.t | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/public-inbox.cgi b/public-inbox.cgi index 1fb96e75..9d60d1fc 100755 --- a/public-inbox.cgi +++ b/public-inbox.cgi @@ -17,7 +17,7 @@ use Encode qw(decode_utf8); use PublicInbox::Config; use URI::Escape qw(uri_escape uri_unescape); 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; @@ -62,7 +62,9 @@ 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\z!o) { + invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi); + } 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/(?:all\.html)?\z!o) { invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 0); @@ -85,8 +87,6 @@ sub main { } elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\z!o) { redirect_mid_html($cgi, $1, $2); - } elsif ($path_info =~ m!$LISTNAME_RE\z!o) { - invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi); } else { r404(); } @@ -156,10 +156,6 @@ EOF $res = cgi_run("/test/m/blahblah\@example.com.txt"); like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/, "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"); |