fix a few small CGI bugs

mojolicious · Feb 24, 2016 · 26efcb9 · 26efcb9 · yuki-kimoto · Feb 25, 2016
1 parent b96cea3
commit 26efcb9
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 194 deletions.
diff --git a/Changes b/Changes
@@ -1,10 +1,11 @@
 
-6.48  2016-02-23
+6.48  2016-02-24
   - Added files function to Mojo::Util.
   - Updated jQuery to version 2.2.1.
   - Improved url_for performance significantly.
   - Fixed bug where the results of the list_files method in Mojo::Home would
     include directories.
+  - Fixed a few small CGI bugs.
 
 6.47  2016-02-19
   - Deprecated Mojo::Log::is_debug, Mojo::Log::is_error, Mojo::Log::is_info and

diff --git a/lib/Mojo/Asset/Memory.pm b/lib/Mojo/Asset/Memory.pm
@@ -12,7 +12,7 @@ sub add_chunk {
   my ($self, $chunk) = @_;
 
   # Upgrade if necessary
-  $self->{content} .= $chunk // '';
+  $self->{content} .= $chunk;
   return $self if !$self->auto_upgrade || $self->size <= $self->max_memory_size;
   my $file = Mojo::Asset::File->new;
   return $file->add_chunk($self->emit(upgrade => $file)->slurp);

diff --git a/lib/Mojo/Date.pm b/lib/Mojo/Date.pm
@@ -46,7 +46,6 @@ sub parse {
   # Invalid
   else { return $self->epoch(undef) }
 
-  # Prevent crash
   my $epoch = eval { timegm $s, $m, $h, $day, $month, $year };
   return $self->epoch(
     (defined $epoch && ($epoch += $offset) >= 0) ? $epoch : undef);

diff --git a/lib/Mojo/Headers.pm b/lib/Mojo/Headers.pm
@@ -86,10 +86,10 @@ sub names {
 }
 
 sub parse {
-  my $self = shift;
+  my ($self, $chunk) = @_;
 
   $self->{state} = 'headers';
-  $self->{buffer} .= shift // '';
+  $self->{buffer} .= $chunk;
   my $headers = $self->{cache} ||= [];
   my $size    = $self->max_line_size;
   my $lines   = $self->max_lines;

diff --git a/lib/Mojo/Message.pm b/lib/Mojo/Message.pm
@@ -142,10 +142,10 @@ sub json {
 }
 
 sub parse {
-  my $self = shift;
+  my ($self, $chunk) = @_;
 
   return $self if $self->{error};
-  $self->{raw_size} += length(my $chunk = shift // '');
+  $self->{raw_size} += length $chunk;
   $self->{buffer} .= $chunk;
 
   # Start-line

diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -107,17 +107,16 @@ sub params {
 
 sub parse {
   my $self = shift;
+  my ($env, $chunk) = ref $_[0] ? (shift, '') : (undef, shift);
 
   # Parse CGI environment
-  my $env = @_ > 1 ? {@_} : ref $_[0] eq 'HASH' ? $_[0] : undef;
   $self->env($env)->_parse_env($env) if $env;
 
   # Parse normal message
-  my @args = $env ? () : @_;
-  if (($self->{state} // '') ne 'cgi') { $self->SUPER::parse(@args) }
+  if (($self->{state} // '') ne 'cgi') { $self->SUPER::parse($chunk) }
 
   # Parse CGI content
-  else { $self->content($self->content->parse_body(@args))->SUPER::parse }
+  else { $self->content($self->content->parse_body($chunk))->SUPER::parse('') }
 
   # Check if we can fix things that require all headers
   return $self unless $self->is_finished;
@@ -129,12 +128,11 @@ sub parse {
   if (!$base->host && (my $host = $headers->host)) { $base->authority($host) }
 
   # Basic authentication
-  my $auth = _parse_basic_auth($headers->authorization);
-  $base->userinfo($auth) if $auth;
+  if (my $basic = _basic($headers->authorization)) { $base->userinfo($basic) }
 
   # Basic proxy authentication
-  my $proxy_auth = _parse_basic_auth($headers->proxy_authorization);
-  $self->proxy(Mojo::URL->new->userinfo($proxy_auth)) if $proxy_auth;
+  my $basic = _basic($headers->proxy_authorization);
+  $self->proxy(Mojo::URL->new->userinfo($basic)) if $basic;
 
   # "X-Forwarded-Proto"
   $base->scheme('https')
@@ -148,14 +146,14 @@ sub query_params { shift->url->query }
 
 sub start_line_size { length shift->_start_line->{start_buffer} }
 
-sub _parse_basic_auth {
-  return undef unless my $header = shift;
-  return $header =~ /Basic (.+)$/ ? b64_decode $1 : undef;
-}
+sub _basic { $_[0] && $_[0] =~ /Basic (.+)$/ ? b64_decode $1 : undef }
 
 sub _parse_env {
   my ($self, $env) = @_;
 
+  # Bypass normal message parser
+  $self->{state} = 'cgi';
+
   # Extract headers
   my $headers = $self->headers;
   my $url     = $self->url;
@@ -167,11 +165,8 @@ sub _parse_env {
     $headers->header($name => $value);
 
     # Host/Port
-    if ($name eq 'HOST') {
-      my ($host, $port) = ($value, undef);
-      ($host, $port) = ($1, $2) if $host =~ /^([^:]*):?(.*)$/;
-      $base->host($host)->port($port);
-    }
+    $value =~ s/:(\d+)$// ? $base->host($value)->port($1) : $base->host($value)
+      if $name eq 'HOST';
   }
 
   # Content-Type is a special case on some servers
@@ -209,9 +204,6 @@ sub _parse_env {
     $buffer =~ s!^/!!;
     $path->parse($buffer);
   }
-
-  # Bypass normal message parser
-  $self->{state} = 'cgi';
 }
 
 sub _start_line {
@@ -439,8 +431,7 @@ default.
 =head2 parse
 
   $req = $req->parse('GET /foo/bar HTTP/1.1');
-  $req = $req->parse(REQUEST_METHOD => 'GET');
-  $req = $req->parse({REQUEST_METHOD => 'GET'});
+  $req = $req->parse({PATH_INFO => '/'});
 
 Parse HTTP request chunks or environment hash.
 

diff --git a/lib/Mojo/Parameters.pm b/lib/Mojo/Parameters.pm
@@ -119,11 +119,9 @@ sub parse {
 
 sub remove {
   my ($self, $name) = @_;
-
   my $pairs = $self->pairs;
   my $i     = 0;
   $pairs->[$i] eq $name ? splice @$pairs, $i, 2 : ($i += 2) while $i < @$pairs;
-
   return $self;
 }
 

diff --git a/lib/Mojo/Transaction/WebSocket.pm b/lib/Mojo/Transaction/WebSocket.pm
@@ -145,7 +145,7 @@ sub send {
 sub server_read {
   my ($self, $chunk) = @_;
 
-  $self->{read} .= $chunk // '';
+  $self->{read} .= $chunk;
   my $max = $self->max_websocket_size;
   while (my $frame = Mojo::WebSocket::parse_frame(\$self->{read}, $max)) {
     $self->finish(1009) and last unless ref $frame;

diff --git a/lib/Mojo/URL.pm b/lib/Mojo/URL.pm
@@ -21,7 +21,7 @@ sub authority {
     $self->userinfo(_decode(url_unescape $1)) if $authority =~ s/^([^\@]+)\@//;
 
     # Port
-    $authority =~ s/:(\d+)$// and $self->port($1);
+    $self->port($1) if $authority =~ s/:(\d+)$//;
 
     # Host
     my $host = url_unescape $authority;

diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -290,8 +290,7 @@ sub signed_cookie {
 sub stash { Mojo::Util::_stash(stash => @_) }
 
 sub url_for {
-  my $self = shift;
-  my $target = shift // '';
+  my ($self, $target) = (shift, shift // '');
 
   # Absolute URL
   return $target if Scalar::Util::blessed $target && $target->isa('Mojo::URL');