fix bug where Mojo::UserAgent would try to follow redirects for CONNE…

…CT requests
mojolicious · Aug 21, 2016 · e9f640d · e9f640d
1 parent 25ae8ab
commit e9f640d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,7 @@
 
-7.04  2016-08-18
+7.04  2016-08-21
+  - Fixed bug where Mojo::UserAgent would try to follow redirects for CONNECT
+    requests.
 
 7.03  2016-08-17
   - Fixed packaging errors.

diff --git a/lib/Mojo/UserAgent/Transactor.pm b/lib/Mojo/UserAgent/Transactor.pm
@@ -71,16 +71,19 @@ sub redirect {
   my $code = $res->code // 0;
   return undef unless grep { $_ == $code } 301, 302, 303, 307, 308;
 
+  # CONNECT requests cannot be redirected
+  my $req = $old->req;
+  return undef if uc $req->method eq 'CONNECT';
+
   # Fix location without authority and/or scheme
   return undef unless my $location = $res->headers->location;
   $location = Mojo::URL->new($location);
-  $location = $location->base($old->req->url)->to_abs unless $location->is_abs;
+  $location = $location->base($req->url)->to_abs unless $location->is_abs;
   my $proto = $location->protocol;
   return undef if ($proto ne 'http' && $proto ne 'https') || !$location->host;
 
   # Clone request if necessary
   my $new = Mojo::Transaction::HTTP->new;
-  my $req = $old->req;
   if ($code == 307 || $code == 308) {
     return undef unless my $clone = $req->clone;
     $new->req($clone);

diff --git a/t/mojo/transactor.t b/t/mojo/transactor.t
@@ -927,6 +927,12 @@ is $tx->req->body, '',    'no content';
 is $tx->res->code, undef, 'no status';
 is $tx->res->headers->location, undef, 'no "Location" value';
 
+# 302 redirect for CONNECT request
+$tx = $t->tx(CONNECT => 'http://mojolicious.org');
+$tx->res->code(302);
+$tx->res->headers->location('http://example.com/bar');
+is $t->redirect($tx), undef, 'unsupported redirect';
+
 # Abstract methods
 eval { Mojo::Transaction->client_read };
 like $@, qr/Method "client_read" not implemented by subclass/, 'right error';