fixed HTTPS proxy bug in Mojo::UserAgent

mojolicious · Oct 21, 2011 · 2d2233c · 2d2233c
1 parent 7fd6f62
commit 2d2233c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,8 @@
 This file documents the revision history for Perl extension Mojolicious.
 
+2.05    2011-10-22 00:00:00
+        - Fixed HTTPS proxy bug in Mojo::UserAgent.
+
 2.04    2011-10-21 00:00:00
         - Improved documentation.
         - Fixed small HTTP response parser bug.

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -887,10 +887,28 @@ Start the loop, this will block until C<stop> is called.
 =head2 C<start_tls>
 
   $loop->start_tls($id);
+  $loop->start_tls($id => {
+    tls_cert => '/foo/client.cert',
+    tls_key  => '/foo/client.key'
+  });
 
 Start new TLS connection inside old connection.
 Note that TLS support depends on L<IO::Socket::SSL>.
 
+These options are currently available:
+
+=over 2
+
+=item C<tls_cert>
+
+Path to the TLS certificate file.
+
+=item C<tls_key>
+
+Path to the TLS key file.
+
+=back
+
 =head2 C<stop>
 
   Mojo::IOLoop->stop;

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -393,7 +393,8 @@ sub _proxy_connect {
       # TLS upgrade
       if ($tx->req->url->scheme eq 'https') {
         return unless my $id = $tx->connection;
-        $self->_loop->start_tls($id);
+        $self->_loop->start_tls(
+          $id => {tls_cert => $self->cert, tls_key => $self->key});
         $old->req->proxy(undef);
       }
 

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -35,7 +35,7 @@ has static   => sub { Mojolicious::Static->new };
 has types    => sub { Mojolicious::Types->new };
 
 our $CODENAME = 'Leaf Fluttering In Wind';
-our $VERSION  = '2.04';
+our $VERSION  = '2.05';
 
 # "These old doomsday devices are dangerously unstable.
 #  I'll rest easier not knowing where they are."

diff --git a/t/mojo/websocket_proxy_tls.t b/t/mojo/websocket_proxy_tls.t
@@ -65,8 +65,10 @@ websocket '/test' => sub {
 my $ua = Mojo::UserAgent->new;
 my $daemon =
   Mojo::Server::Daemon->new(app => app, ioloop => Mojo::IOLoop->singleton);
-my $port = Mojo::IOLoop->new->generate_port;
-$daemon->listen(["https://*:$port"]);
+my $port   = Mojo::IOLoop->new->generate_port;
+my $listen = "https://*:$port:t/mojo/certs/server.crt"
+  . ':t/mojo/certs/server.key:t/mojo/certs/ca.crt';
+$daemon->listen([$listen]);
 $daemon->prepare_ioloop;
 
 # Connect proxy server for testing
@@ -127,7 +129,7 @@ Mojo::IOLoop->listen(
 
 # GET / (normal request)
 my $result;
-$ua->get(
+$ua->cert('t/mojo/certs/client.crt')->key('t/mojo/certs/client.key')->get(
   "https://localhost:$port/" => sub {
     $result = pop->success->body;
     Mojo::IOLoop->stop;