do not allow range requests for empty files

mojolicious · Nov 20, 2012 · 6804499 · 6804499
1 parent 68d81d6
commit 6804499
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/lib/Mojolicious/Static.pm b/lib/Mojolicious/Static.pm
@@ -77,11 +77,11 @@ sub serve_asset {
   # Range
   my $size  = $asset->size;
   my $start = 0;
-  my $end   = $size - 1 >= 0 ? $size - 1 : 0;
+  my $end   = $size - 1;
   if (my $range = $headers->range) {
 
     # Satisfiable
-    if ($range =~ m/^bytes=(\d+)-(\d+)?/ && $1 <= $end) {
+    if ($size && $range =~ m/^bytes=(\d+)-(\d+)?/ && $1 <= $end) {
       $start = $1;
       $end = $2 if defined $2 && $2 <= $end;
       $res->code(206)->headers->content_length($end - $start + 1)

diff --git a/t/mojolicious/public/hello4.txt b/t/mojolicious/public/hello4.txt
diff --git a/t/mojolicious/static_lite_app.t b/t/mojolicious/static_lite_app.t
@@ -72,6 +72,18 @@ $t->get_ok('/hello3.txt' => {Range => 'bytes=0-0'})->status_is(206)
   ->header_is('Accept-Ranges' => 'bytes')->header_is('Content-Length' => 1)
   ->header_is('Content-Range' => 'bytes 0-0/1')->content_is('X');
 
+# GET /hello4.txt (empty file)
+$t->get_ok('/hello4.txt')->status_is(200)
+  ->header_is(Server           => 'Mojolicious (Perl)')
+  ->header_is('X-Powered-By'   => 'Mojolicious (Perl)')
+  ->header_is('Content-Length' => 0)->content_is('');
+
+# GET /hello4.txt (empty file, invalid range)
+$t->get_ok('/hello4.txt' => {Range => 'bytes=0-0'})->status_is(416)
+  ->header_is(Server           => 'Mojolicious (Perl)')
+  ->header_is('X-Powered-By'   => 'Mojolicious (Perl)')
+  ->header_is('Content-Length' => 0)->content_is('');
+
 # GET /static.txt (base64 static inline file, If-Modified-Since)
 my $modified = Mojo::Date->new->epoch(time - 3600);
 $t->get_ok('/static.txt' => {'If-Modified-Since' => $modified})