fixed limit bug in Mojo::Message

mojolicious · May 13, 2013 · 382fe58 · 382fe58
1 parent a490003
commit 382fe58
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -52,6 +52,7 @@
   - Fixed layout bugs in Mojolicious::Renderer.
   - Fixed support for HEAD request method in Mojo::Server::CGI and
     Mojo::Server::PSGI.
+  - Fixed small limit bug in Mojo::Message.
 
 3.97  2013-04-25
   - Added data attribute to Mojo::URL.

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -145,10 +145,7 @@ sub headers { shift->content->headers }
 
 sub is_finished { (shift->{state} // '') eq 'finished' }
 
-sub is_limit_exceeded {
-  return undef unless my $code = (shift->error)[1];
-  return !!($code eq 413 || $code eq 431);
-}
+sub is_limit_exceeded { !!shift->{limit} }
 
 sub json {
   my ($self, $pointer) = @_;
@@ -163,7 +160,7 @@ sub parse {
   my ($self, $chunk) = @_;
 
   # Check message size
-  return $self->error('Maximum message size exceeded', 413)
+  return $self->_limit('Maximum message size exceeded', 413)
     if ($self->{raw_size} += length($chunk //= '')) > $self->max_message_size;
 
   $self->{buffer} .= $chunk;
@@ -174,7 +171,7 @@ sub parse {
     # Check line size
     my $len = index $self->{buffer}, "\x0a";
     $len = length $self->{buffer} if $len < 0;
-    return $self->error('Maximum line size exceeded', 431)
+    return $self->_limit('Maximum line size exceeded', 431)
       if $len > $self->max_line_size;
 
     $self->{state} = 'content' if $self->extract_start_line(\$self->{buffer});
@@ -186,7 +183,7 @@ sub parse {
     if $state eq 'content' || $state eq 'finished';
 
   # Check line size
-  return $self->error('Maximum line size exceeded', 431)
+  return $self->_limit('Maximum line size exceeded', 431)
     if $self->headers->is_limit_exceeded;
 
   # Check buffer size
@@ -260,6 +257,12 @@ sub _cache {
   return wantarray ? @$objects : $objects->[0];
 }
 
+sub _limit {
+  my $self = shift;
+  $self->{limit} = 1;
+  $self->error(@_);
+}
+
 sub _parse_formdata {
   my $self = shift;
 

diff --git a/t/mojo/request.t b/t/mojo/request.t
@@ -329,6 +329,8 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
 # Parse HTTP 1.0 start line (with line size limit)
 {
   $req = Mojo::Message::Request->new;
+  my $limit;
+  $req->on(finish => sub { $limit = shift->is_limit_exceeded });
   ok !$req->is_limit_exceeded, 'limit is not exceeded';
   local $ENV{MOJO_MAX_LINE_SIZE} = 5;
   is $req->headers->max_line_size, 5, 'right size';
@@ -337,6 +339,9 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
   is(($req->error)[0], 'Maximum line size exceeded', 'right error');
   is(($req->error)[1], 431, 'right status');
   ok $req->is_limit_exceeded, 'limit is exceeded';
+  ok $limit, 'limit is exceeded';
+  ok $req->error('Nothing important.')->is_limit_exceeded,
+    'limit is still exceeded';
 }
 
 # Parse HTTP 1.0 start line and headers (with line size limit)
@@ -355,13 +360,16 @@ is $req->headers->content_length, undef,        'no "Content-Length" value';
 # Parse HTTP 1.0 start line (with message size limit)
 {
   $req = Mojo::Message::Request->new;
+  my $limit;
+  $req->on(finish => sub { $limit = shift->is_limit_exceeded });
   local $ENV{MOJO_MAX_MESSAGE_SIZE} = 5;
   is $req->max_message_size, 5, 'right size';
   $req->parse('GET /foo/bar/baz.html HTTP/1');
   ok $req->is_finished, 'request is finished';
   is(($req->error)[0], 'Maximum message size exceeded', 'right error');
   is(($req->error)[1], 413, 'right status');
   ok $req->is_limit_exceeded, 'limit is exceeded';
+  ok $limit, 'limit is exceeded';
 }
 
 # Parse HTTP 1.0 start line and headers (with message size limit)