Enable exporting SSLKEYLOGFILE on Android w/ command line arguments

chrome/browser/io_thread.cc

 // Copyright (c) 2012 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 "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/leak_tracker.h"
+#include "base/environment.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 48 matching lines @@
 #include "net/http/http_auth_filter.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_utils.h"
+#include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/spdy/spdy_session.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_backoff_manager.h"
@@ skipping 452 matching lines @@
   net::SetMessageLoopForNSSHttpIO();
 #endif
 
   // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
   // is fixed.
   tracked_objects::ScopedTracker tracking_profile2(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "466432 IOThread::InitAsync::CommandLineForCurrentProcess"));
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 

[davidben, 2015/10/15 16:46:00]

Optional: I probably wouldn't bother trying to log when both are set and stuff.
You probably can make this logic simpler with a helper

  std::string GetSSLKeyLogFile(const base::CommandLine& command_line)

and then you can just early return out of there.

[Zhongyi Shi, 2015/10/15 19:03:05]

Done.

+  std::string env_ssl_keylog_file;
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  env->GetVar("SSLKEYLOGFILE", &env_ssl_keylog_file);
+
+  std::string flag_ssl_keylog_file;
+  if (command_line.HasSwitch(switches::kSSLKeyLogFile)) {
+    flag_ssl_keylog_file = command_line.GetSwitchValueASCII(
+        switches::kSSLKeyLogFile);
+    if (flag_ssl_keylog_file.empty()) {
+      LOG(WARNING) << "ssl-key-log-file argument missing, ignored.";
+    }
+  }
+
+  if (!flag_ssl_keylog_file.empty() && !env_ssl_keylog_file.empty()) {
+    LOG(WARNING) <<
+      "SSLKEYLOGFILE and ssl-key-log-file both set, SSLKEYLOGFILE ignored";
+  }
+
+  const std::string ssl_keylog_file =

[Bryan McQuade, 2015/10/15 02:09:47]

if possible, this should be const std::string& to avoid the copy.

+    !flag_ssl_keylog_file.empty() ? flag_ssl_keylog_file : env_ssl_keylog_file;
+
+  if (!ssl_keylog_file.empty()) {
+    #if defined(USE_OPENSSL)

[davidben, 2015/10/15 16:46:00]

You can remove this. I'm pretty sure anything using io_thread.cc can assume
USE_OPENSSL at this point.

[Zhongyi Shi, 2015/10/15 19:03:05]

Done.

+      net::SSLClientSocket::SetSSLKeyLogFile(ssl_keylog_file);
+    #else
+      DVLOG(1) << "Platform does not support openssl";
+    #endif
+  }
+
   DCHECK(!globals_);
   globals_ = new Globals;
 
   // Add an observer that will emit network change events to the ChromeNetLog.
   // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be
   // logging the network change before other IO thread consumers respond to it.
   network_change_observer_.reset(
       new LoggingNetworkChangeObserver(net_log_));
 
   // Setup the HistogramWatcher to run on the IO thread.
@@ skipping 1026 matching lines @@
   globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass();
 
   context->set_job_factory(
       globals->proxy_script_fetcher_url_request_job_factory.get());
 
   // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the
   // system URLRequestContext too. There's no reason this should be tied to a
   // profile.
   return context;
 }