[Catalyst-commits] r13260 - in Catalyst-Runtime/5.80/branches/fix_request_uri: lib/Catalyst/Engine t/aggregate

t0m at dev.catalyst.perl.org t0m at dev.catalyst.perl.org
Sat May 15 08:52:16 GMT 2010


Author: t0m
Date: 2010-05-15 09:52:16 +0100 (Sat, 15 May 2010)
New Revision: 13260

Modified:
   Catalyst-Runtime/5.80/branches/fix_request_uri/lib/Catalyst/Engine/CGI.pm
   Catalyst-Runtime/5.80/branches/fix_request_uri/t/aggregate/unit_core_engine_cgi-prepare_path.t
Log:
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

Modified: Catalyst-Runtime/5.80/branches/fix_request_uri/lib/Catalyst/Engine/CGI.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/fix_request_uri/lib/Catalyst/Engine/CGI.pm	2010-05-15 07:54:10 UTC (rev 13259)
+++ Catalyst-Runtime/5.80/branches/fix_request_uri/lib/Catalyst/Engine/CGI.pm	2010-05-15 08:52:16 UTC (rev 13260)
@@ -148,32 +148,19 @@
         }
     }
 
-    # 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;
         }
     }
 

Modified: Catalyst-Runtime/5.80/branches/fix_request_uri/t/aggregate/unit_core_engine_cgi-prepare_path.t
===================================================================
--- Catalyst-Runtime/5.80/branches/fix_request_uri/t/aggregate/unit_core_engine_cgi-prepare_path.t	2010-05-15 07:54:10 UTC (rev 13259)
+++ Catalyst-Runtime/5.80/branches/fix_request_uri/t/aggregate/unit_core_engine_cgi-prepare_path.t	2010-05-15 08:52:16 UTC (rev 13260)
@@ -8,7 +8,7 @@
 
 # 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 @@
 
 # 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 @@
 
 # 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 @@
 }
 # / %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 @@
 # 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 @@
 
 # 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 @@
 
 # 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 @@
 
 {
     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 @@
 # (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 @@
 #       - 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 @@
     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;




More information about the Catalyst-commits mailing list