Blimp: add support for SSL connections.

blimp/client/session/blimp_client_session.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/session/blimp_client_session.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "blimp/client/app/blimp_client_switches.h"
 #include "blimp/client/feature/navigation_feature.h"
 #include "blimp/client/feature/render_widget_feature.h"
 #include "blimp/client/feature/tab_control_feature.h"
 #include "blimp/net/blimp_message_processor.h"
 #include "blimp/net/blimp_message_thread_pipe.h"
 #include "blimp/net/browser_connection_handler.h"
 #include "blimp/net/client_connection_manager.h"
 #include "blimp/net/common.h"
 #include "blimp/net/null_blimp_message_processor.h"
+#include "blimp/net/ssl_client_transport.h"
 #include "blimp/net/tcp_client_transport.h"
 #include "net/base/address_list.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 
 namespace blimp {
 namespace client {
+namespace {
+
+net::AddressList CreateAddressList(const std::vector<net::IPAddress>& addresses,
+                                   int16_t port) {
+  net::AddressList output_list;
+  for (const auto& next_address : addresses) {
+    output_list.push_back(net::IPEndPoint(next_address, port));
+  }
+  return output_list;
+}
+
+}  // namespace
 
 // This class's functions and destruction are all invoked on the IO thread by
 // the BlimpClientSession.
 // TODO(haibinlu): crbug/574884
 class ClientNetworkComponents {
  public:
   // Can be created on any thread.
   ClientNetworkComponents() {}
 
   ~ClientNetworkComponents() {}
@@ skipping 17 matching lines @@
   scoped_ptr<ClientConnectionManager> connection_manager_;
 
   // Container for the feature-specific MessageProcessors.
   std::vector<scoped_ptr<BlimpMessageProcessor>> incoming_proxies_;
 
   // Containers for the MessageProcessors used to write feature-specific
   // messages to the network, and the thread-pipe endpoints through which
   // they are used from the UI thread.
   std::vector<scoped_ptr<BlimpMessageThreadPipe>> outgoing_pipes_;
   std::vector<scoped_ptr<BlimpMessageProcessor>> outgoing_message_processors_;
-
   DISALLOW_COPY_AND_ASSIGN(ClientNetworkComponents);
 };
 
 void ClientNetworkComponents::Initialize() {
   DCHECK(!connection_manager_);
   connection_manager_ = make_scoped_ptr(
       new ClientConnectionManager(browser_connection_handler_.get()));
 }
 
 void ClientNetworkComponents::ConnectWithAssignment(
     const Assignment& assignment) {
   DCHECK(connection_manager_);
   connection_manager_->set_client_token(assignment.client_token);
 
-  connection_manager_->AddTransport(make_scoped_ptr(new TCPClientTransport(
-      net::AddressList(assignment.ip_endpoint), nullptr)));
+  if (assignment.ssl_port > 0) {
+    if (assignment.cert) {
+      connection_manager_->AddTransport(make_scoped_ptr(new SSLClientTransport(
+          CreateAddressList(assignment.ip_addresses, assignment.ssl_port),
+          assignment.cert, nullptr)));
+    } else {
+      DLOG(FATAL) << "SSL port provided but no cert was found.";

[Wez, 2016/02/12 02:31:14]

This check should be at the command-line parsing layer, not here.  You could
DCHECK() that it's set here, if you feel paranoid.

[Kevin M, 2016/02/13 00:44:18]

Done.

+    }
+  }
+
+  if (assignment.tcp_port > 0) {
+    connection_manager_->AddTransport(make_scoped_ptr(new TCPClientTransport(
+        CreateAddressList(assignment.ip_addresses, assignment.tcp_port),
+        nullptr)));
+  }
 
   connection_manager_->Connect();
 }
 
 void ClientNetworkComponents::RegisterFeature(
     BlimpMessage::Type type,
     scoped_ptr<BlimpMessageThreadPipe> outgoing_pipe,
     scoped_ptr<BlimpMessageProcessor> incoming_proxy) {
   if (!browser_connection_handler_) {
     browser_connection_handler_ = make_scoped_ptr(new BrowserConnectionHandler);
@@ skipping 97 matching lines @@
 NavigationFeature* BlimpClientSession::GetNavigationFeature() const {
   return navigation_feature_.get();
 }
 
 RenderWidgetFeature* BlimpClientSession::GetRenderWidgetFeature() const {
   return render_widget_feature_.get();
 }
 
 }  // namespace client
 }  // namespace blimp