Revert "cgi: relax path restriction for top-level"

CGI mounts should probably handle this internally.  We're reverting
this since it adds too much potential for abuse with fake/extra
prefixes in the URL.  We also need to reorder our redirect handling
as a result.

This reverts commit c394de9f2c91c2c5ed1f7832a5a7cc0206120b7f.

diff --git a/public-inbox.cgi b/public-inbox.cgi
index 1fb96e75d82aaf9493a6d112001b0e8c765a84d8..9d60d1fc6370f6a9be163279de86110f51ad4bc3 100755 (executable)
--- 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();
        }

diff --git a/t/cgi.t b/t/cgi.t
index 91efca50a58a63c90fd90e81f8b859c9e6137f52..611fb60423060ef46b4aa8c16ebdcb7646cb3bd5 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -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");