From: Tomas Doran Date: Sat, 15 May 2010 08:52:16 +0000 (+0000) Subject: Simplify madness some more, back to how it looked in the original fix_path_info_decod... X-Git-Tag: 5.80025~2^2~13^2~3^2~2 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=f238bbd95e57622c2db1b7c2ee8bd747ce04f6fa;hp=7d5f2f479c34e59829582e0c2a1af3223af90ae0 Simplify madness some more, back to how it looked in the original fix_path_info_decoding branch so that we aren't using dodgy heuristics to determine the path. Alter the prepare_path tests so that they're testing the appropriate config option so that we now have tests for both code paths --- diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm index a2d3255..da95c6c 100644 --- a/lib/Catalyst/Engine/CGI.pm +++ b/lib/Catalyst/Engine/CGI.pm @@ -148,32 +148,19 @@ sub prepare_path { } } - # RFC 3875: "Unlike a URI path, the PATH_INFO is not URL-encoded, - # and cannot contain path-segment parameters." This means PATH_INFO - # is always decoded, and the script can't distinguish / vs %2F. - # See https://issues.apache.org/bugzilla/show_bug.cgi?id=35256 - # Here we try to resurrect the original encoded URI from REQUEST_URI. my $path_info = $ENV{PATH_INFO}; if ($c->config->{use_request_uri_for_path}) { + # RFC 3875: "Unlike a URI path, the PATH_INFO is not URL-encoded, + # and cannot contain path-segment parameters." This means PATH_INFO + # is always decoded, and the script can't distinguish / vs %2F. + # See https://issues.apache.org/bugzilla/show_bug.cgi?id=35256 + # Here we try to resurrect the original encoded URI from REQUEST_URI. if (my $req_uri = $ENV{REQUEST_URI}) { - $req_uri =~ s/^\Q$base_path\E//; - $req_uri =~ s/\?.*$//; - if ($req_uri) { - # Note that if REQUEST_URI doesn't start with a /, then the user - # is probably using mod_rewrite or something to rewrite requests - # into a sub-path of their application.. - # This means that REQUEST_URI needs information from PATH_INFO - # prepending to it to be useful, otherwise the sub path which is - # being redirected to becomes the app base address which is - # incorrect. - if (substr($req_uri, 0, 1) ne '/') { - my ($match) = $req_uri =~ m|^([^/]+)|; - my ($path_info_part) = $path_info =~ m|^(.*?\Q$match\E)|; - substr($req_uri, 0, length($match), $path_info_part) - if $path_info_part; - } - $path_info = $req_uri; + if (defined $script_name) { + $req_uri =~ s/^\Q$script_name\E//; } + $req_uri =~ s/\?.*$//; + $path_info = $req_uri if $req_uri; } } diff --git a/t/aggregate/unit_core_engine_cgi-prepare_path.t b/t/aggregate/unit_core_engine_cgi-prepare_path.t index 12c21b4..d17cd98 100644 --- a/t/aggregate/unit_core_engine_cgi-prepare_path.t +++ b/t/aggregate/unit_core_engine_cgi-prepare_path.t @@ -8,7 +8,7 @@ use Catalyst::Engine::CGI; # mod_rewrite to app root for non / based app { - my $r = get_req ( + my $r = get_req (0, REDIRECT_URL => '/comics/', SCRIPT_NAME => '/comics/dispatch.cgi', REQUEST_URI => '/comics/', @@ -19,7 +19,7 @@ use Catalyst::Engine::CGI; # mod_rewrite to sub path under app root for non / based app { - my $r = get_req ( + my $r = get_req (0, PATH_INFO => '/foo/bar.gif', REDIRECT_URL => '/comics/foo/bar.gif', SCRIPT_NAME => '/comics/dispatch.cgi', @@ -31,7 +31,7 @@ use Catalyst::Engine::CGI; # Standard CGI hit for non / based app { - my $r = get_req ( + my $r = get_req (0, PATH_INFO => '/static/css/blueprint/screen.css', SCRIPT_NAME => '/~bobtfish/Gitalist/script/gitalist.cgi', REQUEST_URI => '/~bobtfish/Gitalist/script/gitalist.cgi/static/css/blueprint/screen.css', @@ -41,7 +41,7 @@ use Catalyst::Engine::CGI; } # / %2F %252F escaping case. { - my $r = get_req ( + my $r = get_req (1, PATH_INFO => '/%2F/%2F', SCRIPT_NAME => '/~bobtfish/Gitalist/script/gitalist.cgi', REQUEST_URI => '/~bobtfish/Gitalist/script/gitalist.cgi/%252F/%252F', @@ -53,7 +53,7 @@ use Catalyst::Engine::CGI; # Using rewrite rules to ask for a sub-path in your app. # E.g. RewriteRule ^(.*)$ /path/to/fastcgi/domainprofi.fcgi/iframeredirect$1 [L,NS] { - my $r = get_req ( + my $r = get_req (0, PATH_INFO => '/iframeredirect/info', SCRIPT_NAME => '', REQUEST_URI => '/info', @@ -64,7 +64,7 @@ use Catalyst::Engine::CGI; # nginx example from espent with path /"foo" { - my $r = get_req ( + my $r = get_req (0, PATH_INFO => '"foo"', SCRIPT_NAME => '/', REQUEST_URI => '/%22foo%22', @@ -76,7 +76,7 @@ use Catalyst::Engine::CGI; # nginx example from espent with path /"foo" and the app based at /oslobilder { - my $r = get_req ( + my $r = get_req (1, PATH_INFO => 'oslobilder/"foo"', SCRIPT_NAME => '/oslobilder/', REQUEST_URI => '/oslobilder/%22foo%22', @@ -88,7 +88,7 @@ use Catalyst::Engine::CGI; { local $TODO = 'Another mod_rewrite case'; - my $r = get_req ( + my $r = get_req (0, PATH_INFO => '/auth/login', SCRIPT_NAME => '/tx', REQUEST_URI => '/login', @@ -102,7 +102,7 @@ use Catalyst::Engine::CGI; # (i.e. REDIRECT_URL set) when the PATH_INFO contains a regex { my $path = '/engine/request/uri/Rx(here)'; - my $r = get_req ( + my $r = get_req (0, SCRIPT_NAME => '/', PATH_INFO => $path, REQUEST_URI => $path, @@ -121,6 +121,8 @@ use Catalyst::Engine::CGI; # - Test scheme (secure request on port 80) sub get_req { + my $use_request_uri_for_path = shift; + my %template = ( HTTP_HOST => 'www.foo.com', PATH_INFO => '/', @@ -129,6 +131,9 @@ sub get_req { local %ENV = (%template, @_); my $i = TestApp->new; + $i->setup_finished(0); + $i->config(use_request_uri_for_path => $use_request_uri_for_path); + $i->setup_finished(1); $i->engine(Catalyst::Engine::CGI->new); $i->engine->prepare_path($i); return $i->req;