[Jifty-commit] r1504 - in jifty/trunk: lib/Jifty t/TestApp/t

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Fri Jul  7 01:10:11 2006
New Revision: 1504

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Request.pm
   jifty/trunk/t/TestApp/t/07-sandboxing.t

Log:
 r15087 at zoq-fot-pik:  chmrr | 2006-07-07 01:09:42 -0400
  * Add some more bogus urls
  * Move canonicalization into from_data_structure, so it hits all of
 the codepaths
  * Restore POD for L<Jifty::Request/path>


Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm	(original)
+++ jifty/trunk/lib/Jifty/Request.pm	Fri Jul  7 01:10:11 2006
@@ -147,7 +147,7 @@
     my $self = shift;
     my $data = shift;
 
-    $self->path($data->{path} || "/");
+    $self->path(Jifty::Util->canonicalize_path($data->{path} || "/"));
     $self->just_validating($data->{validating}) if $data->{validating};
 
     if (ref $data->{continuation} eq "HASH") {
@@ -220,7 +220,6 @@
 
     my $path = $cgi->path_info;
     $path =~ s/\?.*//;
-    $path = Jifty::Util->canonicalize_path($path);
     $self->path( $path );
 
     use HTML::Mason::Utils;
@@ -537,6 +536,12 @@
     return $self->continuation->return;
 }
 
+=head2 path
+
+Returns the path that was requested
+
+=cut
+
 =head2 just_validating
 
 This method returns true if the request was merely for validation.  If

Modified: jifty/trunk/t/TestApp/t/07-sandboxing.t
==============================================================================
--- jifty/trunk/t/TestApp/t/07-sandboxing.t	(original)
+++ jifty/trunk/t/TestApp/t/07-sandboxing.t	Fri Jul  7 01:10:11 2006
@@ -4,7 +4,7 @@
 
 BEGIN {chdir "t/TestApp"}
 use lib '../../lib';
-use Jifty::Test tests => 71;
+use Jifty::Test tests => 79;
 use Jifty::Test::WWW::Mechanize;
 use Net::HTTP;
 use URI;
@@ -44,6 +44,14 @@
 isnt( $status, 200, "Didn't get a 200" );
 unlike( $body, qr/Jifty->web->navigation/, "Doesn't have the source" );
 
+($status, $body) = bogus_request("/static/css/../../templates/index.html");
+isnt( $status, 200, "Didn't get a 200" );
+unlike( $body, qr/Jifty->web->navigation/, "Doesn't have the source" );
+
+($status, $body) = bogus_request("/static/css/../../templates/_elements/nav");
+isnt( $status, 200, "Didn't get a 200" );
+unlike( $body, qr/Jifty->web->navigation/, "Doesn't have the source" );
+
 ($status, $body) = bogus_request("/static/css/base.css");
 is( $status, 200, "Got a 200" );
 like( $body, qr/body/, "Has content" );